Index: kernel/arch/ppc32/src/ppc32.c =================================================================== --- kernel/arch/ppc32/src/ppc32.c (revision 103bb689fbd9789d2bd117068732c37b209c7772) +++ kernel/arch/ppc32/src/ppc32.c (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) @@ -37,4 +37,5 @@ #include #include +#include #include #include @@ -118,29 +119,4 @@ irq_init(IRQ_COUNT, IRQ_COUNT); - if (bootinfo.macio.addr) { - /* Initialize PIC */ - cir_t cir; - void *cir_arg; - pic_init(bootinfo.macio.addr, PAGE_SIZE, &cir, &cir_arg); - -#ifdef CONFIG_VIA_CUDA - uintptr_t pa = bootinfo.macio.addr + 0x16000; - uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE); - size_t offset = pa - aligned_addr; - size_t size = 2 * PAGE_SIZE; - - cuda_t *cuda = (cuda_t *) - (hw_map(aligned_addr, offset + size) + offset); - - /* Initialize I/O controller */ - cuda_instance_t *cuda_instance = - cuda_init(cuda, IRQ_CUDA, cir, cir_arg); - if (cuda_instance) { - indev_t *sink = stdin_wire(); - cuda_wire(cuda_instance, sink); - } -#endif - } - /* Merge all zones to 1 big zone */ zone_merge_all(); @@ -158,4 +134,33 @@ void arch_post_smp_init(void) { + if (bootinfo.macio.addr) { + /* Initialize PIC */ + cir_t cir; + void *cir_arg; + pic_init(bootinfo.macio.addr, PAGE_SIZE, &cir, &cir_arg); + +#ifdef CONFIG_MAC_KBD + uintptr_t pa = bootinfo.macio.addr + 0x16000; + uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE); + size_t offset = pa - aligned_addr; + size_t size = 2 * PAGE_SIZE; + + cuda_t *cuda = (cuda_t *) + (hw_map(aligned_addr, offset + size) + offset); + + /* Initialize I/O controller */ + cuda_instance_t *cuda_instance = + cuda_init(cuda, IRQ_CUDA, cir, cir_arg); + if (cuda_instance) { + kbrd_instance_t *kbrd_instance = kbrd_init(); + if (kbrd_instance) { + indev_t *sink = stdin_wire(); + indev_t *kbrd = kbrd_wire(kbrd_instance, sink); + cuda_wire(cuda_instance, kbrd); + pic_enable_interrupt(IRQ_CUDA); + } + } +#endif + } } Index: kernel/genarch/Makefile.inc =================================================================== --- kernel/genarch/Makefile.inc (revision 103bb689fbd9789d2bd117068732c37b209c7772) +++ kernel/genarch/Makefile.inc (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) @@ -111,4 +111,10 @@ endif +ifeq ($(CONFIG_MAC_KBD),y) + GENARCH_SOURCES += \ + genarch/src/kbrd/kbrd.c \ + genarch/src/kbrd/scanc_mac.c +endif + ifeq ($(CONFIG_SRLN),y) GENARCH_SOURCES += \ Index: kernel/genarch/include/drivers/via-cuda/cuda.h =================================================================== --- kernel/genarch/include/drivers/via-cuda/cuda.h (revision 103bb689fbd9789d2bd117068732c37b209c7772) +++ kernel/genarch/include/drivers/via-cuda/cuda.h (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) @@ -39,7 +39,59 @@ #include #include +#include typedef struct { + uint8_t b; + uint8_t pad0[0x1ff]; + + uint8_t a; + uint8_t pad1[0x1ff]; + + uint8_t dirb; + uint8_t pad2[0x1ff]; + + uint8_t dira; + uint8_t pad3[0x1ff]; + + uint8_t t1cl; + uint8_t pad4[0x1ff]; + + uint8_t t1ch; + uint8_t pad5[0x1ff]; + + uint8_t t1ll; + uint8_t pad6[0x1ff]; + + uint8_t t1lh; + uint8_t pad7[0x1ff]; + + uint8_t t2cl; + uint8_t pad8[0x1ff]; + + uint8_t t2ch; + uint8_t pad9[0x1ff]; + + uint8_t sr; + uint8_t pad10[0x1ff]; + + uint8_t acr; + uint8_t pad11[0x1ff]; + + uint8_t pcr; + uint8_t pad12[0x1ff]; + + uint8_t ifr; + uint8_t pad13[0x1ff]; + + uint8_t ier; + uint8_t pad14[0x1ff]; + + uint8_t anh; + uint8_t pad15[0x1ff]; } cuda_t; + +enum { + CUDA_RCV_BUF_SIZE = 5 +}; typedef struct { @@ -47,4 +99,6 @@ cuda_t *cuda; indev_t *kbrdin; + uint8_t rcv_buf[CUDA_RCV_BUF_SIZE]; + SPINLOCK_DECLARE(dev_lock); } cuda_instance_t; Index: kernel/genarch/include/kbrd/scanc_mac.h =================================================================== --- kernel/genarch/include/kbrd/scanc_mac.h (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) +++ kernel/genarch/include/kbrd/scanc_mac.h (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * 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 Scan codes for Macintosh ADB keyboards. + */ + +#ifndef KERN_SCANC_MAC_H_ +#define KERN_SCANC_MAC_H_ + +#define SC_LSHIFT 0x38 +#define SC_RSHIFT 0xfd /* Not used */ +#define SC_CAPSLOCK 0xfe /* Not used */ +#define SC_SCAN_ESCAPE 0xff /* Not used */ + +#endif + +/** @} + */ Index: kernel/genarch/src/drivers/via-cuda/cuda.c =================================================================== --- kernel/genarch/src/drivers/via-cuda/cuda.c (revision 103bb689fbd9789d2bd117068732c37b209c7772) +++ kernel/genarch/src/drivers/via-cuda/cuda.c (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) @@ -1,4 +1,5 @@ /* * Copyright (c) 2006 Martin Decky + * Copyright (c) 2009 Jiri Svoboda * All rights reserved. * @@ -39,12 +40,85 @@ #include #include +#include + +static void cuda_packet_handle(cuda_instance_t *instance, size_t len); + +/** B register fields */ +enum { + TREQ = 0x08, + TACK = 0x10, + TIP = 0x20 +}; + +/** IER register fields */ +enum { + IER_SET = 0x80, + SR_INT = 0x04 +}; static irq_ownership_t cuda_claim(irq_t *irq) { - return IRQ_DECLINE; + cuda_instance_t *instance = irq->instance; + cuda_t *dev = instance->cuda; + uint8_t ifr; + + ifr = pio_read_8(&dev->ifr); + + if ((ifr & SR_INT) != 0) + return IRQ_ACCEPT; + else + return IRQ_DECLINE; } static void cuda_irq_handler(irq_t *irq) { + cuda_instance_t *instance = irq->instance; + cuda_t *dev = instance->cuda; + uint8_t b, data; + size_t pos; + + spinlock_lock(&instance->dev_lock); + + /* We have received one or more CUDA packets. Process them all. */ + while (true) { + b = pio_read_8(&dev->b); + + if ((b & TREQ) != 0) + break; /* No data */ + + pio_write_8(&dev->b, b & ~TIP); + + /* Read one packet. */ + + pos = 0; + do { + data = pio_read_8(&dev->sr); + b = pio_read_8(&dev->b); + pio_write_8(&dev->b, b ^ TACK); + + if (pos < CUDA_RCV_BUF_SIZE) + instance->rcv_buf[pos++] = data; + } while ((b & TREQ) == 0); + + pio_write_8(&dev->b, b | TACK | TIP); + + cuda_packet_handle(instance, pos); + } + + spinlock_unlock(&instance->dev_lock); +} + +static void cuda_packet_handle(cuda_instance_t *instance, size_t len) +{ + uint8_t *data = instance->rcv_buf; + + if (data[0] != 0x00 || data[1] != 0x40 || data[2] != 0x2c) + return; + + /* The packet contains one or two scancodes. */ + if (data[3] != 0xff) + indev_push_character(instance->kbrdin, data[3]); + if (data[4] != 0xff) + indev_push_character(instance->kbrdin, data[4]); } @@ -56,5 +130,7 @@ instance->cuda = dev; instance->kbrdin = NULL; - + + spinlock_initialize(&instance->dev_lock, "cuda_dev"); + irq_initialize(&instance->irq); instance->irq.devno = device_assign_devno(); @@ -72,6 +148,13 @@ void cuda_wire(cuda_instance_t *instance, indev_t *kbrdin) { + ASSERT(instance); + ASSERT(kbrdin); + + instance->kbrdin = kbrdin; + irq_register(&instance->irq); + + /* Enable SR interrupt. */ + pio_write_8(&instance->cuda->ier, IER_SET | SR_INT); } - /** @} Index: kernel/genarch/src/kbrd/kbrd.c =================================================================== --- kernel/genarch/src/kbrd/kbrd.c (revision 103bb689fbd9789d2bd117068732c37b209c7772) +++ kernel/genarch/src/kbrd/kbrd.c (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) @@ -44,4 +44,8 @@ #ifdef CONFIG_SUN_KBD #include +#endif + +#ifdef CONFIG_MAC_KBD +#include #endif Index: kernel/genarch/src/kbrd/scanc_mac.c =================================================================== --- kernel/genarch/src/kbrd/scanc_mac.c (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) +++ kernel/genarch/src/kbrd/scanc_mac.c (revision 95bc57cf68d3313bd1ab4ae930757d5fa26a00e5) @@ -0,0 +1,306 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * 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 Scan codes for Macintosh ADB keyboards. + */ + +#include +#include +#include + +/** Primary meaning of scancodes. */ +wchar_t sc_primary_map[SCANCODES] = { + [0x00] = 'a', + [0x01] = 's', + [0x02] = 'd', + [0x03] = 'f', + [0x04] = 'h', + [0x05] = 'g', + [0x06] = 'z', + [0x07] = 'x', + [0x08] = 'c', + [0x09] = 'v', + [0x0a] = U_SPECIAL, + [0x0b] = 'b', + [0x0c] = 'q', + [0x0d] = 'w', + [0x0e] = 'e', + [0x0f] = 'r', + [0x10] = 'y', + [0x11] = 't', + [0x12] = '1', + [0x13] = '2', + [0x14] = '3', + [0x15] = '4', + [0x16] = '6', + [0x17] = '5', + [0x18] = '=', + [0x19] = '9', + [0x1a] = '7', + [0x1b] = '-', + [0x1c] = '8', + [0x1d] = '0', + [0x1e] = ']', + [0x1f] = 'o', + [0x20] = 'u', + [0x21] = '[', + [0x22] = 'i', + [0x23] = 'p', + [0x24] = '\n', /* Enter */ + [0x25] = 'l', + [0x26] = 'j', + [0x27] = '\'', + [0x28] = 'k', + [0x29] = ';', + [0x2a] = '\\', + [0x2b] = ',', + [0x2c] = '/', + [0x2d] = 'n', + [0x2e] = 'm', + [0x2f] = '.', + [0x30] = '\t', /* Tab */ + [0x31] = ' ', /* Space */ + [0x32] = '`', + [0x33] = '\b', /* Backspace */ + [0x34] = U_SPECIAL, + [0x35] = U_ESCAPE, + [0x36] = U_SPECIAL, + [0x37] = U_SPECIAL, + [0x38] = U_SPECIAL, + [0x39] = U_SPECIAL, + [0x3a] = U_SPECIAL, + [0x3b] = U_LEFT_ARROW, + [0x3c] = U_RIGHT_ARROW, + [0x3d] = U_DOWN_ARROW, + [0x3e] = U_UP_ARROW, + [0x3f] = U_SPECIAL, + [0x40] = U_SPECIAL, + [0x41] = '.', /* Num Separator */ + [0x42] = U_SPECIAL, + [0x43] = '*', /* Num Times */ + [0x44] = U_SPECIAL, + [0x45] = '+', /* Num Plus */ + [0x46] = U_SPECIAL, + [0x47] = U_SPECIAL, + [0x48] = U_SPECIAL, + [0x49] = U_SPECIAL, + [0x4a] = U_SPECIAL, + [0x4b] = '/', /* Num Divide */ + [0x4c] = U_SPECIAL, + [0x4d] = U_SPECIAL, + [0x4e] = '-', /* Num Minus */ + [0x4f] = U_SPECIAL, + [0x50] = U_SPECIAL, + [0x51] = U_SPECIAL, + [0x52] = '0', /* Num Zero */ + [0x53] = '1', /* Num One */ + [0x54] = '2', /* Num Two */ + [0x55] = '3', /* Num Three */ + [0x56] = '4', /* Num Four */ + [0x57] = '5', /* Num Five */ + [0x58] = '6', /* Num Six */ + [0x59] = '7', /* Num Seven */ + [0x5a] = U_SPECIAL, + [0x5b] = '8', /* Num Eight */ + [0x5c] = '9', /* Num Nine */ + [0x5d] = U_SPECIAL, + [0x5e] = U_SPECIAL, + [0x5f] = U_SPECIAL, + [0x60] = U_SPECIAL, + [0x61] = U_SPECIAL, + [0x62] = U_SPECIAL, + [0x63] = U_SPECIAL, + [0x64] = U_SPECIAL, + [0x65] = U_SPECIAL, + [0x66] = U_SPECIAL, + [0x67] = U_SPECIAL, + [0x68] = U_SPECIAL, + [0x69] = U_SPECIAL, + [0x6a] = U_SPECIAL, + [0x6b] = U_SPECIAL, + [0x6c] = U_SPECIAL, + [0x6d] = U_SPECIAL, + [0x6e] = U_SPECIAL, + [0x6f] = U_SPECIAL, + [0x70] = U_SPECIAL, + [0x71] = U_SPECIAL, + [0x72] = U_SPECIAL, + [0x73] = U_HOME_ARROW, + [0x74] = U_PAGE_UP, + [0x75] = U_DELETE, + [0x76] = U_SPECIAL, + [0x77] = U_SPECIAL, + [0x78] = U_SPECIAL, + [0x79] = U_PAGE_DOWN, + [0x7a] = U_SPECIAL, + [0x7b] = U_SPECIAL, + [0x7c] = U_SPECIAL, + [0x7d] = U_SPECIAL, + [0x7e] = U_SPECIAL, + [0x7f] = U_SPECIAL +}; + +/** Secondary meaning of scancodes. */ +wchar_t sc_secondary_map[SCANCODES] = { + [0x00] = 'A', + [0x01] = 'S', + [0x02] = 'D', + [0x03] = 'F', + [0x04] = 'H', + [0x05] = 'G', + [0x06] = 'Z', + [0x07] = 'X', + [0x08] = 'C', + [0x09] = 'V', + [0x0a] = U_SPECIAL, + [0x0b] = 'B', + [0x0c] = 'Q', + [0x0d] = 'W', + [0x0e] = 'E', + [0x0f] = 'R', + [0x10] = 'Y', + [0x11] = 'T', + [0x12] = '!', + [0x13] = '@', + [0x14] = '#', + [0x15] = '$', + [0x16] = '^', + [0x17] = '%', + [0x18] = '+', + [0x19] = '(', + [0x1a] = '&', + [0x1b] = '_', + [0x1c] = '*', + [0x1d] = ')', + [0x1e] = '}', + [0x1f] = 'O', + [0x20] = 'U', + [0x21] = '{', + [0x22] = 'I', + [0x23] = 'P', + [0x24] = '\n', /* Enter */ + [0x25] = 'L', + [0x26] = 'J', + [0x27] = '"', + [0x28] = 'K', + [0x29] = ':', + [0x2a] = '|', + [0x2b] = '<', + [0x2c] = '?', + [0x2d] = 'N', + [0x2e] = 'M', + [0x2f] = '>', + [0x30] = '\t', /* Tab */ + [0x31] = ' ', /* Space */ + [0x32] = '~', + [0x33] = '\b', /* Backspace */ + [0x34] = U_SPECIAL, + [0x35] = U_SPECIAL, + [0x36] = U_SPECIAL, + [0x37] = U_SPECIAL, + [0x38] = U_SPECIAL, + [0x39] = U_SPECIAL, + [0x3a] = U_SPECIAL, + [0x3b] = U_SPECIAL, + [0x3c] = U_SPECIAL, + [0x3d] = U_SPECIAL, + [0x3e] = U_SPECIAL, + [0x3f] = U_SPECIAL, + [0x40] = U_SPECIAL, + [0x41] = '.', /* Num Separator */ + [0x42] = U_SPECIAL, + [0x43] = '*', /* Num Times */ + [0x44] = U_SPECIAL, + [0x45] = '+', /* Num Plus */ + [0x46] = U_SPECIAL, + [0x47] = U_SPECIAL, + [0x48] = U_SPECIAL, + [0x49] = U_SPECIAL, + [0x4a] = U_SPECIAL, + [0x4b] = '/', /* Num Divide */ + [0x4c] = U_SPECIAL, + [0x4d] = U_SPECIAL, + [0x4e] = '-', /* Num Minus */ + [0x4f] = U_SPECIAL, + [0x50] = U_SPECIAL, + [0x51] = U_SPECIAL, + [0x52] = '0', /* Num Zero */ + [0x53] = '1', /* Num One */ + [0x54] = '2', /* Num Two */ + [0x55] = '3', /* Num Three */ + [0x56] = '4', /* Num Four */ + [0x57] = '5', /* Num Five */ + [0x58] = '6', /* Num Six */ + [0x59] = '7', /* Num Seven */ + [0x5a] = U_SPECIAL, + [0x5b] = '8', /* Num Eight */ + [0x5c] = '9', /* Num Nine */ + [0x5d] = U_SPECIAL, + [0x5e] = U_SPECIAL, + [0x5f] = U_SPECIAL, + [0x60] = U_SPECIAL, + [0x61] = U_SPECIAL, + [0x62] = U_SPECIAL, + [0x63] = U_SPECIAL, + [0x64] = U_SPECIAL, + [0x65] = U_SPECIAL, + [0x66] = U_SPECIAL, + [0x67] = U_SPECIAL, + [0x68] = U_SPECIAL, + [0x69] = U_SPECIAL, + [0x6a] = U_SPECIAL, + [0x6b] = U_SPECIAL, + [0x6c] = U_SPECIAL, + [0x6d] = U_SPECIAL, + [0x6e] = U_SPECIAL, + [0x6f] = U_SPECIAL, + [0x70] = U_SPECIAL, + [0x71] = U_SPECIAL, + [0x72] = U_SPECIAL, + [0x73] = U_SPECIAL, + [0x74] = U_SPECIAL, + [0x75] = U_SPECIAL, + [0x76] = U_SPECIAL, + [0x77] = U_SPECIAL, + [0x78] = U_SPECIAL, + [0x79] = U_SPECIAL, + [0x7a] = U_SPECIAL, + [0x7b] = U_SPECIAL, + [0x7c] = U_SPECIAL, + [0x7d] = U_SPECIAL, + [0x7e] = U_SPECIAL, + [0x7f] = U_SPECIAL +}; + +/** @} + */