X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=b4ba3f44aa4e251af640dc341b14fa75e1a69162;hp=3bac4a9553b7b2b57f19b3a71a8d19fe534459a2;hb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;hpb=a3e84343e202eb70ebce0ec1e8b15d7f9ce57f00 diff --git a/src/jtag/presto.c b/src/jtag/presto.c index 3bac4a9553..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; @@ -98,10 +97,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; @@ -117,18 +116,17 @@ 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 u8 presto_init_seq[] = +static uint8_t presto_init_seq[] = { 0x80, 0xA0, 0xA8, 0xB0, 0xC0, 0xE0 }; -static int presto_write(u8 *buf, u32 size) +static int presto_write(uint8_t *buf, uint32_t size) { #if BUILD_PRESTO_FTD2XX == 1 DWORD ftbytes; @@ -139,7 +137,7 @@ static int presto_write(u8 *buf, u32 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)); @@ -150,14 +148,15 @@ static int presto_write(u8 *buf, u32 size) if (ftbytes != size) { - LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", (u32)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; } -static int presto_read(u8* buf, u32 size) +static int presto_read(uint8_t* buf, uint32_t size) { #if BUILD_PRESTO_FTD2XX == 1 DWORD ftbytes; @@ -168,7 +167,7 @@ static int presto_read(u8* buf, u32 size) } #elif BUILD_PRESTO_LIBFTDI == 1 - u32 ftbytes = 0; + uint32_t ftbytes = 0; struct timeval timeout, now; gettimeofday(&timeout, NULL); @@ -192,7 +191,8 @@ static int presto_read(u8* buf, u32 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)", (u32)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; } @@ -202,7 +202,7 @@ static int presto_read(u8* buf, u32 size) #if BUILD_PRESTO_FTD2XX == 1 static int presto_open_ftd2xx(char *req_serial) { - u32 i; + uint32_t i; DWORD numdevs; DWORD vidpid; char devname[FT_DEVICE_NAME_LEN]; @@ -237,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) @@ -249,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; } @@ -277,7 +277,7 @@ static 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"); @@ -290,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); @@ -311,7 +311,7 @@ static 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; @@ -332,7 +332,7 @@ static int presto_open_ftd2xx(char *req_serial) #elif BUILD_PRESTO_LIBFTDI == 1 static int presto_open_libftdi(char *req_serial) { - u8 presto_data; + uint8_t presto_data; LOG_DEBUG("searching for PRESTO using libftdi"); @@ -405,22 +405,22 @@ 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->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 @@ -521,7 +521,7 @@ static int presto_sendbyte(int data) 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++; } @@ -532,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(); @@ -551,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; @@ -575,7 +575,7 @@ static int presto_tdi_flush(void) presto_sendbyte(presto->jtag_tdi_data); presto->jtag_tdi_count = 0; presto->jtag_tdi_data = 0; - + return 0; } @@ -586,7 +586,7 @@ static int presto_tck_idle(void) presto_sendbyte(0xCA); presto->jtag_tck = 0; } - + return 0; } @@ -623,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; @@ -650,14 +650,14 @@ static int presto_bitq_flush(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; } 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; @@ -705,13 +705,13 @@ 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; } @@ -719,38 +719,38 @@ 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; } 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; } 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) { @@ -766,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); @@ -787,7 +787,7 @@ static 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;