Changeset bf9cb2f in mainline for uspace/srv/hid

Timestamp:

2014-05-19T01:01:27Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

10ef47ba

Parents:

527f1ca

Message:

complete the desired API semantics of physmem_map() and dmamem_map_anonymous() to be compatible with as_area_create()
(the user is allowed to request a specific virtual memory base address, the kernel uses an available base address if AS_AREA_ANY is used)

Location:

uspace/srv/hid

Files:

• input/port/niagara.c (modified) (2 diffs)
• output/port/ega.c (modified) (1 diff)
• output/port/kchar.c (modified) (1 diff)
• output/port/niagara.c (modified) (1 diff)

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

@@ -74 +74 @@
         uint64_t read_ptr;
         char data[INPUT_BUFFER_SIZE];
-}
-        __attribute__ ((packed))
-        __attribute__ ((aligned(PAGE_SIZE)))
-        *input_buffer_t;
+} __attribute__((packed)) __attribute__((aligned(PAGE_SIZE))) *input_buffer_t;
 
 /* virtual address of the shared buffer */
-static input_buffer_t input_buffer;
+static input_buffer_t input_buffer = (input_buffer_t) AS_AREA_ANY;
 
 static volatile bool polling_disabled = false;
@@ -87 +84 @@
 /**
  * Initializes the Niagara driver.
- * Maps the shared buffer and creates the polling thread. 
+ * Maps the shared buffer and creates the polling thread.
  */
 static int niagara_port_init(kbd_dev_t *kdev)

uspace/srv/hid/output/port/ega.c

@@ -215 +215 @@
         
         ega.size = (ega.cols * ega.rows) << 1;
+        ega.addr = AS_AREA_ANY;
         
         rc = physmem_map(paddr,

uspace/srv/hid/output/port/kchar.c

@@ -84 +84 @@
                 return rc;
         
+        kchar.addr = AS_AREA_ANY;
+        
         rc = physmem_map(paddr,
             ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH,

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

@@ -104 +104 @@
                 return rc;
         
+        niagara.fifo = (output_fifo_t *) AS_AREA_ANY;
+        
         rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE,
             (void *) &niagara.fifo);