Changeset 84afc7b in mainline for uspace

Timestamp:

2009-03-18T10:53:12Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e749794

Parents:

8015eeec

Message:

as kernel little brother drivers are not needed anymore, the device numbers do not have to be correlated between kernel and uspace in any way
introduce new syscall sys_device_assign_devno() for generating system-wide unique device numbers for uspace

Location:

uspace

Files:

• app/klog/klog.c (modified) (1 diff)
• lib/libc/generic/ddi.c (modified) (1 diff)
• lib/libc/include/ddi.h (modified) (1 diff)
• srv/console/console.c (modified) (1 diff)
• srv/kbd/port/gxemul.c (modified) (2 diffs)
• srv/kbd/port/i8042.c (modified) (2 diffs)
• srv/kbd/port/msim.c (modified) (2 diffs)
• srv/kbd/port/ns16550.c (modified) (1 diff)
• srv/kbd/port/z8530.c (modified) (1 diff)

uspace/app/klog/klog.c

@@ -82 +82 @@
         }
         
-        int devno = sysinfo_value("klog.devno");
-        int inr = sysinfo_value("klog.inr");
-        if (ipc_register_irq(inr, devno, 0, NULL) != EOK) {
-                printf(NAME ": Error registering klog notifications\n");
-                return -1;
-        }
+//      int inr = sysinfo_value("klog.inr");
+//      if (ipc_register_irq(inr, devno, 0, NULL) != EOK) {
+//              printf(NAME ": Error registering klog notifications\n");
+//              return -1;
+//      }
         
         async_set_interrupt_received(interrupt_received);

uspace/lib/libc/generic/ddi.c

@@ -41 +41 @@
 #include <libarch/config.h>
 #include <kernel/ddi/ddi_arg.h>
+
+/** Return unique device number.
+ *
+ * @return New unique device number.
+ *
+ */
+int device_assign_devno(void)
+{
+        return __SYSCALL0(SYS_DEVICE_ASSIGN_DEVNO);
+}
 
 /** Map piece of physical memory to task.

uspace/lib/libc/include/ddi.h

@@ -38 +38 @@
 #include <task.h>
 
+extern int device_assign_devno(void);
 extern int physmem_map(void *, void *, unsigned long, int);
 extern int iospace_enable(task_id_t, void *, unsigned long);

uspace/srv/console/console.c

@@ -587 +587 @@
         
         /* Receive kernel notifications */
-        if (sysinfo_value("kconsole.present")) {
-                int devno = sysinfo_value("kconsole.devno");
-                int inr = sysinfo_value("kconsole.inr");
-                if (ipc_register_irq(inr, devno, 0, NULL) != EOK)
-                        printf(NAME ": Error registering kconsole notifications\n");
-                
-                async_set_interrupt_received(interrupt_received);
-        }
+//      if (sysinfo_value("kconsole.present")) {
+//              int inr = sysinfo_value("kconsole.inr");
+//              if (ipc_register_irq(inr, device_assign_devno(), 0, NULL) != EOK)
+//                      printf(NAME ": Error registering kconsole notifications\n");
+//              
+//              async_set_interrupt_received(interrupt_received);
+//      }
         
         // FIXME: avoid connectiong to itself, keep using klog

uspace/srv/kbd/port/gxemul.c

@@ -40 +40 @@
 #include <kbd_port.h>
 #include <kbd.h>
+#include <ddi.h>
 
 static irq_cmd_t gxemul_cmds[] = {
@@ -64 +65 @@
         async_set_interrupt_received(gxemul_irq_handler);
         gxemul_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
-        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
             0, &gxemul_kbd);
         return 0;

uspace/srv/kbd/port/i8042.c

@@ -44 +44 @@
 #include <kbd_port.h>
 #include <kbd.h>
+#include <ddi.h>
 #include "i8042.h"
 
@@ -137 +138 @@
         i8042_kbd.cmds[0].addr = &((i8042_t *) i8042_kernel)->status;
         i8042_kbd.cmds[3].addr = &((i8042_t *) i8042_kernel)->data;
-        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &i8042_kbd);
+        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &i8042_kbd);
 
         int newcontrol = i8042_KBD_IE | i8042_KBD_TRANSLATE;

uspace/srv/kbd/port/msim.c

@@ -40 +40 @@
 #include <kbd_port.h>
 #include <kbd.h>
+#include <ddi.h>
 
 irq_cmd_t msim_cmds[] = {
@@ -64 +65 @@
         async_set_interrupt_received(msim_irq_handler);
         msim_cmds[0].addr = sysinfo_value("kbd.address.virtual");
-        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
             0, &msim_kbd);
         return 0;

uspace/srv/kbd/port/ns16550.c

@@ -100 +100 @@
         ns16550_kbd.cmds[0].addr = (void *) (ns16550_kernel + LSR_REG);
         ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG);
-        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
             0, &ns16550_kbd);
         return pio_enable((void *) ns16550_physical, 8, &vaddr);

uspace/srv/kbd/port/z8530.c

@@ -90 +90 @@
         z8530_cmds[3].addr = (void *) sysinfo_value("kbd.address.kernel") +
             CHAN_A_DATA;
-        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
             sysinfo_value("kbd.inr"), &z8530_kbd);
         return 0;