Changeset 84afc7b in mainline for kernel/genarch/src

Timestamp:

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

kernel/genarch/src/drivers

Files:

• dsrln/dsrlnin.c (modified) (3 diffs)
• i8042/i8042.c (modified) (3 diffs)
• ns16550/ns16550.c (modified) (3 diffs)
• z8530/z8530.c (modified) (3 diffs)

kernel/genarch/src/drivers/dsrln/dsrlnin.c

@@ -39 +39 @@
 #include <mm/slab.h>
 #include <arch/asm.h>
+#include <ddi/device.h>
 
 static indev_operations_t kbrdin_ops = {
@@ -57 +58 @@
 }
 
-indev_t *dsrlnin_init(dsrlnin_t *dev, devno_t devno, inr_t inr)
+indev_t *dsrlnin_init(dsrlnin_t *dev, inr_t inr)
 {
         dsrlnin_instance_t *instance
@@ -66 +67 @@
         indev_initialize("dsrlnin", &instance->kbrdin, &kbrdin_ops);
         
-        instance->devno = devno;
         instance->dsrlnin = dev;
         
         irq_initialize(&instance->irq);
-        instance->irq.devno = devno;
+        instance->irq.devno = device_assign_devno();
         instance->irq.inr = inr;
         instance->irq.claim = dsrlnin_claim;

kernel/genarch/src/drivers/i8042/i8042.c

@@ -42 +42 @@
 #include <console/chardev.h>
 #include <mm/slab.h>
+#include <ddi/device.h>
 
 static indev_operations_t kbrdin_ops = {
@@ -77 +78 @@
 
 /** Initialize i8042. */
-indev_t *i8042_init(i8042_t *dev, devno_t devno, inr_t inr)
+indev_t *i8042_init(i8042_t *dev, inr_t inr)
 {
         i8042_instance_t *instance
@@ -86 +87 @@
         indev_initialize("i8042", &instance->kbrdin, &kbrdin_ops);
         
-        instance->devno = devno;
         instance->i8042 = dev;
         
         irq_initialize(&instance->irq);
-        instance->irq.devno = devno;
+        instance->irq.devno = device_assign_devno();
         instance->irq.inr = inr;
         instance->irq.claim = i8042_claim;

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -40 +40 @@
 #include <console/chardev.h>
 #include <mm/slab.h>
+#include <ddi/device.h>
 
 #define LSR_DATA_READY  0x01
@@ -80 +81 @@
  *
  */
-indev_t *ns16550_init(ns16550_t *dev, devno_t devno, inr_t inr, cir_t cir, void *cir_arg)
+indev_t *ns16550_init(ns16550_t *dev, inr_t inr, cir_t cir, void *cir_arg)
 {
         ns16550_instance_t *instance
@@ -89 +90 @@
         indev_initialize("ns16550", &instance->kbrdin, &kbrdin_ops);
         
-        instance->devno = devno;
         instance->ns16550 = dev;
         
         irq_initialize(&instance->irq);
-        instance->irq.devno = devno;
+        instance->irq.devno = device_assign_devno();
         instance->irq.inr = inr;
         instance->irq.claim = ns16550_claim;

kernel/genarch/src/drivers/z8530/z8530.c

@@ -40 +40 @@
 #include <arch/asm.h>
 #include <mm/slab.h>
+#include <ddi/device.h>
 
 static indev_operations_t kbrdin_ops = {
@@ -88 +89 @@
 
 /** Initialize z8530. */
-indev_t *z8530_init(z8530_t *dev, devno_t devno, inr_t inr, cir_t cir, void *cir_arg)
+indev_t *z8530_init(z8530_t *dev, inr_t inr, cir_t cir, void *cir_arg)
 {
         z8530_instance_t *instance
@@ -97 +98 @@
         indev_initialize("z8530", &instance->kbrdin, &kbrdin_ops);
         
-        instance->devno = devno;
         instance->z8530 = dev;
         
         irq_initialize(&instance->irq);
-        instance->irq.devno = devno;
+        instance->irq.devno = device_assign_devno();
         instance->irq.inr = inr;
         instance->irq.claim = z8530_claim;