Changeset d9fae235 in mainline for uspace/srv

Timestamp:

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

Files:

• bd/rd/rd.c (modified) (11 diffs)
• hid/fb/ega.c (modified) (1 diff)
• hid/fb/fb.c (modified) (1 diff)
• hid/fb/main.c (modified) (7 diffs)
• hid/fb/msim.c (modified) (4 diffs)
• hid/fb/niagara.c (modified) (1 diff)
• hid/fb/sgcn.c (modified) (1 diff)
• hid/kbd/generic/kbd.c (modified) (3 diffs)
• hid/kbd/port/gxemul.c (modified) (2 diffs)
• hid/kbd/port/msim.c (modified) (3 diffs)
• hid/kbd/port/niagara.c (modified) (3 diffs)
• hid/kbd/port/ns16550.c (modified) (4 diffs)
• hid/kbd/port/pl050.c (modified) (1 diff)
• hid/kbd/port/sgcn.c (modified) (3 diffs)
• hid/kbd/port/sun.c (modified) (2 diffs)
• hid/kbd/port/z8530.c (modified) (4 diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (1 diff)
• hw/char/i8042/i8042.c (modified) (2 diffs)
• hw/cir/fhc/fhc.c (modified) (2 diffs)
• hw/cir/obio/obio.c (modified) (2 diffs)
• net/cfg/ne2k.netif_nil_bundle (modified) (1 diff)
• net/cfg/ne2k.netif_standalone (modified) (1 diff)
• net/netstart/netstart.c (modified) (2 diffs)
• ns/ns.c (modified) (5 diffs)
• taskmon/taskmon.c (modified) (2 diffs)

uspace/srv/bd/rd/rd.c

@@ -32 +32 @@
 /** @addtogroup rd
  * @{
- */ 
+ */
 
 /**
- * @file        rd.c
- * @brief       Initial RAM disk for HelenOS.
+ * @file rd.c
+ * @brief Initial RAM disk for HelenOS.
  */
 
@@ -61 +61 @@
 /** Pointer to the ramdisk's image */
 static void *rd_addr;
+
 /** Size of the ramdisk */
 static size_t rd_size;
@@ -70 +71 @@
 static int rd_write_blocks(uint64_t ba, size_t cnt, const void *buf);
 
-/**
- * This rwlock protects the ramdisk's data.
+/** This rwlock protects the ramdisk's data.
+ *
  * If we were to serve multiple requests (read + write or several writes)
- * concurrently (i.e. from two or more threads), each read and write needs to be
- * protected by this rwlock.
- */ 
+ * concurrently (i.e. from two or more threads), each read and write needs to
+ * be protected by this rwlock.
+ *
+ */
 fibril_rwlock_t rd_lock;
 
 /** Handle one connection to ramdisk.
  *
- * @param iid           Hash of the request that opened the connection.
- * @param icall         Call data of the request that opened the connection.
+ * @param iid   Hash of the request that opened the connection.
+ * @param icall Call data of the request that opened the connection.
  */
 static void rd_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -92 +94 @@
         size_t cnt;
         size_t comm_size;
-
+        
         /*
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
         ipc_answer_0(iid, EOK);
-
+        
         /*
          * Now we wait for the client to send us its communication as_area.
@@ -108 +110 @@
                 } else {
                         ipc_answer_0(callid, EHANGUP);
-                        return;         
+                        return;
                 }
         } else {
@@ -178 +180 @@
                 return ELIMIT;
         }
-
+        
         fibril_rwlock_read_lock(&rd_lock);
         memcpy(buf, rd_addr + ba * block_size, block_size * cnt);
         fibril_rwlock_read_unlock(&rd_lock);
-
+        
         return EOK;
 }
@@ -193 +195 @@
                 return ELIMIT;
         }
-
+        
         fibril_rwlock_write_lock(&rd_lock);
         memcpy(rd_addr + ba * block_size, buf, block_size * cnt);
         fibril_rwlock_write_unlock(&rd_lock);
-
+        
         return EOK;
 }
@@ -204 +206 @@
 static bool rd_init(void)
 {
-        rd_size = sysinfo_value("rd.size");
-        void *rd_ph_addr = (void *) sysinfo_value("rd.address.physical");
-        
-        if (rd_size == 0) {
-                printf(NAME ": No RAM disk found\n");
+        int ret = sysinfo_get_value("rd.size", &rd_size);
+        if ((ret != EOK) || (rd_size == 0)) {
+                printf("%s: No RAM disk found\n", NAME);
+                return false;
+        }
+        
+        sysarg_t rd_ph_addr;
+        ret = sysinfo_get_value("rd.address.physical", &rd_ph_addr);
+        if ((ret != EOK) || (rd_ph_addr == 0)) {
+                printf("%s: Invalid RAM disk physical address\n", NAME);
                 return false;
         }
@@ -215 +222 @@
         
         int flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
-        int retval = physmem_map(rd_ph_addr, rd_addr,
+        int retval = physmem_map((void *) rd_ph_addr, rd_addr,
             ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
         
         if (retval < 0) {
-                printf(NAME ": Error mapping RAM disk\n");
-                return false;
-        }
-        
-        printf(NAME ": Found RAM disk at %p, %d bytes\n", rd_ph_addr, rd_size);
+                printf("%s: Error mapping RAM disk\n", NAME);
+                return false;
+        }
+        
+        printf("%s: Found RAM disk at %p, %d bytes\n", NAME, rd_ph_addr, rd_size);
         
         int rc = devmap_driver_register(NAME, rd_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver (%d)\n", rc);
+                printf("%s: Unable to register driver (%d)\n", NAME, rc);
                 return false;
         }
@@ -234 +241 @@
         if (devmap_device_register("bd/initrd", &dev_handle) != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device\n");
+                printf("%s: Unable to register device\n", NAME);
                 return false;
         }
@@ -245 +252 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS RAM disk server\n");
+        printf("%s: HelenOS RAM disk server\n", NAME);
         
         if (!rd_init())
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         async_manager();
 

uspace/srv/hid/fb/ega.c

@@ -415 +415 @@
         void *ega_ph_addr;
         size_t sz;
-
-        ega_ph_addr = (void *) sysinfo_value("fb.address.physical");
-        scr_width = sysinfo_value("fb.width");
-        scr_height = sysinfo_value("fb.height");
-
-        if (sysinfo_value("fb.blinking")) {
+        
+        sysarg_t paddr;
+        if (sysinfo_get_value("fb.address.physical", &paddr) != EOK)
+                return -1;
+        
+        sysarg_t width;
+        if (sysinfo_get_value("fb.width", &width) != EOK)
+                return -1;
+        
+        sysarg_t height;
+        if (sysinfo_get_value("fb.width", &height) != EOK)
+                return -1;
+        
+        sysarg_t blinking;
+        if (sysinfo_get_value("fb.blinking", &blinking) != EOK)
+                blinking = false;
+        
+        ega_ph_addr = (void *) paddr;
+        scr_width = width;
+        scr_height = height;
+        if (blinking) {
                 ega_normal_color &= 0x77;
                 ega_inverted_color &= 0x77;
         }
-
+        
         style = NORMAL_COLOR;
-
+        
         iospace_enable(task_get_id(), (void *) EGA_IO_BASE, 2);
-
+        
         sz = scr_width * scr_height * 2;
         scr_addr = as_get_mappable_page(sz);
-
+        
         if (physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
             PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)

uspace/srv/hid/fb/fb.c

@@ -1756 +1756 @@
         async_set_client_connection(fb_client_connection);
         
-        void *fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
-        unsigned int fb_offset = sysinfo_value("fb.offset");
-        unsigned int fb_width = sysinfo_value("fb.width");
-        unsigned int fb_height = sysinfo_value("fb.height");
-        unsigned int fb_scanline = sysinfo_value("fb.scanline");
-        unsigned int fb_visual = sysinfo_value("fb.visual");
-
-        unsigned int fbsize = fb_scanline * fb_height;
+        sysarg_t fb_ph_addr;
+        if (sysinfo_get_value("fb.address.physical", &fb_ph_addr) != EOK)
+                return -1;
+        
+        sysarg_t fb_offset;
+        if (sysinfo_get_value("fb.offset", &fb_offset) != EOK)
+                fb_offset = 0;
+        
+        sysarg_t fb_width;
+        if (sysinfo_get_value("fb.width", &fb_width) != EOK)
+                return -1;
+        
+        sysarg_t fb_height;
+        if (sysinfo_get_value("fb.height", &fb_height) != EOK)
+                return -1;
+        
+        sysarg_t fb_scanline;
+        if (sysinfo_get_value("fb.scanline", &fb_scanline) != EOK)
+                return -1;
+        
+        sysarg_t fb_visual;
+        if (sysinfo_get_value("fb.visual", &fb_visual) != EOK)
+                return -1;
+        
+        sysarg_t fbsize = fb_scanline * fb_height;
         void *fb_addr = as_get_mappable_page(fbsize);
-
-        if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
+        
+        if (physmem_map((void *) fb_ph_addr + fb_offset, fb_addr,
             ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
                 return -1;
-
+        
         if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
                 return 0;
-
+        
         return -1;
 }

uspace/srv/hid/fb/main.c

@@ -60 +60 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS Framebuffer service\n");
+        printf("%s: HelenOS Framebuffer service\n", NAME);
         
-        ipcarg_t phonead;
         bool initialized = false;
+        sysarg_t fb_present;
+        sysarg_t fb_kind;
+        
+        if (sysinfo_get_value("fb", &fb_present) != EOK)
+                fb_present = false;
+        
+        if (sysinfo_get_value("fb.kind", &fb_kind) != EOK) {
+                printf("%s: Unable to detect framebuffer configuration\n", NAME);
+                return -1;
+        }
         
 #ifdef FB_ENABLED
-        if (sysinfo_value("fb.kind") == 1) {
+        if ((!initialized) && (fb_kind == 1)) {
                 if (fb_init() == 0)
                         initialized = true;
@@ -72 +81 @@
 #endif
 #ifdef EGA_ENABLED
-        if ((!initialized) && (sysinfo_value("fb.kind") == 2)) {
+        if ((!initialized) && (fb_kind == 2)) {
                 if (ega_init() == 0)
                         initialized = true;
@@ -78 +87 @@
 #endif
 #ifdef MSIM_ENABLED
-        if ((!initialized) && (sysinfo_value("fb.kind") == 3)) {
+        if ((!initialized) && (fb_kind == 3)) {
                 if (msim_init() == 0)
                         initialized = true;
@@ -84 +93 @@
 #endif
 #ifdef SGCN_ENABLED
-        if ((!initialized) && (sysinfo_value("fb.kind") == 4)) {
+        if ((!initialized) && (fb_kind == 4)) {
                 if (sgcn_init() == 0)
                         initialized = true;
@@ -90 +99 @@
 #endif
 #ifdef NIAGARA_ENABLED
-        if ((!initialized) && (sysinfo_value("fb.kind") == 5)) {
+        if ((!initialized) && (fb_kind == 5)) {
                 if (niagara_init() == 0)
                         initialized = true;
@@ -96 +105 @@
 #endif
 #ifdef SKI_ENABLED
-        if ((!initialized) && (sysinfo_value("fb") != true)) {
+        if ((!initialized) && (!fb_present)) {
                 if (ski_init() == 0)
                         initialized = true;
@@ -105 +114 @@
                 return -1;
         
+        ipcarg_t phonead;
         if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0) 
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         async_manager();
         

uspace/srv/hid/fb/msim.c

@@ -29 +29 @@
 
 /** @defgroup msimfb MSIM text console
- * @brief       HelenOS MSIM text console.
+ * @brief HelenOS MSIM text console.
  * @ingroup fbs
  * @{
- */ 
+ */
 /** @file
  */
@@ -41 +41 @@
 #include <as.h>
 #include <ddi.h>
+#include <errno.h>
 
 #include "serial_console.h"
@@ -57 +58 @@
 int msim_init(void)
 {
-        void *phys_addr = (void *) sysinfo_value("fb.address.physical");
+        sysarg_t phys_addr;
+        if (sysinfo_get_value("fb.address.physical", &phys_addr) != EOK)
+                return -1;
+        
         virt_addr = (char *) as_get_mappable_page(1);
         
-        if (physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        if (physmem_map((void *) phys_addr, virt_addr, 1,
+            AS_AREA_READ | AS_AREA_WRITE) != 0)
                 return -1;
         
@@ -69 +74 @@
 }
 
-/** 
- * @}
+/** @}
  */

uspace/srv/hid/fb/niagara.c

@@ -91 +91 @@
 int niagara_init(void)
 {
+        sysarg_t paddr;
+        if (sysinfo_get_value("niagara.outbuf.address", &paddr) != EOK)
+                return -1;
+        
         output_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE);
-        int result = physmem_map(
-                (void *) sysinfo_value("niagara.outbuf.address"),
-                (void *) output_buffer_addr,
-                1, AS_AREA_READ | AS_AREA_WRITE);
+        int result = physmem_map((void *) paddr,
+            (void *) output_buffer_addr, 1,
+            AS_AREA_READ | AS_AREA_WRITE);
 
         if (result != 0) {

uspace/srv/hid/fb/sgcn.c

@@ -122 +122 @@
 int sgcn_init(void)
 {
-        sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+        sysarg_t sram_paddr;
+        if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK)
+                return -1;
         
-        if (physmem_map((void *) sysinfo_value("sram.address.physical"),
-            (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE) != 0)
+        sysarg_t sram_size;
+        if (sysinfo_get_value("sram.area.size", &sram_size) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK)
+                sram_buffer_offset = 0;
+        
+        sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size);
+        
+        if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr,
+            sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0)
                 return -1;
         
         serial_console_init(sgcn_putc, WIDTH, HEIGHT);
-        
-        sram_buffer_offset = sysinfo_value("sram.buffer.offset");
         
         async_set_client_connection(serial_client_connection);

uspace/srv/hid/kbd/generic/kbd.c

@@ -212 +212 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS Keyboard service\n");
-        
-        if (sysinfo_value("kbd.cir.fhc") == 1)
+        printf("%s: HelenOS Keyboard service\n", NAME);
+        
+        sysarg_t fhc;
+        sysarg_t obio;
+        
+        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
                 cir_service = SERVICE_FHC;
-        else if (sysinfo_value("kbd.cir.obio") == 1)
+        else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
                 cir_service = SERVICE_OBIO;
         
@@ -240 +243 @@
         int rc = devmap_driver_register(NAME, client_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver (%d)\n", rc);
+                printf("%s: Unable to register driver (%d)\n", NAME, rc);
                 return -1;
         }
@@ -249 +252 @@
         dev_handle_t dev_handle;
         if (devmap_device_register(kbd, &dev_handle) != EOK) {
-                printf(NAME ": Unable to register device %s\n", kbd);
+                printf("%s: Unable to register device %s\n", NAME, kbd);
                 return -1;
         }

uspace/srv/hid/kbd/port/gxemul.c

@@ -41 +41 @@
 #include <kbd.h>
 #include <ddi.h>
+#include <errno.h>
 
 static irq_cmd_t gxemul_cmds[] = {
@@ -63 +64 @@
 int kbd_port_init(void)
 {
+        sysarg_t addr;
+        if (sysinfo_get_value("kbd.address.virtual", &addr) != EOK)
+                return -1;
+        
+        sysarg_t inr;
+        if (sysinfo_get_value("kbd.inr", &inr) != EOK)
+                return -1;
+        
         async_set_interrupt_received(gxemul_irq_handler);
-        gxemul_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
-        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
-            0, &gxemul_kbd);
+        gxemul_cmds[0].addr = (void *) addr;
+        ipc_register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
         return 0;
 }

uspace/srv/hid/kbd/port/msim.c

@@ -30 +30 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief       Msim keyboard port driver.
+ * @brief Msim keyboard port driver.
  */
 
@@ -41 +41 @@
 #include <kbd.h>
 #include <ddi.h>
+#include <errno.h>
 
 irq_cmd_t msim_cmds[] = {
@@ -63 +64 @@
 int kbd_port_init(void)
 {
+        sysarg_t vaddr;
+        if (sysinfo_get_value("kbd.address.virtual", &vaddr) != EOK)
+                return -1;
+        
+        sysarg_t inr;
+        if (sysinfo_get_value("kbd.inr", &inr) != EOK)
+                return -1;
+        
+        msim_cmds[0].addr = (void *) vaddr;
         async_set_interrupt_received(msim_irq_handler);
-        msim_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
-        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
-            0, &msim_kbd);
+        ipc_register_irq(inr, device_assign_devno(), 0, &msim_kbd);
+        
         return 0;
 }

uspace/srv/hid/kbd/port/niagara.c

@@ -44 +44 @@
 #include <thread.h>
 #include <bool.h>
+#include <errno.h>
 
-#define POLL_INTERVAL           10000
+#define POLL_INTERVAL  10000
 
 /**
@@ -57 +58 @@
  * kernel/arch/sparc64/src/drivers/niagara.c.
  */
-#define INPUT_BUFFER_SIZE       ((PAGE_SIZE) - 2 * 8)
+#define INPUT_BUFFER_SIZE  ((PAGE_SIZE) - 2 * 8)
+
 typedef volatile struct {
         uint64_t write_ptr;
@@ -79 +81 @@
 int kbd_port_init(void)
 {
+        sysarg_t paddr;
+        if (sysinfo_get_value("niagara.inbuf.address", &paddr) != EOK)
+                return -1;
+        
         input_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE);
-        int result = physmem_map(
-                (void *) sysinfo_value("niagara.inbuf.address"),
-                (void *) input_buffer_addr,
-                1, AS_AREA_READ | AS_AREA_WRITE);
-
-        if (result != 0) {
+        int rc = physmem_map((void *) paddr, (void *) input_buffer_addr,
+            1, AS_AREA_READ | AS_AREA_WRITE);
+        
+        if (rc != 0) {
                 printf("Niagara: uspace driver couldn't map physical memory: %d\n",
-                        result);
-        }
-
-        input_buffer = (input_buffer_t) input_buffer_addr;
-
-        thread_id_t tid;
-        int rc;
-
-        rc = thread_create(niagara_thread_impl, NULL, "kbd_poll", &tid);
-        if (rc != 0) {
+                    rc);
                 return rc;
         }
+        
+        input_buffer = (input_buffer_t) input_buffer_addr;
+        
+        thread_id_t tid;
+        rc = thread_create(niagara_thread_impl, NULL, "kbd_poll", &tid);
+        if (rc != 0)
+                return rc;
+        
         return 0;
 }

uspace/srv/hid/kbd/port/ns16550.c

@@ -30 +30 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief       NS16550 port driver.
+ * @brief NS16550 port driver.
  */
 
@@ -43 +43 @@
 #include <sun.h>
 #include <ddi.h>
+#include <errno.h>
 
 /* NS16550 registers */
-#define RBR_REG         0       /** Receiver Buffer Register. */
-#define IER_REG         1       /** Interrupt Enable Register. */
-#define IIR_REG         2       /** Interrupt Ident Register (read). */
-#define FCR_REG         2       /** FIFO control register (write). */
-#define LCR_REG         3       /** Line Control register. */
-#define MCR_REG         4       /** Modem Control Register. */
-#define LSR_REG         5       /** Line Status Register. */
+#define RBR_REG  0  /** Receiver Buffer Register. */
+#define IER_REG  1  /** Interrupt Enable Register. */
+#define IIR_REG  2  /** Interrupt Ident Register (read). */
+#define FCR_REG  2  /** FIFO control register (write). */
+#define LCR_REG  3  /** Line Control register. */
+#define MCR_REG  4  /** Modem Control Register. */
+#define LSR_REG  5  /** Line Status Register. */
 
-#define LSR_DATA_READY  0x01
+#define LSR_DATA_READY  0x01
 
 static irq_cmd_t ns16550_cmds[] = {
         {
                 .cmd = CMD_PIO_READ_8,
-                .addr = (void *) 0,     /* will be patched in run-time */
+                .addr = (void *) 0,     /* Will be patched in run-time */
                 .dstarg = 1
         },
@@ -74 +75 @@
         {
                 .cmd = CMD_PIO_READ_8,
-                .addr = (void *) 0,     /* will be patched in run-time */
+                .addr = (void *) 0,     /* Will be patched in run-time */
                 .dstarg = 2
         },
@@ -96 +97 @@
         void *vaddr;
 
-        async_set_interrupt_received(ns16550_irq_handler);
-
-        ns16550_physical = sysinfo_value("kbd.address.physical");
-        ns16550_kernel = sysinfo_value("kbd.address.kernel");
+        if (sysinfo_get_value("kbd.address.physical", &ns16550_physical) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("kbd.address.kernel", &ns16550_kernel) != EOK)
+                return -1;
+        
+        sysarg_t inr;
+        if (sysinfo_get_value("kbd.inr", &inr) != EOK)
+                return -1;
+        
         ns16550_kbd.cmds[0].addr = (void *) (ns16550_kernel + LSR_REG);
         ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG);
-        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
-            sysinfo_value("kbd.inr"), &ns16550_kbd);
+        
+        async_set_interrupt_received(ns16550_irq_handler);
+        ipc_register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
+        
         return pio_enable((void *) ns16550_physical, 8, &vaddr);
 }

uspace/srv/hid/kbd/port/pl050.c

@@ -83 +83 @@
 int kbd_port_init(void)
 {
-
-        pl050_kbd.cmds[0].addr = (void *) sysinfo_value("kbd.address.status");
-        pl050_kbd.cmds[3].addr = (void *) sysinfo_value("kbd.address.data");
-
+        if (sysinfo_get_value("kbd.address.status", &pl050_kbd.cmds[0].addr) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("kbd.address.data", &pl050_kbd.cmds[3].addr) != EOK)
+                return -1;
+        
+        sysarg_t inr;
+        if (sysinfo_get_value("kbd.inr", &inr) != EOK)
+                return -1;
+        
         async_set_interrupt_received(pl050_irq_handler);
-
-        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &pl050_kbd);
-
+        ipc_register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
+        
         return 0;
 }

uspace/srv/hid/kbd/port/sgcn.c

@@ -30 +30 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief       SGCN (Serengeti Console) keyboard port driver.
+ * @brief SGCN (Serengeti Console) keyboard port driver.
  */
 
@@ -44 +44 @@
 #include <thread.h>
 #include <bool.h>
+#include <errno.h>
 
-#define POLL_INTERVAL           10000
+#define POLL_INTERVAL  10000
 
 /**
  * SGCN buffer header. It is placed at the very beginning of the SGCN
- * buffer. 
+ * buffer.
  */
 typedef struct {
@@ -102 +103 @@
 int kbd_port_init(void)
 {
-        sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
-        if (physmem_map((void *) sysinfo_value("sram.address.physical"),
-            (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE) != 0) {
+        sysarg_t sram_paddr;
+        if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK)
+                return -1;
+        
+        sysarg_t sram_size;
+        if (sysinfo_get_value("sram.area.size", &sram_size) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK)
+                sram_buffer_offset = 0;
+        
+        sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size);
+        
+        if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr,
+            sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0) {
                 printf("SGCN: uspace driver could not map physical memory.");
                 return -1;
         }
         
-        sram_buffer_offset = sysinfo_value("sram.buffer.offset");
-
         thread_id_t tid;
-        int rc;
-
-        rc = thread_create(sgcn_thread_impl, NULL, "kbd_poll", &tid);
-        if (rc != 0) {
+        int rc = thread_create(sgcn_thread_impl, NULL, "kbd_poll", &tid);
+        if (rc != 0)
                 return rc;
-        }
-
+        
         return 0;
 }

uspace/srv/hid/kbd/port/sun.c

@@ -39 +39 @@
 #include <sun.h>
 #include <sysinfo.h>
+#include <errno.h>
+#include <bool.h>
 
 /** Sun keyboard virtual port driver.
@@ -50 +52 @@
 int kbd_port_init(void)
 {
-        if (sysinfo_value("kbd.type.z8530")) {
+        sysarg_t z8530;
+        if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK)
+                z8530 = false;
+        
+        sysarg_t ns16550;
+        if (sysinfo_get_value("kbd.type.ns16550", &ns16550) != EOK)
+                ns16550 = false;
+        
+        if (z8530) {
                 if (z8530_port_init() == 0)
                         return 0;
         }
         
-        if (sysinfo_value("kbd.type.ns16550")) {
+        if (ns16550) {
                 if (ns16550_port_init() == 0)
                         return 0;

uspace/srv/hid/kbd/port/z8530.c

@@ -30 +30 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief       Z8530 keyboard port driver.
+ * @brief Z8530 keyboard port driver.
  */
 
@@ -44 +44 @@
 #include <sys/types.h>
 #include <ddi.h>
+#include <errno.h>
 
-#define CHAN_A_STATUS   4
-#define CHAN_A_DATA     6
+#define CHAN_A_STATUS  4
+#define CHAN_A_DATA    6
 
-#define RR0_RCA 1
+#define RR0_RCA  1
 
 static irq_cmd_t z8530_cmds[] = {
         {
                 .cmd = CMD_PIO_READ_8,
-                .addr = (void *) 0,     /* will be patched in run-time */
+                .addr = (void *) 0,     /* Will be patched in run-time */
                 .dstarg = 1
         },
@@ -69 +70 @@
         {
                 .cmd = CMD_PIO_READ_8,
-                .addr = (void *) 0,     /* will be patched in run-time */
+                .addr = (void *) 0,     /* Will be patched in run-time */
                 .dstarg = 2
         },
@@ -86 +87 @@
 int z8530_port_init(void)
 {
+        sysarg_t kaddr;
+        if (sysinfo_get_value("kbd.address.kernel", &kaddr) != EOK)
+                return -1;
+        
+        sysarg_t inr;
+        if (sysinfo_get_value("kbd.inr", &inr) != EOK)
+                return -1;
+        
+        z8530_cmds[0].addr = (void *) kaddr + CHAN_A_STATUS;
+        z8530_cmds[3].addr = (void *) kaddr + CHAN_A_DATA;
+        
         async_set_interrupt_received(z8530_irq_handler);
-        z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.kernel") +
-            CHAN_A_STATUS;
-        z8530_cmds[3].addr = (void *) sysinfo_value("kbd.address.kernel") +
-            CHAN_A_DATA;
-        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
-            sysinfo_value("kbd.inr"), &z8530_kbd);
+        ipc_register_irq(inr, device_assign_devno(), inr, &z8530_kbd);
+        
         return 0;
 }

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

uspace/srv/net/cfg/ne2k.netif_nil_bundle

@@ -7 +7 @@
 IL=ip
 
-# sysinfo_value("netif.dp8390.inr")
 IRQ=9
 IO=300

uspace/srv/net/cfg/ne2k.netif_standalone

@@ -7 +7 @@
 IL=ip
 
-# sysinfo_value("netif.dp8390.inr")
 IRQ=9
 IO=300

uspace/srv/net/netstart/netstart.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <task.h>
+#include <str_error.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
@@ -71 +72 @@
         argv[1] = NULL;
         
-        if (task_spawn(path, argv) == 0) {
-                fprintf(stderr, "%s: Error spawning %s\n", NAME, path);
+        int err;
+        if (task_spawn(path, argv, &err) == 0) {
+                fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, path,
+                    str_error(err));
                 return false;
         }

uspace/srv/ns/ns.c

@@ -55 +55 @@
 static void *klogaddr = NULL;
 
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *ph_addr,
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *faddr,
     size_t pages, void **addr)
 {
-        if (ph_addr == NULL) {
+        if ((faddr == NULL) || (pages == 0)) {
                 ipc_answer_0(callid, ENOENT);
                 return;
@@ -71 +71 @@
                 }
                 
-                if (physmem_map(ph_addr, *addr, pages,
+                if (physmem_map(faddr, *addr, pages,
                     AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
                         ipc_answer_0(callid, ENOENT);
@@ -81 +81 @@
 }
 
+static void setup_clock_area(ipc_callid_t callid, ipc_call_t *call, void **addr)
+{
+        uintptr_t faddr;
+        int err = sysinfo_get_value("clock.faddr", &faddr);
+        
+        if (err != EOK)
+                ipc_answer_0(callid, err);
+        
+        get_as_area(callid, call, (void *) faddr, 1, addr);
+}
+
+static void setup_klog_area(ipc_callid_t callid, ipc_call_t *call, void **addr)
+{
+        uintptr_t faddr;
+        int err = sysinfo_get_value("klog.faddr", &faddr);
+        
+        if (err != EOK)
+                ipc_answer_0(callid, err);
+        
+        size_t pages;
+        err = sysinfo_get_value("klog.pages", &pages);
+        
+        if (err != EOK)
+                ipc_answer_0(callid, err);
+        
+        get_as_area(callid, call, (void *) faddr, pages, addr);
+}
+
 int main(int argc, char **argv)
 {
@@ -97 +125 @@
                 return rc;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         
         while (true) {
@@ -113 +141 @@
                         switch (IPC_GET_ARG3(call)) {
                         case SERVICE_MEM_REALTIME:
-                                get_as_area(callid, &call,
-                                    (void *) sysinfo_value("clock.faddr"),
-                                    1, &clockaddr);
+                                setup_clock_area(callid, &call, &clockaddr);
                                 break;
                         case SERVICE_MEM_KLOG:
-                                get_as_area(callid, &call,
-                                    (void *) sysinfo_value("klog.faddr"),
-                                    sysinfo_value("klog.pages"), &klogaddr);
+                                setup_klog_area(callid, &call, &klogaddr);
                                 break;
                         default:

uspace/srv/taskmon/taskmon.c

@@ -44 +44 @@
 #include <macros.h>
 #include <errno.h>
+#include <str_error.h>
 
 #define NAME  "taskmon"
@@ -96 +97 @@
         }
         putchar('\n');
-
-        if (!task_spawn(fname, argv))
-                printf(NAME ": Error spawning taskdump.\n", fname);
+        
+        int err;
+        if (!task_spawn(fname, argv, &err))
+                printf("%s: Error spawning %s (%s).\n", NAME, fname,
+                    str_error(err));
 }