Changeset d9fae235 in mainline for uspace/srv/hw/char/i8042/i8042.c

Timestamp:

2010-04-17T01:28:38Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9d6bfa5

Parents:

9256ad29

Message:

sysinfo overhaul

• cleanup (nicer data structures, use of SLAB allocator)
• add support for storing arbitrary binary data
• properly reimplement non-constant values (generated by functions)
• add support for non-constant subtrees (generated by functions)
• syscall ABI change, libc API change
• reflect changes in user code

libc: task_spawn() can now return error code

• reflect change in user code, print error strings after failed task_spawn()

uspace cleanup

• more use of string and other constants
• more use of str_error()
• unify error reporting in init

File:

• uspace/srv/hw/char/i8042/i8042.c (modified) (2 diffs)

uspace/srv/hw/char/i8042/i8042.c

@@ -164 +164 @@
 static int i8042_init(void)
 {
+        if (sysinfo_get_value("i8042.address.physical", &i8042_physical) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("i8042.address.kernel", &i8042_kernel) != EOK)
+                return -1;
+        
         void *vaddr;
-
-        i8042_physical = sysinfo_value("i8042.address.physical");
-        i8042_kernel = sysinfo_value("i8042.address.kernel");
         if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
                 return -1;
+        
         i8042 = vaddr;
-
+        
+        sysarg_t inr_a;
+        sysarg_t inr_b;
+        
+        if (sysinfo_get_value("i8042.inr_a", &inr_a) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("i8042.inr_b", &inr_b) != EOK)
+                return -1;
+        
         async_set_interrupt_received(i8042_irq_handler);
-
+        
         /* Disable kbd and aux */
         wait_ready();
@@ -186 +199 @@
         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-        ipc_register_irq(sysinfo_value("i8042.inr_a"), device_assign_devno(), 0, &i8042_kbd);
-        ipc_register_irq(sysinfo_value("i8042.inr_b"), device_assign_devno(), 0, &i8042_kbd);
-        printf("i8042: registered for interrupts %d and %d\n",
-            sysinfo_value("i8042.inr_a"), sysinfo_value("i8042.inr_b"));
+        ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
+        ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
+        printf("%s: registered for interrupts %d and %d\n", NAME, inr_a, inr_b);
 
         wait_ready();