Changeset 57d129e in mainline for uspace/srv/hid

Timestamp:

2011-03-23T17:15:15Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

eb277fa7

Parents:

ab10b842

Message:

unify all IRC services under SERVICE_IRC

Location:

uspace/srv/hid/kbd

Files:

• generic/kbd.c (modified) (2 diffs)
• include/kbd.h (modified) (1 diff)
• port/ns16550.c (modified) (1 diff)
• port/z8530.c (modified) (1 diff)

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

@@ -67 +67 @@
 static unsigned lock_keys;
 
-int cir_service = 0;
-int cir_phone = -1;
+bool irc_service = false;
+int irc_phone = -1;
 
 #define NUM_LAYOUTS 3
@@ -216 +216 @@
         sysarg_t obio;
         
-        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
-                cir_service = SERVICE_FHC;
-        else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
-                cir_service = SERVICE_OBIO;
-        
-        if (cir_service) {
-                while (cir_phone < 0)
-                        cir_phone = service_connect_blocking(cir_service, 0, 0);
+        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
+            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
+                irc_service = true;
+        
+        if (irc_service) {
+                while (irc_phone < 0)
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }
         

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

@@ -38 +38 @@
 #define KBD_KBD_H_
 
-extern int cir_service;
-extern int cir_phone;
+#include <bool.h>
+
+extern bool irc_service;
+extern int irc_phone;
 
 extern void kbd_push_scancode(int);

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

@@ -120 +120 @@
         kbd_push_scancode(scan_code);
         
-        if (cir_service)
-                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+        if (irc_service)
+                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

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

@@ -108 +108 @@
         kbd_push_scancode(scan_code);
         
-        if (cir_service)
-                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+        if (irc_service)
+                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }