Index: uspace/srv/hw/irc/apic/apic.c
===================================================================
--- uspace/srv/hw/irc/apic/apic.c	(revision 4f14e1f8802a61a8c882aefc9d36f523cc9fa40f)
+++ uspace/srv/hw/irc/apic/apic.c	(revision fb2ceebd30add3c4203e742c03bc8a900863c575)
@@ -107,5 +107,5 @@
 	
 	async_set_client_connection(apic_connection);
-	service_register(SERVICE_APIC);
+	service_register(SERVICE_IRC);
 	
 	return true;
Index: uspace/srv/hw/irc/fhc/fhc.c
===================================================================
--- uspace/srv/hw/irc/fhc/fhc.c	(revision 4f14e1f8802a61a8c882aefc9d36f523cc9fa40f)
+++ uspace/srv/hw/irc/fhc/fhc.c	(revision fb2ceebd30add3c4203e742c03bc8a900863c575)
@@ -136,5 +136,5 @@
 	
 	async_set_client_connection(fhc_connection);
-	service_register(SERVICE_FHC);
+	service_register(SERVICE_IRC);
 	
 	return true;
Index: uspace/srv/hw/irc/i8259/i8259.c
===================================================================
--- uspace/srv/hw/irc/i8259/i8259.c	(revision 4f14e1f8802a61a8c882aefc9d36f523cc9fa40f)
+++ uspace/srv/hw/irc/i8259/i8259.c	(revision fb2ceebd30add3c4203e742c03bc8a900863c575)
@@ -149,5 +149,5 @@
 	
 	async_set_client_connection(i8259_connection);
-	service_register(SERVICE_I8259);
+	service_register(SERVICE_IRC);
 	
 	return true;
Index: uspace/srv/hw/irc/obio/obio.c
===================================================================
--- uspace/srv/hw/irc/obio/obio.c	(revision 4f14e1f8802a61a8c882aefc9d36f523cc9fa40f)
+++ uspace/srv/hw/irc/obio/obio.c	(revision fb2ceebd30add3c4203e742c03bc8a900863c575)
@@ -137,5 +137,5 @@
 	
 	async_set_client_connection(obio_connection);
-	service_register(SERVICE_OBIO);
+	service_register(SERVICE_IRC);
 	
 	return true;
Index: uspace/srv/hw/netif/ne2000/ne2000.c
===================================================================
--- uspace/srv/hw/netif/ne2000/ne2000.c	(revision 4f14e1f8802a61a8c882aefc9d36f523cc9fa40f)
+++ uspace/srv/hw/netif/ne2000/ne2000.c	(revision fb2ceebd30add3c4203e742c03bc8a900863c575)
@@ -75,5 +75,5 @@
 #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,12 +383,11 @@
 	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);
 	}