X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=9aca909758b7c18ed5872b39157dd9d143891c18;hp=58389e6908c835db4f04872dea2332c5d81bdaae;hb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa;hpb=c18947b947064e7eceed8047c42d4c8dfd8ae964 diff --git a/src/jtag/presto.c b/src/jtag/presto.c index 58389e6908..9aca909758 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -128,7 +128,7 @@ static uint8_t presto_init_seq[] = 0x80, 0xA0, 0xA8, 0xB0, 0xC0, 0xE0 }; -static int presto_write(uint8_t *buf, u32 size) +static int presto_write(uint8_t *buf, uint32_t size) { #if BUILD_PRESTO_FTD2XX == 1 DWORD ftbytes; @@ -139,7 +139,7 @@ static int presto_write(uint8_t *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 +150,15 @@ static int presto_write(uint8_t *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(uint8_t* buf, u32 size) +static int presto_read(uint8_t* buf, uint32_t size) { #if BUILD_PRESTO_FTD2XX == 1 DWORD ftbytes; @@ -168,7 +169,7 @@ static int presto_read(uint8_t* buf, u32 size) } #elif BUILD_PRESTO_LIBFTDI == 1 - u32 ftbytes = 0; + uint32_t ftbytes = 0; struct timeval timeout, now; gettimeofday(&timeout, NULL); @@ -192,7 +193,8 @@ static int presto_read(uint8_t* 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 +204,7 @@ static int presto_read(uint8_t* 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]; @@ -277,7 +279,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 +292,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 +313,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; @@ -405,21 +407,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); @@ -532,7 +534,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 +553,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; @@ -623,14 +625,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 +652,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,12 +707,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; } @@ -719,7 +721,7 @@ static int presto_jtag_speed_div(int speed, int *khz) { if ((speed < 0) || (speed > 1000)) { - *khz=0; + *khz = 0; return ERROR_INVALID_ARGUMENTS; }