Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/tinet/netdev/if_mbed/if_mbed.c

Timestamp:

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

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/tinet/netdev/if_mbed/if_mbed.c (modified) (8 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/netdev/if_mbed/if_mbed.c

@@ -4 +4 @@
  *  Copyright (C) 2001-2009 by Dep. of Computer Science and Engineering
  *                   Tomakomai National College of Technology, JAPAN
- *  Copyright (C) 2014 Cores Co., Ltd. Japan
+ *  Copyright (C) 2014-2019 Cores Co., Ltd. Japan
  * 
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -64 +64 @@
  * SUCH DAMAGE.
  * 
- * $FreeBSD: src/sys/i386/isa/if_mbed.c,v 1.148.2.4 1999/09/25 13:08:18 nyan Exp $
+ * $FreeBSD: src/sys/i386/isa/if_ed.c,v 1.148.2.4 1999/09/25 13:08:18 nyan Exp $
  */
 
@@ -200 +200 @@
 if_mbed_setrcr(T_IF_SOFTC *ic)
 {
-        T_MBED_SOFTC    *sc = ic->sc;
 }
 
@@ -318 +317 @@
 if_mbed_init(T_IF_SOFTC *ic)
 {
-        T_MBED_SOFTC *sc = ic->sc;
-
         /* mbed_init 本体を呼び出す。*/
         if_mbed_init_sub(ic);
@@ -347 +344 @@
                                 }
                                 if (link_mode_new != NEGO_FAIL) {
-                                        ethernetext_set_link_mode(link_mode_new);
+                                        ethernetext_set_link_mode(link_mode_new | PROMISCUOUS_MODE);
                                         ETHER.EESIPR0 |= EDMAC_EESIPR_INI_TRANS;
                                         ether_set_link_up(ether);
@@ -373 +370 @@
 if_mbed_read(T_IF_SOFTC *ic)
 {
-        T_MBED_SOFTC *sc = ic->sc;
         T_NET_BUF *input = NULL;
         uint_t align;
@@ -406 +402 @@
 if_mbed_start(T_IF_SOFTC *ic, T_NET_BUF *output)
 {
-        T_MBED_SOFTC *sc = ic->sc;
         int32_t len, res, pos;
 
@@ -429 +424 @@
 if_mbed_eth_handler(void)
 {
-    uint32_t stat_edmac;
-    uint32_t stat_etherc;
-
-    /* Clear the interrupt request flag */
-    stat_edmac = (ETHER.EESR0 & ETHER.EESIPR0);       /* Targets are restricted to allowed interrupts */
-    ETHER.EESR0 = stat_edmac;
-    /* Reception-related */
-    if (stat_edmac & EDMAC_EESIPR_INI_RECV) {
-                isig_sem(if_softc.semid_rxb_ready);
-    }
+        uint32_t stat_edmac;
+        uint32_t stat_etherc;
+        ER ret;
+        
+        /* Clear the interrupt request flag */
+        stat_edmac = (ETHER.EESR0 & ETHER.EESIPR0);       /* Targets are restricted to allowed interrupts */
+        ETHER.EESR0 = stat_edmac;
+        /* Reception-related */
+        if (stat_edmac & EDMAC_EESIPR_INI_RECV) {
+                ret = isig_sem(if_softc.semid_rxb_ready);
+                if (ret != E_OK)
+                        syslog(LOG_INFO, "semid_rxb_ready %d %x", ret, stat_edmac & EDMAC_EESIPR_INI_RECV);
+        }
         if (stat_edmac & EDMAC_EESIPR_INI_TRANS) {
-                isig_sem(if_softc.semid_txb_ready);
-        }
-    /* E-MAC-related */
-    if (stat_edmac & EDMAC_EESIPR_INI_EtherC) {
-        /* Clear the interrupt request flag */
-        stat_etherc = (ETHER.ECSR0 & ETHER.ECSIPR0);  /* Targets are restricted to allowed interrupts */
-        ETHER.ECSR0  = stat_etherc;
-    }
-}
+                ret = isig_sem(if_softc.semid_txb_ready);
+                if (ret != E_OK)
+                        syslog(LOG_INFO, "semid_txb_ready %d %x", ret, stat_edmac & EDMAC_EESIPR_INI_TRANS);
+        }
+        /* E-MAC-related */
+        if (stat_edmac & EDMAC_EESIPR_INI_EtherC) {
+                /* Clear the interrupt request flag */
+                stat_etherc = (ETHER.ECSR0 & ETHER.ECSIPR0);  /* Targets are restricted to allowed interrupts */
+                ETHER.ECSR0  = stat_etherc;
+        }
+}