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,
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,
#define BUFFER_SIZE (64*62)
-typedef struct presto_s
-{
+struct presto {
#if BUILD_PRESTO_FTD2XX == 1
FT_HANDLE handle;
FT_STATUS status;
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[] =
{
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;
}
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;
}
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)
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;
}
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");
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);
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;
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);
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();
if (presto_flush() != ERROR_OK)
return -1;
- if (presto->buff_in_pos<presto->buff_in_len)
+ if (presto->buff_in_pos < presto->buff_in_len)
return presto->buff_in[presto->buff_in_pos++];
return -1;
}
/* 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;
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;
{
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;
}
{
if ((speed < 0) || (speed > 1000))
{
- *khz=0;
+ *khz = 0;
return ERROR_INVALID_ARGUMENTS;
}
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
{
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);