Changeset 7943c43 in mainline for uspace/srv/hid/input/port

Timestamp:

2012-01-16T22:45:38Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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.

Location:

uspace/srv/hid/input/port

Files:

• chardev.c (modified) (1 diff)
• chardev_mouse.c (deleted)
• gxemul.c (modified) (1 diff)
• msim.c (modified) (1 diff)
• niagara.c (modified) (3 diffs)
• ns16550.c (modified) (1 diff)
• pl050.c (modified) (1 diff)

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

@@ -63 +63 @@
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-        "char/ps2a",
         "char/s3c24ser"
 };

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

@@ -90 +90 @@
         async_set_interrupt_received(gxemul_irq_handler);
         gxemul_cmds[0].addr = (void *) addr;
-        register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
+        irq_register(inr, device_assign_devno(), 0, &gxemul_kbd);
         return 0;
 }

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

@@ -89 +89 @@
         msim_cmds[0].addr = (void *) vaddr;
         async_set_interrupt_received(msim_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &msim_kbd);
+        irq_register(inr, device_assign_devno(), 0, &msim_kbd);
         
         return 0;

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;

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

@@ -135 +135 @@
         
         async_set_interrupt_received(ns16550_irq_handler);
-        register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
+        irq_register(inr, device_assign_devno(), inr, &ns16550_kbd);
         
         return pio_enable((void *) ns16550_physical, 8, &vaddr);

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

@@ -117 +117 @@
         
         async_set_interrupt_received(pl050_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
+        irq_register(inr, device_assign_devno(), 0, &pl050_kbd);
         
         return 0;