Changeset c0d77f7 in mainline

Timestamp:

2011-03-22T21:18:51Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab10b842

Parents:

9c2b2a8

Message:

Fix scancode map for Integrator/CP in the kernel.

Files:

• HelenOS.config (modified) (1 diff)
• kernel/genarch/Makefile.inc (modified) (1 diff)
• kernel/genarch/src/kbrd/kbrd_pl050.c (deleted)
• kernel/genarch/src/kbrd/scanc_pl050.c (deleted)

HelenOS.config

@@ -417 +417 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
 
+% PC keyboard support
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
+
 % Support for msim/GXemul keyboard
 ! [CONFIG_HID_IN=generic&PLATFORM=mips32] CONFIG_MIPS_KBD (y/n)

kernel/genarch/Makefile.inc

@@ -122 +122 @@
 endif
 
-ifeq ($(CONFIG_PL050),y)
-        GENARCH_SOURCES += \
-                genarch/src/kbrd/kbrd_pl050.c \
-                genarch/src/kbrd/scanc_pl050.c
-endif
-
 ifeq ($(CONFIG_MAC_KBD),y)
         GENARCH_SOURCES += \