Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/tinet/net/ethernet.h

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/tinet/net/ethernet.h (modified) (7 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/net/ethernet.h

@@ -99 +99 @@
 
 #if defined(__RX)
-
 #pragma pack
+#elif defined(_MSC_VER)
+#pragma pack(push, 1)
+#endif
+
+#if defined(__RX) || defined(_MSC_VER)
+
 typedef struct t_ether_header {
 
@@ -113 +118 @@
         uint16_t        type;
         } T_ETHER_HDR;
-#pragma packoption
 
 #elif defined(TOPPERS_S810_CLG3_85)     /* of #if defined(__RX) */
@@ -143 +147 @@
         uint8_t         shost[ETHER_ADDR_LEN];
         uint16_t        type;
-        } __attribute__((packed, aligned(2)))T_ETHER_HDR;
+        } __attribute__((packed, aligned(2))) T_ETHER_HDR;
 
 #endif  /* of #if defined(__RX) */
@@ -158 +162 @@
 typedef struct t_ether_addr {
         uint8_t         lladdr[ETHER_ADDR_LEN];
-        } __attribute__((packed, aligned(2)))T_ETHER_ADDR;
+        } __attribute__((packed, aligned(2))) T_ETHER_ADDR;
+
+#if defined(__RX)
+#pragma packoption
+#elif defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
 /*
@@ -208 +218 @@
                                                         /* インタフェースのマルチキャストアドレスへの変換              */
 
+#define IF_FLAG_UP                              0x01U
+#define IF_FLAG_LINK_UP                 0x10U
+
 /*
  *  前方参照
@@ -266 +279 @@
 #endif  /* of #ifdef T_IF_ETHER_NIC_SOFTC */
 
-#define IF_FLAG_UP                              0x01U
-#define IF_FLAG_LINK_UP                 0x10U
-
 /*
  *  変数
@@ -304 +314 @@
 extern uint32_t ether_srand (void);
 
-/** Function prototype for netif status- or link-callback functions. */
 typedef void (*ether_status_callback_fn)(T_IFNET *ether);
 extern void ether_set_link_callback(ether_status_callback_fn link_callback);
-extern void ether_set_link_up(T_IFNET *ether);
-extern void ether_set_link_down(T_IFNET *ether);
+extern void ether_set_link_up();
+extern void ether_set_link_down();
+extern void ether_set_up();
+extern void ether_set_down();
 
 #endif  /* of #ifdef SUPPORT_ETHER */