Changeset 8f29507f in mainline

Timestamp:

2011-03-24T18:37:36Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d553f81

Parents:

ed2c8ff (diff), eb277fa7 (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 unified IRC services and graceful networking degradation

Location:

uspace

Files:

• lib/c/include/ipc/services.h (modified) (1 diff)
• srv/hid/kbd/generic/kbd.c (modified) (2 diffs)
• srv/hid/kbd/include/kbd.h (modified) (1 diff)
• srv/hid/kbd/port/ns16550.c (modified) (1 diff)
• srv/hid/kbd/port/z8530.c (modified) (1 diff)
• srv/hw/irc/apic/apic.c (modified) (1 diff)
• srv/hw/irc/fhc/fhc.c (modified) (1 diff)
• srv/hw/irc/i8259/i8259.c (modified) (1 diff)
• srv/hw/irc/obio/obio.c (modified) (1 diff)
• srv/hw/netif/ne2000/ne2000.c (modified) (2 diffs)
• srv/net/net/net.c (modified) (2 diffs)

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

@@ -47 +47 @@
         SERVICE_DEVMAP,
         SERVICE_DEVMAN,
-        SERVICE_FHC,
-        SERVICE_OBIO,
-        SERVICE_APIC,
-        SERVICE_I8259,
+        SERVICE_IRC,
         SERVICE_CLIPBOARD,
         SERVICE_NETWORKING,

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));
 }

uspace/srv/hw/irc/apic/apic.c

@@ -107 +107 @@
         
         async_set_client_connection(apic_connection);
-        service_register(SERVICE_APIC);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/fhc/fhc.c

@@ -136 +136 @@
         
         async_set_client_connection(fhc_connection);
-        service_register(SERVICE_FHC);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/i8259/i8259.c

@@ -149 +149 @@
         
         async_set_client_connection(i8259_connection);
-        service_register(SERVICE_I8259);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/obio/obio.c

@@ -137 +137 @@
         
         async_set_client_connection(obio_connection);
-        service_register(SERVICE_OBIO);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -75 +75 @@
 #define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
 
-static int irc_service = 0;
+static bool irc_service = false;
 static int irc_phone = -1;
 
@@ -383 +383 @@
         sysarg_t i8259;
         
-        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-                irc_service = SERVICE_APIC;
-        else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))
-                irc_service = SERVICE_I8259;
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)))
+                irc_service = true;
         
         if (irc_service) {
                 while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(irc_service, 0, 0);
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }
         

uspace/srv/net/net/net.c

@@ -289 +289 @@
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME,
             (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME,
             (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME,
             (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service);
@@ -590 +593 @@
                 rc = start_device(netif);
                 if (rc != EOK) {
-                        printf("%s: Error starting interface %s (%s)\n", NAME,
+                        printf("%s: Ignoring failed interface %s (%s)\n", NAME,
                             netif->name, str_error(rc));
                         measured_strings_destroy(&netif->configuration);
                         netifs_exclude_index(&net_globals.netifs, index);
-                        
-                        return rc;
+                        continue;
                 }