Changeset 158 for uKadecot/trunk/src/ukadecot

Timestamp:

Feb 20, 2016, 10:43:32 PM (8 years ago)

Author:

coas-nagasima

Message:

インクルードのパス指定をContikiに合わせ変更。
整数型の型名をContikiに合わせ変更。

Location:

uKadecot/trunk/src/ukadecot

Files:

• main.c (modified) (2 diffs)
• uip-conf.h (modified) (3 diffs)

uKadecot/trunk/src/ukadecot/main.c

@@ -53 +53 @@
 #include "rx630_msvc/rx630.h"
 #endif
-#include <uip.h>
-#include <pt.h>
+#include <net/ip/uip.h>
+#include <sys/pt.h>
 #include "uip_adpt.h"
 #include "wamp.h"
@@ -458 +458 @@
 static void main_initialize()
 {
-        extern u8_t my_ip[4];
-        extern u8_t my_netmask[4];
-        extern u8_t my_default_router[4];
+        extern uint8_t my_ip[4];
+        extern uint8_t my_netmask[4];
+        extern uint8_t my_default_router[4];
         uint8_t btn1, btn2;
         uint8_t data[32], c;

uKadecot/trunk/src/ukadecot/uip-conf.h

@@ -63 +63 @@
  * \hideinitializer
  */
-typedef unsigned char u8_t;
+typedef unsigned char uint8_t;
 
 /**
@@ -72 +72 @@
  * \hideinitializer
  */
-typedef unsigned short u16_t;
+typedef unsigned short uint16_t;
 
 /**
@@ -181 +181 @@
 /*#include "hello-world.h"*/
 /*#include "telnetd.h"*/
-#include "webserver.h"
-#include "dhcpc.h"
+#include "webserver/webserver.h"
+#include "dhcpc/dhcpc.h"
 /*#include "resolv.h"*/
 /*#include "webclient.h"*/
 /*#include "httpd.h"*/
 
-#include "timer.h"
-#include "pt.h"
+#include "sys/timer.h"
+#include "sys/pt.h"
 
 struct ecnl_state {