Changeset acc7ce4 in mainline for uspace/srv

Timestamp:

2011-01-07T14:57:40Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7c34b28f

Parents:

b404a98

Message:

uspace interrupt controller drivers for i8259 and APIC (non-functional yet)
convert NE2000 driver to use these drivers (not enabling the IRQ in kernel), this solves the "spurious interrupt" issue
(however, on SMP machines this renders the driver unusable for now since the APIC driver does not do anything yet)

Location:

uspace/srv

Files:

• hid/kbd/port/ns16550.c (modified) (2 diffs)
• hid/kbd/port/z8530.c (modified) (2 diffs)
• hw/irc/apic/Makefile (added)
• hw/irc/apic/apic.c (added)
• hw/irc/fhc/Makefile (moved) (moved from uspace/srv/hw/cir/fhc/Makefile )
• hw/irc/fhc/fhc.c (moved) (moved from uspace/srv/hw/cir/fhc/fhc.c ) (2 diffs)
• hw/irc/i8259/Makefile (added)
• hw/irc/i8259/i8259.c (added)
• hw/irc/obio/Makefile (moved) (moved from uspace/srv/hw/cir/obio/Makefile )
• hw/irc/obio/obio.c (moved) (moved from uspace/srv/hw/cir/obio/obio.c ) (2 diffs)
• hw/netif/dp8390/dp8390_module.c (modified) (6 diffs)

uspace/srv/hid/kbd/port/ns16550.c

@@ -36 +36 @@
 
 #include <ipc/ipc.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <async.h>
 #include <sysinfo.h>
@@ -122 +122 @@
         
         if (cir_service)
-                async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
+                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hid/kbd/port/z8530.c

@@ -36 +36 @@
 
 #include <ipc/ipc.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <async.h>
 #include <sysinfo.h>
@@ -110 +110 @@
         
         if (cir_service)
-                async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
+                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hw/irc/fhc/fhc.c

@@ -38 +38 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <ipc/ns.h>
 #include <sysinfo.h>
@@ -83 +83 @@
                 callid = async_get_call(&call);
                 switch (IPC_GET_IMETHOD(call)) {
-                case BUS_CLEAR_INTERRUPT:
+                case IRC_ENABLE_INTERRUPT:
+                        /* Noop */
+                        ipc_answer_0(callid, EOK);
+                        break;
+                case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
                         switch (inr) {

uspace/srv/hw/irc/obio/obio.c

@@ -44 +44 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <ipc/bus.h>
+#include <ipc/irc.h>
 #include <ipc/ns.h>
 #include <sysinfo.h>
@@ -93 +93 @@
                 callid = async_get_call(&call);
                 switch (IPC_GET_IMETHOD(call)) {
-                case BUS_CLEAR_INTERRUPT:
+                case IRC_ENABLE_INTERRUPT:
+                        /* Noop */
+                        ipc_answer_0(callid, EOK);
+                        break;
+                case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
                         base_virt[OBIO_CIR(inr & INO_MASK)] = 0;

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