Changeset d011038 in mainline for uspace/srv/hw

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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.

Location:

uspace/srv/hw

Files:

• irc/apic/apic.c (modified) (1 diff)
• irc/fhc/fhc.c (modified) (1 diff)
• irc/i8259/i8259.c (modified) (1 diff)
• irc/obio/obio.c (modified) (1 diff)
• netif/ne2000/ne2000.c (modified) (2 diffs)

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