Changeset 158 for uKadecot

Timestamp:

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

Author:

coas-nagasima

Message:

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

Location:

uKadecot/trunk

Files:

• csp/ukadecot/ukadecot.mtpj (modified) (3 diffs)
• ecnl_ssp/echonet_task.c (modified) (1 diff)
• ecnl_ssp/echonet_uip_task.c (modified) (1 diff)
• kadecot/wamp_dealer.c (modified) (1 diff)
• src/ukadecot/main.c (modified) (2 diffs)
• src/ukadecot/uip-conf.h (modified) (3 diffs)
• uip/apps/dhcpc/dhcpc.c (modified) (13 diffs)
• uip/apps/dhcpc/dhcpc.h (modified) (2 diffs)
• uip/apps/webserver/http_parser.c (modified) (1 diff)
• uip/apps/webserver/http_pcb.h (modified) (1 diff)
• uip/apps/webserver/httpd-fs.h (modified) (1 diff)
• uip/apps/webserver/httpd.c (modified) (1 diff)
• uip/apps/webserver/httpd.h (modified) (2 diffs)
• uip/apps/webserver/websocket.c (modified) (3 diffs)
• uip/net/ip/psock.c (modified) (7 diffs)
• uip/net/ip/psock.h (modified) (4 diffs)
• uip/net/ip/uip-split.c (modified) (3 diffs)
• uip/net/ip/uip.h (modified) (43 diffs)
• uip/net/ip/uip_arch.h (moved) (moved from uKadecot/trunk/uip/net/ipv4/uip_arch.h ) (5 diffs)
• uip/net/ip/uiplib.c (modified) (1 diff)
• uip/net/ip/uipopt.h (modified) (1 diff)
• uip/net/ipv4/uip-fw.c (modified) (9 diffs)
• uip/net/ipv4/uip-fw.h (modified) (4 diffs)
• uip/net/ipv4/uip-neighbor.c (modified) (3 diffs)
• uip/net/ipv4/uip-neighbor.h (modified) (1 diff)
• uip/net/ipv4/uip.c (modified) (26 diffs)
• uip/net/ipv4/uip_arp.c (modified) (6 diffs)
• uip/net/ipv4/uip_arp.h (modified) (2 diffs)
• uip/sys/lc.h (modified) (1 diff)
• uip/sys/pt.h (modified) (1 diff)
• uip/sys/timer.c (modified) (1 diff)
• uip/sys/timer.h (modified) (1 diff)
• uip/target/if_rx62n/ether_phy.c (modified) (1 diff)
• uip/target/if_rx62n/if_rx62n.c (modified) (1 diff)
• uip/task/uip_adpt.c (modified) (1 diff)
• uip/task/uip_adpt.h (modified) (3 diffs)
• uip/task/uip_task.c (modified) (5 diffs)

uKadecot/trunk/csp/ukadecot/ukadecot.mtpj

@@ -1035 +1035 @@
 -include=..\..\ssp\pdic
 -include=..\..\ssp\target\grsakura_ccrx
--include=..\..\uip\net\ip
--include=..\..\uip\net\ipv4
--include=..\..\uip\sys
+-include=..\..\uip
 -include=..\..\uip\task
--include=..\..\uip\apps\dhcpc
--include=..\..\uip\apps\webserver
+-include=..\..\uip\apps
 -include=..\..\uip\target\if_rx62n
 -include=..\..\pfatfs
@@ -1126 +1123 @@
 ..\..\ssp\pdic
 ..\..\ssp\target\grsakura_ccrx
-..\..\uip\net\ip
-..\..\uip\net\ipv4
-..\..\uip\sys
+..\..\uip
 ..\..\uip\task
-..\..\uip\apps\dhcpc
-..\..\uip\apps\webserver
+..\..\uip\apps
 ..\..\uip\target\if_rx62n
 ..\..\pfatfs
@@ -1161 +1155 @@
 -include=..\..\ssp\pdic
 -include=..\..\ssp\target\grsakura_ccrx
--include=..\..\uip\net\ip
--include=..\..\uip\net\ipv4
--include=..\..\uip\sys
+-include=..\..\uip
 -include=..\..\uip\task
--include=..\..\uip\apps\dhcpc
--include=..\..\uip\apps\webserver
+-include=..\..\uip\apps
 -include=..\..\uip\target\if_rx62n
 -include=..\..\pfatfs

uKadecot/trunk/ecnl_ssp/echonet_task.c

@@ -50 +50 @@
 #include "syssvc/syslog.h"
 
-#include "uip.h"
+#include "net/ip/uip.h"
 
 #include "echonet.h"

uKadecot/trunk/ecnl_ssp/echonet_uip_task.c

@@ -47 +47 @@
 #include <t_syslog.h>
 #include <sil.h>
-#include <uip.h>
+#include <net/ip/uip.h>
 #include "uip_adpt.h"
 

uKadecot/trunk/kadecot/wamp_dealer.c

@@ -46 +46 @@
 #include "arduino.h"
 #include "data_flash.h"
-#include "uip.h"
+#include "net/ip/uip.h"
 #include "uip_adpt.h"
 

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 {

uKadecot/trunk/uip/apps/dhcpc/dhcpc.c

@@ -35 +35 @@
 #include <string.h>
 
-#include "uip.h"
-#include "dhcpc.h"
-#include "timer.h"
-#include "pt.h"
+#include "net/ip/uip.h"
+#include "dhcpc/dhcpc.h"
+#include "sys/timer.h"
+#include "sys/pt.h"
 
 #define STATE_INITIAL         0
@@ -53 +53 @@
 
 struct dhcp_msg {
-  u8_t op, htype, hlen, hops;
-  u8_t xid[4];
-  u16_t secs, flags;
-  u8_t ciaddr[4];
-  u8_t yiaddr[4];
-  u8_t siaddr[4];
-  u8_t giaddr[4];
-  u8_t chaddr[16];
+  uint8_t op, htype, hlen, hops;
+  uint8_t xid[4];
+  uint16_t secs, flags;
+  uint8_t ciaddr[4];
+  uint8_t yiaddr[4];
+  uint8_t siaddr[4];
+  uint8_t giaddr[4];
+  uint8_t chaddr[16];
 #ifndef UIP_CONF_DHCP_LIGHT
-  u8_t sname[64];
-  u8_t file[128];
-#endif
-  u8_t options[312];
+  uint8_t sname[64];
+  uint8_t file[128];
+#endif
+  uint8_t options[312];
 };
 
@@ -103 +103 @@
 #define DHCP_OPTION_END         255
 
-static const u8_t xid[4] = {0xad, 0xde, 0x12, 0x23};
-static const u8_t magic_cookie[4] = {99, 130, 83, 99};
-/*---------------------------------------------------------------------------*/
-static u8_t *
-add_msg_type(u8_t *optptr, u8_t type)
+static const uint8_t xid[4] = {0xad, 0xde, 0x12, 0x23};
+static const uint8_t magic_cookie[4] = {99, 130, 83, 99};
+/*---------------------------------------------------------------------------*/
+static uint8_t *
+add_msg_type(uint8_t *optptr, uint8_t type)
 {
   *optptr++ = DHCP_OPTION_MSG_TYPE;
@@ -115 +115 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t *
-add_server_id(struct dhcpc_state *s, u8_t *optptr)
+static uint8_t *
+add_server_id(struct dhcpc_state *s, uint8_t *optptr)
 {
   *optptr++ = DHCP_OPTION_SERVER_ID;
@@ -124 +124 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t *
-add_req_ipaddr(struct dhcpc_state *s, u8_t *optptr)
+static uint8_t *
+add_req_ipaddr(struct dhcpc_state *s, uint8_t *optptr)
 {
   *optptr++ = DHCP_OPTION_REQ_IPADDR;
@@ -133 +133 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t *
-add_req_options(u8_t *optptr)
+static uint8_t *
+add_req_options(uint8_t *optptr)
 {
   *optptr++ = DHCP_OPTION_REQ_LIST;
@@ -144 +144 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t *
-add_end(u8_t *optptr)
+static uint8_t *
+add_end(uint8_t *optptr)
 {
   *optptr++ = DHCP_OPTION_END;
@@ -179 +179 @@
 send_discover(struct dhcpc_state *s)
 {
-  u8_t *end;
+  uint8_t *end;
   struct dhcp_msg *m = (struct dhcp_msg *)uip_appdata;
 
@@ -188 +188 @@
   end = add_end(end);
 
-  uip_send(uip_appdata, end - (u8_t *)uip_appdata);
+  uip_send(uip_appdata, end - (uint8_t *)uip_appdata);
 }
 /*---------------------------------------------------------------------------*/
@@ -194 +194 @@
 send_request(struct dhcpc_state *s)
 {
-  u8_t *end;
+  uint8_t *end;
   struct dhcp_msg *m = (struct dhcp_msg *)uip_appdata;
 
@@ -204 +204 @@
   end = add_end(end);
 
-  uip_send(uip_appdata, end - (u8_t *)uip_appdata);
-}
-/*---------------------------------------------------------------------------*/
-static u8_t
-parse_options(struct dhcpc_state *s, u8_t *optptr, int len)
-{
-  u8_t *end = optptr + len;
-  u8_t type = 0;
+  uip_send(uip_appdata, end - (uint8_t *)uip_appdata);
+}
+/*---------------------------------------------------------------------------*/
+static uint8_t
+parse_options(struct dhcpc_state *s, uint8_t *optptr, int len)
+{
+  uint8_t *end = optptr + len;
+  uint8_t type = 0;
 
   while(optptr < end) {
@@ -242 +242 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t
+static uint8_t
 parse_msg(struct dhcpc_state *s)
 {
@@ -386 +386 @@
 dhcpc_request(struct dhcpc_state *s)
 {
-  u16_t ipaddr[2];
+  uint16_t ipaddr[2];
 
   s->state = STATE_REQUEST;

uKadecot/trunk/uip/apps/dhcpc/dhcpc.h

@@ -34 +34 @@
 #define __DHCPC_H__
 
-#include "timer.h"
-#include "pt.h"
+#include "sys/timer.h"
+#include "sys/pt.h"
 
 struct dhcpc_state {
@@ -42 +42 @@
   struct uip_udp_conn *conn;
   struct uip_timer timer;
-  u16_t ticks;
+  uint16_t ticks;
   const void *mac_addr;
   int mac_len;
 
-  u8_t serverid[4];
+  uint8_t serverid[4];
 
-  u16_t lease_time[2];
-  u16_t ipaddr[2];
-  u16_t netmask[2];
-  u16_t dnsaddr[2];
-  u16_t default_router[2];
+  uint16_t lease_time[2];
+  uint16_t ipaddr[2];
+  uint16_t netmask[2];
+  uint16_t dnsaddr[2];
+  uint16_t default_router[2];
 };
 

uKadecot/trunk/uip/apps/webserver/http_parser.c

@@ -22 +22 @@
  * IN THE SOFTWARE.
  */
-#include "http_parser.h"
+#include "webserver/http_parser.h"
 //#include <assert.h>
 #include <stddef.h>

uKadecot/trunk/uip/apps/webserver/http_pcb.h

@@ -23 +23 @@
 #define __HTTP_PCB_H__
 
-#include "http_parser.h"
+#include "webserver/http_parser.h"
 
 #define MAX_ELEMENT_SIZE 256

uKadecot/trunk/uip/apps/webserver/httpd-fs.h

@@ -54 +54 @@
 #ifdef HTTPD_FS_STATISTICS
 #if HTTPD_FS_STATISTICS == 1
-u16_t httpd_fs_count(char *name);
+uint16_t httpd_fs_count(char *name);
 #endif /* HTTPD_FS_STATISTICS */
 #endif /* HTTPD_FS_STATISTICS */

uKadecot/trunk/uip/apps/webserver/httpd.c

@@ -56 +56 @@
  */
 
-#include "uip.h"
+#include "net/ip/uip.h"
 #include "httpd.h"
 #include "httpd-fs.h"

uKadecot/trunk/uip/apps/webserver/httpd.h

@@ -36 +36 @@
 #define __HTTPD_H__
 
-#include "psock.h"
+#include "net/ip/psock.h"
 #include "httpd-fs.h"
 #include "http_pcb.h"
@@ -76 +76 @@
 
 void httpd_log(char *msg);
-void httpd_log_file(u16_t *requester, char *file);
+void httpd_log_file(uint16_t *requester, char *file);
 
 #endif /* __HTTPD_H__ */

uKadecot/trunk/uip/apps/webserver/websocket.c

@@ -38 +38 @@
 #include <string.h>
 #include "websocket.h"
-#include "uip.h"
+#include "net/ip/uip.h"
 #include "kernel.h"
 #include "kernel_cfg.h"
@@ -69 +69 @@
 {
         ws_state_t *s = &ws->rstate;
-        const u8_t *pos = (const u8_t *)data, *end = &((const u8_t *)data)[len];
+        const uint8_t *pos = (const uint8_t *)data, *end = &((const uint8_t *)data)[len];
 
         for(; pos < end; pos++){
@@ -192 +192 @@
 {
         ws_state_t *s = &ws->wstate;
-        u8_t *pos = (u8_t *)data, *end = &((u8_t *)data)[len];
+        uint8_t *pos = (uint8_t *)data, *end = &((uint8_t *)data)[len];
 
         for(; pos < end; pos++){

uKadecot/trunk/uip/net/ip/psock.c

@@ -37 +37 @@
 #include <string.h>
 
-#include "uipopt.h"
-#include "psock.h"
-#include "uip.h"
+#include "net/ip/uipopt.h"
+#include "net/ip/psock.h"
+#include "net/ip/uip.h"
 
 #define STATE_NONE 0
@@ -74 +74 @@
 static void
 buf_setup(struct psock_buf *buf,
-          u8_t *bufptr, u16_t bufsize)
+          uint8_t *bufptr, uint16_t bufsize)
 {
   buf->ptr = bufptr;
@@ -80 +80 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t
-buf_bufdata(struct psock_buf *buf, u16_t len,
-            u8_t **dataptr, u16_t *datalen)
+static uint8_t
+buf_bufdata(struct psock_buf *buf, uint16_t len,
+            uint8_t **dataptr, uint16_t *datalen)
 {
   if(*datalen < buf->left) {
@@ -108 +108 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t
-buf_bufto(register struct psock_buf *buf, u8_t endmarker,
-          register u8_t **dataptr, register u16_t *datalen)
-{
-  u8_t c;
+static uint8_t
+buf_bufto(register struct psock_buf *buf, uint8_t endmarker,
+          register uint8_t **dataptr, register uint16_t *datalen)
+{
+  uint8_t c;
   while(buf->left > 0 && *datalen > 0) {
     c = *buf->ptr = **dataptr;
@@ -244 +244 @@
 }
 /*---------------------------------------------------------------------------*/
-u16_t
+uint16_t
 psock_datalen(struct psock *psock)
 {
@@ -283 +283 @@
       PT_WAIT_UNTIL(&psock->psockpt, psock_newdata(psock));
       psock->state = STATE_READ;
-      psock->readptr = (u8_t *)uip_appdata;
+      psock->readptr = (uint8_t *)uip_appdata;
       psock->readlen = uip_datalen();
     }
@@ -311 +311 @@
       printf("Waited for newdata\n");
       psock->state = STATE_READ;
-      psock->readptr = (u8_t *)uip_appdata;
+      psock->readptr = (uint8_t *)uip_appdata;
       psock->readlen = uip_datalen();
     }

uKadecot/trunk/uip/net/ip/psock.h

@@ -82 +82 @@
 #define __PSOCK_H__
 
-#include "uipopt.h"
-#include "pt.h"
+#include "net/ip/uipopt.h"
+#include "sys/pt.h"
 
  /*
@@ -94 +94 @@
  */
 struct psock_buf {
-  u8_t *ptr;
+  uint8_t *ptr;
   unsigned short left;
 };
@@ -108 +108 @@
                             functions, and one that runs inside the
                             psock functions. */
-  const u8_t *sendptr;   /* Pointer to the next data to be sent. */
-  u8_t *readptr;         /* Pointer to the next data to be read. */
+  const uint8_t *sendptr;   /* Pointer to the next data to be sent. */
+  uint8_t *readptr;         /* Pointer to the next data to be read. */
 
   char *bufptr;          /* Pointer to the buffer used for buffering
                             incoming data. */
 
-  u16_t sendlen;         /* The number of bytes left to be sent. */
-  u16_t readlen;         /* The number of bytes left to be read. */
+  uint16_t sendlen;         /* The number of bytes left to be sent. */
+  uint16_t readlen;         /* The number of bytes left to be read. */
 
   struct psock_buf buf;  /* The structure holding the state of the
@@ -281 +281 @@
 #define PSOCK_DATALEN(psock) psock_datalen(psock)
 
-u16_t psock_datalen(struct psock *psock);
+uint16_t psock_datalen(struct psock *psock);
 
 /**

uKadecot/trunk/uip/net/ip/uip-split.c

@@ -36 +36 @@
 #include <string.h>
 
-#include "uip-split.h"
-#include "uip.h"
-#include "uip-fw.h"
-#include "uip_arch.h"
+#include "net/ip/uip-split.h"
+#include "net/ip/uip.h"
+#include "net/ipv4/uip-fw.h"
+#include "net/ip/uip_arch.h"
 
 
@@ -49 +49 @@
 uip_split_output(void)
 {
-  u16_t tcplen, len1, len2;
+  uint16_t tcplen, len1, len2;
 
   /* We only try to split maximum sized TCP segments. */
@@ -107 +107 @@
     
     /*    uip_appdata += len1;*/
-    memcpy(uip_appdata, (u8_t *)uip_appdata + len1, len2);
+    memcpy(uip_appdata, (uint8_t *)uip_appdata + len1, len2);
 
     uip_add32(BUF->seqno, len1);

uKadecot/trunk/uip/net/ip/uip.h

@@ -54 +54 @@
 #define __UIP_H__
 
-#include "uipopt.h"
+#include "net/ip/uipopt.h"
 
 /**
@@ -60 +60 @@
  *
  */
-typedef u16_t uip_ip4addr_t[2];
-typedef u16_t uip_ip6addr_t[8];
+typedef uint16_t uip_ip4addr_t[2];
+typedef uint16_t uip_ip6addr_t[8];
 #if UIP_CONF_IPV6
 typedef uip_ip6addr_t uip_ipaddr_t;
@@ -193 +193 @@
  * This function may be used at boot time to set the initial ip_id.
  */
-void uip_setipid(u16_t id);
+void uip_setipid(uint16_t id);
 
 /** @} */
@@ -421 +421 @@
  */
 #if 0
-extern u8_t uip_buf[UIP_BUFSIZE+2];
+extern uint8_t uip_buf[UIP_BUFSIZE+2];
 #else
-extern u8_t *uip_buf;
+extern uint8_t *uip_buf;
 #endif
 
@@ -452 +452 @@
  * \param port A 16-bit port number in network byte order.
  */
-void uip_listen(u16_t port);
+void uip_listen(uint16_t port);
 
 /**
@@ -466 +466 @@
  * \param port A 16-bit port number in network byte order.
  */
-void uip_unlisten(u16_t port);
+void uip_unlisten(uint16_t port);
 
 /**
@@ -500 +500 @@
  *
  */
-struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, u16_t port);
+struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, uint16_t port);
 
 
@@ -768 +768 @@
  * if no connection could be allocated.
  */
-struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport);
+struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, uint16_t rport);
 
 /**
@@ -843 +843 @@
  */
 #define uip_ipaddr(addr, addr0,addr1,addr2,addr3) do { \
-                     ((u16_t *)(addr))[0] = HTONS(((addr0) << 8) | (addr1)); \
-                     ((u16_t *)(addr))[1] = HTONS(((addr2) << 8) | (addr3)); \
+                     ((uint16_t *)(addr))[0] = HTONS(((addr0) << 8) | (addr1)); \
+                     ((uint16_t *)(addr))[1] = HTONS(((addr2) << 8) | (addr3)); \
                   } while(0)
 
@@ -855 +855 @@
  */
 #define uip_ip6addr(addr, addr0,addr1,addr2,addr3,addr4,addr5,addr6,addr7) do { \
-                     ((u16_t *)(addr))[0] = HTONS((addr0)); \
-                     ((u16_t *)(addr))[1] = HTONS((addr1)); \
-                     ((u16_t *)(addr))[2] = HTONS((addr2)); \
-                     ((u16_t *)(addr))[3] = HTONS((addr3)); \
-                     ((u16_t *)(addr))[4] = HTONS((addr4)); \
-                     ((u16_t *)(addr))[5] = HTONS((addr5)); \
-                     ((u16_t *)(addr))[6] = HTONS((addr6)); \
-                     ((u16_t *)(addr))[7] = HTONS((addr7)); \
+                     ((uint16_t *)(addr))[0] = HTONS((addr0)); \
+                     ((uint16_t *)(addr))[1] = HTONS((addr1)); \
+                     ((uint16_t *)(addr))[2] = HTONS((addr2)); \
+                     ((uint16_t *)(addr))[3] = HTONS((addr3)); \
+                     ((uint16_t *)(addr))[4] = HTONS((addr4)); \
+                     ((uint16_t *)(addr))[5] = HTONS((addr5)); \
+                     ((uint16_t *)(addr))[6] = HTONS((addr6)); \
+                     ((uint16_t *)(addr))[7] = HTONS((addr7)); \
                   } while(0)
 
@@ -885 +885 @@
 #if !UIP_CONF_IPV6
 #define uip_ipaddr_copy(dest, src) do { \
-                     ((u16_t *)dest)[0] = ((u16_t *)src)[0]; \
-                     ((u16_t *)dest)[1] = ((u16_t *)src)[1]; \
+                     ((uint16_t *)dest)[0] = ((uint16_t *)src)[0]; \
+                     ((uint16_t *)dest)[1] = ((uint16_t *)src)[1]; \
                   } while(0)
 #else /* !UIP_CONF_IPV6 */
@@ -913 +913 @@
  */
 #if !UIP_CONF_IPV6
-#define uip_ipaddr_cmp(addr1, addr2) (((u16_t *)addr1)[0] == ((u16_t *)addr2)[0] && \
-                                      ((u16_t *)addr1)[1] == ((u16_t *)addr2)[1])
+#define uip_ipaddr_cmp(addr1, addr2) (((uint16_t *)addr1)[0] == ((uint16_t *)addr2)[0] && \
+                                      ((uint16_t *)addr1)[1] == ((uint16_t *)addr2)[1])
 #else /* !UIP_CONF_IPV6 */
 #define uip_ipaddr_cmp(addr1, addr2) (memcmp(addr1, addr2, sizeof(uip_ip6addr_t)) == 0)
@@ -944 +944 @@
  */
 #define uip_ipaddr_maskcmp(addr1, addr2, mask) \
-                          (((((u16_t *)addr1)[0] & ((u16_t *)mask)[0]) == \
-                            (((u16_t *)addr2)[0] & ((u16_t *)mask)[0])) && \
-                           ((((u16_t *)addr1)[1] & ((u16_t *)mask)[1]) == \
-                            (((u16_t *)addr2)[1] & ((u16_t *)mask)[1])))
+                          (((((uint16_t *)addr1)[0] & ((uint16_t *)mask)[0]) == \
+                            (((uint16_t *)addr2)[0] & ((uint16_t *)mask)[0])) && \
+                           ((((uint16_t *)addr1)[1] & ((uint16_t *)mask)[1]) == \
+                            (((uint16_t *)addr2)[1] & ((uint16_t *)mask)[1])))
 
 
@@ -975 +975 @@
  */
 #define uip_ipaddr_mask(dest, src, mask) do { \
-                     ((u16_t *)dest)[0] = ((u16_t *)src)[0] & ((u16_t *)mask)[0]; \
-                     ((u16_t *)dest)[1] = ((u16_t *)src)[1] & ((u16_t *)mask)[1]; \
+                     ((uint16_t *)dest)[0] = ((uint16_t *)src)[0] & ((uint16_t *)mask)[0]; \
+                     ((uint16_t *)dest)[1] = ((uint16_t *)src)[1] & ((uint16_t *)mask)[1]; \
                   } while(0)
 
@@ -987 +987 @@
  \code
  uip_ipaddr_t ipaddr;
- u8_t octet;
+ uint8_t octet;
 
  uip_ipaddr(&ipaddr, 1,2,3,4);
@@ -997 +997 @@
  * \hideinitializer
  */
-#define uip_ipaddr1(addr) (htons(((u16_t *)(addr))[0]) >> 8)
+#define uip_ipaddr1(addr) (htons(((uint16_t *)(addr))[0]) >> 8)
 
 /**
@@ -1007 +1007 @@
  \code
  uip_ipaddr_t ipaddr;
- u8_t octet;
+ uint8_t octet;
 
  uip_ipaddr(&ipaddr, 1,2,3,4);
@@ -1017 +1017 @@
  * \hideinitializer
  */
-#define uip_ipaddr2(addr) (htons(((u16_t *)(addr))[0]) & 0xff)
+#define uip_ipaddr2(addr) (htons(((uint16_t *)(addr))[0]) & 0xff)
 
 /**
@@ -1027 +1027 @@
  \code
  uip_ipaddr_t ipaddr;
- u8_t octet;
+ uint8_t octet;
 
  uip_ipaddr(&ipaddr, 1,2,3,4);
@@ -1037 +1037 @@
  * \hideinitializer
  */
-#define uip_ipaddr3(addr) (htons(((u16_t *)(addr))[1]) >> 8)
+#define uip_ipaddr3(addr) (htons(((uint16_t *)(addr))[1]) >> 8)
 
 /**
@@ -1047 +1047 @@
  \code
  uip_ipaddr_t ipaddr;
- u8_t octet;
+ uint8_t octet;
 
  uip_ipaddr(&ipaddr, 1,2,3,4);
@@ -1057 +1057 @@
  * \hideinitializer
  */
-#define uip_ipaddr4(addr) (htons(((u16_t *)(addr))[1]) & 0xff)
+#define uip_ipaddr4(addr) (htons(((uint16_t *)(addr))[1]) & 0xff)
 
 /**
@@ -1072 +1072 @@
 #      define HTONS(n) (n)
 #   else /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
-#      define HTONS(n) (u16_t)((((u16_t) (n)) << 8) | (((u16_t) (n)) >> 8))
+#      define HTONS(n) (uint16_t)((((uint16_t) (n)) << 8) | (((uint16_t) (n)) >> 8))
 #   endif /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
 #else
@@ -1086 +1086 @@
  */
 #ifndef htons
-u16_t htons(u16_t val);
+uint16_t htons(uint16_t val);
 #endif /* htons */
 #ifndef ntohs
@@ -1104 +1104 @@
 
 #if UIP_URGDATA > 0
-/* u8_t *uip_urgdata:
+/* uint8_t *uip_urgdata:
  *
  * This pointer points to any urgent data that has been received. Only
@@ -1136 +1136 @@
  *
  */
-extern u16_t uip_len;
+extern uint16_t uip_len;
 
 /** @} */
 
 #if UIP_URGDATA > 0
-extern u16_t uip_urglen, uip_surglen;
+extern uint16_t uip_urglen, uip_surglen;
 #endif /* UIP_URGDATA > 0 */
 
@@ -1158 +1158 @@
   uip_ipaddr_t ripaddr;   /**< The IP address of the remote host. */
 
-  u16_t lport;        /**< The local TCP port, in network byte order. */
-  u16_t rport;        /**< The local remote TCP port, in network byte
+  uint16_t lport;        /**< The local TCP port, in network byte order. */
+  uint16_t rport;        /**< The local remote TCP port, in network byte
                          order. */
 
-  u8_t rcv_nxt[4];    /**< The sequence number that we expect to
+  uint8_t rcv_nxt[4];    /**< The sequence number that we expect to
                          receive next. */
-  u8_t snd_nxt[4];    /**< The sequence number that was last sent by
+  uint8_t snd_nxt[4];    /**< The sequence number that was last sent by
                          us. */
-  u16_t len;          /**< Length of the data that was previously sent. */
-  u16_t mss;          /**< Current maximum segment size for the
+  uint16_t len;          /**< Length of the data that was previously sent. */
+  uint16_t mss;          /**< Current maximum segment size for the
                          connection. */
-  u16_t initialmss;   /**< Initial maximum segment size for the
+  uint16_t initialmss;   /**< Initial maximum segment size for the
                          connection. */
-  u8_t sa;            /**< Retransmission time-out calculation state
+  uint8_t sa;            /**< Retransmission time-out calculation state
                          variable. */
-  u8_t sv;            /**< Retransmission time-out calculation state
+  uint8_t sv;            /**< Retransmission time-out calculation state
                          variable. */
-  u8_t rto;           /**< Retransmission time-out. */
-  u8_t tcpstateflags; /**< TCP state and flags. */
-  u8_t timer;         /**< The retransmission timer. */
-  u8_t nrtx;          /**< The number of retransmissions for the last
+  uint8_t rto;           /**< Retransmission time-out. */
+  uint8_t tcpstateflags; /**< TCP state and flags. */
+  uint8_t timer;         /**< The retransmission timer. */
+  uint8_t nrtx;          /**< The number of retransmissions for the last
                          segment sent. */
 
@@ -1203 +1203 @@
  * 4-byte array used for the 32-bit sequence number calculations.
  */
-extern u8_t uip_acc32[4];
+extern uint8_t uip_acc32[4];
 
 /** @} */
@@ -1214 +1214 @@
 struct uip_udp_conn {
   uip_ipaddr_t ripaddr;   /**< The IP address of the remote peer. */
-  u16_t lport;        /**< The local port number in network byte order. */
-  u16_t rport;        /**< The remote port number in network byte order. */
-  u8_t  ttl;          /**< Default time-to-live. */
+  uint16_t lport;        /**< The local port number in network byte order. */
+  uint16_t rport;        /**< The remote port number in network byte order. */
+  uint8_t  ttl;          /**< Default time-to-live. */
 
   /** The application state. */
@@ -1301 +1301 @@
  */
 /*---------------------------------------------------------------------------*/
-/* u8_t uip_flags:
+/* uint8_t uip_flags:
  *
  * When the application is called, uip_flags will contain the flags
@@ -1307 +1307 @@
  * infomation.
  */
-extern u8_t uip_flags;
+extern uint8_t uip_flags;
 
 /* The following flags may be set in the global variable uip_flags
@@ -1349 +1349 @@
  * The actual uIP function which does all the work.
  */
-void uip_process(u8_t flag);
+void uip_process(uint8_t flag);
 
 /* The following flags are passed as an argument to the uip_process()
@@ -1397 +1397 @@
 #if UIP_CONF_IPV6
   /* IPv6 header. */
-  u8_t vtc,
+  uint8_t vtc,
     tcflow;
-  u16_t flow;
-  u8_t len[2];
-  u8_t proto, ttl;
+  uint16_t flow;
+  uint8_t len[2];
+  uint8_t proto, ttl;
   uip_ip6addr_t srcipaddr, destipaddr;
 #else /* UIP_CONF_IPV6 */
   /* IPv4 header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos,
     len[2],
@@ -1412 +1412 @@
     ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
 #endif /* UIP_CONF_IPV6 */
 
   /* TCP header. */
-  u16_t srcport,
+  uint16_t srcport,
     destport;
-  u8_t seqno[4],
+  uint8_t seqno[4],
     ackno[4],
     tcpoffset,
     flags,
     wnd[2];
-  u16_t tcpchksum;
-  u8_t urgp[2];
-  u8_t optdata[4];
+  uint16_t tcpchksum;
+  uint8_t urgp[2];
+  uint8_t optdata[4];
 };
 
@@ -1434 +1434 @@
 #if UIP_CONF_IPV6
   /* IPv6 header. */
-  u8_t vtc,
+  uint8_t vtc,
     tcf;
-  u16_t flow;
-  u8_t len[2];
-  u8_t proto, ttl;
+  uint16_t flow;
+  uint8_t len[2];
+  uint8_t proto, ttl;
   uip_ip6addr_t srcipaddr, destipaddr;
 #else /* UIP_CONF_IPV6 */
   /* IPv4 header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos,
     len[2],
@@ -1449 +1449 @@
     ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
 #endif /* UIP_CONF_IPV6 */
 
   /* ICMP (echo) header. */
-  u8_t type, icode;
-  u16_t icmpchksum;
+  uint8_t type, icode;
+  uint16_t icmpchksum;
 #if !UIP_CONF_IPV6
-  u16_t id, seqno;
+  uint16_t id, seqno;
 #else /* !UIP_CONF_IPV6 */
-  u8_t flags, reserved1, reserved2, reserved3;
-  u8_t icmp6data[16];
-  u8_t options[1];
+  uint8_t flags, reserved1, reserved2, reserved3;
+  uint8_t icmp6data[16];
+  uint8_t options[1];
 #endif /* !UIP_CONF_IPV6 */
 };
@@ -1471 +1471 @@
 #if UIP_CONF_IPV6
   /* IPv6 header. */
-  u8_t vtc,
+  uint8_t vtc,
     tcf;
-  u16_t flow;
-  u8_t len[2];
-  u8_t proto, ttl;
+  uint16_t flow;
+  uint8_t len[2];
+  uint8_t proto, ttl;
   uip_ip6addr_t srcipaddr, destipaddr;
 #else /* UIP_CONF_IPV6 */
   /* IP header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos,
     len[2],
@@ -1486 +1486 @@
     ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
 #endif /* UIP_CONF_IPV6 */
 
   /* UDP header. */
-  u16_t srcport,
+  uint16_t srcport,
     destport;
-  u16_t udplen;
-  u16_t udpchksum;
+  uint16_t udplen;
+  uint16_t udpchksum;
 };
 
@@ -1555 +1555 @@
  */
 struct uip_eth_addr {
-  u8_t addr[6];
+  uint8_t addr[6];
 };
 
@@ -1574 +1574 @@
  * \return The Internet checksum of the buffer.
  */
-u16_t uip_chksum(u16_t *buf, u16_t len);
+uint16_t uip_chksum(uint16_t *buf, uint16_t len);
 
 /**
@@ -1585 +1585 @@
  * buffer.
  */
-u16_t uip_ipchksum(void);
+uint16_t uip_ipchksum(void);
 
 /**
@@ -1596 +1596 @@
  * to by uip_appdata.
  */
-u16_t uip_tcpchksum(void);
+uint16_t uip_tcpchksum(void);
 
 /**
@@ -1607 +1607 @@
  * to by uip_appdata.
  */
-u16_t uip_udpchksum(void);
+uint16_t uip_udpchksum(void);
 
 

uKadecot/trunk/uip/net/ip/uip_arch.h

@@ -62 +62 @@
 #define __UIP_ARCH_H__
 
-#include "uip.h"
+#include "net/ip/uip.h"
 
 /**
@@ -82 +82 @@
  * \param op16 A 16-bit integer in host byte order.
  */
-void uip_add32(u8_t *op32, u16_t op16);
+void uip_add32(uint8_t *op32, uint16_t op16);
 
 /**
@@ -103 +103 @@
  * \return The Internet checksum of the buffer.
  */
-u16_t uip_chksum(u16_t *buf, u16_t len);
+uint16_t uip_chksum(uint16_t *buf, uint16_t len);
 
 /**
@@ -114 +114 @@
  * buffer.
  */
-u16_t uip_ipchksum(void);
+uint16_t uip_ipchksum(void);
 
 /**
@@ -129 +129 @@
  * to by uip_appdata.
  */
-u16_t uip_tcpchksum(void);
+uint16_t uip_tcpchksum(void);
 
-u16_t uip_udpchksum(void);
+uint16_t uip_udpchksum(void);
 
 /** @} */

uKadecot/trunk/uip/net/ip/uiplib.c

@@ -35 +35 @@
 
 
-#include "uip.h"
-#include "uiplib.h"
+#include "net/ip/uip.h"
+#include "net/ip/uiplib.h"
 
 

uKadecot/trunk/uip/net/ip/uipopt.h

@@ -502 +502 @@
 
 struct httpd_state {
-  u8_t state;
-  u16_t count;
+  uint8_t state;
+  uint16_t count;
   char *dataptr;
   char *script;

uKadecot/trunk/uip/net/ipv4/uip-fw.c

@@ -54 +54 @@
  */
 
-#include "uip.h"
-#include "uip_arch.h"
-#include "uip-fw.h"
+#include "net/ip/uip.h"
+#include "net/ip/uip_arch.h"
+#include "net/ipv4/uip-fw.h"
 
 #include <string.h> /* for memcpy() */
@@ -78 +78 @@
 struct tcpip_hdr {
   /* IP header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos;
-  u16_t len,
+  uint16_t len,
     ipid,
     ipoffset;
-  u8_t ttl,
+  uint8_t ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
   
   /* TCP header. */
-  u16_t srcport,
+  uint16_t srcport,
     destport;
-  u8_t seqno[4],
+  uint8_t seqno[4],
     ackno[4],
     tcpoffset,
     flags,
     wnd[2];
-  u16_t tcpchksum;
-  u8_t urgp[2];
-  u8_t optdata[4];
+  uint16_t tcpchksum;
+  uint8_t urgp[2];
+  uint8_t optdata[4];
 };
 
 struct icmpip_hdr {
   /* IP header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos,
     len[2],
@@ -111 +111 @@
     ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
   /* ICMP (echo) header. */
-  u8_t type, icode;
-  u16_t icmpchksum;
-  u16_t id, seqno;
-  u8_t payload[1];
+  uint8_t type, icode;
+  uint16_t icmpchksum;
+  uint16_t id, seqno;
+  uint8_t payload[1];
 };
 
@@ -142 +142 @@
  */
 struct fwcache_entry {
-  u16_t timer;
-  
-  u16_t srcipaddr[2];
-  u16_t destipaddr[2];
-  u16_t ipid;
-  u8_t proto;
-  u8_t unused;
+  uint16_t timer;
+  
+  uint16_t srcipaddr[2];
+  uint16_t destipaddr[2];
+  uint16_t ipid;
+  uint8_t proto;
+  uint8_t unused;
 
 #if notdef
-  u16_t payload[2];
+  uint16_t payload[2];
 #endif
 
 #if UIP_REASSEMBLY > 0
-  u16_t len, offset;
+  uint16_t len, offset;
 #endif
 };
@@ -217 +217 @@
 /*------------------------------------------------------------------------------*/
 static unsigned char
-ipaddr_maskcmp(u16_t *ipaddr, u16_t *netipaddr, u16_t *netmask)
+ipaddr_maskcmp(uint16_t *ipaddr, uint16_t *netipaddr, uint16_t *netmask)
 {
   return (ipaddr[0] & netmask [0]) == (netipaddr[0] & netmask[0]) &&
@@ -234 +234 @@
 time_exceeded(void)
 {
-  u16_t tmp16;
+  uint16_t tmp16;
 
   /* We don't send out ICMP errors for ICMP messages. */
@@ -250 +250 @@
   /* Calculate the ICMP checksum. */
   ICMPBUF->icmpchksum = 0;
-  ICMPBUF->icmpchksum = ~uip_chksum((u16_t *)&(ICMPBUF->type), 36);
+  ICMPBUF->icmpchksum = ~uip_chksum((uint16_t *)&(ICMPBUF->type), 36);
 
   /* Set the IP destination address to be the source address of the
@@ -367 +367 @@
  */
 /*------------------------------------------------------------------------------*/
-u8_t
+uint8_t
 uip_fw_output(void)
 {
@@ -415 +415 @@
  */
 /*------------------------------------------------------------------------------*/
-u8_t
+uint8_t
 uip_fw_forward(void)
 {

uKadecot/trunk/uip/net/ipv4/uip-fw.h

@@ -47 +47 @@
 #define __UIP_FW_H__
 
-#include "uip.h"
+#include "net/ip/uip.h"
 
 /**
@@ -55 +55 @@
   struct uip_fw_netif *next;  /**< Pointer to the next interface when
                                  linked in a list. */
-  u16_t ipaddr[2];            /**< The IP address of this interface. */
-  u16_t netmask[2];           /**< The netmask of the interface. */
-  u8_t (* output)(void);
+  uint16_t ipaddr[2];            /**< The IP address of this interface. */
+  uint16_t netmask[2];           /**< The netmask of the interface. */
+  uint8_t (* output)(void);
                               /**< A pointer to the function that
                                  sends a packet. */
@@ -94 +94 @@
  */
 #define uip_fw_setipaddr(netif, addr) \
-        do { (netif)->ipaddr[0] = ((u16_t *)(addr))[0]; \
-             (netif)->ipaddr[1] = ((u16_t *)(addr))[1]; } while(0)
+        do { (netif)->ipaddr[0] = ((uint16_t *)(addr))[0]; \
+             (netif)->ipaddr[1] = ((uint16_t *)(addr))[1]; } while(0)
 /**
  * Set the netmask of a network interface.
@@ -106 +106 @@
  */
 #define uip_fw_setnetmask(netif, addr) \
-        do { (netif)->netmask[0] = ((u16_t *)(addr))[0]; \
-             (netif)->netmask[1] = ((u16_t *)(addr))[1]; } while(0)
+        do { (netif)->netmask[0] = ((uint16_t *)(addr))[0]; \
+             (netif)->netmask[1] = ((uint16_t *)(addr))[1]; } while(0)
 
 void uip_fw_init(void);
-u8_t uip_fw_forward(void);
-u8_t uip_fw_output(void);
+uint8_t uip_fw_forward(void);
+uint8_t uip_fw_output(void);
 void uip_fw_register(struct uip_fw_netif *netif);
 void uip_fw_default(struct uip_fw_netif *netif);

uKadecot/trunk/uip/net/ipv4/uip-neighbor.c

@@ -40 +40 @@
  */
 
-#include "uip-neighbor.h"
+#include "net/ipv4/uip-neighbor.h"
 
 #include <string.h>
@@ -55 +55 @@
   uip_ipaddr_t ipaddr;
   struct uip_neighbor_addr addr;
-  u8_t time;
+  uint8_t time;
 };
 static struct neighbor_entry entries[ENTRIES];
@@ -86 +86 @@
 {
   int i, oldest;
-  u8_t oldest_time;
+  uint8_t oldest_time;
 
   printf("Adding neighbor with link address %02x:%02x:%02x:%02x:%02x:%02x\n",

uKadecot/trunk/uip/net/ipv4/uip-neighbor.h

@@ -43 +43 @@
 #define __UIP_NEIGHBOR_H__
 
-#include "uip.h"
+#include "net/ip/uip.h"
 
 struct uip_neighbor_addr {

uKadecot/trunk/uip/net/ipv4/uip.c

@@ -80 +80 @@
 */
 
-#include "uip.h"
-#include "uipopt.h"
-#include "uip_arch.h"
+#include "net/ip/uip.h"
+#include "net/ip/uipopt.h"
+#include "net/ip/uip_arch.h"
 
 #if UIP_CONF_IPV6
-#include "uip-neighbor.h"
+#include "net/ipv4/uip-neighbor.h"
 #endif /* UIP_CONF_IPV6 */
 
@@ -137 +137 @@
 
 #ifndef UIP_CONF_EXTERNAL_BUFFER
-u8_t uip_buf[UIP_BUFSIZE + 2];   /* The packet buffer that contains
+uint8_t uip_buf[UIP_BUFSIZE + 2];   /* The packet buffer that contains
                                     incoming packets. */
 #endif /* UIP_CONF_EXTERNAL_BUFFER */
@@ -150 +150 @@
                                        urgent data (out-of-band data), if
                                        present. */
-u16_t uip_urglen, uip_surglen;
+uint16_t uip_urglen, uip_surglen;
 #endif /* UIP_URGDATA > 0 */
 
-u16_t uip_len, uip_slen;
+uint16_t uip_len, uip_slen;
                              /* The uip_len is either 8 or 16 bits,
                                 depending on the maximum packet
                                 size. */
 
-u8_t uip_flags;     /* The uip_flags variable is used for
+uint8_t uip_flags;     /* The uip_flags variable is used for
                                 communication between the TCP/IP stack
                                 and the application program. */
@@ -167 +167 @@
                              /* The uip_conns array holds all TCP
                                 connections. */
-u16_t uip_listenports[UIP_LISTENPORTS];
+uint16_t uip_listenports[UIP_LISTENPORTS];
                              /* The uip_listenports list all currently
                                 listning ports. */
@@ -175 +175 @@
 #endif /* UIP_UDP */
 
-static u16_t ipid;           /* Ths ipid variable is an increasing
+static uint16_t ipid;           /* Ths ipid variable is an increasing
                                 number that is used for the IP ID
                                 field. */
 
-void uip_setipid(u16_t id) { ipid = id; }
-
-static u8_t iss[4];          /* The iss variable is used for the TCP
+void uip_setipid(uint16_t id) { ipid = id; }
+
+static uint8_t iss[4];          /* The iss variable is used for the TCP
                                 initial sequence number. */
 
 #if UIP_ACTIVE_OPEN
-static u16_t lastport;       /* Keeps track of the last port used for
+static uint16_t lastport;       /* Keeps track of the last port used for
                                 a new connection. */
 #endif /* UIP_ACTIVE_OPEN */
 
 /* Temporary variables. */
-u8_t uip_acc32[4];
-static u8_t c, opt;
-static u16_t tmp16;
+uint8_t uip_acc32[4];
+static uint8_t c, opt;
+static uint16_t tmp16;
 
 /* Structures and definitions. */
@@ -247 +247 @@
 #if ! UIP_ARCH_ADD32
 void
-uip_add32(u8_t *op32, u16_t op16)
+uip_add32(uint8_t *op32, uint16_t op16)
 {
   uip_acc32[3] = op32[3] + (op16 & 0xff);
@@ -277 +277 @@
 #if ! UIP_ARCH_CHKSUM
 /*---------------------------------------------------------------------------*/
-static u16_t
-chksum(u16_t sum, const u8_t *data, u16_t len)
+static uint16_t
+chksum(uint16_t sum, const uint8_t *data, uint16_t len)
 {
-  u16_t t;
-  const u8_t *dataptr;
-  const u8_t *last_byte;
+  uint16_t t;
+  const uint8_t *dataptr;
+  const uint8_t *last_byte;
 
   dataptr = data;
@@ -308 +308 @@
 }
 /*---------------------------------------------------------------------------*/
-u16_t
-uip_chksum(u16_t *data, u16_t len)
+uint16_t
+uip_chksum(uint16_t *data, uint16_t len)
 {
-  return htons(chksum(0, (u8_t *)data, len));
+  return htons(chksum(0, (uint8_t *)data, len));
 }
 /*---------------------------------------------------------------------------*/
 #ifndef UIP_ARCH_IPCHKSUM
-u16_t
+uint16_t
 uip_ipchksum(void)
 {
-  u16_t sum;
+  uint16_t sum;
 
   sum = chksum(0, &uip_buf[UIP_LLH_LEN], UIP_IPH_LEN);
@@ -326 +326 @@
 #endif
 /*---------------------------------------------------------------------------*/
-static u16_t
-upper_layer_chksum(u8_t proto)
+static uint16_t
+upper_layer_chksum(uint8_t proto)
 {
-  u16_t upper_layer_len;
-  u16_t sum;
+  uint16_t upper_layer_len;
+  uint16_t sum;
 
 #if UIP_CONF_IPV6
-  upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]);
+  upper_layer_len = (((uint16_t)(BUF->len[0]) << 8) + BUF->len[1]);
 #else /* UIP_CONF_IPV6 */
-  upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
+  upper_layer_len = (((uint16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
 #endif /* UIP_CONF_IPV6 */
 
@@ -343 +343 @@
   sum = upper_layer_len + proto;
   /* Sum IP source and destination addresses. */
-  sum = chksum(sum, (u8_t *)&BUF->srcipaddr[0], 2 * sizeof(uip_ipaddr_t));
+  sum = chksum(sum, (uint8_t *)&BUF->srcipaddr[0], 2 * sizeof(uip_ipaddr_t));
 
   /* Sum TCP header and data. */
@@ -353 +353 @@
 /*---------------------------------------------------------------------------*/
 #if UIP_CONF_IPV6
-u16_t
+uint16_t
 uip_icmp6chksum(void)
 {
@@ -361 +361 @@
 #endif /* UIP_CONF_IPV6 */
 /*---------------------------------------------------------------------------*/
-u16_t
+uint16_t
 uip_tcpchksum(void)
 {
@@ -368 +368 @@
 /*---------------------------------------------------------------------------*/
 #if UIP_UDP_CHECKSUMS
-u16_t
+uint16_t
 uip_udpchksum(void)
 {
@@ -375 +375 @@
 #endif /* UIP_UDP_CHECKSUMS */
 #endif /* UIP_ARCH_CHKSUM */
-u8_t
+uint8_t
 uip_ismulticast(uip_ipaddr_t ipaddr)
 {
@@ -381 +381 @@
   return 0;
 #else
-  static const u16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
-  static const u16_t multicast_mask[2] = { 0x00f0, 0x0000 };
+  static const uint16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
+  static const uint16_t multicast_mask[2] = { 0x00f0, 0x0000 };
   return uip_ipaddr_maskcmp(ipaddr, multicast_ipaddr, multicast_mask);
 #endif
@@ -416 +416 @@
 #if UIP_ACTIVE_OPEN
 struct uip_conn *
-uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
+uip_connect(uip_ipaddr_t *ripaddr, uint16_t rport)
 {
   register struct uip_conn *conn, *cconn;
@@ -482 +482 @@
 #if UIP_UDP
 struct uip_udp_conn *
-uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport)
+uip_udp_new(uip_ipaddr_t *ripaddr, uint16_t rport)
 {
   register struct uip_udp_conn *conn;
@@ -527 +527 @@
 /*---------------------------------------------------------------------------*/
 void
-uip_unlisten(u16_t port)
+uip_unlisten(uint16_t port)
 {
   for(c = 0; c < UIP_LISTENPORTS; ++c) {
@@ -538 +538 @@
 /*---------------------------------------------------------------------------*/
 void
-uip_listen(u16_t port)
+uip_listen(uint16_t port)
 {
   for(c = 0; c < UIP_LISTENPORTS; ++c) {
@@ -552 +552 @@
 #if UIP_REASSEMBLY && !UIP_CONF_IPV6
 #define UIP_REASS_BUFSIZE (UIP_BUFSIZE - UIP_LLH_LEN)
-static u8_t uip_reassbuf[UIP_REASS_BUFSIZE];
-static u8_t uip_reassbitmap[UIP_REASS_BUFSIZE / (8 * 8)];
-static const u8_t bitmap_bits[8] = {0xff, 0x7f, 0x3f, 0x1f,
+static uint8_t uip_reassbuf[UIP_REASS_BUFSIZE];
+static uint8_t uip_reassbitmap[UIP_REASS_BUFSIZE / (8 * 8)];
+static const uint8_t bitmap_bits[8] = {0xff, 0x7f, 0x3f, 0x1f,
                                     0x0f, 0x07, 0x03, 0x01};
-static u16_t uip_reasslen;
-static u8_t uip_reassflags;
+static uint16_t uip_reasslen;
+static uint8_t uip_reassflags;
 #define UIP_REASS_FLAG_LASTFRAG 0x01
-static u8_t uip_reasstmr;
+static uint8_t uip_reasstmr;
 
 #define IP_MF   0x20
 
-static u8_t
+static uint8_t
 uip_reass(void)
 {
-  u16_t offset, len;
-  u16_t i;
+  uint16_t offset, len;
+  uint16_t i;
 
   /* If ip_reasstmr is zero, no packet is present in the buffer, so we
@@ -653 +653 @@
          right amount of bits. */
       if(uip_reassbitmap[uip_reasslen / (8 * 8)] !=
-         (u8_t)~bitmap_bits[uip_reasslen / 8 & 7]) {
+         (uint8_t)~bitmap_bits[uip_reasslen / 8 & 7]) {
         goto nullreturn;
       }
@@ -681 +681 @@
 /*---------------------------------------------------------------------------*/
 static void
-uip_add_rcv_nxt(u16_t n)
+uip_add_rcv_nxt(uint16_t n)
 {
   uip_add32(uip_conn->rcv_nxt, n);
@@ -691 +691 @@
 /*---------------------------------------------------------------------------*/
 void
-uip_process(u8_t flag)
+uip_process(uint8_t flag)
 {
   register struct uip_conn *uip_connr = uip_conn;
@@ -1349 +1349 @@
                 uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
         /* An MSS option with the right option length. */
-        tmp16 = ((u16_t)uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
-          (u16_t)uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + 3 + c];
+        tmp16 = ((uint16_t)uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
+          (uint16_t)uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + 3 + c];
         uip_connr->initialmss = uip_connr->mss =
           tmp16 > UIP_TCP_MSS? UIP_TCP_MSS: tmp16;
@@ -1631 +1631 @@
        "persistent timer" and uses the retransmission mechanim.
     */
-    tmp16 = ((u16_t)BUF->wnd[0] << 8) + (u16_t)BUF->wnd[1];
+    tmp16 = ((uint16_t)BUF->wnd[0] << 8) + (uint16_t)BUF->wnd[1];
     if(tmp16 > uip_connr->initialmss ||
        tmp16 == 0) {
@@ -1891 +1891 @@
 }
 /*---------------------------------------------------------------------------*/
-u16_t
-htons(u16_t val)
+uint16_t
+htons(uint16_t val)
 {
   return HTONS(val);

uKadecot/trunk/uip/net/ipv4/uip_arp.c

@@ -60 +60 @@
 
 
-#include "uip_arp.h"
+#include "net/ipv4/uip_arp.h"
 
 #include <string.h>
@@ -72 +72 @@
 struct arp_hdr {
   struct uip_eth_hdr ethhdr;
-  u16_t hwtype;
-  u16_t protocol;
-  u8_t hwlen;
-  u8_t protolen;
-  u16_t opcode;
+  uint16_t hwtype;
+  uint16_t protocol;
+  uint8_t hwlen;
+  uint8_t protolen;
+  uint16_t opcode;
   struct uip_eth_addr shwaddr;
-  u16_t sipaddr[2];
+  uint16_t sipaddr[2];
   struct uip_eth_addr dhwaddr;
-  u16_t dipaddr[2];
+  uint16_t dipaddr[2];
 };
 
@@ -86 +86 @@
   struct uip_eth_hdr ethhdr;
   /* IP header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos,
     len[2],
@@ -93 +93 @@
     ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
 };
@@ -110 +110 @@
 
 struct arp_entry {
-  u16_t ipaddr[2];
+  uint16_t ipaddr[2];
   struct uip_eth_addr ethaddr;
-  u8_t time;
+  uint8_t time;
 };
 
 static const struct uip_eth_addr broadcast_ethaddr =
   {{0xff,0xff,0xff,0xff,0xff,0xff}};
-static const u16_t broadcast_ipaddr[2] = {0xffff,0xffff};
-static const u16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
-static const u16_t multicast_mask[2] = { 0x00f0, 0x0000 };
+static const uint16_t broadcast_ipaddr[2] = {0xffff,0xffff};
+static const uint16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
+static const uint16_t multicast_mask[2] = { 0x00f0, 0x0000 };
 
 static struct arp_entry arp_table[UIP_ARPTAB_SIZE];
-static u16_t ipaddr[2];
-static u8_t i, c;
-
-static u8_t arptime;
-static u8_t tmpage;
+static uint16_t ipaddr[2];
+static uint8_t i, c;
+
+static uint8_t arptime;
+static uint8_t tmpage;
 
 #define BUF   ((struct arp_hdr *)&uip_buf[0])
@@ -170 +170 @@
 /*-----------------------------------------------------------------------------------*/
 static void
-uip_arp_update(u16_t *ipaddr, struct uip_eth_addr *ethaddr)
+uip_arp_update(uint16_t *ipaddr, struct uip_eth_addr *ethaddr)
 {
   register struct arp_entry *tabptr = NULL;

uKadecot/trunk/uip/net/ipv4/uip_arp.h

@@ -53 +53 @@
 #define __UIP_ARP_H__
 
-#include "uip.h"
+#include "net/ip/uip.h"
 
 #ifdef __RX
@@ -69 +69 @@
   struct uip_eth_addr dest;
   struct uip_eth_addr src;
-  u16_t type;
+  uint16_t type;
 };
 

uKadecot/trunk/uip/sys/lc.h

@@ -123 +123 @@
 #include LC_CONF_INCLUDE
 #else
-#include "lc-switch.h"
+#include "sys/lc-switch.h"
 #endif /* LC_CONF_INCLUDE */
 

uKadecot/trunk/uip/sys/pt.h

@@ -50 +50 @@
 #define __PT_H__
 
-#include "lc.h"
+#include "sys/lc.h"
 
 struct pt {

uKadecot/trunk/uip/sys/timer.c

@@ -46 +46 @@
  */
 
-#include "clock.h"
-#include "timer.h"
+#include "sys/clock.h"
+#include "sys/timer.h"
 
 /*---------------------------------------------------------------------------*/

uKadecot/trunk/uip/sys/timer.h

@@ -62 +62 @@
 #define __TIMER_H__
 
-#include "clock.h"
+#include "sys/clock.h"
 
 /**

uKadecot/trunk/uip/target/if_rx62n/ether_phy.c

@@ -40 +40 @@
 #include "ether_phy.h"
 #include <kernel.h>
-#include "uip.h"
+#include "net/ip/uip.h"
 #include <sil.h>
 

uKadecot/trunk/uip/target/if_rx62n/if_rx62n.c

@@ -45 +45 @@
 #include "kernel/kernel_impl.h"
 #include "uip_target_config.h"
-#include "uip_arp.h"
+#include "net/ipv4/uip_arp.h"
 #include "if_rx62n.h"
 #include "ether_phy.h"

uKadecot/trunk/uip/task/uip_adpt.c

@@ -37 +37 @@
 
 #include <kernel.h>
-#include "uip.h"
+#include "net/ip/uip.h"
 #include "uip_adpt.h"
 #include "t_syslog.h"

uKadecot/trunk/uip/task/uip_adpt.h

@@ -55 +55 @@
 typedef struct t_ipv4ep {
         T_IN4_ADDR      ipaddr;         /* IPv4アドレス             */
-        u16_t           portno;         /* ポート番号                */
+        uint16_t                portno;         /* ポート番号                */
 } T_IPV4EP;
 
@@ -63 +63 @@
 {
         T_IN4_ADDR      ripaddr;                /* リモートIPv4アドレス         */
-        u16_t           rport;                  /* リモートポート番号            */
-        u16_t           lport;                  /* ローカルポート番号            */
+        uint16_t                rport;                  /* リモートポート番号            */
+        uint16_t                lport;                  /* ローカルポート番号            */
         void(*callback)(struct uip_conn *uip_conn, int fncd, void *p_parblk);
 } T_TCP_CCEP;
@@ -75 +75 @@
 {
         T_IN4_ADDR      ripaddr;                /* リモートIPv4アドレス         */
-        u16_t           rport;                  /* リモートポート番号            */
-        u16_t           lport;                  /* ローカルポート番号            */
+        uint16_t                rport;                  /* リモートポート番号            */
+        uint16_t                lport;                  /* ローカルポート番号            */
         void (*callback)(struct uip_udp_conn *uip_udp_conn, int fncd, void *p_parblk);
 } T_UDP_CCEP;

uKadecot/trunk/uip/task/uip_task.c

@@ -38 +38 @@
 #include <string.h>
 #include <kernel.h>
-#include "uip.h"
-#include "uip_arp.h"
-#include "timer.h"
+#include "net/ip/uip.h"
+#include "net/ipv4/uip_arp.h"
+#include "sys/timer.h"
 #include "uip_task.h"
 #include "uip_nic_config.h"
@@ -57 +57 @@
         struct uip_timer periodic_timer, arp_timer;
         clock_time_t timer;
-        u8_t uip_buf[UIP_BUFSIZE + 2];
+        uint8_t uip_buf[UIP_BUFSIZE + 2];
 };
 
@@ -64 +64 @@
 };
 
-u8_t *uip_buf = uiptsk.uip_buf;
+uint8_t *uip_buf = uiptsk.uip_buf;
 
 typedef struct _uip_out_buf_t
@@ -73 +73 @@
         } cepid;
         uip_ipaddr_t ripaddr;
-        u16_t rport;
+        uint16_t rport;
         int len;
-        u8_t data[UIP_BUFSIZE + 2];
+        uint8_t data[UIP_BUFSIZE + 2];
 } UIP_OUT_BUF_T;
 
@@ -82 +82 @@
 int uip_out_wpos = 0;
 int uip_out_rpos = 0;
-u8_t my_ip[4] = { IPV4_ADDR_LOCAL };
-u8_t my_netmask[4] = { IPV4_ADDR_LOCAL_MASK };
-u8_t my_default_router[4] = { IPV4_ADDR_DEFAULT_GW };
+uint8_t my_ip[4] = { IPV4_ADDR_LOCAL };
+uint8_t my_netmask[4] = { IPV4_ADDR_LOCAL_MASK };
+uint8_t my_default_router[4] = { IPV4_ADDR_DEFAULT_GW };
 int ws_out_req;
 int ws_out_res;