Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / lwip / src / include / arch / cc.h

diff --git a/lwip/src/include/arch/cc.h b/lwip/src/include/arch/cc.h
index 52adcb548dbab042628d6e937c8aa35e06001f03..62df7c4de4c24d266ebcf1178e7b6f07118a125e 100644 (file)
--- a/lwip/src/include/arch/cc.h
+++ b/lwip/src/include/arch/cc.h
@@ -2,6 +2,8 @@
 #define _ARCH_CC_H
 
 #include <stdint.h>
 #define _ARCH_CC_H
 
 #include <stdint.h>

+#include <vga-overlay.h>
+#include <output.h>

 #include <minilib.h>
 
 typedef uint8_t u8_t;
 #include <minilib.h>
 
 typedef uint8_t u8_t;


@@ -12,7 +14,7 @@ typedef int16_t s16_t;
 typedef int32_t s32_t;
 typedef uint32_t mem_ptr_t;
 
 typedef int32_t s32_t;
 typedef uint32_t mem_ptr_t;
 

-#define PACK_STRUCT_FIELD(x) x __attribute__((packed))
+#define PACK_STRUCT_FIELD(x) x

 #define PACK_STRUCT_STRUCT __attribute__((packed))
 #define PACK_STRUCT_BEGIN
 #define PACK_STRUCT_END
 #define PACK_STRUCT_STRUCT __attribute__((packed))
 #define PACK_STRUCT_BEGIN
 #define PACK_STRUCT_END


@@ -27,8 +29,7 @@ typedef uint32_t mem_ptr_t;
 #define LWIP_PLATFORM_HTONS(x) htons(x)
 #define LWIP_PLATFORM_HTONL(x) htonl(x)
 
 #define LWIP_PLATFORM_HTONS(x) htons(x)
 #define LWIP_PLATFORM_HTONL(x) htonl(x)
 

-/* XXX fix this */
-#define LWIP_PLATFORM_DIAG(x)
-#define LWIP_PLATFORM_ASSERT(x)
+#define LWIP_PLATFORM_DIAG(x) outputf x
+#define LWIP_PLATFORM_ASSERT(x) dologf("ASSERT FAILED: %s\n", (x));

 
 #endif
 
 #endif