Changeset 158 for uKadecot/trunk/uip/net/ipv4/uip-fw.h

Timestamp:

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

Author:

coas-nagasima

Message:

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

File:

• uKadecot/trunk/uip/net/ipv4/uip-fw.h (modified) (4 diffs)

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);