Changeset d9fae235 in mainline for uspace/srv/hid/fb

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/hid/fb

Files:

• ega.c (modified) (1 diff)
• fb.c (modified) (1 diff)
• main.c (modified) (7 diffs)
• msim.c (modified) (4 diffs)
• niagara.c (modified) (1 diff)
• sgcn.c (modified) (1 diff)

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