Changeset d9fae235 in mainline for uspace/srv/hid/kbd/port/sgcn.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/hid/kbd/port/sgcn.c (modified) (3 diffs)

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