Re: [Openocd-development] [PATCH] contrib: fix udev rules for tty based adaptors
Luca Bruno scrisse: This patch fix udev rules to work with any listed tty-based adaptor. Speaking of udev, another related patch is currently sitting in the bug tracker at http://sourceforge.net/apps/trac/openocd/ticket/39 Would anyone care to review and commit it? Cheers, Luca P.S. pardon the cross-post, I'm not sure which ML is currently active now. -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
[Openocd-development] [PATCH] contrib: fix udev rules for tty based adaptors
Most serial adaptors are identified by udev with SUBSYSTEM=tty and
without DEVTYPE. This patch fix udev rules to work with any listed
tty-based adaptor. It has been tested with a FTDI-based Bus Pirate.
Signed-off-by: Luca Bruno lu...@debian.org
---
contrib/openocd.udev |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/openocd.udev b/contrib/openocd.udev
index 34a819c..c239072 100644
--- a/contrib/openocd.udev
+++ b/contrib/openocd.udev
@@ -1,6 +1,5 @@
ACTION!=add|change, GOTO=openocd_rules_end
-SUBSYSTEM!=usb, GOTO=openocd_rules_end
-ENV{DEVTYPE}!=usb_device, GOTO=openocd_rules_end
+SUBSYSTEM!=usb|tty, GOTO=openocd_rules_end
# Olimex ARM-USB-OCD
ATTRS{idVendor}==15ba, ATTRS{idProduct}==0003, MODE=664, GROUP=plugdev
@@ -31,6 +30,7 @@ ATTRS{idVendor}==0fbb, ATTRS{idProduct}==1000,
MODE=664, GROUP=plugdev
ATTRS{idVendor}==0403, ATTRS{idProduct}==6010, MODE=664, GROUP=plugdev
# Calao Systems USB-A9260-C02
+# Bus Pirate
ATTRS{idVendor}==0403, ATTRS{idProduct}==6001, MODE=664, GROUP=plugdev
# IAR J-Link USB
--
1.7.5.4
___
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
[Openocd-development] [PATCH] Fixes and spellchecks for various Buspirate output messages
Signed-off-by: Luca Bruno lu...@debian.org
---
src/jtag/drivers/buspirate.c | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c
index a360d23..62ab008 100644
--- a/src/jtag/drivers/buspirate.c
+++ b/src/jtag/drivers/buspirate.c
@@ -217,13 +217,13 @@ static int buspirate_execute_queue(void)
static int buspirate_init(void)
{
if (buspirate_port == NULL) {
- LOG_ERROR(You need to specify port !);
+ LOG_ERROR(You need to specify the serial port!);
return ERROR_JTAG_INIT_FAILED;
}
buspirate_fd = buspirate_serial_open(buspirate_port);
if (buspirate_fd == -1) {
- LOG_ERROR(Could not open serial port.);
+ LOG_ERROR(Could not open serial port);
return ERROR_JTAG_INIT_FAILED;
}
@@ -249,7 +249,7 @@ static int buspirate_init(void)
static int buspirate_quit(void)
{
- LOG_INFO(Shuting down buspirate );
+ LOG_INFO(Shutting down buspirate.);
buspirate_jtag_set_mode(buspirate_fd, MODE_HIZ);
buspirate_jtag_set_speed(buspirate_fd, SERIAL_NORMAL);
@@ -665,7 +665,7 @@ static void buspirate_tap_append(int tms, int tdi)
tap_chain_index++;
} else
- LOG_ERROR(tap_chain overflow, Bad things will happen);
+ LOG_ERROR(tap_chain overflow, bad things will happen);
}
@@ -724,19 +724,19 @@ static void buspirate_jtag_enable(int fd)
while (!done) {
ret = buspirate_serial_read(fd, tmp, 4);
if (ret != 4) {
- LOG_ERROR(Buspirate error. Is is binary/
+ LOG_ERROR(Buspirate error. Is binary
/OpenOCD support enabled?);
exit(-1);
}
if (strncmp(tmp, BBIO, 4) == 0) {
ret = buspirate_serial_read(fd, tmp, 1);
if (ret != 1) {
- LOG_ERROR(Buspirate did not correctly!
+ LOG_ERROR(Buspirate did not answer correctly!
Do you have correct firmware?);
exit(-1);
}
if (tmp[0] != '1') {
- LOG_ERROR(Unsupported binary protocol );
+ LOG_ERROR(Unsupported binary protocol);
exit(-1);
}
if (cmd_sent == 0) {
@@ -747,7 +747,7 @@ static void buspirate_jtag_enable(int fd)
} else if (strncmp(tmp, OCD1, 4) == 0)
done = 1;
else {
- LOG_ERROR(Buspirate did not correctly!
+ LOG_ERROR(Buspirate did not answer correctly!
Do you have correct firmware?);
exit(-1);
}
@@ -794,7 +794,7 @@ static void buspirate_jtag_set_speed(int fd, char speed)
exit(-1);
}
if ((tmp[0] != CMD_UART_SPEED) || (tmp[1] != speed)) {
- LOG_ERROR(Buspirate didn't reply as expected);
+ LOG_ERROR(Buspirate did not reply as expected);
exit(-1);
}
LOG_INFO(Buspirate switched to %s mode,
--
1.7.5.4
___
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] 0.5.0 release
Jean-Christophe PLAGNIOL-VILLARD scrisse: HI, I finally get the time to generate the release Sorry for the delay I was busy on the kernel and barebox merge window The tarbal are available at https://sourceforge.net/projects/openocd/files/openocd/0.5.0/ Thanks for your work! Package has been uploaded to Debian and built fine on every supported architectures: https://buildd.debian.org/status/package.php?p=openocd Hopefully it will hit testing in a bunch of weeks; I have to check if it's not to late to have it in Ubuntu, too. Ciao, Luca -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] [PATCH] Automatically generate ChangeLog from git log for release tarball
Andreas Fritiofson scrisse: make dist should use git2cl to genereate ChangeLog from git history, populating the placeholder file in released tarball. Still not working for srcdir != builddir make[1]: Entering directory `/home/soliver/openocd/openocd-rel' if test -d ../openocd/.git -a \( ! -e openocd-0.5.0-dev/ChangeLog -o -w openocd-0.5.0-dev/ChangeLog \) ; then \ ../openocd/tools/git2cl/git2cl openocd-0.5.0-dev/ChangeLog ; \ fi fatal: Not a git repository (or any of the parent directories): .git Current directory needs to be $(srcdir) before running git2cl. I suspect this will get tricky, as $(distdir) is relative to $(builddir). It could be easier to directly feed git2cl with a pipe from `git log -- $(srcdir)`, as in the attached patch. Spen, can you please check if this is ok for you? Jean-Christophe, could you consider it for inclusion in 0.5.0 (if ACKed)? Ciao, Luca P.S. sorry for the delay in this iteration, I'm moving home. -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer From f920c3c2927a54af0edc002d343c1af937711918 Mon Sep 17 00:00:00 2001 From: Luca Bruno lu...@debian.org Date: Sun, 10 Jul 2011 15:35:12 +0200 Subject: [PATCH] Automatically generate ChangeLog from git log for release tarball make dist should use git2cl to generate ChangeLog from git history, populating the placeholder file in released tarball. Signed-off-by: Luca Bruno lu...@debian.org --- Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 461bca4..52eafae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,9 @@ TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \ sed -e 's,^$(srcdir)/$(TCL_PATH),,' dist-hook: + if test -d $(srcdir)/.git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \ + git log -- $(srcdir) | $(srcdir)/tools/git2cl/git2cl $(distdir)/ChangeLog ; \ + fi for i in $$($(TCL_FILES)); do \ j=$(distdir)/$(TCL_PATH)/$$i \ mkdir -p $$(dirname $$j) \ -- 1.7.5.4 signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
[Openocd-development] [PATCH] Automatically generate ChangeLog from git log for release tarball
make dist should use git2cl to genereate ChangeLog from git history, populating the placeholder file in released tarball. Signed-off-by: Luca Bruno lu...@debian.org --- Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1b19ba4..d2a18cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,9 @@ TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \ sed -e 's,^$(srcdir)/$(TCL_PATH),,' dist-hook: + if test -d $(srcdir)/.git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \ + $(srcdir)/tools/git2cl/git2cl $(distdir)/ChangeLog ; \ + fi for i in $$($(TCL_FILES)); do \ j=$(distdir)/$(TCL_PATH)/$$i \ mkdir -p $$(dirname $$j) \ -- 1.7.5.4 ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] [PATCH] Automatically generate ChangeLog from git log for release tarball
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Spencer Oliver scrisse: On 10 July 2011 15:17, Luca Bruno lu...@debian.org wrote: make dist should use git2cl to genereate ChangeLog from git history, populating the placeholder file in released tarball. I like this, however it fails when building out of the src tree. Good catch, I only tried the basic in-tree case when packaging a tarball on my own. I've now cooked a new patch which won't let make distcheck fail. Did you use other out-of-tree testing recipes other than make distcheck that I should try before resending? Cheers, Luca - -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk4e7WMACgkQRqobajv7n7NZ9wCgjsOvEyikXSP4w2e+KcCYW5QA GoUAnidc7xE+FmZNmBJnjBUwzpqVnSrR =EZrM -END PGP SIGNATURE- ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] OpenOCD 0.5.0-rc2 release
Jean-Christophe PLAGNIOL-VILLARD scrisse: Here is OpenOCD v0.5.0-rc2 This time on the official git tree The following changes since commit ff640f197a9a343b2f3ed10e9174e35282334e8c: It looks like you forgot to push the corresponding tag. I took the liberty to take this commit and package a tarball on my own. So far, it looks to be building fine. As a sidenote, publishing tarball for -rc helps testing in conditions similar to the final one, avoiding late bugs introduced by autotools packaging or similar. I still suggest you to do so, even if you have already spoken against it. I hope you may re-consider it. Ciao, Luca -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
[Openocd-development] [PATCH] Fix typo in command output
Fix a bunch of minor typo in user facing output.
Signed-off-by: Luca Bruno lu...@debian.org
---
src/flash/nand/lpc3180.c |2 +-
src/flash/nor/stellaris.c |2 +-
src/rtos/FreeRTOS.c |2 +-
src/rtos/ThreadX.c|2 +-
src/rtos/eCos.c |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 4cd4c6f..f196af7 100644
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -1317,7 +1317,7 @@ COMMAND_HANDLER(handle_lpc3180_select_command)
if (lpc3180_info-selected_controller == LPC3180_MLC_CONTROLLER)
command_print(CMD_CTX, %s controller selected,
selected[lpc3180_info-selected_controller]);
else{
-command_print(CMD_CTX, lpc3180_info-is_bulk?%s controller
selected bulk mode is avaliable:%s controller selected bulk mode is not
avaliable, selected[lpc3180_info-selected_controller]);
+command_print(CMD_CTX, lpc3180_info-is_bulk?%s controller
selected bulk mode is available:%s controller selected bulk mode is not
available, selected[lpc3180_info-selected_controller]);
}
diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index e57943c..89cc8ef 100644
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -783,7 +783,7 @@ static int stellaris_protect(struct flash_bank *bank, int
set, int first, int la
if (!set)
{
- LOG_ERROR(Hardware doesn't suppport page-level unprotect.
+ LOG_ERROR(Hardware doesn't support page-level unprotect.
Try the 'recover' command.);
return ERROR_INVALID_ARGUMENTS;
}
diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index 2aa4565..40da925 100644
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -472,7 +472,7 @@ static int FreeRTOS_create( struct target* target )
}
if ( i = FREERTOS_NUM_PARAMS )
{
- LOG_OUTPUT(Could not find target in FreeRTOS compatability
list\r\n);
+ LOG_OUTPUT(Could not find target in FreeRTOS compatibility
list\r\n);
return -1;
}
diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c
index 8dc4640..1ce47a2 100644
--- a/src/rtos/ThreadX.c
+++ b/src/rtos/ThreadX.c
@@ -525,7 +525,7 @@ static int ThreadX_create( struct target* target )
}
if ( i = THREADX_NUM_PARAMS )
{
- LOG_OUTPUT(Could not find target in ThreadX compatability
list\r\n);
+ LOG_OUTPUT(Could not find target in ThreadX compatibility
list\r\n);
return -1;
}
diff --git a/src/rtos/eCos.c b/src/rtos/eCos.c
index c26b66a..f301a35 100644
--- a/src/rtos/eCos.c
+++ b/src/rtos/eCos.c
@@ -416,7 +416,7 @@ static int eCos_create( struct target* target )
}
if ( i = ECOS_NUM_PARAMS )
{
- LOG_OUTPUT(Could not find target in eCos compatability
list\r\n);
+ LOG_OUTPUT(Could not find target in eCos compatibility
list\r\n);
return -1;
}
--
1.7.5.4
___
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] [PATCH] Fix typo in command output
Øyvind Harboe scrisse: Fixed. How did you find these? Some sort of tool? Thanks. Yes, it is part of lintian, the debian package checker: http://lintian.debian.org/tags/spelling-error-in-binary.html However, this isn't an accurate source static analyzer, so it does not assure to catch all typos or other specific kinds of problems. It looked worthy to me to patch these now though, as we are refinining a new release. Ciao, Luca -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
[Openocd-development] [PATCH] Do not append git info to version string when building from released tarball
When building official releases from tarball, git commit info is not available in the building environment. Thus, automake should not try to append the git commit to the version string. Signed-off-by: Luca Bruno lu...@debian.org --- src/Makefile.am |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1e7af9c..1be24ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,10 +45,11 @@ libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\`date +%F-%R`\ # guess-rev.sh returns either a repository version ID or -snapshot if RELEASE libopenocd_la_CPPFLAGS += -DRELSTR=\\ +libopenocd_la_CPPFLAGS += -DGITVERSION=\\ else libopenocd_la_CPPFLAGS += -DRELSTR=\`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\ -endif libopenocd_la_CPPFLAGS += -DGITVERSION=\`cd $(top_srcdir) git describe`\ +endif # add default CPPFLAGS libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS) -- 1.7.5.4 ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Please welcome Jean-Christophe as release manager
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jean-Christophe PLAGNIOL-VILLARD scrisse: I'll send a patch to sumurize all our discussion about the new release process this WE It will be nice to have a list of Maintainer and their role to specify which part of OpenOCD they take care of As everyone see the first rc1 is done the rc2 will be Monday so please help us to stabilize the current release and do a great and stable 0.5.0 I had liked to give this -rc1 a shot on various autobuilders to detect early build failures, but I've failed so far to see a proper signed tarball or even a git tag on the openocd repo to base upon. I've also not seen any changes to doc/manual/release.txt or a Maintainer file, even if various release details were discussed and consensus reached. Yet, an -rc2 is expected for today. I'm a bit puzzled, but maybe I'm missing some important details here. Can I expect a version bump in configure.in to reflect a release? Out of which commits are these -rcX being done? Did you perhaps forgot to push the tag? And most importantly, where are testers/packagers expected to get the tarball from? Thanks, Luca - -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk4RhSkACgkQRqobajv7n7MsRgCbBHrCc4InVOr3VQIJ8iOn4q5J dpYAn2Tf2ZYYMXE4mJe8oolRlXIUZSwU =2JkV -END PGP SIGNATURE- ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Openocd release known issues
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Spencer Oliver scrisse: The solution as mentioned is to either get the user to download jim and install in the jimtcl dir of openocd or we tweak jim to work with make dist. I have been making a few tweaks and got it working, but it is a bodge - life would be simpler if automake was used in jimtcl :) Given that jimctl is a third-party package, IMHO its hypothetical dist target won't work anyway (wouldn't it just create a tarball-in-tarball?). I think you really need something along the line of the following patch. Let me know if it works for your make dist needs (after a fresh autotool-ization), if so I can cook a proper git commit out of it. Cheers, Luca diff --git a/Makefile.am b/Makefile.am index b31bcea..5187f7b 100644 - --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ endif SUBDIRS += src doc EXTRA_DIST = \ + jimtcl \ Doxyfile.in \ tools/logger.pl - -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk36hOwACgkQRqobajv7n7PQ8ACgsWIL8i0NjGj7yPHFDeIo3fq+ vSMAnjX5Zm4nYdUrFl8O+ohipIB40+QY =rH3O -END PGP SIGNATURE- ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Outstanding patches
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Øyvind Harboe scrisse: Are there any outstanding patches currently that are ready to be committed? Speaking of which, I'd like to hear some bits about current status. Looking at the press, latest release has been more than a year ago (4.0 on Feb 2010) while previous versions were more closely released. For an outsider, this may smell a lot like a stalled project, while looking at this ML and git there's great activity. I may have missed it, but is there a release plan or a roadmap, even a provisional one? If not, it may be handy to draw a current status draft and check what to achieve for the next release. Sorry for the noise and so many inquiries ;) Keep up with your great work, Luca - -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk3ThloACgkQRqobajv7n7OXcwCbBhV45Hi5TWWq8vCS6523bmfo Gi8AoK3Kw/7Zj8Igs9I+CZzJ+KlhA8o+ =b7D1 -END PGP SIGNATURE- ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] [PATCH] Update ep93xx and at91rm9200 drivers
Zach Welch scrisse: Since I was the one that did that work and overlooked these files, I have reviewed and committed the fixes that you provided. Sorry for the game delay. Thanks a lot, openocd is now properly built on all supported Debian arch: https://buildd.debian.org/pkg.cgi?pkg=openocd Ciao, Luc -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] [PATCH] Update ep93xx and at91rm9200 drivers
Luca Bruno scrisse: ep93xx and at91rm9200 are conditionally built only on arm and were not updated to reflect changes in command registration handler. This patch makes them properly compile again, fixing a build failure experienced on Debian armel. Before integrating this patch in our downstream packaging, I'd like to hear some comments from openocd developers and (preferably) having a copy (or improved version) of it in upstream git, to avoid divergence... Any comments on this? I forgot to say, the bug report which triggered this patch is at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597932 (the armel part) Cheers, Luca -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] [PATCH] Update ep93xx and at91rm9200 drivers
Hector Oron scrisse: I have also been playing with this bug. Just one comment on the ep93xx.c -static int ep93xx_register_commands(struct command_context *cmd_ctx); - .register_commands = ep93xx_register_commands, Why not just use the right value in the struct, + .commands = ep93xx_register_commands, Because the commands field no longer accepts function pointers, as in src/jtag/interface.h:229: /** * The interface driver may register additional commands to expose * additional features not covered by the standard command set. */ const struct command_registration *commands; Moreover, ep93xx_register_commands was just a stub, and looking at git history I've seen they're usually removed (eg. in 66ee30). I hope not to be wrong on this... Cheers, Luca -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S.| lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer signature.asc Description: PGP signature ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
[Openocd-development] [PATCH] Update ep93xx and at91rm9200 drivers
ep93xx and at91rm9200 are conditionally built only on arm and were not
updated to reflect changes in command registration handler.
This patch makes them properly compile again, fixing a build failure
experienced on Debian armel.
Signed-off-by: Luca Bruno lu...@debian.org
---
src/jtag/drivers/at91rm9200.c | 30 --
src/jtag/drivers/ep93xx.c |8
2 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/src/jtag/drivers/at91rm9200.c b/src/jtag/drivers/at91rm9200.c
index 89d7000..f7494fe 100644
--- a/src/jtag/drivers/at91rm9200.c
+++ b/src/jtag/drivers/at91rm9200.c
@@ -118,23 +118,9 @@ static void at91rm9200_write(int tck, int tms, int tdi);
static void at91rm9200_reset(int trst, int srst);
static int at91rm9200_speed(int speed);
-static int at91rm9200_register_commands(struct command_context *cmd_ctx);
static int at91rm9200_init(void);
static int at91rm9200_quit(void);
-struct jtag_interface at91rm9200_interface =
-{
- .name = at91rm9200,
-
- .supported = DEBUG_CAP_TMS_SEQ,
- .execute_queue = bitbang_execute_queue,
-
- .speed = at91rm9200_speed,
- .register_commands = at91rm9200_register_commands,
- .init = at91rm9200_init,
- .quit = at91rm9200_quit,
-};
-
static struct bitbang_interface at91rm9200_bitbang =
{
.read = at91rm9200_read,
@@ -186,7 +172,7 @@ static int at91rm9200_speed(int speed)
return ERROR_OK;
}
-static int at91rm9200_handle_device_command(struct command_context *cmd_ctx,
char *cmd, char **CMD_ARGV, int argc)
+COMMAND_HANDLER(at91rm9200_handle_device_command)
{
if (CMD_ARGC == 0)
return ERROR_OK;
@@ -208,12 +194,20 @@ static const struct command_registration
at91rm9200_command_handlers[] = {
.mode = COMMAND_CONFIG,
.help = query armjtagew info,
},
+ COMMAND_REGISTRATION_DONE
};
-static int at91rm9200_register_commands(struct command_context *cmd_ctx)
+struct jtag_interface at91rm9200_interface =
{
- return register_commands(cmd_ctx, NULL, at91rm9200_command_handlers);
-}
+ .name = at91rm9200,
+
+ .execute_queue = bitbang_execute_queue,
+
+ .speed = at91rm9200_speed,
+ .commands = at91rm9200_command_handlers,
+ .init = at91rm9200_init,
+ .quit = at91rm9200_quit,
+};
static int at91rm9200_init(void)
{
diff --git a/src/jtag/drivers/ep93xx.c b/src/jtag/drivers/ep93xx.c
index 0959a56..09312c5 100644
--- a/src/jtag/drivers/ep93xx.c
+++ b/src/jtag/drivers/ep93xx.c
@@ -47,7 +47,6 @@ static void ep93xx_write(int tck, int tms, int tdi);
static void ep93xx_reset(int trst, int srst);
static int ep93xx_speed(int speed);
-static int ep93xx_register_commands(struct command_context *cmd_ctx);
static int ep93xx_init(void);
static int ep93xx_quit(void);
@@ -61,7 +60,6 @@ struct jtag_interface ep93xx_interface =
.execute_queue = bitbang_execute_queue,
.speed = ep93xx_speed,
- .register_commands = ep93xx_register_commands,
.init = ep93xx_init,
.quit = ep93xx_quit,
};
@@ -123,12 +121,6 @@ static int ep93xx_speed(int speed)
return ERROR_OK;
}
-static int ep93xx_register_commands(struct command_context *cmd_ctx)
-{
-
- return ERROR_OK;
-}
-
static int set_gonk_mode(void)
{
void *syscon;
--
1.7.1
___
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
