X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fjtag%2Fpresto.c;h=f22bd9eb862e487794aa26cb6a1b11973b24b2e2;hb=833e7f5248778bcb31b4db1a1b91160995415203;hp=0e532817fc4453f7704b761ac09ae312182b9cf9;hpb=0cba0d4df3fe120f08945703506f8405760325c9;p=openocd.git diff --git a/src/jtag/presto.c b/src/jtag/presto.c index 0e532817fc..f22bd9eb86 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -25,20 +25,10 @@ #include "windows.h" #endif -#include "replacements.h" - -/* project specific includes */ -#include "log.h" -#include "types.h" -#include "jtag.h" -#include "configuration.h" +#include "interface.h" #include "time_support.h" #include "bitq.h" -/* system includes */ -#include -#include -#include /* PRESTO access library includes */ #if BUILD_PRESTO_FTD2XX == 1 @@ -49,42 +39,6 @@ #error "BUG: either FTD2XX and LIBFTDI has to be used" #endif -int presto_jtag_speed(int speed); -int presto_jtag_khz(int khz, int *jtag_speed); -int presto_jtag_speed_div(int speed, int *khz); -int presto_jtag_register_commands(struct command_context_s *cmd_ctx); -int presto_jtag_init(void); -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, -}; - -int presto_bitq_out(int tms, int tdi, int tdo_req); -int presto_bitq_flush(void); -int presto_bitq_sleep(unsigned long us); -int presto_bitq_reset(int trst, int srst); -int presto_bitq_in_rdy(void); -int presto_bitq_in(void); - -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 @@ -96,8 +50,7 @@ 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; @@ -108,10 +61,10 @@ typedef struct presto_s char serial[FT_DEVICE_SERNUM_LEN]; - u8 buff_out[BUFFER_SIZE]; + uint8_t buff_out[BUFFER_SIZE]; int buff_out_pos; - u8 buff_in[BUFFER_SIZE]; + uint8_t buff_in[BUFFER_SIZE]; int buff_in_exp; /* expected in buffer length */ int buff_in_len; /* length of data received */ int buff_in_pos; @@ -127,18 +80,17 @@ typedef struct presto_s int jtag_tdi_count; int jtag_speed; - -} presto_t; +}; -presto_t presto_state; -presto_t *presto = &presto_state; +static struct presto presto_state; +static struct presto *presto = &presto_state; -u8 presto_init_seq[] = +static uint8_t presto_init_seq[] = { 0x80, 0xA0, 0xA8, 0xB0, 0xC0, 0xE0 }; -int presto_write(u8 *buf, int size) +static int presto_write(uint8_t *buf, uint32_t size) { #if BUILD_PRESTO_FTD2XX == 1 DWORD ftbytes; @@ -149,7 +101,7 @@ int presto_write(u8 *buf, int size) } #elif BUILD_PRESTO_LIBFTDI == 1 - u32 ftbytes; + uint32_t ftbytes; if ((presto->retval = ftdi_write_data(&presto->ftdic, buf, size)) < 0) { LOG_ERROR("ftdi_write_data: %s", ftdi_get_error_string(&presto->ftdic)); @@ -160,14 +112,15 @@ int presto_write(u8 *buf, int size) if (ftbytes != size) { - LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%i < %i)", ftbytes, size); + LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", + (unsigned)ftbytes, (unsigned)size); return ERROR_JTAG_DEVICE_ERROR; } return ERROR_OK; } -int presto_read(u8* buf, int size) +static int presto_read(uint8_t* buf, uint32_t size) { #if BUILD_PRESTO_FTD2XX == 1 DWORD ftbytes; @@ -178,7 +131,7 @@ int presto_read(u8* buf, int size) } #elif BUILD_PRESTO_LIBFTDI == 1 - u32 ftbytes = 0; + uint32_t ftbytes = 0; struct timeval timeout, now; gettimeofday(&timeout, NULL); @@ -202,7 +155,8 @@ int presto_read(u8* buf, int 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 (%i < %i)", ftbytes, size); + LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", + (unsigned)ftbytes, (unsigned)size); return ERROR_JTAG_DEVICE_ERROR; } @@ -210,9 +164,9 @@ int presto_read(u8* buf, int size) } #if BUILD_PRESTO_FTD2XX == 1 -int presto_open_ftd2xx(char *req_serial) +static int presto_open_ftd2xx(char *req_serial) { - int i; + uint32_t i; DWORD numdevs; DWORD vidpid; char devname[FT_DEVICE_NAME_LEN]; @@ -238,7 +192,7 @@ int presto_open_ftd2xx(char *req_serial) return ERROR_JTAG_DEVICE_ERROR; } - LOG_DEBUG("FTDI devices available: %i", numdevs); + LOG_DEBUG("FTDI devices available: %lu", numdevs); for (i = 0; i < numdevs; i++) { if ((presto->status = FT_Open(i, &(presto->handle))) != FT_OK) @@ -247,7 +201,7 @@ 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) @@ -257,9 +211,9 @@ int presto_open_ftd2xx(char *req_serial) break; } else - LOG_DEBUG("FT_GetDeviceInfo failed: %i", presto->status); + 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; } @@ -287,7 +241,7 @@ int presto_open_ftd2xx(char *req_serial) if ((presto->status = FT_Read(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK) return ERROR_JTAG_DEVICE_ERROR; - if (ftbytes!=1) + if (ftbytes != 1) { LOG_DEBUG("PRESTO reset"); @@ -300,7 +254,7 @@ 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); @@ -321,7 +275,7 @@ int presto_open_ftd2xx(char *req_serial) if ((presto->status = FT_Read(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK) return ERROR_JTAG_DEVICE_ERROR; - if (ftbytes!=1) + if (ftbytes != 1) { LOG_DEBUG("PRESTO not responding"); return ERROR_JTAG_DEVICE_ERROR; @@ -340,9 +294,9 @@ int presto_open_ftd2xx(char *req_serial) } #elif BUILD_PRESTO_LIBFTDI == 1 -int presto_open_libftdi(char *req_serial) +static int presto_open_libftdi(char *req_serial) { - u8 presto_data; + uint8_t presto_data; LOG_DEBUG("searching for PRESTO using libftdi"); @@ -413,24 +367,24 @@ int presto_open_libftdi(char *req_serial) } #endif /* BUILD_PRESTO_LIBFTDI == 1 */ -int presto_open(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->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_speed=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->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; + #if BUILD_PRESTO_FTD2XX == 1 return presto_open_ftd2xx(req_serial); #elif BUILD_PRESTO_LIBFTDI == 1 @@ -438,7 +392,7 @@ int presto_open(char *req_serial) #endif } -int presto_close(void) +static int presto_close(void) { int result = ERROR_OK; @@ -482,7 +436,7 @@ int presto_close(void) return result; } -int presto_flush(void) +static int presto_flush(void) { if (presto->buff_out_pos == 0) return ERROR_OK; @@ -525,13 +479,13 @@ int presto_flush(void) return ERROR_OK; } -int presto_sendbyte(int data) +static int presto_sendbyte(int data) { if (data == EOF) return presto_flush(); if (presto->buff_out_pos < BUFFER_SIZE) { - presto->buff_out[presto->buff_out_pos++] = (u8)data; + presto->buff_out[presto->buff_out_pos++] = (uint8_t)data; if (((data & 0xC0) == 0x40) || ((data & 0xD0)== 0xD0)) presto->buff_in_exp++; } @@ -542,14 +496,15 @@ 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(); return ERROR_OK; } -int presto_getbyte(void) +#if 0 +static int presto_getbyte(void) { if (presto->buff_in_pos < presto->buff_in_len) return presto->buff_in[presto->buff_in_pos++]; @@ -560,15 +515,16 @@ 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; } +#endif /* -------------------------------------------------------------------------- */ -int presto_tdi_flush(void) +static int presto_tdi_flush(void) { if (presto->jtag_tdi_count == 0) return 0; @@ -583,24 +539,24 @@ int presto_tdi_flush(void) presto_sendbyte(presto->jtag_tdi_data); presto->jtag_tdi_count = 0; presto->jtag_tdi_data = 0; - + return 0; } -int presto_tck_idle(void) +static int presto_tck_idle(void) { if (presto->jtag_tck == 1) { presto_sendbyte(0xCA); presto->jtag_tck = 0; } - + return 0; } /* -------------------------------------------------------------------------- */ -int presto_bitq_out(int tms, int tdi, int tdo_req) +static int presto_bitq_out(int tms, int tdi, int tdo_req) { int i; unsigned char cmd; @@ -631,14 +587,14 @@ 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; @@ -646,7 +602,7 @@ int presto_bitq_out(int tms, int tdi, int tdo_req) return 0; } -int presto_bitq_flush(void) +static int presto_bitq_flush(void) { presto_tdi_flush(); presto_tck_idle(); @@ -656,22 +612,22 @@ int presto_bitq_flush(void) return presto_flush(); } -int presto_bitq_in_rdy(void) +static int presto_bitq_in_rdy(void) { - if (presto->buff_in_pos>=presto->buff_in_len) + if (presto->buff_in_pos >= presto->buff_in_len) return 0; return presto->buff_in_len-presto->buff_in_pos; } -int presto_bitq_in(void) +static int presto_bitq_in(void) { - if (presto->buff_in_pos>=presto->buff_in_len) + if (presto->buff_in_pos >= presto->buff_in_len) return -1; if (presto->buff_in[presto->buff_in_pos++]&0x08) return 1; return 0; } -int presto_bitq_sleep(unsigned long us) +static int presto_bitq_sleep(unsigned long us) { long waits; @@ -692,7 +648,7 @@ int presto_bitq_sleep(unsigned long us) return 0; } -int presto_bitq_reset(int trst, int srst) +static int presto_bitq_reset(int trst, int srst) { presto_tdi_flush(); presto_tck_idle(); @@ -707,64 +663,73 @@ 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, + }; + /* -------------------------------------------------------------------------- */ -int presto_jtag_khz(int khz, int *jtag_speed) +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; } -int presto_jtag_speed_div(int speed, int *khz) +static int presto_jtag_speed_div(int speed, int *khz) { if ((speed < 0) || (speed > 1000)) { - *khz=0; + *khz = 0; return ERROR_INVALID_ARGUMENTS; } if (speed == 0) *khz = 3000; else *khz = 1000/speed; - + return 0; } -int presto_jtag_speed(int speed) +static int presto_jtag_speed(int speed) { int khz; - + if (presto_jtag_speed_div(speed, &khz)) { return ERROR_INVALID_ARGUMENTS; } presto->jtag_speed = speed; - + if (khz%1000 == 0) LOG_INFO("setting speed to %d, max. TCK freq. is %d MHz", speed, khz/1000); else LOG_INFO("setting speed to %d, max. TCK freq. is %d kHz", speed, khz); - + return 0; } -char *presto_serial; +static char *presto_serial; -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 { @@ -774,14 +739,14 @@ int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, c return ERROR_OK; } -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_REGISTER(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command, COMMAND_CONFIG, NULL); return ERROR_OK; } -int presto_jtag_init(void) +static int presto_jtag_init(void) { if (presto_open(presto_serial) != ERROR_OK) { @@ -795,13 +760,13 @@ int presto_jtag_init(void) LOG_INFO("PRESTO open, serial number '%s'", presto->serial); /* use JTAG speed setting from configuration file */ - presto_jtag_speed(jtag_speed); + presto_jtag_speed(jtag_get_speed()); bitq_interface = &presto_bitq; return ERROR_OK; } -int presto_jtag_quit(void) +static int presto_jtag_quit(void) { bitq_cleanup(); presto_close(); @@ -815,3 +780,14 @@ int presto_jtag_quit(void) return ERROR_OK; } + +struct jtag_interface 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, + };