Changes in uspace/srv/hw/irc/obio/obio.c [df01d303:3e6a98c5] in mainline

File:

• uspace/srv/hw/irc/obio/obio.c (modified) (5 diffs)

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

@@ -45 +45 @@
 #include <ipc/irc.h>
 #include <ns.h>
+#include <sysinfo.h>
 #include <as.h>
 #include <ddi.h>
@@ -68 +69 @@
 #define INO_MASK        0x1f
 
-static uintptr_t base_phys;
-static volatile uint64_t *base_virt = (volatile uint64_t *) AS_AREA_ANY;
+static void *base_phys;
+static volatile uint64_t *base_virt;
 
 /** Handle one connection to obio.
@@ -93 +94 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case IRC_ENABLE_INTERRUPT:
-                        inr = IPC_GET_ARG1(call);
-                        base_virt[OBIO_IMR(inr & INO_MASK)] |= (1UL << 31);
+                        /* Noop */
                         async_answer_0(callid, EOK);
                         break;
@@ -111 +111 @@
 /** Initialize the OBIO driver.
  *
- * In the future, the OBIO driver should be integrated with the sun4u platform driver.
+ * So far, the driver heavily depends on information provided by the kernel via
+ * sysinfo. In the future, there should be a standalone OBIO driver.
  */
 static bool obio_init(void)
 {
-        base_phys = (uintptr_t) 0x1fe00000000ULL;
+        sysarg_t paddr;
+        
+        if (sysinfo_get_value("obio.base.physical", &paddr) != EOK) {
+                printf("%s: No OBIO registers found\n", NAME);
+                return false;
+        }
+        
+        base_phys = (void *) paddr;
         
         int flags = AS_AREA_READ | AS_AREA_WRITE;
@@ -127 +135 @@
         }
         
-        printf("%s: OBIO registers with base at %lx\n", NAME, base_phys);
+        printf("%s: OBIO registers with base at %p\n", NAME, base_phys);
         
-        async_set_fallback_port_handler(obio_connection, NULL);
+        async_set_client_connection(obio_connection);
         service_register(SERVICE_IRC);