/* parallel port cable description
*/
-typedef struct cable_s
-{
+struct cable {
char* name;
uint8_t TDO_MASK; /* status port bit containing current TDO value */
uint8_t TRST_MASK; /* data port bit for TRST */
uint8_t PORT_INIT; /* initialize data port with this value */
uint8_t PORT_EXIT; /* de-initialize data port with this value */
uint8_t LED_MASK; /* data port bit for LED */
-} cable_t;
+};
-static cable_t cables[] =
+static struct cable cables[] =
{
/* name tdo trst tms tck tdi srst o_inv i_inv init exit led */
{ "wiggler", 0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x01, 0x80, 0x80, 0x80, 0x00 },
/* configuration */
static char* parport_cable = NULL;
static uint16_t parport_port;
-static int parport_exit = 0;
+static bool parport_exit = 0;
static uint32_t parport_toggling_time_ns = 1000;
static int wait_states;
/* interface variables
*/
-static cable_t* cable;
+static struct cable* cable;
static uint8_t dataport_value = 0x0;
#if PARPORT_USE_PPDEV == 1
}
#endif
-static bitbang_interface_t parport_bitbang = {
+static struct bitbang_interface parport_bitbang = {
.read = &parport_read,
.write = &parport_write,
.reset = &parport_reset,
static int parport_init(void)
{
- cable_t *cur_cable;
+ struct cable *cur_cable;
#if PARPORT_USE_PPDEV == 1
char buffer[256];
int i = 0;
COMMAND_HANDLER(parport_handle_parport_port_command)
{
- if (argc == 1)
+ if (CMD_ARGC == 1)
{
/* only if the port wasn't overwritten by cmdline */
if (parport_port == 0)
{
- COMMAND_PARSE_NUMBER(u16, args[0], parport_port);
+ COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], parport_port);
}
else
{
}
}
- command_print(cmd_ctx, "parport port = %u", parport_port);
+ command_print(CMD_CTX, "parport port = %u", parport_port);
return ERROR_OK;
}
COMMAND_HANDLER(parport_handle_parport_cable_command)
{
- if (argc == 0)
+ if (CMD_ARGC == 0)
return ERROR_OK;
/* only if the cable name wasn't overwritten by cmdline */
if (parport_cable == 0)
{
- parport_cable = malloc(strlen(args[0]) + sizeof(char));
- strcpy(parport_cable, args[0]);
+ parport_cable = malloc(strlen(CMD_ARGV[0]) + sizeof(char));
+ strcpy(parport_cable, CMD_ARGV[0]);
}
return ERROR_OK;
COMMAND_HANDLER(parport_handle_write_on_exit_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
{
- command_print(cmd_ctx, "usage: parport_write_on_exit <on | off>");
+ command_print(CMD_CTX, "usage: parport_write_on_exit <on | off>");
return ERROR_OK;
}
- if (strcmp(args[0], "on") == 0)
- parport_exit = 1;
- else if (strcmp(args[0], "off") == 0)
- parport_exit = 0;
+ COMMAND_PARSE_ON_OFF(CMD_ARGV[0], parport_exit);
return ERROR_OK;
}
-static int
-parport_handle_parport_toggling_time_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
{
- if (argc == 1) {
+ if (CMD_ARGC == 1) {
uint32_t ns;
- int retval = parse_u32(args[0], &ns);
+ int retval = parse_u32(CMD_ARGV[0], &ns);
if (ERROR_OK != retval)
return retval;
wait_states = jtag_get_speed();
}
- command_print(cmd_ctx, "parport toggling time = %" PRIu32 " ns",
+ command_print(CMD_CTX, "parport toggling time = %" PRIu32 " ns",
parport_toggling_time_ns);
return ERROR_OK;
}
-static int parport_register_commands(struct command_context_s *cmd_ctx)
-{
- register_command(cmd_ctx, NULL, "parport_port",
- parport_handle_parport_port_command, COMMAND_CONFIG,
- "either the address of the I/O port "
- "or the number of the '/dev/parport' device");
+static const struct command_registration parport_command_handlers[] = {
+ {
+ .name = "parport_port",
+ .handler = &parport_handle_parport_port_command,
+ .mode = COMMAND_CONFIG,
+ .help = "either the address of the I/O port "
+ "or the number of the '/dev/parport' device",
+ .usage = "[<port|devname>]",
+ },
+ {
+ .name = "parport_cable",
+ .handler = &parport_handle_parport_cable_command,
+ .mode = COMMAND_CONFIG,
+ .help = "the layout of the parallel port cable "
+ "used to connect to the target",
+ .usage = "[<layout>]",
+ },
+ {
+ .name = "parport_write_on_exit",
+ .handler = &parport_handle_write_on_exit_command,
+ .mode = COMMAND_CONFIG,
+ .help = "configure the parallel driver to write "
+ "a known value to the parallel interface",
+ .usage = "[<on|off>]",
+ },
+ {
+ .name = "parport_toggling_time",
+ .handler = &parport_handle_parport_toggling_time_command,
+ .mode = COMMAND_CONFIG,
+ .help = "time <ns> it takes for the hardware to toggle TCK",
+ .usage = "[<ns>]",
+ },
+ COMMAND_REGISTRATION_DONE
+};
- register_command(cmd_ctx, NULL, "parport_cable",
- parport_handle_parport_cable_command, COMMAND_CONFIG,
- "the layout of the parallel port cable "
- "used to connect to the target");
+struct jtag_interface parport_interface = {
+ .name = "parport",
- register_command(cmd_ctx, NULL, "parport_write_on_exit",
- parport_handle_write_on_exit_command, COMMAND_CONFIG,
- "configure the parallel driver to write "
- "a known value to the parallel interface");
+ .commands = parport_command_handlers,
- register_command(cmd_ctx, NULL, "parport_toggling_time",
- parport_handle_parport_toggling_time_command, COMMAND_ANY,
- "time <ns> it takes for the hardware to toggle TCK");
+ .init = &parport_init,
+ .quit = &parport_quit,
- return ERROR_OK;
-}
+ .khz = &parport_khz,
+ .speed_div = &parport_speed_div,
+ .speed = &parport_speed,
-jtag_interface_t parport_interface = {
- .name = "parport",
- .register_commands = parport_register_commands,
- .init = parport_init,
- .quit = parport_quit,
- .khz = parport_khz,
- .speed_div = parport_speed_div,
- .speed = parport_speed,
- .execute_queue = bitbang_execute_queue,
-};
+ .execute_queue = &bitbang_execute_queue,
+ };
Code Review / openocd.git / blobdiff