Changeset 84afc7b in mainline for kernel/arch/ppc32

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/arch/ppc32

Files:

• include/drivers/cuda.h (modified) (1 diff)
• src/drivers/cuda.c (modified) (4 diffs)
• src/ppc32.c (modified) (2 diffs)

kernel/arch/ppc32/include/drivers/cuda.h

@@ -39 +39 @@
 #include <typedefs.h>
 
-extern void cuda_init(devno_t devno, uintptr_t base, size_t size);
+extern void cuda_init(uintptr_t base, size_t size);
 extern int cuda_get_scancode(void);
 

kernel/arch/ppc32/src/drivers/cuda.c

@@ -41 +41 @@
 #include <interrupt.h>
 #include <stdarg.h>
+#include <ddi/device.h>
 
 #define CUDA_IRQ 10
@@ -242 +243 @@
 }
 
-void cuda_init(devno_t devno, uintptr_t base, size_t size)
+void cuda_init(uintptr_t base, size_t size)
 {
         cuda = (uint8_t *) hw_map(base, size);
@@ -250 +251 @@
         
         irq_initialize(&cuda_irq);
-        cuda_irq.devno = devno;
+        cuda_irq.devno = device_assign_devno();
         cuda_irq.inr = CUDA_IRQ;
         cuda_irq.claim = cuda_claim;
@@ -259 +260 @@
         
         sysinfo_set_item_val("kbd", NULL, true);
-        sysinfo_set_item_val("kbd.devno", NULL, devno);
         sysinfo_set_item_val("kbd.inr", NULL, CUDA_IRQ);
         sysinfo_set_item_val("kbd.address.virtual", NULL, base);

kernel/arch/ppc32/src/ppc32.c

@@ -43 +43 @@
 #include <proc/uarg.h>
 #include <console/console.h>
-#include <ddi/device.h>
 #include <ddi/irq.h>
 #include <arch/drivers/pic.h>
@@ -122 +121 @@
                         
                         /* Initialize I/O controller */
-                        cuda_init(device_assign_devno(),
-                            bootinfo.macio.addr + 0x16000, 2 * PAGE_SIZE);
+                        cuda_init(bootinfo.macio.addr + 0x16000, 2 * PAGE_SIZE);
                 }