Changeset 5012203 in mainline


Ignore:
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.

Files:
7 added
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r1afd9ee r5012203  
    486486
    487487% PC keyboard support
    488 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
     488! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_AT_KBD (y/n)
    489489
    490490% Support for msim keyboard

  • boot/arch/arm32/Makefile.inc

    r1afd9ee r5012203  
    7474        RD_DRVS_ESSENTIAL += \
    7575                char/pl050 \
    76                 char/xtkbd \
     76                char/atkbd \
    7777                char/ps2mouse \
    7878                platform/icp

  • kernel/genarch/Makefile.inc

    r1afd9ee r5012203  
    141141endif
    142142
     143ifeq ($(CONFIG_AT_KBD),y)
     144GENARCH_SOURCES += \
     145        genarch/src/kbrd/kbrd_at.c \
     146        genarch/src/kbrd/scanc_at.c
     147endif
     148
    143149ifeq ($(CONFIG_SUN_KBD),y)
    144150GENARCH_SOURCES += \

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

    r1afd9ee r5012203  
    3232/**
    3333 * @file
    34  * @brief       Scan codes for pl050 keyboards.
     34 * @brief       Scan codes for PC/AT keyboards.
    3535 */
    3636
    37 #ifndef KERN_SCANC_PL050_H_
    38 #define KERN_SCANC_PL050_H_
     37#ifndef KERN_SCANC_AT_H_
     38#define KERN_SCANC_AT_H_
    3939
    4040#define SC_SCAN_ESCAPE  0xE0

  • uspace/Makefile

    r1afd9ee r5012203  
    144144        drv/char/pl050 \
    145145        drv/char/ps2mouse \
     146        drv/char/atkbd \
    146147        drv/char/xtkbd \
    147148        drv/test/test1 \

  • uspace/drv/char/pl050/pl050.c

    r1afd9ee r5012203  
    323323
    324324        if (str_cmp(pl050->name, "kbd") == 0)
    325                 mname = "char/xtkbd";
     325                mname = "char/atkbd";
    326326        else
    327327                mname = "char/ps2mouse";
Note: See TracChangeset for help on using the changeset viewer.