Changeset d9fae235 in mainline for uspace/srv/hw

Timestamp:

2010-04-17T01:28:38Z (15 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

Location:

uspace/srv/hw

Files:

• bus/cuda_adb/cuda_adb.c (modified) (1 diff)
• char/i8042/i8042.c (modified) (2 diffs)
• cir/fhc/fhc.c (modified) (2 diffs)
• cir/obio/obio.c (modified) (2 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -254 +254 @@
 static int cuda_init(void)
 {
+        if (sysinfo_get_value("cuda.address.physical", &(instance->cuda_physical)) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("cuda.address.kernel", &(instance->cuda_kernel)) != EOK)
+                return -1;
+        
         void *vaddr;
-
-        instance->cuda_physical = sysinfo_value("cuda.address.physical");
-        instance->cuda_kernel = sysinfo_value("cuda.address.kernel");
-
         if (pio_enable((void *) instance->cuda_physical, sizeof(cuda_t), &vaddr) != 0)
                 return -1;
+        
         dev = vaddr;
 

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();

uspace/srv/hw/cir/fhc/fhc.c

@@ -109 +109 @@
 static bool fhc_init(void)
 {
-        ipcarg_t phonead;
+        sysarg_t paddr;
 
-        fhc_uart_size = sysinfo_value("fhc.uart.size");
-        fhc_uart_phys = (void *) sysinfo_value("fhc.uart.physical");
-        
-        if (!fhc_uart_size) {
+        if ((sysinfo_get_value("fhc.uart.physical", &paddr) != EOK)
+            || (sysinfo_get_value("fhc.uart.size", &fhc_uart_size) != EOK)) {
                 printf(NAME ": no FHC UART registers found\n");
                 return false;
         }
-
+        
+        fhc_uart_phys = (void *) paddr;
         fhc_uart_virt = as_get_mappable_page(fhc_uart_size);
         
@@ -132 +131 @@
         printf(NAME ": FHC UART registers at %p, %d bytes\n", fhc_uart_phys,
             fhc_uart_size);
-
+        
         async_set_client_connection(fhc_connection);
+        ipcarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_FHC, 0, 0, &phonead);
         

uspace/srv/hw/cir/obio/obio.c

@@ -112 +112 @@
 static bool obio_init(void)
 {
-        ipcarg_t phonead;
-
-        base_phys = (void *) sysinfo_value("obio.base.physical");
+        sysarg_t paddr;
         
-        if (!base_phys) {
+        if (sysinfo_get_value("obio.base.physical", &paddr) != EOK) {
                 printf(NAME ": no OBIO registers found\n");
                 return false;
         }
-
+        
+        base_phys = (void *) paddr;
         base_virt = as_get_mappable_page(OBIO_SIZE);
         
@@ -133 +132 @@
         
         printf(NAME ": OBIO registers with base at %p\n", base_phys);
-
+        
         async_set_client_connection(obio_connection);
+        ipcarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_OBIO, 0, 0, &phonead);