Changeset 4f3f9659 in mainline

Timestamp:

2011-06-11T22:38:19Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f2f99ae

Parents:

9be360ee

Message:

Split up ('de-virtualize') z8530 and ns16550 port drivers.

Location:

uspace/srv/hid/kbd

Files:

• Makefile (modified) (1 diff)
• generic/kbd.c (modified) (1 diff)
• include/kbd_port.h (modified) (1 diff)
• include/sun.h (deleted)
• port/ns16550.c (modified) (4 diffs)
• port/sun.c (deleted)
• port/z8530.c (modified) (4 diffs)

uspace/srv/hid/kbd/Makefile

@@ -59 +59 @@
         port/sgcn.c \
         port/ski.c \
-        port/sun.c \
         port/z8530.c \
         ctl/apple.c \

uspace/srv/hid/kbd/generic/kbd.c

@@ -304 +304 @@
 #endif
 #if defined(UARCH_sparc64) && defined(MACHINE_generic)
-        kbd_add_dev(&sun_port, &sun_ctl);
+        kbd_add_dev(&z8530_port, &sun_ctl);
+        kbd_add_dev(&ns16550_port, &sun_ctl);
 #endif
         /* Silence warning on abs32le about kbd_add_dev() being unused */

uspace/srv/hid/kbd/include/kbd_port.h

@@ -59 +59 @@
 extern kbd_port_ops_t sgcn_port;
 extern kbd_port_ops_t ski_port;
-extern kbd_port_ops_t sun_port;
 extern kbd_port_ops_t z8530_port;
 

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +42 @@
 #include <kbd.h>
 #include <kbd_port.h>
-#include <sun.h>
 #include <ddi.h>
 #include <errno.h>
+
+static int ns16550_port_init(kbd_dev_t *);
+static void ns16550_port_yield(void);
+static void ns16550_port_reclaim(void);
+static void ns16550_port_write(uint8_t data);
+
+kbd_port_ops_t ns16550_port = {
+        .init = ns16550_port_init,
+        .yield = ns16550_port_yield,
+        .reclaim = ns16550_port_reclaim,
+        .write = ns16550_port_write
+};
+
+static kbd_dev_t *kbd_dev;
 
 /* NS16550 registers */
@@ -91 +105 @@
 
 static uintptr_t ns16550_physical;
-static uintptr_t ns16550_kernel; 
+static uintptr_t ns16550_kernel;
 
 static kbd_dev_t *kbd_dev;
 
-int ns16550_port_init(kbd_dev_t *kdev)
+static int ns16550_port_init(kbd_dev_t *kdev)
 {
         void *vaddr;
-
+        
         kbd_dev = kdev;
-
+        
+        sysarg_t ns16550;
+        if (sysinfo_get_value("kbd.type.ns16550", &ns16550) != EOK)
+                return -1;
+        if (!ns16550)
+                return -1;
+        
         if (sysinfo_get_value("kbd.address.physical", &ns16550_physical) != EOK)
                 return -1;
@@ -120 +140 @@
 }
 
+static void ns16550_port_yield(void)
+{
+}
+
+static void ns16550_port_reclaim(void)
+{
+}
+
+static void ns16550_port_write(uint8_t data)
+{
+        (void) data;
+}
+
 static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {

uspace/srv/hid/kbd/port/z8530.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +42 @@
 #include <kbd.h>
 #include <kbd_port.h>
-#include <sun.h>
 #include <sys/types.h>
 #include <ddi.h>
 #include <errno.h>
+
+static int z8530_port_init(kbd_dev_t *);
+static void z8530_port_yield(void);
+static void z8530_port_reclaim(void);
+static void z8530_port_write(uint8_t data);
+
+kbd_port_ops_t z8530_port = {
+        .init = z8530_port_init,
+        .yield = z8530_port_yield,
+        .reclaim = z8530_port_reclaim,
+        .write = z8530_port_write
+};
 
 static kbd_dev_t *kbd_dev;
@@ -87 +99 @@
 static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 
-int z8530_port_init(kbd_dev_t *kdev)
+static int z8530_port_init(kbd_dev_t *kdev)
 {
         kbd_dev = kdev;
+        
+        sysarg_t z8530;
+        if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK)
+                return -1;
+        if (!z8530)
+                return -1;
         
         sysarg_t kaddr;
@@ -108 +126 @@
 }
 
+static void z8530_port_yield(void)
+{
+}
+
+static void z8530_port_reclaim(void)
+{
+}
+
+static void z8530_port_write(uint8_t data)
+{
+        (void) data;
+}
+
 static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {