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

Timestamp:

2011-07-20T15:26:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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 (moved) (moved from uspace/srv/hid/kbd/port/niagara.c ) (6 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Pavel Rimsky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +47 @@
 #include <errno.h>
 
+static int niagara_port_init(kbd_dev_t *);
+static void niagara_port_yield(void);
+static void niagara_port_reclaim(void);
+static void niagara_port_write(uint8_t data);
+
+kbd_port_ops_t niagara_port = {
+        .init = niagara_port_init,
+        .yield = niagara_port_yield,
+        .reclaim = niagara_port_reclaim,
+        .write = niagara_port_write
+};
+
+static kbd_dev_t *kbd_dev;
+
 #define POLL_INTERVAL  10000
 
@@ -70 +85 @@
 
 /* virtual address of the shared buffer */
-input_buffer_t input_buffer;
+static input_buffer_t input_buffer;
 
 static volatile bool polling_disabled = false;
@@ -79 +94 @@
  * Maps the shared buffer and creates the polling thread. 
  */
-int kbd_port_init(void)
+static int niagara_port_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
+        
         sysarg_t paddr;
         if (sysinfo_get_value("niagara.inbuf.address", &paddr) != EOK)
@@ -105 +122 @@
 }
 
-void kbd_port_yield(void)
+static void niagara_port_yield(void)
 {
         polling_disabled = true;
 }
 
-void kbd_port_reclaim(void)
+static void niagara_port_reclaim(void)
 {
         polling_disabled = false;
 }
 
-void kbd_port_write(uint8_t data)
+static void niagara_port_write(uint8_t data)
 {
         (void) data;
@@ -131 +148 @@
                 c = input_buffer->data[input_buffer->read_ptr];
                 input_buffer->read_ptr =
-                        ((input_buffer->read_ptr) + 1) % INPUT_BUFFER_SIZE;
-                kbd_push_scancode(c);
+                    ((input_buffer->read_ptr) + 1) % INPUT_BUFFER_SIZE;
+                kbd_push_data(kbd_dev, c);
         }
 }
 
 /**
- * Thread to poll SGCN for keypresses.
+ * Thread to poll Niagara console for keypresses.
  */
 static void niagara_thread_impl(void *arg)