Index: uKadecot/trunk/uip/apps/dhcpc/dhcpc.c
===================================================================
--- uKadecot/trunk/uip/apps/dhcpc/dhcpc.c	(revision 125)
+++ uKadecot/trunk/uip/apps/dhcpc/dhcpc.c	(revision 158)
@@ -35,8 +35,8 @@
 #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,17 +53,17 @@
 
 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,9 +103,9 @@
 #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,6 +115,6 @@
 }
 /*---------------------------------------------------------------------------*/
-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,6 +124,6 @@
 }
 /*---------------------------------------------------------------------------*/
-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,6 +133,6 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t *
-add_req_options(u8_t *optptr)
+static uint8_t *
+add_req_options(uint8_t *optptr)
 {
   *optptr++ = DHCP_OPTION_REQ_LIST;
@@ -144,6 +144,6 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t *
-add_end(u8_t *optptr)
+static uint8_t *
+add_end(uint8_t *optptr)
 {
   *optptr++ = DHCP_OPTION_END;
@@ -179,5 +179,5 @@
 send_discover(struct dhcpc_state *s)
 {
-  u8_t *end;
+  uint8_t *end;
   struct dhcp_msg *m = (struct dhcp_msg *)uip_appdata;
 
@@ -188,5 +188,5 @@
   end = add_end(end);
 
-  uip_send(uip_appdata, end - (u8_t *)uip_appdata);
+  uip_send(uip_appdata, end - (uint8_t *)uip_appdata);
 }
 /*---------------------------------------------------------------------------*/
@@ -194,5 +194,5 @@
 send_request(struct dhcpc_state *s)
 {
-  u8_t *end;
+  uint8_t *end;
   struct dhcp_msg *m = (struct dhcp_msg *)uip_appdata;
 
@@ -204,12 +204,12 @@
   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,5 +242,5 @@
 }
 /*---------------------------------------------------------------------------*/
-static u8_t
+static uint8_t
 parse_msg(struct dhcpc_state *s)
 {
@@ -386,5 +386,5 @@
 dhcpc_request(struct dhcpc_state *s)
 {
-  u16_t ipaddr[2];
+  uint16_t ipaddr[2];
 
   s->state = STATE_REQUEST;
