Index: kernel/arch/sparc64/include/drivers/fhc.h =================================================================== --- kernel/arch/sparc64/include/drivers/fhc.h (revision b366a6f4b86cb7fe82fcf415965c5a7de1a59638) +++ (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: kernel/arch/sparc64/include/drivers/sgcn.h =================================================================== --- kernel/arch/sparc64/include/drivers/sgcn.h (revision b366a6f4b86cb7fe82fcf415965c5a7de1a59638) +++ (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 - -/** @} - */