X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=tools%2Frlink_make_speed_table%2Frlink_make_speed_table.pl;h=5b519b5d62961b77f160085d7b3bfd2a9a2258a3;hb=eaa70635dc3886a3795d5ddb542b008adb45467a;hp=f35c9edb59d2a471af465c2b00f24107d9cdf2fe;hpb=9d1f95e01a4d273bd0e82a98719a4ea5ff435647;p=openocd.git

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 f35c9edb59..5b519b5d62 100755
--- a/tools/rlink_make_speed_table/rlink_make_speed_table.pl
+++ b/tools/rlink_make_speed_table/rlink_make_speed_table.pl
@@ -16,18 +16,25 @@
 #*   You should have received a copy of the GNU General Public License     *
 #*   along with this program; if not, write to the                         *
 #*   Free Software Foundation, Inc.,                                       *
-#*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+#*   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
 #***************************************************************************
 
 # A simple utility to read a list of files (names composed by numeric prescaler arguments) and compose a C source file defining data structures which hold the binary data read from those files.
 
-@speed_table = ();
+my @speed_table = ();
 
-printf("/* This file was created automatically by %s. */\n\n", $0);
-for $i ('rlink', 'st7') {
-	printf("#include \"$i.h\"\n");
-}
-printf("\n");
+print <<HEADER;
+/* This file was created automatically by the following script:
+ *   $0
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "rlink.h"
+#include "rlink_st7.h"
+
+HEADER
 
 for $prescaler (sort {$b <=> $a} @ARGV) {
 	my(@ary) = (
@@ -42,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 {