#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
#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_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;
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)
}
if (khz >= 3000) *jtag_speed = 0;
- else *jtag_speed = (1000+khz-1)/khz;
+ else *jtag_speed = (1000 + khz-1)/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)
+ 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)
-{
- 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 = "<devname>",
+ },
+ COMMAND_REGISTRATION_DONE
+};
static int presto_jtag_init(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,
+ };