From fcee56c0b16536ae38f5cbb5946a458160b60dc6 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 1 Jul 1999 23:39:13 +0000 Subject: Patch from Eric Valette to clean up the previous submission. --- .../powerpc/motorola_powerpc/console/console.c | 55 +++++++++------------- .../powerpc/motorola_powerpc/console/consoleIo.h | 12 +++++ .../powerpc/motorola_powerpc/console/consoleLib.S | 14 ++++-- .../libbsp/powerpc/motorola_powerpc/console/inch.c | 51 ++++++++------------ .../powerpc/motorola_powerpc/console/keyboard.h | 12 +++++ .../powerpc/motorola_powerpc/console/polled_io.c | 18 ++++--- 6 files changed, 86 insertions(+), 76 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc/console') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c index dcf3316c69..d262c0d7a2 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c @@ -1,37 +1,24 @@ -/*-------------------------------------------------------------------------+ -| console.c v1.1 - PC386 BSP - 1997/08/07 -+--------------------------------------------------------------------------+ -| This file contains the PC386 console I/O package. -+--------------------------------------------------------------------------+ -| (C) Copyright 1997 - -| - NavIST Group - Real-Time Distributed Systems and Industrial Automation -| -| http://pandora.ist.utl.pt -| -| Instituto Superior Tecnico * Lisboa * PORTUGAL -+--------------------------------------------------------------------------+ -| Disclaimer: -| -| This file is provided "AS IS" without warranty of any kind, either -| expressed or implied. -+--------------------------------------------------------------------------+ -| This code is based on: -| console.c,v 1.4 1995/12/19 20:07:23 joel Exp - go32 BSP -| With the following copyright notice: -| ************************************************************************** -| * COPYRIGHT (c) 1989-1998. -| * On-Line Applications Research Corporation (OAR). -| * Copyright assigned to U.S. Government, 1994. -| * -| * The license and distribution terms for this file may be -| * found in found in the file LICENSE in this distribution or at -| * http://www.OARcorp.com/rtems/license.html. -| ************************************************************************** -| -| $Id$ -+--------------------------------------------------------------------------*/ - -#include +/* + * console.c -- console I/O package + * + * Copyright (C) 1999 Eric Valette. valette@crf.canon.fr + * + * This code is based on the pc386 BSP console.c so the following + * copyright also applies : + * + * (C) Copyright 1997 - + * - NavIST Group - Real-Time Distributed Systems and Industrial Automation + * + * http://pandora.ist.utl.pt + * + * Instituto Superior Tecnico * Lisboa * PORTUGAL + * The license and distribution terms for this file may be + * found in found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ + #include #include #undef __assert diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleIo.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleIo.h index 3b204ff4d6..c1d76f5a77 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleIo.h +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleIo.h @@ -1,3 +1,15 @@ +/* + * consoleIo.h -- console I/O package interface + * + * Copyright (C) 1999 Eric Valette. valette@crf.canon.fr + * + * The license and distribution terms for this file may be + * found in found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ + #ifndef __CONSOLE_IO_H #define __CONSOLE_IO_H diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleLib.S b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleLib.S index 4b42a80851..b18f018aea 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleLib.S +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/consoleLib.S @@ -1,11 +1,17 @@ /* - * $Id$ - * - * This code is loaded by the ROM loader at some arbitrary location. - * Move it to high memory so that it can load the kernel at 0x0000. + * consoleLib.S -- console I/O package utility functions. + * + * Copyright (C) 1999 Eric Valette. valette@crf.canon.fr * + * The license and distribution terms for this file may be + * found in found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ */ + /* A few utility functions, some copied from arch/ppc/lib/string.S */ + #include #include #include "asm.h" diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/inch.c b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/inch.c index 33a1eff84a..823e7180df 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/inch.c +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/inch.c @@ -1,34 +1,23 @@ -/*-------------------------------------------------------------------------+ -| inch.c v1.1 - PC386 BSP - 1997/08/07 -+--------------------------------------------------------------------------+ -| (C) Copyright 1997 - -| - NavIST Group - Real-Time Distributed Systems and Industrial Automation -| -| http://pandora.ist.utl.pt -| -| Instituto Superior Tecnico * Lisboa * PORTUGAL -+--------------------------------------------------------------------------+ -| Disclaimer: -| -| This file is provided "AS IS" without warranty of any kind, either -| expressed or implied. -+--------------------------------------------------------------------------+ -| This code is based on: -| inch.c,v 1.3 1995/12/19 20:07:25 joel Exp - go32 BSP -| With the following copyright notice: -| With the following copyright notice: -| ************************************************************************** -| * COPYRIGHT (c) 1989-1998. -| * On-Line Applications Research Corporation (OAR). -| * Copyright assigned to U.S. Government, 1994. -| * -| * The license and distribution terms for this file may be -| * found in found in the file LICENSE in this distribution or at -| * http://www.OARcorp.com/rtems/license.html. -| ************************************************************************** -| -| $Id$ -+--------------------------------------------------------------------------*/ +/* + * inch.c -- keyboard minimal driver + * + * Copyright (C) 1999 Eric Valette. valette@crf.canon.fr + * + * This code is based on the pc386 BSP inch.c so the following + * copyright also applies : + * + * (C) Copyright 1997 - + * - NavIST Group - Real-Time Distributed Systems and Industrial Automation + * + * http://pandora.ist.utl.pt + * + * Instituto Superior Tecnico * Lisboa * PORTUGAL + * The license and distribution terms for this file may be + * found in found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ #include #include diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/keyboard.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/keyboard.h index 25b1f17e67..a7cb39bbd1 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/keyboard.h +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/keyboard.h @@ -1,3 +1,15 @@ +/* + * keyboard.h -- keyboard definitions. + * + * Copyright (C) 1999 Eric Valette. valette@crf.canon.fr + * + * The license and distribution terms for this file may be + * found in found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ + #ifndef __LINUX_KEYBOARD_H #define __LINUX_KEYBOARD_H diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/polled_io.c b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/polled_io.c index 1ba154c5c3..41f0bd33a9 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/polled_io.c +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/polled_io.c @@ -1,14 +1,18 @@ /* - * arch/ppc/prepboot/console.c + * polled_io.c -- Basic input/output for early boot * - * Copyright (C) 1998 Gabriel Paubert, paubert@iram.es + * Copyright (C) 1998, 1999 Gabriel Paubert, paubert@iram.es * - * This file is based on arch/ppc/boot/{kbd,vreset}.c in previous versions - * of Linux/PPC, mostly contributed by Gary Thomas and Cort Dougan. + * Modified to compile in RTEMS development environment + * by Eric Valette * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. + * Copyright (C) 1999 Eric Valette. valette@crf.canon.fr + * + * The license and distribution terms for this file may be + * found in found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ */ #include -- cgit v1.2.3