ft2232_device_t -> struct ft2232_device

Remove misleading typedef from ft2232_device; it was barely used.
This commit is contained in:
Zachary T Welch 2009-11-13 05:17:18 -08:00
parent 4bc155398e
commit a3f1c87eb7
1 changed files with 5 additions and 6 deletions

View File

@ -114,13 +114,12 @@ static unsigned ft2232_max_tck = FTDI_2232C_MAX_TCK;
static uint16_t ft2232_vid[MAX_USB_IDS + 1] = { 0x0403, 0 }; static uint16_t ft2232_vid[MAX_USB_IDS + 1] = { 0x0403, 0 };
static uint16_t ft2232_pid[MAX_USB_IDS + 1] = { 0x6010, 0 }; static uint16_t ft2232_pid[MAX_USB_IDS + 1] = { 0x6010, 0 };
typedef struct ft2232_layout_s struct ft2232_layout {
{
char* name; char* name;
int (*init)(void); int (*init)(void);
void (*reset)(int trst, int srst); void (*reset)(int trst, int srst);
void (*blink)(void); void (*blink)(void);
} ft2232_layout_t; };
/* init procedures for supported layouts */ /* init procedures for supported layouts */
static int usbjtag_init(void); static int usbjtag_init(void);
@ -158,7 +157,7 @@ static void turtle_jtag_blink(void);
static void signalyzer_h_blink(void); static void signalyzer_h_blink(void);
static void ktlink_blink(void); static void ktlink_blink(void);
static const ft2232_layout_t ft2232_layouts[] = static const struct ft2232_layout ft2232_layouts[] =
{ {
{ "usbjtag", usbjtag_init, usbjtag_reset, NULL }, { "usbjtag", usbjtag_init, usbjtag_reset, NULL },
{ "jtagkey", jtagkey_init, jtagkey_reset, NULL }, { "jtagkey", jtagkey_init, jtagkey_reset, NULL },
@ -183,7 +182,7 @@ static const ft2232_layout_t ft2232_layouts[] =
static uint8_t nTRST, nTRSTnOE, nSRST, nSRSTnOE; static uint8_t nTRST, nTRSTnOE, nSRST, nSRSTnOE;
static const ft2232_layout_t *layout; static const struct ft2232_layout *layout;
static uint8_t low_output = 0x0; static uint8_t low_output = 0x0;
static uint8_t low_direction = 0x0; static uint8_t low_direction = 0x0;
static uint8_t high_output = 0x0; static uint8_t high_output = 0x0;
@ -2060,7 +2059,7 @@ static int ft2232_init(void)
uint8_t buf[1]; uint8_t buf[1];
int retval; int retval;
uint32_t bytes_written; uint32_t bytes_written;
const ft2232_layout_t* cur_layout = ft2232_layouts; const struct ft2232_layout* cur_layout = ft2232_layouts;
int i; int i;
if (tap_get_tms_path_len(TAP_IRPAUSE,TAP_IRPAUSE) == 7) if (tap_get_tms_path_len(TAP_IRPAUSE,TAP_IRPAUSE) == 7)