X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=b4ba3f44aa4e251af640dc341b14fa75e1a69162;hp=8985cd76b1ccaa80c9cc68e0d4cbcbe7843616b1;hb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;hpb=4ce93ac479c29210c4b472a16733bed2537c35f9 diff --git a/src/jtag/presto.c b/src/jtag/presto.c index 8985cd76b1..b4ba3f44aa 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -42,11 +42,11 @@ static int presto_jtag_speed(int speed); static int presto_jtag_khz(int khz, int *jtag_speed); static int presto_jtag_speed_div(int speed, int *khz); -static int presto_jtag_register_commands(struct command_context_s *cmd_ctx); +static int presto_jtag_register_commands(struct command_context *cmd_ctx); static int presto_jtag_init(void); static int presto_jtag_quit(void); -jtag_interface_t presto_interface = +struct jtag_interface presto_interface = { .name = "presto", .execute_queue = bitq_execute_queue, @@ -65,7 +65,7 @@ static int presto_bitq_reset(int trst, int srst); static int presto_bitq_in_rdy(void); static int presto_bitq_in(void); -static bitq_interface_t presto_bitq = +static struct bitq_interface presto_bitq = { .out = presto_bitq_out, .flush = presto_bitq_flush, @@ -86,8 +86,7 @@ static bitq_interface_t presto_bitq = #define BUFFER_SIZE (64*62) -typedef struct presto_s -{ +struct presto { #if BUILD_PRESTO_FTD2XX == 1 FT_HANDLE handle; FT_STATUS status; @@ -117,11 +116,10 @@ typedef struct presto_s int jtag_tdi_count; int jtag_speed; +}; -} presto_t; - -static presto_t presto_state; -static presto_t *presto = &presto_state; +static struct presto presto_state; +static struct presto *presto = &presto_state; static uint8_t presto_init_seq[] = { @@ -150,7 +148,7 @@ static int presto_write(uint8_t *buf, uint32_t size) if (ftbytes != size) { - LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", + LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", (unsigned)ftbytes, (unsigned)size); return ERROR_JTAG_DEVICE_ERROR; } @@ -193,7 +191,7 @@ static int presto_read(uint8_t* buf, uint32_t size) if (ftbytes != size) { /* this is just a warning, there might have been timeout when detecting PRESTO, which is not fatal */ - LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", + LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", (unsigned)ftbytes, (unsigned)size); return ERROR_JTAG_DEVICE_ERROR; } @@ -239,7 +237,7 @@ static int presto_open_ftd2xx(char *req_serial) LOG_DEBUG("FT_Open failed: %i", (int)presto->status); continue; } - LOG_DEBUG("FTDI device %i open", i); + LOG_DEBUG("FTDI device %i open", (int)i); if ((presto->status = FT_GetDeviceInfo(presto->handle, &device, &vidpid, presto->serial, devname, NULL)) == FT_OK) @@ -251,7 +249,7 @@ static int presto_open_ftd2xx(char *req_serial) else LOG_DEBUG("FT_GetDeviceInfo failed: %lu", presto->status); - LOG_DEBUG("FTDI device %i does not match, closing", i); + LOG_DEBUG("FTDI device %i does not match, closing", (int)i); FT_Close(presto->handle); presto->handle = (FT_HANDLE)INVALID_HANDLE_VALUE; } @@ -292,7 +290,7 @@ static int presto_open_ftd2xx(char *req_serial) presto_data = 0; for (i = 0; i < 4 * 62; i++) - if ((presto->status=FT_Write(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK) + if ((presto->status = FT_Write(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK) return ERROR_JTAG_DEVICE_ERROR; usleep(100000); @@ -407,21 +405,21 @@ static int presto_open_libftdi(char *req_serial) static int presto_open(char *req_serial) { - presto->buff_out_pos=0; - presto->buff_in_pos=0; - presto->buff_in_len=0; - presto->buff_in_exp=0; + presto->buff_out_pos = 0; + presto->buff_in_pos = 0; + presto->buff_in_len = 0; + presto->buff_in_exp = 0; - presto->total_out=0; - presto->total_in=0; + presto->total_out = 0; + presto->total_in = 0; - presto->jtag_tms=0; - presto->jtag_tck=0; - presto->jtag_rst=0; - presto->jtag_tdi_data=0; - presto->jtag_tdi_count=0; + presto->jtag_tms = 0; + presto->jtag_tck = 0; + presto->jtag_rst = 0; + presto->jtag_tdi_data = 0; + presto->jtag_tdi_count = 0; - presto->jtag_speed=0; + presto->jtag_speed = 0; #if BUILD_PRESTO_FTD2XX == 1 return presto_open_ftd2xx(req_serial); @@ -534,7 +532,7 @@ static int presto_sendbyte(int data) if (presto->buff_out_pos >= BUFFER_SIZE) #elif BUILD_PRESTO_LIBFTDI == 1 /* libftdi does not do background read, be sure that USB IN buffer does not overflow (128 bytes only!) */ - if (presto->buff_out_pos >= BUFFER_SIZE || presto->buff_in_exp==128) + if (presto->buff_out_pos >= BUFFER_SIZE || presto->buff_in_exp == 128) #endif return presto_flush(); @@ -553,7 +551,7 @@ static int presto_getbyte(void) if (presto_flush() != ERROR_OK) return -1; - if (presto->buff_in_posbuff_in_len) + if (presto->buff_in_pos < presto->buff_in_len) return presto->buff_in[presto->buff_in_pos++]; return -1; @@ -625,14 +623,14 @@ static int presto_bitq_out(int tms, int tdi, int tdo_req) } /* delay with TCK low */ - for (i=presto->jtag_speed; i>1; i--) + for (i = presto->jtag_speed; i > 1; i--) presto_sendbyte(cmd); cmd |= 0x04; presto_sendbyte(cmd | (tdo_req ? 0x10 : 0)); /* delay with TCK high */ - for (i=presto->jtag_speed; i>1; i--) + for (i = presto->jtag_speed; i > 1; i--) presto_sendbyte(cmd); presto->jtag_tck = 1; @@ -707,12 +705,12 @@ static int presto_jtag_khz(int khz, int *jtag_speed) { if (khz < 0) { - *jtag_speed=0; + *jtag_speed = 0; return ERROR_INVALID_ARGUMENTS; } if (khz >= 3000) *jtag_speed = 0; - else *jtag_speed = (1000+khz-1)/khz; + else *jtag_speed = (1000 + khz-1)/khz; return 0; } @@ -721,7 +719,7 @@ static int presto_jtag_speed_div(int speed, int *khz) { if ((speed < 0) || (speed > 1000)) { - *khz=0; + *khz = 0; return ERROR_INVALID_ARGUMENTS; } @@ -752,7 +750,7 @@ static int presto_jtag_speed(int speed) static char *presto_serial; -static int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(presto_handle_serial_command) { if (argc == 1) { @@ -768,7 +766,7 @@ static int presto_handle_serial_command(struct command_context_s *cmd_ctx, char return ERROR_OK; } -static int presto_jtag_register_commands(struct command_context_s *cmd_ctx) +static int presto_jtag_register_commands(struct command_context *cmd_ctx) { register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command, COMMAND_CONFIG, NULL);