| /trunk/kernel/kernel.config |
|---|
| 36,6 → 36,11 |
| @ "indy" SGI Indy |
| ! [ARCH=mips32] MACHINE (choice) |
| # Machine type |
| @ "ultra" Sun Ultra 5 |
| @ "enterprise" Sun Enterprise E6500 |
| ! [ARCH=sparc64] MACHINE (choice) |
| # Framebuffer support |
| ! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)] CONFIG_FB (y/n) |
| /trunk/kernel/genarch/include/kbd/ns16550.h |
|---|
| 0,0 → 1,48 |
| /* |
| * Copyright (C) 2001-2004 Jakub Jermar |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup genarch |
| * @{ |
| */ |
| /** |
| * @file |
| * @brief Headers for NS 16550 serial port / keyboard driver. |
| */ |
| #ifndef KERN_NS16550_H_ |
| #define KERN_NS16550_H_ |
| extern void ns16550_init(void); |
| extern void ns16550_poll(void); |
| extern void ns16550_grab(void); |
| extern void ns16550_release(void); |
| #endif |
| /** @} |
| */ |
| /trunk/kernel/genarch/Makefile.inc |
|---|
| 79,3 → 79,11 |
| genarch/src/kbd/key.c \ |
| genarch/src/kbd/scanc_sun.c |
| endif |
| ## ns16550 controller |
| ifeq ($(CONFIG_NS16550),y) |
| GENARCH_SOURCES += \ |
| genarch/src/kbd/ns16550.c \ |
| genarch/src/kbd/key.c \ |
| genarch/src/kbd/scanc_sun.c |
| endif |
| /trunk/kernel/genarch/src/kbd/ns16550.c |
|---|
| 0,0 → 1,154 |
| /* |
| * Copyright (C) 2001-2004 Jakub Jermar |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup genarch |
| * @{ |
| */ |
| /** |
| * @file |
| * @brief NS 16550 serial port / keyboard driver. |
| */ |
| #include <genarch/kbd/ns16550.h> |
| #include <genarch/kbd/key.h> |
| #include <genarch/kbd/scanc.h> |
| #include <genarch/kbd/scanc_sun.h> |
| #include <arch/drivers/ns16550.h> |
| #include <arch/interrupt.h> |
| #include <cpu.h> |
| #include <arch/asm.h> |
| #include <arch.h> |
| #include <typedefs.h> |
| #include <console/chardev.h> |
| #include <console/console.h> |
| #include <interrupt.h> |
| #define LSR_DATA_READY 0x01 |
| /* |
| * These codes read from ns16550 data register are silently ignored. |
| */ |
| #define IGNORE_CODE 0x7f /* all keys up */ |
| static void ns16550_suspend(chardev_t *); |
| static void ns16550_resume(chardev_t *); |
| chardev_t kbrd; |
| static chardev_operations_t ops = { |
| .suspend = ns16550_suspend, |
| .resume = ns16550_resume, |
| .read = key_read |
| }; |
| void ns16550_interrupt(int n, istate_t *istate); |
| void ns16550_wait(void); |
| /** Initialize keyboard and service interrupts using kernel routine */ |
| void ns16550_grab(void) |
| { |
| /* TODO */ |
| } |
| /** Resume the former interrupt vector */ |
| void ns16550_release(void) |
| { |
| /* TODO */ |
| } |
| /** Initialize ns16550. */ |
| void ns16550_init(void) |
| { |
| ns16550_grab(); |
| chardev_initialize("ns16550_kbd", &kbrd, &ops); |
| stdin = &kbrd; |
| } |
| /** Process ns16550 interrupt. |
| * |
| * @param n Interrupt vector. |
| * @param istate Interrupted state. |
| */ |
| void ns16550_interrupt(int n, istate_t *istate) |
| { |
| /* TODO */ |
| } |
| /** Wait until the controller reads its data. */ |
| void ns16550_wait(void) { |
| } |
| /* Called from getc(). */ |
| void ns16550_resume(chardev_t *d) |
| { |
| } |
| /* Called from getc(). */ |
| void ns16550_suspend(chardev_t *d) |
| { |
| } |
| char key_read(chardev_t *d) |
| { |
| char ch; |
| while(!(ch = active_read_buff_read())) { |
| uint8_t x; |
| while (!(ns16550_lsr_read() & LSR_DATA_READY)) |
| ; |
| x = ns16550_rbr_read(); |
| if (x != IGNORE_CODE) { |
| if (x & KEY_RELEASE) |
| key_released(x ^ KEY_RELEASE); |
| else |
| active_read_key_pressed(x); |
| } |
| } |
| return ch; |
| } |
| /** Poll for key press and release events. |
| * |
| * This function can be used to implement keyboard polling. |
| */ |
| void ns16550_poll(void) |
| { |
| uint8_t x; |
| while (((x = ns16550_lsr_read() & LSR_DATA_READY))) { |
| x = ns16550_rbr_read(); |
| if (x != IGNORE_CODE) { |
| if (x & KEY_RELEASE) |
| key_released(x ^ KEY_RELEASE); |
| else |
| key_pressed(x); |
| } |
| } |
| } |
| /** @} |
| */ |
| /trunk/kernel/genarch/src/kbd/key.c |
|---|
| 36,7 → 36,12 |
| #include <genarch/kbd/key.h> |
| #include <genarch/kbd/scanc.h> |
| #ifdef CONFIG_I8042 |
| #include <genarch/kbd/scanc_pc.h> |
| #endif |
| #if (defined(CONFIG_Z8530) || defined(CONFIG_NS16550)) |
| #include <genarch/kbd/scanc_sun.h> |
| #endif |
| #include <synch/spinlock.h> |
| #include <console/chardev.h> |
| #include <typedefs.h> |
| /trunk/kernel/arch/sparc64/include/drivers/ns16550.h |
|---|
| 0,0 → 1,57 |
| /* |
| * Copyright (C) 2006 Jakub Jermar |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup sparc64 |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef KERN_sparc64_NS16550_H_ |
| #define KERN_sparc64_NS16550_H_ |
| #include <arch/types.h> |
| #include <arch/drivers/kbd.h> |
| #define RBR_REG 0 /** Receiver Buffer Register. */ |
| #define LSR_REG 5 /** Line Status Register. */ |
| static inline uint8_t ns16550_rbr_read(void) |
| { |
| return kbd_virt_address[RBR_REG]; |
| } |
| static inline uint8_t ns16550_lsr_read(void) |
| { |
| return kbd_virt_address[LSR_REG]; |
| } |
| #endif |
| /** @} |
| */ |
| /trunk/kernel/arch/sparc64/Makefile.inc |
|---|
| 60,12 → 60,25 |
| CONFIG_FB = y |
| ## Compile with support for z8530 controller. |
| # |
| CONFIG_Z8530 = y |
| DEFS += -DCONFIG_Z8530 |
| ifeq ($(MACHINE),enterprise) |
| ## Compile with support for z8530 controller. |
| # |
| CONFIG_Z8530 = y |
| DEFS += -DCONFIG_Z8530 |
| endif |
| ifeq ($(MACHINE),ultra) |
| ## Compile with support for ns16550 controller. |
| # |
| CONFIG_NS16550 = y |
| DEFS += -DCONFIG_NS16550 |
| DEFS += -DKBD_ADDR_OVRD=0x1fff13083f8ULL |
| endif |
| ARCH_SOURCES = \ |
| arch/$(ARCH)/src/cpu/cpu.c \ |
| arch/$(ARCH)/src/asm.S \ |
| /trunk/kernel/arch/sparc64/src/console.c |
|---|
| 42,8 → 42,8 |
| #ifdef CONFIG_Z8530 |
| #include <genarch/kbd/z8530.h> |
| #endif |
| #ifdef CONFIG_16550A |
| #include <genarch/kbd/16550a.h> |
| #ifdef CONFIG_NS16550 |
| #include <genarch/kbd/ns16550.h> |
| #endif |
| #include <console/chardev.h> |
| 64,6 → 64,11 |
| fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, |
| bootinfo.screen.bpp, bootinfo.screen.scanline, true); |
| #ifdef KBD_ADDR_OVRD |
| if (!bootinfo.keyboard.addr) |
| bootinfo.keyboard.addr = KBD_ADDR_OVRD; |
| #endif |
| if (bootinfo.keyboard.addr) |
| kbd_init(); |
| } |
| 81,8 → 86,8 |
| #ifdef CONFIG_Z8530 |
| z8530_poll(); |
| #endif |
| #ifdef CONFIG_16550A |
| 16550a_poll(); |
| #ifdef CONFIG_NS16550 |
| ns16550_poll(); |
| #endif |
| thread_usleep(KEYBOARD_POLL_PAUSE); |
| } |
| /trunk/kernel/arch/sparc64/src/drivers/kbd.c |
|---|
| 36,8 → 36,8 |
| #ifdef CONFIG_Z8530 |
| #include <genarch/kbd/z8530.h> |
| #endif |
| #ifdef CONFIG_16650A |
| #include <genarch/kbd/16650a.h> |
| #ifdef CONFIG_NS16550 |
| #include <genarch/kbd/ns16550.h> |
| #endif |
| #include <arch/boot/boot.h> |
| 69,8 → 69,8 |
| #ifdef CONFIG_Z8530 |
| z8530_init(); |
| #endif |
| #ifdef CONFIG_16650A |
| 16650A_init(); |
| #ifdef CONFIG_NS16550 |
| ns16550_init(); |
| #endif |
| } |
| /trunk/kernel/arch/amd64/Makefile.inc |
|---|
| 61,6 → 61,7 |
| # |
| CONFIG_I8042 = y |
| DEFS += -DCONFIG_I8042 |
| ## Accepted configuration directives |
| # |
| /trunk/kernel/arch/ia32/Makefile.inc |
|---|
| 80,6 → 80,7 |
| # |
| CONFIG_I8042 = y |
| DEFS += -DCONFIG_I8042 |
| ## Accepted configuration directives |
| # |