Changeset 158 for uKadecot/trunk/uip/net/ipv4/uip_arp.c

Timestamp:

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

Author:

coas-nagasima

Message:

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

File:

• uKadecot/trunk/uip/net/ipv4/uip_arp.c (modified) (6 diffs)

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;