Changeset 6ac14a70 in mainline for kernel/genarch


Ignore:
Timestamp:
2009-07-28T12:47:31Z (16 years ago)
Author:
Vineeth Pillai <vineethrp@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5e73815
Parents:
7038f55
Message:

ARM port for development board integratorcp(ARM926EJ core module).

Location:
kernel/genarch
Files:
4 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • kernel/genarch/Makefile.inc

    r7038f55 r6ac14a70  
    111111endif
    112112
     113ifeq ($(CONFIG_PL050),y)
     114        GENARCH_SOURCES += \
     115                genarch/src/kbrd/kbrd_pl050.c \
     116                genarch/src/kbrd/scanc_pl050.c
     117endif
     118
    113119ifeq ($(CONFIG_MAC_KBD),y)
    114120        GENARCH_SOURCES += \

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

    r7038f55 r6ac14a70  
    11/*
    2  * Copyright (c) 2007 Michal Kebrt, Petr Stepan
     2 * Copyright (c) 2009 Vineeth Pillai
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup arm32gxemul
     29/** @addtogroup genarch
    3030 * @{
    3131 */
    32 /** @file
    33  *  @brief GXemul drivers.
     32/**
     33 * @file
     34 * @brief       Scan codes for pl050 keyboards.
    3435 */
    3536
    36 #include <arch/drivers/gxemul.h>
    37 #include <mm/page.h>
     37#ifndef KERN_SCANC_PL050_H_
     38#define KERN_SCANC_PL050_H_
    3839
    39 void *gxemul_kbd;
    40 void *gxemul_rtc;
    41 void *gxemul_irqc;
     40#define SC_SCAN_ESCAPE  0xE0
     41#define SC_ESC          0x76
     42#define SC_BACKSPACE    0x66
     43#define SC_LSHIFT       0x12
     44#define SC_RSHIFT       0x59
     45#define SC_CAPSLOCK     0x58
     46#define SC_SPEC_ESCAPE  0xe0
     47#define SC_LEFTARR      0x6b
     48#define SC_RIGHTARR     0x74
     49#define SC_UPARR        0x75
     50#define SC_DOWNARR      0x72
     51#define SC_DELETE       0x70
     52#define SC_HOME         0x6C
     53#define SC_END          0x69
    4254
    43 void gxemul_init(void)
    44 {
    45         gxemul_kbd = (void *) hw_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE);
    46         gxemul_rtc = (void *) hw_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE);
    47         gxemul_irqc = (void *) hw_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE);
    48 }
     55#endif
    4956
    5057/** @}

  • kernel/genarch/src/fb/fb.c

    r7038f55 r6ac14a70  
    115115        *((uint32_t *) dst)
    116116            = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8);
     117}
     118
     119static void rgb_8880(void *dst, uint32_t rgb)
     120{
     121        *((uint32_t *) dst)
     122           = (RED(rgb, 8) << 24) | (GREEN(rgb, 8) << 16) | (BLUE(rgb, 8) << 8);
     123
    117124}
    118125
    … …  
    471478                break;
    472479        case VISUAL_RGB_8_8_8_0:
    473                 rgb_conv = rgb_888;
     480                rgb_conv = rgb_8880;
    474481                pixelbytes = 4;
    475482                break;
Note: See TracChangeset for help on using the changeset viewer.