X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fparport.c;h=d4d9b22d6373a9ca4cbd6310cbcf2295228d5f15;hb=e1c26950c03b09efe42b8a25dd83f1e50e22a507;hp=fdf7df4da0de60a4bc31c1010f8f77f60ae6c146;hpb=8d6dcb9d39f0f948ef44beff991337b830fc4567;p=openocd.git

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index fdf7df4da0..d4d9b22d63 100644
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -105,6 +105,8 @@ static cable_t cables[] =
 static char* parport_cable = NULL;
 static uint16_t parport_port;
 static int parport_exit = 0;
+static uint32_t parport_toggling_time_ns = 1000;
+static int wait_states;
 
 /* interface variables
  */
@@ -152,7 +154,7 @@ static __inline__ void parport_write_data(void)
 
 static void parport_write(int tck, int tms, int tdi)
 {
-	int i = jtag_get_speed() + 1;
+	int i = wait_states + 1;
 
 	if (tck)
 		dataport_value |= cable->TCK_MASK;
@@ -204,6 +206,26 @@ static void parport_led(int on)
 
 static int parport_speed(int speed)
 {
+	wait_states = speed;
+	return ERROR_OK;
+}
+
+static int parport_khz(int khz, int* jtag_speed)
+{
+	if (khz == 0) {
+		LOG_DEBUG("RCLK not supported");
+		return ERROR_FAIL;
+	}
+
+	*jtag_speed = 499999 / (khz * parport_toggling_time_ns);
+	return ERROR_OK;
+}
+
+static int parport_speed_div(int speed, int* khz)
+{
+	uint32_t denominator = (speed + 1) * parport_toggling_time_ns;
+
+	*khz = (499999 + denominator) / denominator;
 	return ERROR_OK;
 }
 
@@ -233,7 +255,7 @@ static int parport_get_giveio_access(void)
 }
 #endif
 
-static bitbang_interface_t parport_bitbang = {
+static struct bitbang_interface parport_bitbang = {
 		.read = &parport_read,
 		.write = &parport_write,
 		.reset = &parport_reset,
@@ -364,6 +386,8 @@ static int parport_init(void)
 
 	bitbang_interface = &parport_bitbang;
 
+	wait_states = jtag_get_speed();
+
 	return ERROR_OK;
 }
 
@@ -386,7 +410,7 @@ static int parport_quit(void)
 	return ERROR_OK;
 }
 
-static int parport_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(parport_handle_parport_port_command)
 {
 	if (argc == 1)
 	{
@@ -407,7 +431,7 @@ static int parport_handle_parport_port_command(struct command_context_s *cmd_ctx
 	return ERROR_OK;
 }
 
-static int parport_handle_parport_cable_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(parport_handle_parport_cable_command)
 {
 	if (argc == 0)
 		return ERROR_OK;
@@ -422,7 +446,7 @@ static int parport_handle_parport_cable_command(struct command_context_s *cmd_ct
 	return ERROR_OK;
 }
 
-static int parport_handle_write_on_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(parport_handle_write_on_exit_command)
 {
 	if (argc != 1)
 	{
@@ -438,6 +462,30 @@ static int parport_handle_write_on_exit_command(struct command_context_s *cmd_ct
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
+{
+	if (argc == 1) {
+		uint32_t ns;
+		int retval = parse_u32(args[0], &ns);
+
+		if (ERROR_OK != retval)
+			return retval;
+
+		if (ns == 0) {
+			LOG_ERROR("0 ns is not a valid parport toggling time");
+			return ERROR_FAIL;
+		}
+
+		parport_toggling_time_ns = ns;
+		wait_states = jtag_get_speed();
+	}
+
+	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",
@@ -455,14 +503,20 @@ static int parport_register_commands(struct command_context_s *cmd_ctx)
 			"configure the parallel driver to write "
 			"a known value to the parallel interface");
 
+	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");
+
 	return ERROR_OK;
 }
 
-jtag_interface_t parport_interface = {
-		.name = "parport",
-		.register_commands = &parport_register_commands,
-		.init = &parport_init,
-		.quit = &parport_quit,
-		.speed = &parport_speed,
-		.execute_queue = &bitbang_execute_queue,
-	};
+struct jtag_interface 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,
+};