Changeset 5012203 in mainline for kernel

Timestamp:

2016-05-12T13:55:09Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4363000

Parents:

1afd9ee

Message:

IntegratorCP: switch to using the PC/AT (set 2) scancodes

This is consistent with a change introduced in QEMU 2.6.0. It appears
that the previously provided and then removed PL050 scan codes were
actually PC/AT set 2 scancodes.

Location:

kernel/genarch

Files:

• Makefile.inc (modified) (1 diff)
• include/genarch/kbrd/scanc_at.h (moved) (moved from kernel/genarch/include/genarch/kbrd/scanc_pl050.h ) (1 diff)
• src/kbrd/kbrd_at.c (added)
• src/kbrd/scanc_at.c (added)

kernel/genarch/Makefile.inc

@@ -141 +141 @@
 endif
 
+ifeq ($(CONFIG_AT_KBD),y)
+GENARCH_SOURCES += \
+        genarch/src/kbrd/kbrd_at.c \
+        genarch/src/kbrd/scanc_at.c
+endif
+
 ifeq ($(CONFIG_SUN_KBD),y)
 GENARCH_SOURCES += \

kernel/genarch/include/genarch/kbrd/scanc_at.h

@@ -32 +32 @@
 /**
  * @file
- * @brief       Scan codes for pl050 keyboards.
+ * @brief       Scan codes for PC/AT keyboards.
  */
 
-#ifndef KERN_SCANC_PL050_H_
-#define KERN_SCANC_PL050_H_
+#ifndef KERN_SCANC_AT_H_
+#define KERN_SCANC_AT_H_
 
 #define SC_SCAN_ESCAPE  0xE0