From de49de66e129874d278d4b841595d0bbecd83329 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 2 Oct 2008 17:27:07 +0000 Subject: 2008-10-02 Joel Sherrill * console/config.c, console/console.c, console/console.h, console/ns16550cfg.c, console/ns16550cfg.h, include/bsp.h, include/tm27.h, irq/irq_init.c, irq/openpic_xxx_irq.c, pci/no_host_bridge.c: File head clean up. * console/debugio.c: Removed. --- c/src/lib/libbsp/powerpc/ep1a/ChangeLog | 8 ++ c/src/lib/libbsp/powerpc/ep1a/console/config.c | 2 +- c/src/lib/libbsp/powerpc/ep1a/console/console.c | 79 +------------- c/src/lib/libbsp/powerpc/ep1a/console/console.h | 16 --- c/src/lib/libbsp/powerpc/ep1a/console/debugio.c | 113 --------------------- c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c | 6 +- c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h | 18 +--- c/src/lib/libbsp/powerpc/ep1a/include/bsp.h | 3 +- c/src/lib/libbsp/powerpc/ep1a/include/tm27.h | 2 +- c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c | 5 +- .../lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c | 4 +- c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c | 2 +- 12 files changed, 22 insertions(+), 236 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/ep1a/console/debugio.c (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index dd2aa82161..cfbb423f67 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,3 +1,11 @@ +2008-10-02 Joel Sherrill + + * console/config.c, console/console.c, console/console.h, + console/ns16550cfg.c, console/ns16550cfg.h, include/bsp.h, + include/tm27.h, irq/irq_init.c, irq/openpic_xxx_irq.c, + pci/no_host_bridge.c: File head clean up. + * console/debugio.c: Removed. + 2008-10-02 Joel Sherrill * preinstall.am: Regenerated. diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/config.c b/c/src/lib/libbsp/powerpc/ep1a/console/config.c index 923f9f8ef5..f511077bb8 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/config.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/config.c @@ -1,7 +1,7 @@ /* * This file contains the TTY driver table for the EP1A * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/console.c b/c/src/lib/libbsp/powerpc/ep1a/console/console.c index 8c0367c7f6..6ea68b436d 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/console.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/console.c @@ -1,4 +1,4 @@ -/*XXX +/* * This file contains the TTY driver for the ep1a * * This driver uses the termios pseudo driver. @@ -241,83 +241,6 @@ rtems_device_driver console_initialize( return RTEMS_SUCCESSFUL; } -#if 0 -/* PAGE - * - * DEBUG_puts - * - * This should be safe in the event of an error. It attempts to ensure - * that no TX empty interrupts occur while it is doing polled IO. Then - * it restores the state of that external interrupt. - * - * Input parameters: - * string - pointer to debug output string - * - * Output parameters: NONE - * - * Return values: NONE - */ - -void DEBUG_puts( - char *string -) -{ - char *s; - unsigned32 Irql; - - rtems_interrupt_disable(Irql); - - for ( s = string ; *s ; s++ ) - { - Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> - deviceWritePolled(Console_Port_Minor, *s); - } - - rtems_interrupt_enable(Irql); -} - -/* PAGE - * - * DEBUG_puth - * - * This should be safe in the event of an error. It attempts to ensure - * that no TX empty interrupts occur while it is doing polled IO. Then - * it restores the state of that external interrupt. - * - * Input parameters: - * ulHexNum - value to display - * - * Output parameters: NONE - * - * Return values: NONE - */ -void -DEBUG_puth( - unsigned32 ulHexNum - ) -{ - unsigned long i,d; - unsigned32 Irql; - - rtems_interrupt_disable(Irql); - - Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> - deviceWritePolled(Console_Port_Minor, '0'); - Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> - deviceWritePolled(Console_Port_Minor, 'x'); - - for(i=32;i;) - { - i-=4; - d=(ulHexNum>>i)&0xf; - Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> - deviceWritePolled(Console_Port_Minor, - (d<=9) ? d+'0' : d+'a'-0xa); - } - - rtems_interrupt_enable(Irql); -} -#endif /* const char arg to be compatible with BSP_output_char decl. */ void diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/console.h b/c/src/lib/libbsp/powerpc/ep1a/console/console.h index ee26244212..5dbda53733 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/console.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/console.h @@ -1,22 +1,6 @@ /* - * This file contains the TTY driver table definition for the PPCn_60x - * * This driver uses the termios pseudo driver. * - * COPYRIGHT (c) 1998 by Radstone Technology - * - * - * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK - * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU. - * - * You are hereby granted permission to use, copy, modify, and distribute - * this file, provided that this notice, plus the above copyright notice - * and disclaimer, appears in all copies. Radstone Technology will provide - * no support for this code. - * - * * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/debugio.c b/c/src/lib/libbsp/powerpc/ep1a/console/debugio.c deleted file mode 100644 index f38f51ee9c..0000000000 --- a/c/src/lib/libbsp/powerpc/ep1a/console/debugio.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * This file contains the debug IO support. - * - * COPYRIGHT (c) 1998 by Radstone Technology - * - * - * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK - * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU. - * - * You are hereby granted permission to use, copy, modify, and distribute - * this file, provided that this notice, plus the above copyright notice - * and disclaimer, appears in all copies. Radstone Technology will provide - * no support for this code. - * - * COPYRIGHT (c) 1989-1997. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * debugio.c,v 1.2.4.1 2003/09/04 18:45:11 joel Exp - */ - -#include -#include -#include -#include -#include - -#include - -/* - * Load configuration table - */ - -extern console_data Console_Port_Data[]; -extern rtems_device_minor_number Console_Port_Minor; - -/* PAGE - * - * DEBUG_puts - * - * This should be safe in the event of an error. It attempts to ensure - * that no TX empty interrupts occur while it is doing polled IO. Then - * it restores the state of that external interrupt. - * - * Input parameters: - * string - pointer to debug output string - * - * Output parameters: NONE - * - * Return values: NONE - */ - -void DEBUG_puts( - char *string -) -{ - char *s; - unsigned32 Irql; - - rtems_interrupt_disable(Irql); - - for ( s = string ; *s ; s++ ) { - Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> - deviceWritePolled(Console_Port_Minor, *s); - } - - rtems_interrupt_enable(Irql); -} - -/* PAGE - * - * DEBUG_puth - * - * This should be safe in the event of an error. It attempts to ensure - * that no TX empty interrupts occur while it is doing polled IO. Then - * it restores the state of that external interrupt. - * - * Input parameters: - * ulHexNum - value to display - * - * Output parameters: NONE - * - * Return values: NONE - */ - -void DEBUG_puth( - unsigned32 ulHexNum -) -{ - unsigned long i,d; - unsigned32 Irql; - void (*poll)(int minor, char cChar); - - poll = Console_Port_Tbl[Console_Port_Minor].pDeviceFns->deviceWritePolled; - - rtems_interrupt_disable(Irql); - - (*poll)(Console_Port_Minor, '0'); - (*poll)(Console_Port_Minor, 'x'); - - for ( i=32 ; i ; ) { - i -= 4; - d = (ulHexNum>>i)&0xf; - (*poll)(Console_Port_Minor, (d<=9) ? d+'0' : d+'a'-0xa); - } - rtems_interrupt_enable(Irql); -} - diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c index a91bc0a7a3..1a75435f37 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c @@ -1,7 +1,7 @@ /* * This include file contains all console driver definations for the nc16550 * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -17,8 +17,8 @@ typedef struct uart_reg { - unsigned char reg; - unsigned char pad[7]; + unsigned char reg; + unsigned char pad[7]; } uartReg; uint8_t Read_ns16550_register( diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h index 4f4c9955cf..0d8e63d180 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h @@ -1,21 +1,7 @@ -/* nc16550cfg.h - * +/* * This include file contains all console driver definations for the nc16550 * - * COPYRIGHT (c) 1998 by Radstone Technology - * - * - * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK - * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU. - * - * You are hereby granted permission to use, copy, modify, and distribute - * this file, provided that this notice, plus the above copyright notice - * and disclaimer, appears in all copies. Radstone Technology will provide - * no support for this code. - * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h index b51dc4cd39..c0ed8f11ea 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h @@ -1,6 +1,5 @@ /* - * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h b/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h index c3bb2732eb..fa76ce4998 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h +++ b/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c b/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c index b9ed2ccc47..7a6ed9348f 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c @@ -1,5 +1,4 @@ -/* irq_init.c - * +/* * This file contains the implementation of rtems initialization * related to interrupt handling. * @@ -11,7 +10,7 @@ * Till Straumann , 12/20/2001: * Use the new interface to openpic_init * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be diff --git a/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c b/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c index 791500083b..63226173fc 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c +++ b/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c @@ -1,6 +1,6 @@ /* - * - * This file contains the i8259/openpic-specific implementation of the function described in irq.h + * This file contains the i8259/openpic-specific implementation of + * the function described in irq.h * * Copyright (C) 1998, 1999 valette@crf.canon.fr * diff --git a/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c b/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c index 8f48b1e350..5c3fe4308b 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c +++ b/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be -- cgit v1.2.3