Changeset 84afc7b in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2009-03-18T10:53:12Z (15 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

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (7 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -47 +47 @@
 
 #include <console/console.h>
-#include <ddi/device.h>
 #include <ddi/irq.h>
 #include <arch/mm/page.h>
@@ -75 +74 @@
         cir_t cir;
         void *cir_arg;
-
+        
 #ifdef CONFIG_NS16550
         ns16550_t *ns16550;
@@ -116 +115 @@
         uintptr_t pa;
         size_t size;
-        devno_t devno;
         inr_t inr;
         
@@ -165 +163 @@
 #ifdef CONFIG_Z8530
         case KBD_Z8530:
-                devno = device_assign_devno();
                 z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) +
                     offset;
                 
-                indev_t *kbrdin_z8530 = z8530_init(z8530, devno, inr, cir, cir_arg);
+                indev_t *kbrdin_z8530 = z8530_init(z8530, inr, cir, cir_arg);
                 if (kbrdin_z8530)
                         kbrd_init(kbrdin_z8530);
@@ -179 +176 @@
                 sysinfo_set_item_val("kbd", NULL, true);
                 sysinfo_set_item_val("kbd.type", NULL, KBD_Z8530);
-                sysinfo_set_item_val("kbd.devno", NULL, devno);
                 sysinfo_set_item_val("kbd.inr", NULL, inr);
                 sysinfo_set_item_val("kbd.address.kernel", NULL,
@@ -188 +184 @@
 #ifdef CONFIG_NS16550
         case KBD_NS16550:
-                devno = device_assign_devno();
                 ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) +
                     offset;
                 
-                indev_t *kbrdin_ns16550 = ns16550_init(ns16550, devno, inr, cir, cir_arg);
+                indev_t *kbrdin_ns16550 = ns16550_init(ns16550, inr, cir, cir_arg);
                 if (kbrdin_ns16550)
                         kbrd_init(kbrdin_ns16550);
@@ -202 +197 @@
                 sysinfo_set_item_val("kbd", NULL, true);
                 sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
-                sysinfo_set_item_val("kbd.devno", NULL, devno);
                 sysinfo_set_item_val("kbd.inr", NULL, inr);
                 sysinfo_set_item_val("kbd.address.kernel", NULL,