Menu
▾
▴
[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-39-ge033829
|
From: David B. <dbr...@us...> - 2010-01-03 22:10:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via e0338293b80211aee4254848ea56e0cf38bf3b9a (commit)
via d9508b30e096b5cc44a4fdbf2d6b99ca173a43f1 (commit)
from 4ed5b45097cb2c13f9ef0682848c4682b5fd7240 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e0338293b80211aee4254848ea56e0cf38bf3b9a
Author: David Brownell <dbr...@us...>
Date: Sun Jan 3 13:07:18 2010 -0800
JTAG/drivers: cleanup jtag_interface structs
Get rid of excess indents.
Ditto superfluous "&" before function pointers.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 6221011..e54c8c6 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -513,17 +513,15 @@ static const struct command_registration armjtagew_command_handlers[] = {
};
struct jtag_interface armjtagew_interface = {
- .name = "arm-jtag-ew",
-
- .commands = armjtagew_command_handlers,
-
- .execute_queue = &armjtagew_execute_queue,
- .speed = &armjtagew_speed,
- .khz = &armjtagew_khz,
-
- .init = &armjtagew_init,
- .quit = &armjtagew_quit,
- };
+ .name = "arm-jtag-ew",
+ .commands = armjtagew_command_handlers,
+
+ .execute_queue = armjtagew_execute_queue,
+ .speed = armjtagew_speed,
+ .khz = armjtagew_khz,
+ .init = armjtagew_init,
+ .quit = armjtagew_quit,
+};
/***************************************************************************/
/* ARM-JTAG-EW tap functions */
diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 06fc252..a3ac142 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -4018,12 +4018,13 @@ static const struct command_registration ft2232_command_handlers[] = {
};
struct jtag_interface ft2232_interface = {
- .name = "ft2232",
- .commands = ft2232_command_handlers,
- .init = &ft2232_init,
- .quit = &ft2232_quit,
- .speed = &ft2232_speed,
- .speed_div = &ft2232_speed_div,
- .khz = &ft2232_khz,
- .execute_queue = &ft2232_execute_queue,
- };
+ .name = "ft2232",
+ .commands = ft2232_command_handlers,
+
+ .init = ft2232_init,
+ .quit = ft2232_quit,
+ .speed = ft2232_speed,
+ .speed_div = ft2232_speed_div,
+ .khz = ft2232_khz,
+ .execute_queue = ft2232_execute_queue,
+};
diff --git a/src/jtag/drivers/gw16012.c b/src/jtag/drivers/gw16012.c
index 9083e92..38e5dd7 100644
--- a/src/jtag/drivers/gw16012.c
+++ b/src/jtag/drivers/gw16012.c
@@ -574,10 +574,11 @@ static const struct command_registration gw16012_command_handlers[] = {
};
struct jtag_interface gw16012_interface = {
- .name = "gw16012",
- .commands = gw16012_command_handlers,
- .init = &gw16012_init,
- .quit = &gw16012_quit,
- .speed = &gw16012_speed,
- .execute_queue = &gw16012_execute_queue,
- };
+ .name = "gw16012",
+ .commands = gw16012_command_handlers,
+
+ .init = gw16012_init,
+ .quit = gw16012_quit,
+ .speed = gw16012_speed,
+ .execute_queue = gw16012_execute_queue,
+};
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 4ca4349..6596849 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -645,18 +645,16 @@ static const struct command_registration jlink_command_handlers[] = {
};
struct jtag_interface jlink_interface = {
- .name = "jlink",
-
- .commands = jlink_command_handlers,
-
- .execute_queue = &jlink_execute_queue,
- .speed = &jlink_speed,
- .speed_div = &jlink_speed_div,
- .khz = &jlink_khz,
-
- .init = &jlink_init,
- .quit = &jlink_quit,
- };
+ .name = "jlink",
+ .commands = jlink_command_handlers,
+
+ .execute_queue = jlink_execute_queue,
+ .speed = jlink_speed,
+ .speed_div = jlink_speed_div,
+ .khz = jlink_khz,
+ .init = jlink_init,
+ .quit = jlink_quit,
+};
/***************************************************************************/
/* J-Link tap functions */
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index 04ac272..2e6b9ed 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -517,16 +517,13 @@ static const struct command_registration parport_command_handlers[] = {
};
struct jtag_interface parport_interface = {
- .name = "parport",
-
- .commands = parport_command_handlers,
-
- .init = &parport_init,
- .quit = &parport_quit,
-
- .khz = &parport_khz,
- .speed_div = &parport_speed_div,
- .speed = &parport_speed,
-
- .execute_queue = &bitbang_execute_queue,
- };
+ .name = "parport",
+ .commands = parport_command_handlers,
+
+ .init = parport_init,
+ .quit = parport_quit,
+ .khz = parport_khz,
+ .speed_div = parport_speed_div,
+ .speed = parport_speed,
+ .execute_queue = bitbang_execute_queue,
+};
diff --git a/src/jtag/drivers/presto.c b/src/jtag/drivers/presto.c
index fac5e82..0baf561 100644
--- a/src/jtag/drivers/presto.c
+++ b/src/jtag/drivers/presto.c
@@ -786,15 +786,13 @@ static int presto_jtag_quit(void)
}
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,
- };
+ .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,
+};
diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index f6d8a97..0d51b27 100644
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -652,9 +652,10 @@ static void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag)
}
struct jtag_interface usbprog_interface = {
- .name = "usbprog",
- .execute_queue = &usbprog_execute_queue,
- .speed = &usbprog_speed,
- .init = &usbprog_init,
- .quit = &usbprog_quit
- };
+ .name = "usbprog",
+
+ .execute_queue = usbprog_execute_queue,
+ .speed = usbprog_speed,
+ .init = usbprog_init,
+ .quit = usbprog_quit
+};
diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index bbbb5f9..d301290 100644
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -1891,13 +1891,13 @@ static const struct command_registration vsllink_command_handlers[] = {
};
struct jtag_interface vsllink_interface = {
- .name = "vsllink",
- .commands = vsllink_command_handlers,
-
- .init = &vsllink_init,
- .quit = &vsllink_quit,
- .khz = &vsllink_khz,
- .speed = &vsllink_speed,
- .speed_div = &vsllink_speed_div,
- .execute_queue = &vsllink_execute_queue,
- };
+ .name = "vsllink",
+ .commands = vsllink_command_handlers,
+
+ .init = vsllink_init,
+ .quit = vsllink_quit,
+ .khz = vsllink_khz,
+ .speed = vsllink_speed,
+ .speed_div = vsllink_speed_div,
+ .execute_queue = vsllink_execute_queue,
+};
commit d9508b30e096b5cc44a4fdbf2d6b99ca173a43f1
Author: David Brownell <dbr...@us...>
Date: Sun Jan 3 12:59:51 2010 -0800
JTAG/drivers: amt_jtagaccel fixes + cleanup
Build fixes: it failed abysmally with PPDEV enabled. Swapped
a build-time error with a FIXME comment in the affected macros.
Cleanup: remove "&" before function pointers, and excess indent,
for the interface struct declaration.
Signed-off-by: David Brownell <dbr...@us...>
diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index 8ba1583..de7cdcb 100644
--- a/src/jtag/drivers/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
@@ -55,13 +55,41 @@ static int rtck_enabled = 0;
#if PARPORT_USE_PPDEV == 1
static int device_handle;
-static int addr_mode = IEEE1284_MODE_EPP | IEEE1284_ADDR ;
-#define AMT_AW(val) do { ioctl(device_handle, PPSETMODE, &addr_mode); write(device_handle, &val, 1); } while (0)
-#define AMT_AR(val) do { ioctl(device_handle, PPSETMODE, &addr_mode); read(device_handle, &val, 1); } while (0)
-
-static int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA ;
-#define AMT_DW(val) do { ioctl(device_handle, PPSETMODE, &data_mode); write(device_handle, &val, 1); } while (0)
-#define AMT_DR(val) do { ioctl(device_handle, PPSETMODE, &data_mode); read(device_handle, &val, 1); } while (0)
+static const int addr_mode = IEEE1284_MODE_EPP | IEEE1284_ADDR;
+
+/* FIXME do something sane when these ioctl/read/write calls fail. */
+
+#define AMT_AW(val) \
+ do { \
+ int __retval; \
+ \
+ __retval = ioctl(device_handle, PPSETMODE, &addr_mode); \
+ __retval = write(device_handle, &val, 1); \
+ } while (0)
+#define AMT_AR(val) \
+ do { \
+ int __retval; \
+ \
+ __retval = ioctl(device_handle, PPSETMODE, &addr_mode); \
+ __retval = read(device_handle, &val, 1); \
+ } while (0)
+
+static const int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA;
+
+#define AMT_DW(val) \
+ do { \
+ int __retval; \
+ \
+ __retval = ioctl(device_handle, PPSETMODE, &data_mode); \
+ __retval = write(device_handle, &val, 1); \
+ } while (0)
+#define AMT_DR(val) \
+ do { \
+ int __retval; \
+ \
+ __retval = ioctl(device_handle, PPSETMODE, &data_mode); \
+ __retval = read(device_handle, &val, 1); \
+ } while (0)
#else
@@ -559,10 +587,11 @@ static const struct command_registration amtjtagaccel_command_handlers[] = {
};
struct jtag_interface amt_jtagaccel_interface = {
- .name = "amt_jtagaccel",
- .commands = amtjtagaccel_command_handlers,
- .init = &amt_jtagaccel_init,
- .quit = &amt_jtagaccel_quit,
- .speed = &amt_jtagaccel_speed,
- .execute_queue = &amt_jtagaccel_execute_queue,
- };
+ .name = "amt_jtagaccel",
+ .commands = amtjtagaccel_command_handlers,
+
+ .init = amt_jtagaccel_init,
+ .quit = amt_jtagaccel_quit,
+ .speed = amt_jtagaccel_speed,
+ .execute_queue = amt_jtagaccel_execute_queue,
+};
-----------------------------------------------------------------------
Summary of changes:
src/jtag/drivers/amt_jtagaccel.c | 57 ++++++++++++++++++++++++++++---------
src/jtag/drivers/arm-jtag-ew.c | 20 ++++++-------
src/jtag/drivers/ft2232.c | 19 ++++++------
src/jtag/drivers/gw16012.c | 15 +++++----
src/jtag/drivers/jlink.c | 22 ++++++--------
src/jtag/drivers/parport.c | 23 ++++++--------
src/jtag/drivers/presto.c | 22 ++++++--------
src/jtag/drivers/usbprog.c | 13 ++++----
src/jtag/drivers/vsllink.c | 20 ++++++------
9 files changed, 117 insertions(+), 94 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
