Changeset b7068da in mainline for uspace/srv/hid/input/port/niagara.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/input/port/niagara.c (modified) (3 diffs)

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

@@ -63 +63 @@
 #define POLL_INTERVAL  10000
 
-/**
- * Virtual address mapped to the buffer shared with the kernel counterpart.
- */
-static uintptr_t input_buffer_addr;
-
 /*
  * Kernel counterpart of the driver pushes characters (it has read) here.
@@ -102 +97 @@
                 return -1;
         
-        input_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE);
-        int rc = physmem_map((void *) paddr, (void *) input_buffer_addr,
-            1, AS_AREA_READ | AS_AREA_WRITE);
-        
+        int rc = physmem_map((void *) paddr, 1,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &input_buffer);
         if (rc != 0) {
                 printf("Niagara: uspace driver couldn't map physical memory: %d\n",
@@ -111 +104 @@
                 return rc;
         }
-        
-        input_buffer = (input_buffer_t) input_buffer_addr;
         
         thread_id_t tid;