Index: HelenOS.config =================================================================== --- HelenOS.config (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ HelenOS.config (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -59,5 +59,4 @@ % Machine type @ "generic" Generic Sun workstation or server -@ "serengeti" Serengeti system ! [PLATFORM=sparc64] MACHINE (choice) @@ -86,8 +85,4 @@ ! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice) -% CPU type -@ "us3" -! [PLATFORM=sparc64&MACHINE=serengeti] PROCESSOR (choice) - % RAM disk format @ "tmpfs" TMPFS image @@ -468,13 +463,4 @@ ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y) -% Support for Z8530 controller -! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic] CONFIG_Z8530 (y/n) - -% Support for Serengeti console -! [CONFIG_HID_OUT=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_PRN (y/n) - -% Support for Serengeti keyboard -! [CONFIG_HID_IN=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_KBD (y/n) - % Support for i8042 controller ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y) @@ -484,5 +470,5 @@ % Sun keyboard support -! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&(CONFIG_NS16550=y|CONFIG_Z8530=y)] CONFIG_SUN_KBD (y) +! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&CONFIG_NS16550=y] CONFIG_SUN_KBD (y) % Macintosh ADB keyboard support @@ -496,5 +482,5 @@ % Serial line input module -! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y) +! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y) % EGA support @@ -543,7 +529,4 @@ ! [PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n) -% Preserve A.OUT header in isofs.b -! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y) - % Dynamic linking support ! [PLATFORM=ia32] CONFIG_RTLD (n/y) Index: boot/Makefile.silo =================================================================== --- boot/Makefile.silo (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ boot/Makefile.silo (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -31,9 +31,5 @@ include Makefile.common -ifeq ($(CONFIG_AOUT_ISOFS_B),y) - SILO_PACKAGE = a.out -else - SILO_PACKAGE = raw -endif +SILO_PACKAGE = a.out ISOFS_B = silo/$(SILO_PACKAGE)/isofs.b Index: boot/arch/sparc64/Makefile.inc =================================================================== --- boot/arch/sparc64/Makefile.inc (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ boot/arch/sparc64/Makefile.inc (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -43,5 +43,4 @@ RD_SRVS_ESSENTIAL += \ - $(USPACE_PATH)/srv/hw/irc/fhc/fhc \ $(USPACE_PATH)/srv/hw/irc/obio/obio Index: boot/arch/sparc64/src/main.c =================================================================== --- boot/arch/sparc64/src/main.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ boot/arch/sparc64/src/main.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -182,8 +182,5 @@ * of the "/memory" node to find out which parts of memory * are used by OBP and redesign the algorithm of copying - * kernel/init tasks/ramdisk from the bootable image to memory - * (which we must do anyway because of issues with claiming the memory - * on Serengeti). - * + * kernel/init tasks/ramdisk from the bootable image to memory. */ bootinfo.physmem_start += OBP_BIAS; Index: defaults/sparc64/Makefile.config =================================================================== --- defaults/sparc64/Makefile.config (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ defaults/sparc64/Makefile.config (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -53,7 +53,4 @@ CONFIG_AP = y -# Preserve A.OUT header in isofs.b -CONFIG_AOUT_ISOFS_B = y - # Load disk drivers on startup CONFIG_START_BD = n Index: faults/sparc64/serengeti/Makefile.config =================================================================== --- defaults/sparc64/serengeti/Makefile.config (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,11 +1,0 @@ -# Machine type -MACHINE = serengeti -RDFMT = tmpfs -CONFIG_SMP = n -CONFIG_DEBUG = n -CONFIG_UDEBUG = n -CONFIG_SYMTAB = n -CONFIG_TEST = n -CONFIG_STRIP_BINARIES = y -CONFIG_OPTIMIZE_FOR_SIZE = y -CONFIG_BAREBONE = y Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ kernel/arch/sparc64/Makefile.inc (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -84,7 +84,5 @@ arch/$(KARCH)/src/drivers/tick.c \ arch/$(KARCH)/src/drivers/kbd.c \ - arch/$(KARCH)/src/drivers/sgcn.c \ arch/$(KARCH)/src/drivers/pci.c \ - arch/$(KARCH)/src/drivers/fhc.c \ arch/$(KARCH)/src/trap/$(USARCH)/interrupt.c Index: rnel/arch/sparc64/include/drivers/fhc.h =================================================================== --- kernel/arch/sparc64/include/drivers/fhc.h (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * 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_FHC_H_ -#define KERN_sparc64_FHC_H_ - -#include -#include - -typedef struct { - volatile uint32_t *uart_imap; -} fhc_t; - -extern fhc_t *central_fhc; - -extern fhc_t *fhc_init(ofw_tree_node_t *); -extern void fhc_enable_interrupt(fhc_t *, int); -extern void fhc_clear_interrupt(void *, int); - -#endif - -/** @} - */ Index: rnel/arch/sparc64/include/drivers/sgcn.h =================================================================== --- kernel/arch/sparc64/include/drivers/sgcn.h (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,155 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * 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_SGCN_H_ -#define KERN_sparc64_SGCN_H_ - -#include -#include -#include -#include -#include - -/* number of bytes in the TOC magic, including the NULL-terminator */ -#define TOC_MAGIC_BYTES 8 - -/* number of bytes in the TOC key, including the NULL-terminator */ -#define TOC_KEY_SIZE 8 - -/* maximum number of entries in the SRAM table of contents */ -#define MAX_TOC_ENTRIES 32 - -/* number of bytes in the SGCN buffer magic, including the NULL-terminator */ -#define SGCN_MAGIC_BYTES 4 - -/** - * Entry in the SRAM table of contents. Describes one segment of the SRAM - * which serves a particular purpose (e.g. OBP serial console, Solaris serial - * console, Solaris mailbox,...). - */ -typedef struct { - /** key (e.g. "OBPCONS", "SOLCONS", "SOLMBOX",...) */ - char key[TOC_KEY_SIZE]; - - /** size of the segment in bytes */ - uint32_t size; - - /** offset of the segment within SRAM */ - uint32_t offset; -} __attribute ((packed)) toc_entry_t; - -/** - * SRAM table of contents. Describes all segments within the SRAM. - */ -typedef struct { - /** hard-wired to "TOCSRAM" */ - char magic[TOC_MAGIC_BYTES]; - - /** we don't need this */ - char unused[8]; - - /** TOC entries */ - toc_entry_t keys[MAX_TOC_ENTRIES]; -} __attribute__ ((packed)) iosram_toc_t; - -/** - * SGCN buffer header. It is placed at the very beginning of the SGCN - * buffer. - */ -typedef struct { - /** hard-wired to "CON" */ - char magic[SGCN_MAGIC_BYTES]; - - /** we don't need this */ - char unused[8]; - - /** offset within the SGCN buffer of the input buffer start */ - uint32_t in_begin; - - /** offset within the SGCN buffer of the input buffer end */ - uint32_t in_end; - - /** offset within the SGCN buffer of the input buffer read pointer */ - uint32_t in_rdptr; - - /** offset within the SGCN buffer of the input buffer write pointer */ - uint32_t in_wrptr; - - /** offset within the SGCN buffer of the output buffer start */ - uint32_t out_begin; - - /** offset within the SGCN buffer of the output buffer end */ - uint32_t out_end; - - /** offset within the SGCN buffer of the output buffer read pointer */ - uint32_t out_rdptr; - - /** offset within the SGCN buffer of the output buffer write pointer */ - uint32_t out_wrptr; -} __attribute__ ((packed)) sgcn_buffer_header_t; - -typedef struct { - /** Starting address of SRAM */ - uintptr_t sram_begin; - - /** Starting address of the SGCN buffer */ - uintptr_t buffer_begin; - - /** Physical memory area */ - parea_t parea; - - /** - * Ensure that writing to the buffer and consequent - * update of the write pointer are one atomic operation. - */ - SPINLOCK_DECLARE(output_lock); - - /** - * Prevent the input buffer read/write pointers from - * getting to inconsistent state. - */ - SPINLOCK_DECLARE(input_lock); - - thread_t *thread; - indev_t *srlnin; -} sgcn_instance_t; - -extern sgcn_instance_t *sgcnin_init(void); -extern void sgcnin_wire(sgcn_instance_t *, indev_t *); -extern outdev_t *sgcnout_init(void); - -#endif - -/** @} - */ Index: kernel/arch/sparc64/src/console.c =================================================================== --- kernel/arch/sparc64/src/console.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ kernel/arch/sparc64/src/console.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -38,5 +38,4 @@ #include #include -#include #include #include @@ -89,26 +88,4 @@ } -/** Initilize I/O on the Serengeti machine. */ -static void serengeti_init(void) -{ -#ifdef CONFIG_SGCN_KBD - sgcn_instance_t *sgcn_instance = sgcnin_init(); - if (sgcn_instance) { - srln_instance_t *srln_instance = srln_init(); - if (srln_instance) { - indev_t *sink = stdin_wire(); - indev_t *srln = srln_wire(srln_instance, sink); - sgcnin_wire(sgcn_instance, srln); - } - } -#endif - -#ifdef CONFIG_SGCN_PRN - outdev_t *sgcndev = sgcnout_init(); - if (sgcndev) - stdout_wire(sgcndev); -#endif -} - /** * Initialize input/output. Auto-detects the type of machine @@ -127,9 +104,6 @@ prop = ofw_tree_getprop(aliases, "def-cn"); - if ((!prop) || (!prop->value) || (str_cmp(prop->value, "/sgcn") != 0)) { + if ((!prop) || (!prop->value)) standard_console_init(aliases); - } else { - serengeti_init(); - } } Index: rnel/arch/sparc64/src/drivers/fhc.c =================================================================== --- kernel/arch/sparc64/src/drivers/fhc.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,129 +1,0 @@ -/* - * 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 - * @brief FireHose Controller (FHC) driver. - * - * Note that this driver is a result of reverse engineering - * rather than implementation of a specification. This - * is due to the fact that the FHC documentation is not - * publicly available. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -fhc_t *central_fhc = NULL; - -/** - * I suspect this must be hardcoded in the FHC. - * If it is not, than we can read all IMAP registers - * and get the complete mapping. - */ -#define FHC_UART_INR 0x39 - -#define FHC_UART_IMAP 0x0 -#define FHC_UART_ICLR 0x4 - -#define UART_IMAP_REG 4 - -fhc_t *fhc_init(ofw_tree_node_t *node) -{ - fhc_t *fhc; - ofw_tree_property_t *prop; - - prop = ofw_tree_getprop(node, "reg"); - - if (!prop || !prop->value) - return NULL; - - size_t regs = prop->size / sizeof(ofw_central_reg_t); - if (regs + 1 < UART_IMAP_REG) - return NULL; - - ofw_central_reg_t *reg = &((ofw_central_reg_t *) prop->value)[UART_IMAP_REG]; - - uintptr_t paddr; - if (!ofw_central_apply_ranges(node->parent, reg, &paddr)) - return NULL; - - fhc = (fhc_t *) malloc(sizeof(fhc_t), FRAME_ATOMIC); - if (!fhc) - return NULL; - - fhc->uart_imap = (uint32_t *) hw_map(paddr, reg->size); - - /* - * Set sysinfo data needed by the uspace FHC driver. - */ - sysinfo_set_item_val("fhc.uart.size", NULL, reg->size); - sysinfo_set_item_val("fhc.uart.physical", NULL, paddr); - sysinfo_set_item_val("kbd.cir.fhc", NULL, 1); - - return fhc; -} - -void fhc_enable_interrupt(fhc_t *fhc, int inr) -{ - switch (inr) { - case FHC_UART_INR: - fhc->uart_imap[FHC_UART_IMAP] |= IMAP_V_MASK; - break; - default: - panic("Unexpected INR (%d).", inr); - break; - } -} - -void fhc_clear_interrupt(void *fhcp, int inr) -{ - fhc_t *fhc = (fhc_t *)fhcp; - ASSERT(fhc->uart_imap); - - switch (inr) { - case FHC_UART_INR: - fhc->uart_imap[FHC_UART_ICLR] = 0; - break; - default: - panic("Unexpected INR (%d).", inr); - break; - } -} - -/** @} - */ Index: kernel/arch/sparc64/src/drivers/kbd.c =================================================================== --- kernel/arch/sparc64/src/drivers/kbd.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ kernel/arch/sparc64/src/drivers/kbd.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -35,5 +35,4 @@ #include #include -#include #include #include @@ -51,8 +50,4 @@ #endif -#ifdef CONFIG_Z8530 -#include -#endif - #ifdef CONFIG_NS16550 #include @@ -60,90 +55,4 @@ #ifdef CONFIG_SUN_KBD - -#ifdef CONFIG_Z8530 - -static bool kbd_z8530_init(ofw_tree_node_t *node) -{ - const char *name = ofw_tree_node_name(node); - - if (str_cmp(name, "zs") != 0) - return false; - - /* - * Read 'interrupts' property. - */ - ofw_tree_property_t *prop = ofw_tree_getprop(node, "interrupts"); - if ((!prop) || (!prop->value)) { - printf("z8530: Unable to find interrupts property\n"); - return false; - } - - uint32_t interrupts = *((uint32_t *) prop->value); - - /* - * Read 'reg' property. - */ - prop = ofw_tree_getprop(node, "reg"); - if ((!prop) || (!prop->value)) { - printf("z8530: Unable to find reg property\n"); - return false; - } - - size_t size = ((ofw_fhc_reg_t *) prop->value)->size; - - uintptr_t pa; - if (!ofw_fhc_apply_ranges(node->parent, - ((ofw_fhc_reg_t *) prop->value), &pa)) { - printf("z8530: Failed to determine address\n"); - return false; - } - - inr_t inr; - cir_t cir; - void *cir_arg; - if (!ofw_fhc_map_interrupt(node->parent, - ((ofw_fhc_reg_t *) prop->value), interrupts, &inr, &cir, - &cir_arg)) { - printf("z8530: Failed to determine interrupt\n"); - return false; - } - - /* - * We need to pass aligned address to hw_map(). - * However, the physical keyboard address can - * be pretty much unaligned, depending on the - * underlying controller. - */ - uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE); - size_t offset = pa - aligned_addr; - - z8530_t *z8530 = (z8530_t *) - (hw_map(aligned_addr, offset + size) + offset); - - z8530_instance_t *z8530_instance = z8530_init(z8530, inr, cir, cir_arg); - if (z8530_instance) { - kbrd_instance_t *kbrd_instance = kbrd_init(); - if (kbrd_instance) { - indev_t *sink = stdin_wire(); - indev_t *kbrd = kbrd_wire(kbrd_instance, sink); - z8530_wire(z8530_instance, kbrd); - } - } - - /* - * This is the necessary evil until the userspace drivers are - * entirely self-sufficient. - */ - sysinfo_set_item_val("kbd", NULL, true); - sysinfo_set_item_val("kbd.inr", NULL, inr); - sysinfo_set_item_val("kbd.address.kernel", NULL, - (uintptr_t) z8530); - sysinfo_set_item_val("kbd.address.physical", NULL, pa); - sysinfo_set_item_val("kbd.type.z8530", NULL, true); - - return true; -} - -#endif /* CONFIG_Z8530 */ #ifdef CONFIG_NS16550 @@ -243,8 +152,4 @@ void kbd_init(ofw_tree_node_t *node) { -#ifdef CONFIG_Z8530 - kbd_z8530_init(node); -#endif - #ifdef CONFIG_NS16550 kbd_ns16550_init(node); Index: rnel/arch/sparc64/src/drivers/sgcn.c =================================================================== --- kernel/arch/sparc64/src/drivers/sgcn.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,359 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * 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 - * @brief SGCN driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define POLL_INTERVAL 10000 - -/* - * Physical address at which the SBBC starts. This value has been obtained - * by inspecting (using Simics) memory accesses made by OBP. It is valid - * for the Simics-simulated Serengeti machine. The author of this code is - * not sure whether this value is valid generally. - */ -#define SBBC_START 0x63000000000 - -/* offset of SRAM within the SBBC memory */ -#define SBBC_SRAM_OFFSET 0x900000 - -/* size (in bytes) of the physical memory area which will be mapped */ -#define MAPPED_AREA_SIZE (128 * 1024) - -/* magic string contained at the beginning of SRAM */ -#define SRAM_TOC_MAGIC "TOCSRAM" - -/* - * Key into the SRAM table of contents which identifies the entry - * describing the OBP console buffer. It is worth mentioning - * that the OBP console buffer is not the only console buffer - * which can be used. It is, however, used because when the kernel - * is running, the OBP buffer is not used by OBP any more but OBP - * has already made necessary arrangements so that the output will - * be read from the OBP buffer and input will go to the OBP buffer. - * Therefore HelenOS needs to make no such arrangements any more. - */ -#define CONSOLE_KEY "OBPCONS" - -/* magic string contained at the beginning of the console buffer */ -#define SGCN_BUFFER_MAGIC "CON" - -/* - * Returns a pointer to the object of a given type which is placed at the given - * offset from the SRAM beginning. - */ -#define SRAM(type, offset) ((type *) (instance->sram_begin + (offset))) - -/* Returns a pointer to the SRAM table of contents. */ -#define SRAM_TOC (SRAM(iosram_toc_t, 0)) - -/* - * Returns a pointer to the object of a given type which is placed at the given - * offset from the console buffer beginning. - */ -#define SGCN_BUFFER(type, offset) \ - ((type *) (instance->buffer_begin + (offset))) - -/** Returns a pointer to the console buffer header. */ -#define SGCN_BUFFER_HEADER (SGCN_BUFFER(sgcn_buffer_header_t, 0)) - -static void sgcn_putchar(outdev_t *, const wchar_t); - -static outdev_operations_t sgcndev_ops = { - .write = sgcn_putchar, - .redraw = NULL -}; - -static sgcn_instance_t *instance = NULL; - -/** Initialize the starting address of SRAM. - * - * The SRAM starts 0x900000 + C bytes behind the SBBC start in the - * physical memory, where C is the value read from the "iosram-toc" - * property of the "/chosen" OBP node. The sram_begin variable will - * be set to the virtual address which maps to the SRAM physical - * address. - * - */ -static void init_sram_begin(void) -{ - ASSERT(instance); - - ofw_tree_node_t *chosen = ofw_tree_lookup("/chosen"); - if (!chosen) - panic("Cannot find '/chosen'."); - - ofw_tree_property_t *iosram_toc = - ofw_tree_getprop(chosen, "iosram-toc"); - if (!iosram_toc) - panic("Cannot find property 'iosram-toc'."); - if (!iosram_toc->value) - panic("Cannot find SRAM TOC."); - - uintptr_t sram_begin_physical = SBBC_START + SBBC_SRAM_OFFSET - + *((uint32_t *) iosram_toc->value); - instance->sram_begin = hw_map(sram_begin_physical, MAPPED_AREA_SIZE); - - link_initialize(&instance->parea.link); - instance->parea.pbase = sram_begin_physical; - instance->parea.frames = SIZE2FRAMES(MAPPED_AREA_SIZE); - instance->parea.unpriv = false; - instance->parea.mapped = false; - ddi_parea_register(&instance->parea); - - sysinfo_set_item_val("sram.area.size", NULL, MAPPED_AREA_SIZE); - sysinfo_set_item_val("sram.address.physical", NULL, - sram_begin_physical); -} - -/** Get unread characters from the input queue. - * - * Check for unread characters in the input queue. - * - */ -static void sgcn_poll(sgcn_instance_t *instance) -{ - uint32_t begin = SGCN_BUFFER_HEADER->in_begin; - uint32_t end = SGCN_BUFFER_HEADER->in_end; - uint32_t size = end - begin; - - if ((instance->parea.mapped) && (!console_override)) - return; - - spinlock_lock(&instance->input_lock); - - /* We need pointers to volatile variables */ - volatile char *buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr); - volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr); - - while (*in_rdptr_ptr != *in_wrptr_ptr) { - buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - char c = *buf_ptr; - *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin; - - indev_push_character(instance->srlnin, c); - } - - spinlock_unlock(&instance->input_lock); -} - -/** Polling thread function. - * - */ -static void ksgcnpoll(void *instance) { - while (true) { - sgcn_poll(instance); - thread_usleep(POLL_INTERVAL); - } -} - -/** Initialize the starting address of the SGCN buffer. - * - * The offset of the SGCN buffer within SRAM is obtained from the - * SRAM table of contents. The table of contents contains - * information about several buffers, among which there is an OBP - * console buffer -- this one will be used as the SGCN buffer. - * - * This function also writes the offset of the SGCN buffer within SRAM - * under the sram.buffer.offset sysinfo key. - * - */ -static void sgcn_init(void) -{ - if (instance) - return; - - instance = malloc(sizeof(sgcn_instance_t), FRAME_ATOMIC); - - if (instance) { - instance->thread = thread_create(ksgcnpoll, instance, TASK, 0, - "ksgcnpoll", true); - - if (!instance->thread) { - free(instance); - instance = NULL; - return; - } - - init_sram_begin(); - - ASSERT(str_cmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0); - - /* Lookup TOC entry with the correct key */ - uint32_t i; - for (i = 0; i < MAX_TOC_ENTRIES; i++) { - if (str_cmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0) - break; - } - ASSERT(i < MAX_TOC_ENTRIES); - - instance->buffer_begin = - instance->sram_begin + SRAM_TOC->keys[i].offset; - - sysinfo_set_item_val("sram.buffer.offset", NULL, - SRAM_TOC->keys[i].offset); - - instance->srlnin = NULL; - } -} - -/** Write a single character to the SGCN output buffer - * - * Write a single character to the SGCN (circular) output buffer - * and update the output write pointer so that SGCN gets to know - * that the character has been written. - * - */ -static void sgcn_do_putchar(const char c) -{ - uint32_t begin = SGCN_BUFFER_HEADER->out_begin; - uint32_t end = SGCN_BUFFER_HEADER->out_end; - uint32_t size = end - begin; - - /* We need pointers to volatile variables */ - volatile char *buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->out_wrptr); - volatile uint32_t *out_wrptr_ptr = &(SGCN_BUFFER_HEADER->out_wrptr); - volatile uint32_t *out_rdptr_ptr = &(SGCN_BUFFER_HEADER->out_rdptr); - - /* - * Write the character and increment the write pointer modulo the - * output buffer size. Note that if we are to rewrite a character - * which has not been read by the SGCN controller yet (i.e. the output - * buffer is full), we need to wait until the controller reads some more - * characters. We wait actively, which means that all threads waiting - * for the lock are blocked. However, this situation is - * 1) rare - the output buffer is big, so filling the whole - * output buffer is improbable - * 2) short-lasting - it will take the controller only a fraction - * of millisecond to pick the unread characters up - * 3) not serious - the blocked threads are those that print something - * to user console, which is not a time-critical operation - */ - uint32_t new_wrptr = (((*out_wrptr_ptr) - begin + 1) % size) + begin; - while (*out_rdptr_ptr == new_wrptr); - - *buf_ptr = c; - *out_wrptr_ptr = new_wrptr; -} - -/** SGCN output operation - * - * Print a single character to the SGCN. Newline - * character is converted to CRLF. - * - */ -static void sgcn_putchar(outdev_t *dev, const wchar_t ch) -{ - if ((!instance->parea.mapped) || (console_override)) { - spinlock_lock(&instance->output_lock); - - if (ascii_check(ch)) { - if (ch == '\n') - sgcn_do_putchar('\r'); - sgcn_do_putchar(ch); - } else - sgcn_do_putchar(U_SPECIAL); - - spinlock_unlock(&instance->output_lock); - } -} - -/** Initialize input from the Serengeti console. - * - */ -sgcn_instance_t *sgcnin_init(void) -{ - sgcn_init(); - return instance; -} - -void sgcnin_wire(sgcn_instance_t *instance, indev_t *srlnin) -{ - ASSERT(instance); - ASSERT(srlnin); - - instance->srlnin = srlnin; - thread_ready(instance->thread); - - sysinfo_set_item_val("kbd", NULL, true); -} - -/** Initialize output to the Serengeti console. - * - */ -outdev_t *sgcnout_init(void) -{ - sgcn_init(); - if (!instance) - return NULL; - - outdev_t *sgcndev = malloc(sizeof(outdev_t), FRAME_ATOMIC); - if (!sgcndev) - return NULL; - - outdev_initialize("sgcndev", sgcndev, &sgcndev_ops); - sgcndev->data = instance; - - if (!fb_exported) { - /* - * This is the necessary evil until the userspace driver is entirely - * self-sufficient. - */ - sysinfo_set_item_val("fb.kind", NULL, 4); - - fb_exported = true; - } - - return sgcndev; -} - -/** @} - */ Index: kernel/genarch/Makefile.inc =================================================================== --- kernel/genarch/Makefile.inc (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ kernel/genarch/Makefile.inc (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -100,9 +100,4 @@ endif -ifeq ($(CONFIG_Z8530),y) - GENARCH_SOURCES += \ - genarch/src/drivers/z8530/z8530.c -endif - ifeq ($(CONFIG_VIA_CUDA),y) GENARCH_SOURCES += \ @@ -141,5 +136,4 @@ GENARCH_SOURCES += \ genarch/src/ofw/ebus.c \ - genarch/src/ofw/fhc.c \ genarch/src/ofw/pci.c \ genarch/src/ofw/sbus.c \ Index: rnel/genarch/include/drivers/z8530/z8530.h =================================================================== --- kernel/genarch/include/drivers/z8530/z8530.h (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,128 +1,0 @@ -/* - * Copyright (c) 2009 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 Zilog 8530 serial controller. - */ - -#ifndef KERN_Z8530_H_ -#define KERN_Z8530_H_ - -#include -#include -#include - -#define WR0 0 -#define WR1 1 -#define WR2 2 -#define WR3 3 -#define WR4 4 -#define WR5 5 -#define WR6 6 -#define WR7 7 -#define WR8 8 -#define WR9 9 -#define WR10 10 -#define WR11 11 -#define WR12 12 -#define WR13 13 -#define WR14 14 -#define WR15 15 - -#define RR0 0 -#define RR1 1 -#define RR2 2 -#define RR3 3 -#define RR8 8 -#define RR10 10 -#define RR12 12 -#define RR13 13 -#define RR14 14 -#define RR15 15 - -/** Reset pending TX interrupt. */ -#define WR0_TX_IP_RST (0x5 << 3) -#define WR0_ERR_RST (0x6 << 3) - -/** Receive Interrupts Disabled. */ -#define WR1_RID (0x0 << 3) -/** Receive Interrupt on First Character or Special Condition. */ -#define WR1_RIFCSC (0x1 << 3) -/** Interrupt on All Receive Characters or Special Conditions. */ -#define WR1_IARCSC (0x2 << 3) -/** Receive Interrupt on Special Condition. */ -#define WR1_RISC (0x3 << 3) -/** Parity Is Special Condition. */ -#define WR1_PISC (0x1 << 2) - -/** Rx Enable. */ -#define WR3_RX_ENABLE (0x1 << 0) -/** 8-bits per character. */ -#define WR3_RX8BITSCH (0x3 << 6) - -/** Master Interrupt Enable. */ -#define WR9_MIE (0x1 << 3) - -/** Receive Character Available. */ -#define RR0_RCA (0x1 << 0) - -/** z8530's registers. */ -typedef struct { - union { - ioport8_t ctl_b; - ioport8_t status_b; - } __attribute__ ((packed)); - uint8_t pad1; - ioport8_t data_b; - uint8_t pad2; - union { - ioport8_t ctl_a; - ioport8_t status_a; - } __attribute__ ((packed)); - uint8_t pad3; - ioport8_t data_a; -} __attribute__ ((packed)) z8530_t; - -/** Structure representing the z8530 device. */ -typedef struct { - irq_t irq; - z8530_t *z8530; - indev_t *kbrdin; -} z8530_instance_t; - -extern z8530_instance_t *z8530_init(z8530_t *, inr_t, cir_t, void *); -extern void z8530_wire(z8530_instance_t *, indev_t *); - -#endif - -/** @} - */ Index: rnel/genarch/include/ofw/fhc.h =================================================================== --- kernel/genarch/include/ofw/fhc.h (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,67 +1,0 @@ -/* - * 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. - */ - -#ifndef KERN_FHC_H_ -#define KERN_FHC_H_ - -#include -#include -#include -#include - -typedef struct { - uint64_t addr; - uint32_t size; -} __attribute__ ((packed)) ofw_fhc_reg_t; - -typedef struct { - uint64_t child_base; - uint64_t parent_base; - uint32_t size; -} __attribute__ ((packed)) ofw_fhc_range_t; - -typedef struct { - uint64_t addr; - uint32_t size; -} __attribute__ ((packed)) ofw_central_reg_t; - -typedef struct { - uint64_t child_base; - uint64_t parent_base; - uint32_t size; -} __attribute__ ((packed)) ofw_central_range_t; - -extern bool ofw_fhc_apply_ranges(ofw_tree_node_t *, ofw_fhc_reg_t *, - uintptr_t *); -extern bool ofw_central_apply_ranges(ofw_tree_node_t *, ofw_central_reg_t *, - uintptr_t *); - -extern bool ofw_fhc_map_interrupt(ofw_tree_node_t *, ofw_fhc_reg_t *, - uint32_t, int *, cir_t *, void **); - -#endif Index: rnel/genarch/src/drivers/z8530/z8530.c =================================================================== --- kernel/genarch/src/drivers/z8530/z8530.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,136 +1,0 @@ -/* - * Copyright (c) 2009 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 Zilog 8530 serial controller driver. - */ - -#include -#include -#include -#include -#include -#include - -static inline void z8530_write(ioport8_t *ctl, uint8_t reg, uint8_t val) -{ - /* - * Registers 8-15 will automatically issue the Point High - * command as their bit 3 is 1. - */ - pio_write_8(ctl, reg); /* Select register */ - pio_write_8(ctl, val); /* Write value */ -} - -static inline uint8_t z8530_read(ioport8_t *ctl, uint8_t reg) -{ - /* - * Registers 8-15 will automatically issue the Point High - * command as their bit 3 is 1. - */ - pio_write_8(ctl, reg); /* Select register */ - return pio_read_8(ctl); -} - -static irq_ownership_t z8530_claim(irq_t *irq) -{ - z8530_instance_t *instance = irq->instance; - z8530_t *dev = instance->z8530; - - if (z8530_read(&dev->ctl_a, RR0) & RR0_RCA) - return IRQ_ACCEPT; - else - return IRQ_DECLINE; -} - -static void z8530_irq_handler(irq_t *irq) -{ - z8530_instance_t *instance = irq->instance; - z8530_t *dev = instance->z8530; - - if (z8530_read(&dev->ctl_a, RR0) & RR0_RCA) { - uint8_t data = z8530_read(&dev->ctl_a, RR8); - indev_push_character(instance->kbrdin, data); - } -} - -/** Initialize z8530. */ -z8530_instance_t *z8530_init(z8530_t *dev, inr_t inr, cir_t cir, void *cir_arg) -{ - z8530_instance_t *instance - = malloc(sizeof(z8530_instance_t), FRAME_ATOMIC); - if (instance) { - instance->z8530 = dev; - instance->kbrdin = NULL; - - irq_initialize(&instance->irq); - instance->irq.devno = device_assign_devno(); - instance->irq.inr = inr; - instance->irq.claim = z8530_claim; - instance->irq.handler = z8530_irq_handler; - instance->irq.instance = instance; - instance->irq.cir = cir; - instance->irq.cir_arg = cir_arg; - } - - return instance; -} - -void z8530_wire(z8530_instance_t *instance, indev_t *kbrdin) -{ - ASSERT(instance); - ASSERT(kbrdin); - - instance->kbrdin = kbrdin; - - irq_register(&instance->irq); - - (void) z8530_read(&instance->z8530->ctl_a, RR8); - - /* - * Clear any pending TX interrupts or we never manage - * to set FHC UART interrupt state to idle. - */ - z8530_write(&instance->z8530->ctl_a, WR0, WR0_TX_IP_RST); - - /* interrupt on all characters */ - z8530_write(&instance->z8530->ctl_a, WR1, WR1_IARCSC); - - /* 8 bits per character and enable receiver */ - z8530_write(&instance->z8530->ctl_a, WR3, WR3_RX8BITSCH | WR3_RX_ENABLE); - - /* Master Interrupt Enable. */ - z8530_write(&instance->z8530->ctl_a, WR9, WR9_MIE); -} - -/** @} - */ Index: rnel/genarch/src/ofw/fhc.c =================================================================== --- kernel/genarch/src/ofw/fhc.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,137 +1,0 @@ -/* - * 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 ofw - * @{ - */ -/** - * @file - * @brief FHC 'reg' and 'ranges' properties handling. - * - */ - -#include -#include -#include -#include -#include -#include - -bool ofw_fhc_apply_ranges(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uintptr_t *pa) -{ - ofw_tree_property_t *prop; - ofw_fhc_range_t *range; - size_t ranges; - - prop = ofw_tree_getprop(node, "ranges"); - if (!prop) - return false; - - ranges = prop->size / sizeof(ofw_fhc_range_t); - range = prop->value; - - unsigned int i; - - for (i = 0; i < ranges; i++) { - if (overlaps(reg->addr, reg->size, range[i].child_base, range[i].size)) { - uintptr_t addr; - - addr = range[i].parent_base + (reg->addr - range[i].child_base); - if (!node->parent->parent) { - *pa = addr; - return true; - } - if (str_cmp(ofw_tree_node_name(node->parent), "central") != 0) - panic("Unexpected parent node: %s.", ofw_tree_node_name(node->parent)); - - ofw_central_reg_t central_reg; - - central_reg.addr = addr; - central_reg.size = reg->size; - - return ofw_central_apply_ranges(node->parent, ¢ral_reg, pa); - } - } - - return false; -} - -bool ofw_central_apply_ranges(ofw_tree_node_t *node, ofw_central_reg_t *reg, uintptr_t *pa) -{ - if (node->parent->parent) - panic("Unexpected parent node: %s.", ofw_tree_node_name(node->parent)); - - ofw_tree_property_t *prop; - ofw_central_range_t *range; - size_t ranges; - - prop = ofw_tree_getprop(node, "ranges"); - if (!prop) - return false; - - ranges = prop->size / sizeof(ofw_central_range_t); - range = prop->value; - - unsigned int i; - - for (i = 0; i < ranges; i++) { - if (overlaps(reg->addr, reg->size, range[i].child_base, range[i].size)) { - *pa = range[i].parent_base + (reg->addr - range[i].child_base); - return true; - } - } - - return false; -} - -bool -ofw_fhc_map_interrupt(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, - uint32_t interrupt, int *inr, cir_t *cir, void **cir_arg) -{ - fhc_t *fhc = NULL; - if (!node->device) { - fhc = fhc_init(node); - if (!fhc) - return false; - node->device = fhc; - central_fhc = fhc; - } - - /* - * The interrupt controller for the interrupt is the FHC itself. - */ - fhc_enable_interrupt(fhc, interrupt); - - *inr = interrupt; - *cir = fhc_clear_interrupt; - *cir_arg = fhc; - return true; -} - -/** @} - */ Index: release/Makefile =================================================================== --- release/Makefile (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ release/Makefile (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -34,5 +34,5 @@ PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \ ia64/i460GX ia64/ski mips32/GXemul mips32/msim sparc64/niagara \ - sparc64/serengeti sparc64/ultra + sparc64/ultra BZR = bzr Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/Makefile (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -153,5 +153,4 @@ ifeq ($(UARCH),sparc64) DIRS += \ - srv/hw/irc/fhc \ srv/hw/irc/obio endif Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/app/init/init.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -270,5 +270,4 @@ spawn("/srv/apic"); spawn("/srv/i8259"); - spawn("/srv/fhc"); spawn("/srv/obio"); srv_start("/srv/cuda_adb"); Index: uspace/srv/hid/fb/Makefile =================================================================== --- uspace/srv/hid/fb/Makefile (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/fb/Makefile (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -84,11 +84,4 @@ EXTRA_CFLAGS += -DNIAGARA_ENABLED endif - - ifeq ($(MACHINE),serengeti) - SOURCES += \ - sgcn.c \ - serial_console.c - EXTRA_CFLAGS += -DSGCN_ENABLED - endif endif Index: uspace/srv/hid/fb/main.c =================================================================== --- uspace/srv/hid/fb/main.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/fb/main.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -40,5 +40,4 @@ #include "msim.h" #include "ski.h" -#include "sgcn.h" #include "niagara.h" #include "main.h" @@ -92,10 +91,4 @@ } #endif -#ifdef SGCN_ENABLED - if ((!initialized) && (fb_kind == 4)) { - if (sgcn_init() == 0) - initialized = true; - } -#endif #ifdef NIAGARA_ENABLED if ((!initialized) && (fb_kind == 5)) { Index: uspace/srv/hid/fb/niagara.c =================================================================== --- uspace/srv/hid/fb/niagara.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/fb/niagara.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -29,5 +29,5 @@ */ -/** @defgroup niagarafb SGCN +/** @defgroup niagarafb * @brief userland driver of the Niagara console output * @{ Index: uspace/srv/hid/fb/niagara.h =================================================================== --- uspace/srv/hid/fb/niagara.h (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/fb/niagara.h (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -27,6 +27,6 @@ */ -/** @defgroup sgcnfb SGCN - * @brief userland driver of the Serengeti console output +/** @defgroup niagarafb + * @brief userland driver of the Niagara console output * @{ */ Index: pace/srv/hid/fb/sgcn.c =================================================================== --- uspace/srv/hid/fb/sgcn.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,150 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * Copyright (c) 2008 Martin Decky - * Copyright (c) 2008 Pavel Rimsky - * 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. - */ - -/** @defgroup sgcnfb SGCN - * @brief userland driver of the Serengeti console output - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include - -#include "serial_console.h" -#include "sgcn.h" - -#define WIDTH 80 -#define HEIGHT 24 - -/** - * Virtual address mapped to SRAM. - */ -static uintptr_t sram_virt_addr; - -/** - * SGCN buffer offset within SGCN. - */ -static uintptr_t sram_buffer_offset; - -/** - * SGCN buffer header. It is placed at the very beginning of the SGCN - * buffer. - */ -typedef struct { - /** hard-wired to "CON" */ - char magic[4]; - - /** we don't need this */ - char unused[24]; - - /** offset within the SGCN buffer of the output buffer start */ - uint32_t out_begin; - - /** offset within the SGCN buffer of the output buffer end */ - uint32_t out_end; - - /** offset within the SGCN buffer of the output buffer read pointer */ - uint32_t out_rdptr; - - /** offset within the SGCN buffer of the output buffer write pointer */ - uint32_t out_wrptr; -} __attribute__ ((packed)) sgcn_buffer_header_t; - - -/* - * Returns a pointer to the object of a given type which is placed at the given - * offset from the console buffer beginning. - */ -#define SGCN_BUFFER(type, offset) \ - ((type *) (sram_virt_addr + sram_buffer_offset + (offset))) - -/** Returns a pointer to the console buffer header. */ -#define SGCN_BUFFER_HEADER (SGCN_BUFFER(sgcn_buffer_header_t, 0)) - -/** - * Pushes the character to the SGCN serial. - * @param c character to be pushed - */ -static void sgcn_putc(char c) -{ - uint32_t begin = SGCN_BUFFER_HEADER->out_begin; - uint32_t end = SGCN_BUFFER_HEADER->out_end; - uint32_t size = end - begin; - - /* we need pointers to volatile variables */ - volatile char *buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->out_wrptr); - volatile uint32_t *out_wrptr_ptr = &(SGCN_BUFFER_HEADER->out_wrptr); - volatile uint32_t *out_rdptr_ptr = &(SGCN_BUFFER_HEADER->out_rdptr); - - uint32_t new_wrptr = (((*out_wrptr_ptr) - begin + 1) % size) + begin; - while (*out_rdptr_ptr == new_wrptr) - ; - *buf_ptr = c; - *out_wrptr_ptr = new_wrptr; -} - -/** - * Initializes the SGCN serial driver. - */ -int sgcn_init(void) -{ - sysarg_t sram_paddr; - if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK) - return -1; - - sysarg_t sram_size; - if (sysinfo_get_value("sram.area.size", &sram_size) != EOK) - return -1; - - if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK) - sram_buffer_offset = 0; - - sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size); - - if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr, - sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0) - return -1; - - serial_console_init(sgcn_putc, WIDTH, HEIGHT); - - async_set_client_connection(serial_client_connection); - return 0; -} - -/** - * @} - */ - Index: pace/srv/hid/fb/sgcn.h =================================================================== --- uspace/srv/hid/fb/sgcn.h (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * 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. - */ - -/** @defgroup sgcnfb SGCN - * @brief userland driver of the Serengeti console output - * @{ - */ - -/** @file - */ - -#ifndef FB_SGCN_H_ -#define FB_SGCN_H_ - -int sgcn_init(void); - -#endif - -/** - * @} - */ Index: uspace/srv/hid/input/Makefile =================================================================== --- uspace/srv/hid/input/Makefile (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/input/Makefile (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -49,7 +49,5 @@ port/ns16550.c \ port/pl050.c \ - port/sgcn.c \ port/ski.c \ - port/z8530.c \ proto/adb.c \ proto/mousedev.c \ Index: uspace/srv/hid/input/generic/input.c =================================================================== --- uspace/srv/hid/input/generic/input.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/input/generic/input.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -424,9 +424,5 @@ kbd_add_dev(&niagara_port, &stty_ctl); #endif -#if defined(UARCH_sparc64) && defined(MACHINE_serengeti) - kbd_add_dev(&sgcn_port, &stty_ctl); -#endif #if defined(UARCH_sparc64) && defined(MACHINE_generic) - kbd_add_dev(&z8530_port, &sun_ctl); kbd_add_dev(&ns16550_port, &sun_ctl); #endif @@ -556,5 +552,4 @@ printf("%s: HelenOS input service\n", NAME); - sysarg_t fhc; sysarg_t obio; @@ -562,6 +557,5 @@ list_initialize(&mouse_devs); - if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc)) - || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))) + if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)) irc_service = true; Index: uspace/srv/hid/input/include/kbd_port.h =================================================================== --- uspace/srv/hid/input/include/kbd_port.h (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/input/include/kbd_port.h (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -56,7 +56,5 @@ extern kbd_port_ops_t ns16550_port; extern kbd_port_ops_t pl050_port; -extern kbd_port_ops_t sgcn_port; extern kbd_port_ops_t ski_port; -extern kbd_port_ops_t z8530_port; #endif Index: uspace/srv/hid/input/port/niagara.c =================================================================== --- uspace/srv/hid/input/port/niagara.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ uspace/srv/hid/input/port/niagara.c (revision 336d2f520e09eb22615e1ef5eed791543683ae14) @@ -154,5 +154,5 @@ /** - * Thread to poll SGCN for keypresses. + * Thread to poll Niagara console for keypresses. */ static void niagara_thread_impl(void *arg) Index: pace/srv/hid/input/port/sgcn.c =================================================================== --- uspace/srv/hid/input/port/sgcn.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,205 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * Copyright (c) 2011 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 kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief SGCN (Serengeti Console) keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int sgcn_port_init(kbd_dev_t *); -static void sgcn_port_yield(void); -static void sgcn_port_reclaim(void); -static void sgcn_port_write(uint8_t data); - -kbd_port_ops_t sgcn_port = { - .init = sgcn_port_init, - .yield = sgcn_port_yield, - .reclaim = sgcn_port_reclaim, - .write = sgcn_port_write -}; - -static kbd_dev_t *kbd_dev; - -#define POLL_INTERVAL 10000 - -/** - * SGCN buffer header. It is placed at the very beginning of the SGCN - * buffer. - */ -typedef struct { - /** hard-wired to "CON" */ - char magic[4]; - - /** we don't need this */ - char unused[8]; - - /** offset within the SGCN buffer of the input buffer start */ - uint32_t in_begin; - - /** offset within the SGCN buffer of the input buffer end */ - uint32_t in_end; - - /** offset within the SGCN buffer of the input buffer read pointer */ - uint32_t in_rdptr; - - /** offset within the SGCN buffer of the input buffer write pointer */ - uint32_t in_wrptr; -} __attribute__ ((packed)) sgcn_buffer_header_t; - -/* - * Returns a pointer to the object of a given type which is placed at the given - * offset from the console buffer beginning. - */ -#define SGCN_BUFFER(type, offset) \ - ((type *) (sram_virt_addr + sram_buffer_offset + (offset))) - -/** Returns a pointer to the console buffer header. */ -#define SGCN_BUFFER_HEADER (SGCN_BUFFER(sgcn_buffer_header_t, 0)) - -/** - * Virtual address mapped to SRAM. - */ -static uintptr_t sram_virt_addr; - -/** - * SGCN buffer offset within SGCN. - */ -static uintptr_t sram_buffer_offset; - -/* polling thread */ -static void sgcn_thread_impl(void *arg); - -static volatile bool polling_disabled = false; - -/** - * Initializes the SGCN driver. - * Maps the physical memory (SRAM) and creates the polling thread. - */ -static int sgcn_port_init(kbd_dev_t *kdev) -{ - kbd_dev = kdev; - - sysarg_t sram_paddr; - if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK) - return -1; - - sysarg_t sram_size; - if (sysinfo_get_value("sram.area.size", &sram_size) != EOK) - return -1; - - if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK) - sram_buffer_offset = 0; - - sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size); - - if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr, - sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0) { - printf("SGCN: uspace driver could not map physical memory."); - return -1; - } - - thread_id_t tid; - int rc = thread_create(sgcn_thread_impl, NULL, "kbd_poll", &tid); - if (rc != 0) - return rc; - - return 0; -} - -static void sgcn_port_yield(void) -{ - polling_disabled = true; -} - -static void sgcn_port_reclaim(void) -{ - polling_disabled = false; -} - -static void sgcn_port_write(uint8_t data) -{ - (void) data; -} - -/** - * Handler of the "key pressed" event. Reads codes of all the pressed keys from - * the buffer. - */ -static void sgcn_key_pressed(void) -{ - char c; - - uint32_t begin = SGCN_BUFFER_HEADER->in_begin; - uint32_t end = SGCN_BUFFER_HEADER->in_end; - uint32_t size = end - begin; - - volatile char *buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr); - volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr); - - while (*in_rdptr_ptr != *in_wrptr_ptr) { - c = *buf_ptr; - *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin; - buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - kbd_push_data(kbd_dev, c); - } -} - -/** - * Thread to poll SGCN for keypresses. - */ -static void sgcn_thread_impl(void *arg) -{ - (void) arg; - - while (1) { - if (polling_disabled == false) - sgcn_key_pressed(); - usleep(POLL_INTERVAL); - } -} - -/** @} - */ Index: pace/srv/hid/input/port/z8530.c =================================================================== --- uspace/srv/hid/input/port/z8530.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,152 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * Copyright (c) 2011 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 kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief Z8530 keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int z8530_port_init(kbd_dev_t *); -static void z8530_port_yield(void); -static void z8530_port_reclaim(void); -static void z8530_port_write(uint8_t data); - -kbd_port_ops_t z8530_port = { - .init = z8530_port_init, - .yield = z8530_port_yield, - .reclaim = z8530_port_reclaim, - .write = z8530_port_write -}; - -static kbd_dev_t *kbd_dev; - -#define CHAN_A_STATUS 4 -#define CHAN_A_DATA 6 - -#define RR0_RCA 1 - -static irq_cmd_t z8530_cmds[] = { - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 1 - }, - { - .cmd = CMD_BTEST, - .value = RR0_RCA, - .srcarg = 1, - .dstarg = 3 - }, - { - .cmd = CMD_PREDICATE, - .value = 2, - .srcarg = 3 - }, - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 2 - }, - { - .cmd = CMD_ACCEPT - } -}; - -static irq_code_t z8530_kbd = { - sizeof(z8530_cmds) / sizeof(irq_cmd_t), - z8530_cmds -}; - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call); - -static int z8530_port_init(kbd_dev_t *kdev) -{ - kbd_dev = kdev; - - sysarg_t z8530; - if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK) - return -1; - if (!z8530) - return -1; - - sysarg_t kaddr; - if (sysinfo_get_value("kbd.address.kernel", &kaddr) != EOK) - return -1; - - sysarg_t inr; - if (sysinfo_get_value("kbd.inr", &inr) != EOK) - return -1; - - z8530_cmds[0].addr = (void *) kaddr + CHAN_A_STATUS; - z8530_cmds[3].addr = (void *) kaddr + CHAN_A_DATA; - - async_set_interrupt_received(z8530_irq_handler); - register_irq(inr, device_assign_devno(), inr, &z8530_kbd); - - return 0; -} - -static void z8530_port_yield(void) -{ -} - -static void z8530_port_reclaim(void) -{ -} - -static void z8530_port_write(uint8_t data) -{ - (void) data; -} - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call) -{ - kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); - - if (irc_service) - async_obsolete_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, - IPC_GET_IMETHOD(*call)); -} - -/** @} - */ Index: pace/srv/hw/irc/fhc/Makefile =================================================================== --- uspace/srv/hw/irc/fhc/Makefile (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 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. -# - -USPACE_PREFIX = ../../../.. -BINARY = fhc - -SOURCES = \ - fhc.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/srv/hw/irc/fhc/fhc.c =================================================================== --- uspace/srv/hw/irc/fhc/fhc.c (revision d2fac08c799595e851bf16ef460d21c3653116de) +++ (revision ) @@ -1,161 +1,0 @@ -/* - * Copyright (c) 2009 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 fhc - * @{ - */ - -/** - * @file fhc.c - * @brief FHC bus controller driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NAME "fhc" - -#define FHC_UART_INR 0x39 - -#define FHC_UART_IMAP 0x0 -#define FHC_UART_ICLR 0x4 - -static void *fhc_uart_phys; -static volatile uint32_t *fhc_uart_virt; -static size_t fhc_uart_size; - -/** Handle one connection to fhc. - * - * @param iid Hash of the request that opened the connection. - * @param icall Call data of the request that opened the connection. - * @param arg Local argument. - */ -static void fhc_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) -{ - ipc_callid_t callid; - ipc_call_t call; - - /* - * Answer the first IPC_M_CONNECT_ME_TO call. - */ - async_answer_0(iid, EOK); - - while (1) { - int inr; - - callid = async_get_call(&call); - switch (IPC_GET_IMETHOD(call)) { - case IRC_ENABLE_INTERRUPT: - /* Noop */ - async_answer_0(callid, EOK); - break; - case IRC_CLEAR_INTERRUPT: - inr = IPC_GET_ARG1(call); - switch (inr) { - case FHC_UART_INR: - fhc_uart_virt[FHC_UART_ICLR] = 0; - async_answer_0(callid, EOK); - break; - default: - async_answer_0(callid, ENOTSUP); - break; - } - break; - default: - async_answer_0(callid, EINVAL); - break; - } - } -} - -/** Initialize the FHC driver. - * - * So far, the driver heavily depends on information provided by the kernel via - * sysinfo. In the future, there should be a standalone FHC driver. - */ -static bool fhc_init(void) -{ - sysarg_t paddr; - - if ((sysinfo_get_value("fhc.uart.physical", &paddr) != EOK) - || (sysinfo_get_value("fhc.uart.size", &fhc_uart_size) != EOK)) { - printf(NAME ": no FHC UART registers found\n"); - return false; - } - - fhc_uart_phys = (void *) paddr; - fhc_uart_virt = as_get_mappable_page(fhc_uart_size); - - int flags = AS_AREA_READ | AS_AREA_WRITE; - int retval = physmem_map(fhc_uart_phys, (void *) fhc_uart_virt, - ALIGN_UP(fhc_uart_size, PAGE_SIZE) >> PAGE_WIDTH, flags); - - if (retval < 0) { - printf("%s: Error mapping FHC UART registers\n", NAME); - return false; - } - - printf("%s: FHC UART registers at %p, %zu bytes\n", NAME, - fhc_uart_phys, fhc_uart_size); - - async_set_client_connection(fhc_connection); - service_register(SERVICE_IRC); - - return true; -} - -int main(int argc, char **argv) -{ - printf("%s: HelenOS FHC bus controller driver\n", NAME); - - if (!fhc_init()) - return -1; - - printf("%s: Accepting connections\n", NAME); - task_retval(0); - async_manager(); - - /* Never reached */ - return 0; -} - -/** - * @} - */