Changeset da74747 in mainline for kernel/genarch


Ignore:
Timestamp:
2006-08-09T12:24:58Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
287920f
Parents:
e2882a7
Message:

Start reorganization of different keyboard drivers.
What seemed like a screwed i8042 chip appears to be
Zilog 8530.

The repository won't compile now. To be fixed in next commits.

Location:
kernel/genarch
Files:
7 moved

Legend:

Unmodified
Added
Removed

  • kernel/genarch/include/kbd/i8042.h

    re2882a7 rda74747  
    3333 */
    3434
    35 #ifndef __I8042_H__
    36 #define __I8042_H__
     35#ifndef KERN_I8042_H_
     36#define KERN_I8042_H_
    3737
    38 #ifdef CONFIG_I8042_PC
    39 #include <genarch/i8042/scanc_pc.h>
    40 #endif
    41 #ifdef CONFIG_I8042_SUN
    42 #include <genarch/i8042/scanc_sun.h>
    43 #endif
     38#include <genarch/kbd/scanc_pc.h>
    4439
    4540#define SPECIAL         '?'

  • kernel/genarch/include/kbd/scanc_pc.h

    re2882a7 rda74747  
    3535 */
    3636
    37 #ifndef KERN_I8042_PC_H_
    38 #define KERN_I8042_PC_H_
     37#ifndef KERN_SCANC_PC_H_
     38#define KERN_SCANC_PC_H_
    3939
    4040#define SC_ESC          0x01

  • kernel/genarch/include/kbd/scanc_sun.h

    re2882a7 rda74747  
    3535 */
    3636
    37 #ifndef KERN_I8042_SUN_H_
    38 #define KERN_I8042_SUN_H_
     37#ifndef KERN_SCANC_SUN_H_
     38#define KERN_SCANC_SUN_H_
    3939
    4040#define SC_ESC          0x1d

  • kernel/genarch/include/kbd/z8530.h

    re2882a7 rda74747  
    11/*
    2  * Copyright (C) 2006 Jakub Jermar
     2 * Copyright (C) 2001-2004 Jakub Jermar
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup sparc64
     29/** @addtogroup genarch
    3030 * @{
    3131 */
    32 /** @file
     32/**
     33 * @file
     34 * @brief       Headers for Zilog 8530 serial port / keyboard driver.
    3335 */
    3436
    35 #include <arch/drivers/i8042.h>
    36 #include <genarch/i8042/i8042.h>
    37 #include <arch/boot/boot.h>
    38 #include <arch/types.h>
    39 #include <arch/mm/page.h>
     37#ifndef KERN_Z8530_H_
     38#define KERN_Z8530_H_
    4039
    41 volatile uint8_t *kbd_virt_address = NULL;
     40#include <genarch/kbd/scanc_sun.h>
    4241
    43 void kbd_init()
    44 {
    45         kbd_virt_address = (uint8_t *) hw_map(bootinfo.keyboard.addr, LAST_REG);
    46         i8042_init();
    47 }
     42#define SPECIAL         '?'
     43
     44extern char sc_primary_map[];
     45extern char sc_secondary_map[];
     46
     47extern void z8530_init(void);
     48extern void z8530_poll(void);
     49extern void z8530_grab(void);
     50extern void z8530_release(void);
     51
     52#endif
    4853
    4954/** @}

  • kernel/genarch/src/kbd/scanc_sun.c

    re2882a7 rda74747  
    8282        [0x29] = '=',
    8383        [0x2a] = '`',
    84         [0x2b] = '\b',  /* Backspace */
     84        [0x2b] = '\b',          /* Backspace */
    8585        [0x2c] = SPECIAL,       /* Insert */
    8686        [0x2d] = SPECIAL,
Note: See TracChangeset for help on using the changeset viewer.