- fix win32 build issues from previous jim patch

git-svn-id: svn://svn.berlios.de/openocd/trunk@958 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/configure.in b/configure.in
index 007ac14237e462ac2ce49d3097f0b64ef8d988e6..f3414f8ccded635c9869c11e58bd36786257770e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,7 @@ AC_CHECK_FUNCS(strndup)
 AC_CHECK_FUNCS(strnlen)
 AC_CHECK_FUNCS(gettimeofday)
 AC_CHECK_FUNCS(usleep)
+AC_CHECK_FUNCS(vasprintf)
 
 build_bitbang=no
 build_bitq=no

diff --git a/src/helper/jim.c b/src/helper/jim.c
index 02d0e0d1bcb20441ebb07b73931b8aa4cfe3286d..ce7b8f62b98af80f798af3b37de9c8194df5e3fb 100644 (file)
--- a/src/helper/jim.c
+++ b/src/helper/jim.c
@@ -12526,7 +12526,7 @@ int
 Jim_SetResult_sprintf( Jim_Interp *interp, const char *fmt,... )
 {
        va_list ap;
-#if 0
+#ifndef HAVE_VASPRINTF
        /* yucky way */
        char buf[2048];
 

diff --git a/src/target/target/lm3s3748.cfg b/src/target/target/lm3s3748.cfg
index 924c78a9499f8d141ef969a798597bc4c2d41f93..ff3d71582ddf723fdb47be89d2559476cab399e9 100644 (file)
--- a/src/target/target/lm3s3748.cfg
+++ b/src/target/target/lm3s3748.cfg
@@ -1,28 +1,28 @@
-# Script for luminary lm3s3748\r
-#\r
-# NB! work in progress! Duplicated from lm3s811.cfg, but does\r
-# it need modification??\r
-\r
-# RCLK \r
-jtag_khz 500\r
-\r
-jtag_nsrst_delay 100\r
-jtag_ntrst_delay 100\r
-\r
-#lm3s3748 Evaluation Board has only srst\r
-reset_config srst_only\r
-\r
-#jtag scan chain\r
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)\r
-jtag_device 4 0x1 0xf 0xe\r
-\r
-# the luminary variant causes a software reset rather than asserting SRST\r
-# this stops the debug registers from being cleared\r
-# this will be fixed in later revisions of silicon\r
-target cortex_m3 little 0 lm3s\r
-\r
-# 8k working area at base of ram\r
-working_area 0 0x20000000 0x2000 nobackup\r
-\r
-#flash configuration\r
-flash bank stellaris 0 0 0 0 0\r
+# Script for luminary lm3s3748
+#
+# NB! work in progress! Duplicated from lm3s811.cfg, but does
+# it need modification??
+
+# RCLK 
+jtag_khz 500
+
+jtag_nsrst_delay 100
+jtag_ntrst_delay 100
+
+#lm3s3748 Evaluation Board has only srst
+reset_config srst_only
+
+#jtag scan chain
+#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
+jtag_device 4 0x1 0xf 0xe
+
+# the luminary variant causes a software reset rather than asserting SRST
+# this stops the debug registers from being cleared
+# this will be fixed in later revisions of silicon
+target cortex_m3 little 0 lm3s
+
+# 8k working area at base of ram
+working_area 0 0x20000000 0x2000 nobackup
+
+#flash configuration
+flash bank stellaris 0 0 0 0 0