X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=f4e689c2a527f7eb229ab517c184c362e518b88e;hp=b1ca3bdd56d56349dce54c17d9635547b1fb2122;hb=a93b404161dc42f8dee805c8f95bc4974aded9cb;hpb=84df52f9ea78e2d71bde648a16b69d80404c6421 diff --git a/src/jtag/presto.c b/src/jtag/presto.c index b1ca3bdd56..f4e689c2a5 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -39,42 +39,6 @@ #error "BUG: either FTD2XX and LIBFTDI has to be used" #endif -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_init(void); -static int presto_jtag_quit(void); - -jtag_interface_t presto_interface = -{ - .name = "presto", - .execute_queue = bitq_execute_queue, - .speed = presto_jtag_speed, - .khz = presto_jtag_khz, - .speed_div = presto_jtag_speed_div, - .register_commands = presto_jtag_register_commands, - .init = presto_jtag_init, - .quit = presto_jtag_quit, -}; - -static int presto_bitq_out(int tms, int tdi, int tdo_req); -static int presto_bitq_flush(void); -static int presto_bitq_sleep(unsigned long us); -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 = -{ - .out = presto_bitq_out, - .flush = presto_bitq_flush, - .sleep = presto_bitq_sleep, - .reset = presto_bitq_reset, - .in_rdy = presto_bitq_in_rdy, - .in = presto_bitq_in, -}; - /* -------------------------------------------------------------------------- */ #define FT_DEVICE_NAME_LEN 64 @@ -86,8 +50,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 +80,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 +112,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 +155,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 +201,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 +213,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; } @@ -553,7 +515,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 +587,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; @@ -701,6 +663,15 @@ static int presto_bitq_reset(int trst, int srst) return 0; } +static struct bitq_interface presto_bitq = { + .out = &presto_bitq_out, + .flush = &presto_bitq_flush, + .sleep = &presto_bitq_sleep, + .reset = &presto_bitq_reset, + .in_rdy = &presto_bitq_in_rdy, + .in = &presto_bitq_in, + }; + /* -------------------------------------------------------------------------- */ static int presto_jtag_khz(int khz, int *jtag_speed) @@ -712,7 +683,7 @@ static int presto_jtag_khz(int khz, int *jtag_speed) } if (khz >= 3000) *jtag_speed = 0; - else *jtag_speed = (1000+khz-1)/khz; + else *jtag_speed = (1000 + khz-1)/khz; return 0; } @@ -752,13 +723,13 @@ 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) + if (CMD_ARGC == 1) { if (presto_serial) free(presto_serial); - presto_serial = strdup(args[0]); + presto_serial = strdup(CMD_ARGV[0]); } else { @@ -768,12 +739,16 @@ 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) -{ - register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command, - COMMAND_CONFIG, NULL); - return ERROR_OK; -} +static const struct command_registration presto_command_handlers[] = { + { + .name = "presto_serial", + .handler = &presto_handle_serial_command, + .mode = COMMAND_CONFIG, + .help = "configure serial port", + .usage = "", + }, + COMMAND_REGISTRATION_DONE +}; static int presto_jtag_init(void) { @@ -809,3 +784,17 @@ static int presto_jtag_quit(void) return ERROR_OK; } + +struct jtag_interface presto_interface = { + .name = "presto", + + .commands = presto_command_handlers, + + .execute_queue = &bitq_execute_queue, + .speed = &presto_jtag_speed, + .khz = &presto_jtag_khz, + .speed_div = &presto_jtag_speed_div, + + .init = &presto_jtag_init, + .quit = &presto_jtag_quit, + };