[openocd-svn] Main OpenOCD repository branch, master, updated. v0.2.0-396-ga02411a

[Øyvind H. <go...@us...>]

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  a02411a15f24a9e1f0ac893e631c6a520adfdab8 (commit)
      from  7556a93aed97c3fad2c0a904a115168cd3dd61a8 (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 a02411a15f24a9e1f0ac893e631c6a520adfdab8
Author: Øyvind Harboe <oyv...@zy...>
Date:   Wed Oct 21 12:02:04 2009 +0200

    eCos synthetic target updates.

diff --git a/src/ecosboard.c b/src/ecosboard.c
index b537e5b..4af38e8 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -328,6 +328,7 @@ void openocd_sleep_postlude(void)
 
 void format(void)
 {
+#ifdef CYGDAT_IO_FLASH_BLOCK_DEVICE_NAME_1
 	diag_printf("Formatting JFFS2...\n");
 
 	cyg_io_handle_t handle;
@@ -365,6 +366,7 @@ void format(void)
 	}
 
 	diag_printf("Flash formatted successfully\n");
+#endif
 
 	reboot();
 }
diff --git a/src/helper/types.h b/src/helper/types.h
index 86b62c2..eb836c2 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -123,13 +123,14 @@ static inline void h_u16_to_be(uint8_t* buf, int val)
 	buf[1] = (uint8_t) (val >> 0);
 }
 
-#ifdef __ECOS
+#if defined(__ECOS)
+
 /* eCos plain lacks these definition... A series of upstream patches
  * could probably repair it, but it seems like too much work to be
  * worth it.
  */
 
-
+#if !defined(_STDINT_H)
 #define PRIx32 "x"
 #define PRId32 "d"
 #define SCNx32 "x"
@@ -151,6 +152,14 @@ typedef uint64_t uintmax_t;
 #define INT64_MAX 0x7fffffffffffffffLL
 #define INT64_MIN (-INT64_MAX - 1LL)
 #define UINT64_MAX (__CONCAT(INT64_MAX, U) * 2ULL + 1ULL)
+#endif
+
+    #ifndef LLONG_MAX
+	#define ULLONG_MAX	UINT64_C(0xFFFFFFFFFFFFFFFF)
+	#define LLONG_MAX	INT64_C(0x7FFFFFFFFFFFFFFF)
+	#define LLONG_MIN	ULLONG_MAX
+    #endif
+
 
 #define ULLONG_MAX 18446744073709551615
 

-----------------------------------------------------------------------

Summary of changes:
 src/ecosboard.c    |    2 ++
 src/helper/types.h |   13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository