Changeset cfb79747 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2012-02-14T22:06:15Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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.

File:

• kernel/arch/ia32/src/ia32.c (modified) (1 diff)

kernel/arch/ia32/src/ia32.c

@@ -168 +168 @@
                 }
         }
-        
-        /*
-         * This is the necessary evil until the userspace driver is entirely
-         * self-sufficient.
-         */
-        sysinfo_set_item_val("i8042", NULL, true);
-        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
-        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
-        sysinfo_set_item_val("i8042.address.physical", NULL,
-            (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("i8042.address.kernel", NULL,
-            (uintptr_t) I8042_BASE);
 #endif
         
         if (irqs_info != NULL)
                 sysinfo_set_item_val(irqs_info, NULL, true);
-        
-        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
 }