This is an automated email from Gerrit.
Paul Fertser (fercer...@gmail.com) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/1431
-- gerrit
commit e56a2239ff32528473c19cd7b7408734b93e498b
Author: Paul Fertser <fercer...@gmail.com>
Date: Sun Jun 2 13:28:37 2013 +0400
rlink: fix speed table generation
The speed table generation (by using explicit
make -f Makefile.rlink) was broken since
865efd828a267992db0f2a92a731c5ce23a34236 Dec 2 2009 which did a bunch of
renaming and included hand-editing of a generated rlink_speed_table.c file.
This patch is compile-tested, i.e. the new generated rlink_speed_table.c
links fine with the rlink driver.
Change-Id: I1789a2f2f5bf20183b772d55c55fe68a0bd05cf5
Signed-off-by: Paul Fertser <fercer...@gmail.com>
diff --git a/src/jtag/drivers/Makefile.rlink b/src/jtag/drivers/Makefile.rlink
index 94c53f5..37630e1 100644
--- a/src/jtag/drivers/Makefile.rlink
+++ b/src/jtag/drivers/Makefile.rlink
@@ -51,10 +51,10 @@ DTCFILES += $(addsuffix _call.dtc, ${PRESCALERS})
default: rlink_speed_table.c clean
-%_init.fsm: init.m4
+%_init.fsm: rlink_init.m4
${M4} -P -DSHIFTER_PRESCALER=`echo "$@" | sed -e's/_.*//'` $< > $@
-%_call.fsm: call.m4
+%_call.fsm: rlink_call.m4
${M4} -P -DSHIFTER_PRESCALER=`echo "$@" | sed -e's/_.*//'` $< > $@
%.dtc: %.fsm
diff --git a/tools/rlink_make_speed_table/rlink_make_speed_table.pl
b/tools/rlink_make_speed_table/rlink_make_speed_table.pl
index 910fbf8..305d170 100755
--- a/tools/rlink_make_speed_table/rlink_make_speed_table.pl
+++ b/tools/rlink_make_speed_table/rlink_make_speed_table.pl
@@ -32,7 +32,7 @@ print <<HEADER;
#endif
#include "rlink.h"
-#include "st7.h"
+#include "rlink_st7.h"
HEADER
@@ -49,12 +49,12 @@ for $prescaler (sort {$b <=> $a} @ARGV) {
$bytes =~ s/(^|\s)(.{70}?\S*)/\2\n/go; # break up long lines
$bytes =~ s/\n +/\n/go;
$bytes =~ s/(^|\n)/\1\t/go; # format nicely
- printf("static const u8 dtc_%d[] = {\n%s\n};\n\n", $prescaler, $bytes);
+ printf("static const uint8_t dtc_%d[] = {\n%s\n};\n\n", $prescaler,
$bytes);
push(@speed_table, sprintf("\tdtc_%d, sizeof(dtc_%d), (ST7_FOSC * 2) /
(1000 * %d), %d\n", $prescaler, $prescaler, $prescaler, $prescaler));
}
-printf("const rlink_speed_table_t rlink_speed_table[] = {{\n%s}};\n\n",
join("}, {\n", @speed_table));
-printf("const size_t rlink_speed_table_size = sizeof(rlink_speed_table) /
sizeof(*rlink_speed_table);\n\n");
+printf("const struct rlink_speed_table rlink_speed_table[] = { {\n%s} };\n\n",
join("}, {\n", @speed_table));
+printf("const size_t rlink_speed_table_size =
ARRAY_SIZE(rlink_speed_table);\n\n");
sub byte_array_from_file {
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
