Changeset 7c34b28f in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2011-01-07T15:10:52Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

61bfc370

Parents:

3d5e190 (diff), acc7ce4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge small NE2000 and interrupt handling improvements

• introduce new uspace interrupt controller drivers
  • i8259
  • APIC (only a non-functional stub yet)
• do not pre-enable NE2000's IRQ in kernel, but use the above drivers (solves the "spurious interrupt" issue, but breaks SMP functionality because of the non-functional APIC driver)

File:

• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (6 diffs)

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -41 +41 @@
 #include <err.h>
 #include <malloc.h>
+#include <sysinfo.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/irc.h>
 #include <net/modules.h>
 #include <packet_client.h>
@@ -71 +73 @@
  */
 #define IRQ_GET_ISR(call)  ((int) IPC_GET_ARG2(call))
+
+static int irc_service = 0;
+static int irc_phone = -1;
 
 /** DP8390 kernel interrupt command sequence.
@@ -136 +141 @@
 }
 
-/** Changes the network interface state.
+/** Change the network interface state.
+ *
  *  @param[in,out] device The network interface.
- *  @param[in] state The new state.
- *  @returns The new state.
+ *  @param[in]     state  The new state.
+ *
+ *  @return The new state.
+ *
  */
 static int change_state(netif_device_t *device, device_state_t state)
@@ -272 +280 @@
                 return rc;
         
-        if (device->state != NETIF_ACTIVE){
+        if (device->state != NETIF_ACTIVE) {
                 netif_pq_release(packet_get_id(packet));
                 return EFORWARD;
@@ -312 +320 @@
                 }
                 
-                return change_state(device, NETIF_ACTIVE);
+                rc = change_state(device, NETIF_ACTIVE);
+                
+                if (irc_service)
+                        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, dep->de_irq);
+                
+                return rc;
         }
         
@@ -334 +347 @@
 int netif_initialize(void)
 {
+        sysarg_t apic;
+        sysarg_t i8259;
+        
+        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+                irc_service = SERVICE_APIC;
+        else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))
+                irc_service = SERVICE_I8259;
+        
+        if (irc_service) {
+                while (irc_phone < 0) {
+                        irc_phone = ipc_connect_me_to_blocking(PHONE_NS, irc_service,
+                            0, 0);
+                }
+        }
+        
+        async_set_interrupt_received(irq_handler);
+        
         sysarg_t phonehash;
-        async_set_interrupt_received(irq_handler);
         return ipc_connect_to_me(PHONE_NS, SERVICE_DP8390, 0, 0, &phonehash);
 }