Changeset 948911d in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2012-01-24T02:27:43Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -214 +214 @@
                 }
         }
-        
-        /*
-         * 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);
 }