From 957d886a8f7799f8ef9b30f38bd6ff8e3971e2c9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 11 Sep 2006 21:42:23 +0000 Subject: 2006-09-11 Joel Sherrill * libmisc/mw-fb/mw_fb.c, libmisc/mw-fb/mw_fb.h, libmisc/mw-fb/mw_uid.c, libmisc/mw-fb/mw_uid.h: Remove warning. --- cpukit/ChangeLog | 5 ++ cpukit/libmisc/mw-fb/mw_fb.c | 101 ++++++++----------------------------- cpukit/libmisc/mw-fb/mw_fb.h | 39 +++----------- cpukit/libmisc/mw-fb/mw_uid.c | 115 ++++-------------------------------------- cpukit/libmisc/mw-fb/mw_uid.h | 41 ++++----------- 5 files changed, 53 insertions(+), 248 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 2130f4f6a9..738e3bf036 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2006-09-11 Joel Sherrill + + * libmisc/mw-fb/mw_fb.c, libmisc/mw-fb/mw_fb.h, libmisc/mw-fb/mw_uid.c, + libmisc/mw-fb/mw_uid.h: Remove warning. + 2006-09-11 Jerry Needell * libnetworking/netinet/in_cksum.c: Joel should have used int32_t not diff --git a/cpukit/libmisc/mw-fb/mw_fb.c b/cpukit/libmisc/mw-fb/mw_fb.c index 7ea715a18f..5f3e3e03f4 100644 --- a/cpukit/libmisc/mw-fb/mw_fb.c +++ b/cpukit/libmisc/mw-fb/mw_fb.c @@ -1,76 +1,16 @@ /* -///////////////////////////////////////////////////////////////////////////// -// $Header$ -// -// Copyright (c) 2000 - Rosimildo da Silva -// -// MODULE DESCRIPTION: -// Wrapper API around the ioctls calls for the Micro FrameBuffer -// interface for Embedded Systems -// -// All functions returns 0 on success. Any other value should be -// decoded as an error. A list of errors will be created over time. -// -// MODIFICATION/HISTORY: -// -// $Log$ -// Revision 1.3 2004/04/15 13:24:46 ralf -// Remove stray white spaces. -// -// Revision 1.2 2003/07/08 08:38:48 ralf -// 2003-07-08 Ralf Corsepius -// -// * capture/capture-cli.c: Add config-header support. -// * capture/capture.c: Add config-header support. -// * cpuuse/cpuuse.c: Add config-header support. -// * devnull/devnull.c: Add config-header support. -// * dummy/dummy.c: Add config-header support. -// * dumpbuf/dumpbuf.c: Add config-header support. -// * monitor/mon-command.c: Add config-header support. -// * monitor/mon-config.c: Add config-header support. -// * monitor/mon-dname.c: Add config-header support. -// * monitor/mon-driver.c: Add config-header support. -// * monitor/mon-extension.c: Add config-header support. -// * monitor/mon-itask.c: Add config-header support. -// * monitor/mon-manager.c: Add config-header support. -// * monitor/mon-monitor.c: Add config-header support. -// * monitor/mon-mpci.c: Add config-header support. -// * monitor/mon-object.c: Add config-header support. -// * monitor/mon-prmisc.c: Add config-header support. -// * monitor/mon-queue.c: Add config-header support. -// * monitor/mon-server.c: Add config-header support. -// * monitor/mon-symbols.c: Add config-header support. -// * monitor/mon-task.c: Add config-header support. -// * mw-fb/mw_fb.c: Add config-header support. -// * mw-fb/mw_uid.c: Add config-header support. -// * rtmonuse/rtmonuse.c: Add config-header support. -// * serdbg/serdbg.c: Add config-header support. -// * serdbg/serdbgio.c: Add config-header support. -// * serdbg/termios_printk.c: Add config-header support. -// * shell/cmds.c: Add config-header support. -// * stackchk/check.c: Add config-header support. -// * untar/untar.c: Add config-header support. -// -// Revision 1.1 2000/08/30 08:21:24 joel -// 2000-08-26 Rosimildo da Silva -// -// * Added generic Micro FrameBuffer interface for MicroWindows. -// This interface allows MicroWindows to under RTEMS. A sample -// driver has been developed for the pc386 BSP. See -// pc386/fb_vga.c as a sample. -// * Added Uniform Input Device interface for MicroWindows. -// See PC386 bsp for sample drivers for mouse and keyboard (console). -// * mw-bf: New directory. -// * Makefile.am, configure.in, wrapup/Makefile.am: Account for mw-fb. -// * mw-fb/Makefile.am: New file. -// * mw-fb/mw_fb.c: New file. -// * mw-fb/mw_fb.h: New file. -// * mw-fb/mw_uid.c: New file. -// * mw-fb/mw_uid.h: New file. -// -// -///////////////////////////////////////////////////////////////////////////// -*/ + * + * Copyright (c) 2000 - Rosimildo da Silva + * + * MODULE DESCRIPTION: + * Wrapper API around the ioctls calls for the Micro FrameBuffer + * interface for Embedded Systems + * + * All functions returns 0 on success. Any other value should be + * decoded as an error. A list of errors will be created over time. + * + * $Id$ + */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -91,8 +31,6 @@ return ioctl( fd, FB_SCREENINFO, ( void *)info); } - - /* * Returns the mode of the graphics subsystem */ @@ -104,7 +42,6 @@ return ioctl( fd, FB_EXEC_FUNCTION , ( void *)&exec ); } - /* * Returns the current collor pallete */ @@ -113,7 +50,6 @@ return ioctl( fd, FB_GETPALETTE, ( void *)color ); } - /* * Set the current collor pallete */ @@ -134,7 +70,6 @@ return ioctl( fd, FB_EXEC_FUNCTION , ( void *)&exec ); } - /* * Switch the device back to the default mode of operation. * In most cases it put the device back to plain text mode. @@ -161,12 +96,16 @@ } - /* - * This function maps the physical ( kernel mode ) address of the framebuffer device - * and maps it to the user space address. + * This function maps the physical ( kernel mode ) address of the framebuffer + * device and maps it to the user space address. */ - int ufb_mmap_to_user_space( int fd, void **fb_addr, void *physical_addr, unsigned long size ) + int ufb_mmap_to_user_space( + int fd, + void **fb_addr, + void *physical_addr, + unsigned long size + ) { #ifdef __rtems__ /* RTEMS runs in ring 0, and there is no distinction between diff --git a/cpukit/libmisc/mw-fb/mw_fb.h b/cpukit/libmisc/mw-fb/mw_fb.h index fb7b6f6170..c48ae72783 100644 --- a/cpukit/libmisc/mw-fb/mw_fb.h +++ b/cpukit/libmisc/mw-fb/mw_fb.h @@ -1,35 +1,12 @@ /* -///////////////////////////////////////////////////////////////////////////// -// $Header$ -// -// Copyright (c) 2000 - Rosimildo da Silva -// -// MODULE DESCRIPTION: -// Micro FrameBuffer interface for Embedded Systems. -// -// MODIFICATION/HISTORY: -// -// $Log$ -// Revision 1.1 2000/08/30 08:21:24 joel -// 2000-08-26 Rosimildo da Silva -// -// * Added generic Micro FrameBuffer interface for MicroWindows. -// This interface allows MicroWindows to under RTEMS. A sample -// driver has been developed for the pc386 BSP. See -// pc386/fb_vga.c as a sample. -// * Added Uniform Input Device interface for MicroWindows. -// See PC386 bsp for sample drivers for mouse and keyboard (console). -// * mw-bf: New directory. -// * Makefile.am, configure.in, wrapup/Makefile.am: Account for mw-fb. -// * mw-fb/Makefile.am: New file. -// * mw-fb/mw_fb.c: New file. -// * mw-fb/mw_fb.h: New file. -// * mw-fb/mw_uid.c: New file. -// * mw-fb/mw_uid.h: New file. -// -// -///////////////////////////////////////////////////////////////////////////// -*/ + * Copyright (c) 2000 - Rosimildo da Silva + * + * MODULE DESCRIPTION: + * Micro FrameBuffer interface for Embedded Systems. + * + * $Id$ + */ + #ifndef _MW_FB_H #define _MW_FB_H diff --git a/cpukit/libmisc/mw-fb/mw_uid.c b/cpukit/libmisc/mw-fb/mw_uid.c index 07cfca5571..8e1742ab73 100644 --- a/cpukit/libmisc/mw-fb/mw_uid.c +++ b/cpukit/libmisc/mw-fb/mw_uid.c @@ -1,108 +1,15 @@ /* -///////////////////////////////////////////////////////////////////////////// -// $Header$ -// -// Copyright (c) 2000 - Rosimildo da Silva -// -// MODULE DESCRIPTION: -// This module implements the input devices interface used by MicroWindows -// in an embedded system environment. -// It uses the RTEMS message queue as the repository for the messages posted -// by the devices registered. -// -// MODIFICATION/HISTORY: -// -// $Log$ -// Revision 1.6 2004/03/26 06:59:18 ralf -// 2004-03-26 Ralf Corsepius -// -// * libmisc/capture/capture-cli.c, libmisc/capture/capture.c, -// libmisc/capture/capture.h, libmisc/cpuuse/cpuuse.c, -// libmisc/devnull/devnull.c, libmisc/fsmount/fsmount.h, -// libmisc/monitor/mon-config.c, libmisc/monitor/mon-dname.c, -// libmisc/monitor/mon-driver.c, libmisc/monitor/mon-extension.c, -// libmisc/monitor/mon-itask.c, libmisc/monitor/mon-monitor.c, -// libmisc/monitor/mon-mpci.c, libmisc/monitor/mon-object.c, -// libmisc/monitor/mon-prmisc.c, libmisc/monitor/mon-queue.c, -// libmisc/monitor/mon-server.c, libmisc/monitor/mon-symbols.c, -// libmisc/monitor/monitor.h, libmisc/monitor/symbols.h, -// libmisc/mw-fb/mw_uid.c, libmisc/rtmonuse/rtmonuse.c, -// libmisc/serdbg/serdbg.h, libmisc/serdbg/serdbgio.c, -// libmisc/serdbg/termios_printk.c, libmisc/serdbg/termios_printk.h, -// libmisc/shell/shell.c, libmisc/shell/shell.h, libmisc/stackchk/check.c, -// libmisc/stackchk/internal.h: Convert to using c99 fixed size types. -// -// Revision 1.5 2003/07/08 08:38:48 ralf -// 2003-07-08 Ralf Corsepius -// -// * capture/capture-cli.c: Add config-header support. -// * capture/capture.c: Add config-header support. -// * cpuuse/cpuuse.c: Add config-header support. -// * devnull/devnull.c: Add config-header support. -// * dummy/dummy.c: Add config-header support. -// * dumpbuf/dumpbuf.c: Add config-header support. -// * monitor/mon-command.c: Add config-header support. -// * monitor/mon-config.c: Add config-header support. -// * monitor/mon-dname.c: Add config-header support. -// * monitor/mon-driver.c: Add config-header support. -// * monitor/mon-extension.c: Add config-header support. -// * monitor/mon-itask.c: Add config-header support. -// * monitor/mon-manager.c: Add config-header support. -// * monitor/mon-monitor.c: Add config-header support. -// * monitor/mon-mpci.c: Add config-header support. -// * monitor/mon-object.c: Add config-header support. -// * monitor/mon-prmisc.c: Add config-header support. -// * monitor/mon-queue.c: Add config-header support. -// * monitor/mon-server.c: Add config-header support. -// * monitor/mon-symbols.c: Add config-header support. -// * monitor/mon-task.c: Add config-header support. -// * mw-fb/mw_fb.c: Add config-header support. -// * mw-fb/mw_uid.c: Add config-header support. -// * rtmonuse/rtmonuse.c: Add config-header support. -// * serdbg/serdbg.c: Add config-header support. -// * serdbg/serdbgio.c: Add config-header support. -// * serdbg/termios_printk.c: Add config-header support. -// * shell/cmds.c: Add config-header support. -// * stackchk/check.c: Add config-header support. -// * untar/untar.c: Add config-header support. -// -// Revision 1.4 2002/01/04 18:32:48 joel -// 2002-01-04 Ralf Corsepius -// -// * mw-fb/mw_uid.c: Apply rtems_set_errno_and_return_minus_one. -// -// Revision 1.3 2000/11/30 14:36:46 joel -// 2000-11-30 Joel Sherrill -// -// * mw-fb/mw_uid.c: Removed unnecessary dependency on . -// -// Revision 1.2 2000/08/30 17:12:55 joel -// 2000-08-30 Joel Sherrill -// -// * Many files: Moved posix/include/rtems/posix/seterr.h to -// score/include/rtems/seterr.h so it would be available within -// all APIs. -// -// Revision 1.1 2000/08/30 08:21:24 joel -// 2000-08-26 Rosimildo da Silva -// -// * Added generic Micro FrameBuffer interface for MicroWindows. -// This interface allows MicroWindows to under RTEMS. A sample -// driver has been developed for the pc386 BSP. See -// pc386/fb_vga.c as a sample. -// * Added Uniform Input Device interface for MicroWindows. -// See PC386 bsp for sample drivers for mouse and keyboard (console). -// * mw-bf: New directory. -// * Makefile.am, configure.in, wrapup/Makefile.am: Account for mw-fb. -// * mw-fb/Makefile.am: New file. -// * mw-fb/mw_fb.c: New file. -// * mw-fb/mw_fb.h: New file. -// * mw-fb/mw_uid.c: New file. -// * mw-fb/mw_uid.h: New file. -// -// -///////////////////////////////////////////////////////////////////////////// -*/ + * + * Copyright (c) 2000 - Rosimildo da Silva + * + * MODULE DESCRIPTION: + * This module implements the input devices interface used by MicroWindows + * in an embedded system environment. + * It uses the RTEMS message queue as the repository for the messages posted + * by the devices registered. + * + * $Id$ + */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/cpukit/libmisc/mw-fb/mw_uid.h b/cpukit/libmisc/mw-fb/mw_uid.h index 2bfc258057..867a28e2e5 100644 --- a/cpukit/libmisc/mw-fb/mw_uid.h +++ b/cpukit/libmisc/mw-fb/mw_uid.h @@ -1,36 +1,13 @@ /* -///////////////////////////////////////////////////////////////////////////// -// $Header$ -// -// Copyright (c) 2000 - Rosimildo da Silva -// -// MODULE DESCRIPTION: -// This module defines the interface for input devices used by MicroWindows -// in an embedded system environment. -// -// MODIFICATION/HISTORY: -// -// $Log$ -// Revision 1.1 2000/08/30 08:21:24 joel -// 2000-08-26 Rosimildo da Silva -// -// * Added generic Micro FrameBuffer interface for MicroWindows. -// This interface allows MicroWindows to under RTEMS. A sample -// driver has been developed for the pc386 BSP. See -// pc386/fb_vga.c as a sample. -// * Added Uniform Input Device interface for MicroWindows. -// See PC386 bsp for sample drivers for mouse and keyboard (console). -// * mw-bf: New directory. -// * Makefile.am, configure.in, wrapup/Makefile.am: Account for mw-fb. -// * mw-fb/Makefile.am: New file. -// * mw-fb/mw_fb.c: New file. -// * mw-fb/mw_fb.h: New file. -// * mw-fb/mw_uid.c: New file. -// * mw-fb/mw_uid.h: New file. -// -// -///////////////////////////////////////////////////////////////////////////// -*/ + * Copyright (c) 2000 - Rosimildo da Silva + * + * MODULE DESCRIPTION: + * This module defines the interface for input devices used by MicroWindows + * in an embedded system environment. + * + * $Id$ + */ + #ifndef _MW_UID_H #define _MW_UID_H -- cgit v1.2.3