Changeset f4f866c in mainline for uspace/srv/hid/kbd/port/niagara.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/hid/kbd/port/niagara.c (modified) (3 diffs)

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