Changeset 3e5a814 in mainline for uspace

Timestamp:

2009-02-25T21:32:18Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6b1de7a

Parents:

f542825

Message:

Add simple userspace FHC driver.
Modify the z8530 userspace driver
to send BUS_CLEAR_INTERRUPT
notification to the FHC driver.

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• app/init/init.c (modified) (1 diff)
• lib/libc/include/ipc/bus.h (added)
• lib/libc/include/ipc/services.h (modified) (1 diff)
• srv/fhc/Makefile (added)
• srv/fhc/fhc.c (added)
• srv/kbd/generic/kbd.c (modified) (3 diffs)
• srv/kbd/include/kbd.h (modified) (1 diff)
• srv/kbd/port/z8530.c (modified) (3 diffs)

uspace/Makefile

@@ -63 +63 @@
 endif
 
+ifeq ($(UARCH),sparc64)
+        DIRS += srv/fhc
+endif
+
 BUILDS := $(addsuffix .build,$(DIRS))
 CLEANS := $(addsuffix .clean,$(DIRS))

uspace/app/init/init.c

@@ -109 +109 @@
         spawn("/srv/kbd");
         spawn("/srv/console");
+        spawn("/srv/fhc");
         
         console_wait();

uspace/lib/libc/include/ipc/services.h

@@ -45 +45 @@
         SERVICE_CONSOLE,
         SERVICE_VFS,
-        SERVICE_DEVMAP
+        SERVICE_DEVMAP,
+        SERVICE_FHC
 } services_t;
 

uspace/srv/kbd/generic/kbd.c

@@ -38 +38 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <sysinfo.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -66 +67 @@
 /** Currently pressed lock keys. We track these to tackle autorepeat. */
 static unsigned lock_keys;
+
+int cir_service = 0;
+int cir_phone = -1;
 
 void kbd_push_scancode(int scancode)
@@ -173 +177 @@
         ipcarg_t phonead;
         
+        if (sysinfo_value("kbd.cir.fhc") == 1)
+                cir_service = SERVICE_FHC;
+        
+        if (cir_service) {
+                while (cir_phone < 0) {
+                        cir_phone = ipc_connect_me_to(PHONE_NS, cir_service,
+                            0, 0);
+                }
+        }
+        
         /* Initialize port driver. */
         if (kbd_port_init())

uspace/srv/kbd/include/kbd.h

@@ -46 +46 @@
 #define KBD_MS_MOVE     1028
 
+extern int cir_service;
+extern int cir_phone;
+
 extern void kbd_push_scancode(int);
 extern void kbd_push_ev(int, unsigned int);

uspace/srv/kbd/port/z8530.c

@@ -36 +36 @@
 
 #include <ipc/ipc.h>
+#include <ipc/bus.h>
 #include <async.h>
 #include <sysinfo.h>
@@ -89 +90 @@
             CHAN_A_DATA;
         ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
-            0, &z8530_kbd);
+            sysinfo_value("kbd.inr"), &z8530_kbd);
         return 0;
 }
@@ -97 +98 @@
         int scan_code = IPC_GET_ARG2(*call);
         kbd_push_scancode(scan_code);
+        
+        if (cir_service)
+                async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
+                    IPC_GET_METHOD(*call));
 }