From 8ae4e430b21973bae9a6bc26b6fd5e08bd07c4c7 Mon Sep 17 00:00:00 2001 From: bernie Date: Fri, 8 Aug 2008 10:54:40 +0000 Subject: [PATCH] Fix headers and license info in several places git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1578 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/drv/lcd_gfx.h | 25 +++++++++ bertos/emul/switch_i386.S | 34 ++++++++++-- bertos/emul/switch_win32.s | 34 ++++++++++-- bertos/emul/switch_x86_64.s | 57 ++++++++++---------- bertos/gfx/charts.c | 37 ++----------- bertos/gfx/text.c | 100 +----------------------------------- bertos/gfx/text_format.c | 74 +------------------------- bertos/mware/rle.c | 16 ------ bertos/mware/rle.h | 20 +------- 9 files changed, 120 insertions(+), 277 deletions(-) diff --git a/bertos/drv/lcd_gfx.h b/bertos/drv/lcd_gfx.h index d7f3cec8..f8cb4fae 100644 --- a/bertos/drv/lcd_gfx.h +++ b/bertos/drv/lcd_gfx.h @@ -1,6 +1,31 @@ /** * \file * * - * \brief i386 context switch - * * \version $Id$ - * * \author Bernie Innocenti + * + * \brief i386 context switch */ diff --git a/bertos/emul/switch_win32.s b/bertos/emul/switch_win32.s index f68fcd80..c258f6ef 100644 --- a/bertos/emul/switch_win32.s +++ b/bertos/emul/switch_win32.s @@ -1,16 +1,40 @@ -/*! +/** * \file * * - * \brief i386 context switch for WIN32 - * * \version $Id$ - * * \author Bernie Innocenti + * + * \brief i386 context switch for WIN32 */ !!!!!! THIS FILE HAS NOT BEEN REVISED FOR THE NEW SCHEDULER API !!!!!! diff --git a/bertos/emul/switch_x86_64.s b/bertos/emul/switch_x86_64.s index df511d66..61859834 100644 --- a/bertos/emul/switch_x86_64.s +++ b/bertos/emul/switch_x86_64.s @@ -1,41 +1,40 @@ -/*! +/** * \file * + * This file is part of BeRTOS. * - * \brief i386 context switch + * Bertos is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * \version $Id$ - * - * \author Bernie Innocenti - */ - -/* - * $Log$ - * Revision 1.4 2006/09/20 14:02:49 marco - * C-style comment. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * Revision 1.3 2006/02/24 01:35:40 bernie - * Update for new emulator. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * Revision 1.2 2006/02/24 01:17:05 bernie - * Update for new emulator. + * As a special exception, you may use this file as part of a free software + * library without restriction. Specifically, if other files instantiate + * templates or use macros or inline functions from this file, or you compile + * this file and link it with other files to produce an executable, this + * file does not by itself cause the resulting executable to be covered by + * the GNU General Public License. This exception does not however + * invalidate any other reasons why the executable file might be covered by + * the GNU General Public License. * - * Revision 1.1 2005/11/27 03:06:15 bernie - * Add x86_64 task switching (to be updated to new-style scheduler). - * - * Revision 1.1 2005/11/14 21:06:38 bernie - * Add x86_64 support. - * - * Revision 1.2 2004/06/06 16:14:12 bernie - * Add DevLib license information. + * Copyright 2004 Develer S.r.l. (http://www.develer.com/) + * Copyright 1999, 2000, 2001 Bernie Innocenti + * This file is part of DevLib - See devlib/README for information. + * --> * - * Revision 1.1 2004/05/23 17:27:00 bernie - * Import kern/ subdirectory. + * \version $Id$ + * \author Bernie Innocenti * + * \brief i386 context switch */ /* I know it's ugly... */ diff --git a/bertos/gfx/charts.c b/bertos/gfx/charts.c index e56a38cd..0a9a195d 100644 --- a/bertos/gfx/charts.c +++ b/bertos/gfx/charts.c @@ -31,6 +31,9 @@ * * --> * + * \version $Id$ + * \author Bernie Innocenti + * * \brief Simple charts on top of mware/gfx routines (implementation). * * Sample usage: @@ -44,42 +47,8 @@ * * print_bitmap(bm); * \endcode - * - * \version $Id$ - * \author Bernie Innocenti */ -/*#* - *#* $Log$ - *#* Revision 1.4 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.3 2005/11/27 23:33:29 bernie - *#* Reorder includes. - *#* - *#* Revision 1.2 2005/11/04 18:17:45 bernie - *#* Fix header guards and includes for new location of gfx module. - *#* - *#* Revision 1.1 2005/11/04 18:11:35 bernie - *#* Move graphics stuff from mware/ to gfx/. - *#* - *#* Revision 1.7 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.6 2004/11/16 21:04:23 bernie - *#* Update to new naming scheme in mware/gfx.c. - *#* - *#* Revision 1.5 2004/09/14 20:56:39 bernie - *#* Make more generic and adapt to new gfx functions. - *#* - *#* Revision 1.3 2004/08/11 19:39:12 bernie - *#* Use chart_x_t and chart_y_t for the input dataset. - *#* - *#* Revision 1.1 2004/08/04 03:16:30 bernie - *#* Import simple chart drawing code. - *#* - *#*/ - #include "charts.h" #include diff --git a/bertos/gfx/text.c b/bertos/gfx/text.c index 8b69d13e..942bc73b 100644 --- a/bertos/gfx/text.c +++ b/bertos/gfx/text.c @@ -31,109 +31,13 @@ * * --> * - * \brief Text graphic routines - * * \version $Id$ * \author Bernie Innocenti * \author Stefano Fedrigo + * + * \brief Text graphic routines */ -/*#* - *#* $Log$ - *#* Revision 1.13 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.12 2006/05/25 23:35:22 bernie - *#* Implement correct and faster clipping for algo text. - *#* - *#* Revision 1.11 2006/05/15 07:21:06 bernie - *#* Doxygen fix. - *#* - *#* Revision 1.10 2006/04/27 05:39:23 bernie - *#* Enhance text rendering to arbitrary x,y coords. - *#* - *#* Revision 1.9 2006/04/11 00:08:24 bernie - *#* text_offset(): New function, but I'm not quite confident with the design. - *#* - *#* Revision 1.8 2006/03/22 09:50:37 bernie - *#* Use the same format for fonts and rasters. - *#* - *#* Revision 1.7 2006/03/20 17:51:55 bernie - *#* Cleanups. - *#* - *#* Revision 1.6 2006/03/13 02:05:54 bernie - *#* Mark slow paths as UNLIKELY. - *#* - *#* Revision 1.5 2006/03/07 22:18:04 bernie - *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute. - *#* - *#* Revision 1.4 2006/02/15 09:10:15 bernie - *#* Implement prop fonts; Fix algo styles. - *#* - *#* Revision 1.3 2006/02/10 12:31:55 bernie - *#* Add multiple font support in bitmaps. - *#* - *#* Revision 1.2 2005/11/04 18:17:45 bernie - *#* Fix header guards and includes for new location of gfx module. - *#* - *#* Revision 1.1 2005/11/04 18:11:35 bernie - *#* Move graphics stuff from mware/ to gfx/. - *#* - *#* Revision 1.13 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.12 2005/04/11 19:10:28 bernie - *#* Include top-level headers from cfg/ subdir. - *#* - *#* Revision 1.11 2005/01/20 18:46:31 aleph - *#* Fix progmem includes. - *#* - *#* Revision 1.10 2005/01/08 09:20:12 bernie - *#* Really make it work on both architectures. - *#* - *#* Revision 1.9 2004/12/31 16:44:29 bernie - *#* Sanitize for non-Harvard processors. - *#* - *#* Revision 1.8 2004/11/16 21:16:28 bernie - *#* Update to new naming scheme in mware/gfx.c. - *#* - *#* Revision 1.7 2004/09/20 03:28:28 bernie - *#* Fix header. - *#* - *#* Revision 1.6 2004/09/14 20:57:15 bernie - *#* Use debug.h instead of kdebug.h. - *#* - *#* Revision 1.5 2004/09/06 21:51:26 bernie - *#* Extend interface to allow any algorithmic style. - *#* - *#* Revision 1.2 2004/06/03 11:27:09 bernie - *#* Add dual-license information. - *#* - *#* Revision 1.1 2004/05/23 15:43:16 bernie - *#* Import mware modules. - *#* - *#* Revision 1.17 2004/05/15 16:57:01 aleph - *#* Fixes for non-DEBUG build - *#* - *#* Revision 1.16 2004/04/03 20:42:49 aleph - *#* Add text_clear() - *#* - *#* Revision 1.15 2004/03/24 15:03:45 bernie - *#* Use explicit include paths; clean Doxygen comments - *#* - *#* Revision 1.14 2004/03/19 16:52:28 bernie - *#* Move printf() like functions from text.c to text_format.c and add PROGMEM versions. - *#* - *#* Revision 1.13 2004/03/17 18:23:32 bernie - *#* Oops. - *#* - *#* Revision 1.12 2004/03/17 18:03:22 bernie - *#* Make diagnostic message shorter - *#* - *#* Revision 1.11 2004/03/13 22:52:54 aleph - *#* documentation fixes - *#*/ - #include #include #include diff --git a/bertos/gfx/text_format.c b/bertos/gfx/text_format.c index 25bbeafc..50b6cf11 100644 --- a/bertos/gfx/text_format.c +++ b/bertos/gfx/text_format.c @@ -31,83 +31,13 @@ * * --> * - * \brief printf-family routines for text output - * * \version $Id$ * \author Bernie Innocenti * \author Stefano Fedrigo + * + * \brief printf-family routines for text output */ -/*#* - *#* $Log$ - *#* Revision 1.10 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.9 2006/04/27 05:39:24 bernie - *#* Enhance text rendering to arbitrary x,y coords. - *#* - *#* Revision 1.8 2006/03/22 09:50:11 bernie - *#* Don't use C99 stuff. - *#* - *#* Revision 1.7 2006/03/20 17:51:55 bernie - *#* Cleanups. - *#* - *#* Revision 1.6 2006/03/13 02:05:54 bernie - *#* Mark slow paths as UNLIKELY. - *#* - *#* Revision 1.5 2006/03/07 22:18:04 bernie - *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute. - *#* - *#* Revision 1.4 2006/02/10 12:31:33 bernie - *#* Add multiple font support in bitmaps. - *#* - *#* Revision 1.3 2005/11/27 23:31:58 bernie - *#* Reorder includes. - *#* - *#* Revision 1.2 2005/11/04 18:17:45 bernie - *#* Fix header guards and includes for new location of gfx module. - *#* - *#* Revision 1.1 2005/11/04 18:11:35 bernie - *#* Move graphics stuff from mware/ to gfx/. - *#* - *#* Revision 1.10 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.9 2004/12/31 17:47:45 bernie - *#* Rename UNUSED() to UNUSED_ARG(). - *#* - *#* Revision 1.8 2004/11/16 21:16:56 bernie - *#* Update to new naming scheme in mware/gfx.c. - *#* - *#* Revision 1.7 2004/10/03 19:05:04 bernie - *#* text_widthf(), text_vwidthf(): New functions. - *#* - *#* Revision 1.6 2004/09/14 20:59:04 bernie - *#* text_xprintf(): Support all styles; Pixel-wise text centering. - *#* - *#* Revision 1.5 2004/08/25 14:12:09 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* Revision 1.4 2004/08/05 18:46:44 bernie - *#* Documentation improvements. - *#* - *#* Revision 1.3 2004/08/03 15:57:18 aleph - *#* Add include to fix warning for vsprintf() - *#* - *#* Revision 1.2 2004/06/03 11:27:09 bernie - *#* Add dual-license information. - *#* - *#* Revision 1.1 2004/05/23 15:43:16 bernie - *#* Import mware modules. - *#* - *#* Revision 1.2 2004/03/26 18:50:50 bernie - *#* Move _PROGMEM stuff to compiler.h - *#* - *#* Revision 1.1 2004/03/19 16:52:28 bernie - *#* Move printf() like functions from text.c to text_format.c and add PROGMEM versions. - *#* - *#*/ - #include "text.h" #include /* _formatted_write() */ diff --git a/bertos/mware/rle.c b/bertos/mware/rle.c index 96bd94af..66701e94 100644 --- a/bertos/mware/rle.c +++ b/bertos/mware/rle.c @@ -39,22 +39,6 @@ * \author Bernie Innocenti */ -/*#* - *#* $Log$ - *#* Revision 1.4 2006/07/19 12:56:28 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.3 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.2 2004/08/25 14:12:09 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* Revision 1.1 2004/08/04 02:35:54 bernie - *#* Import simple RLE algorithm. - *#* - *#*/ - #include "rle.h" diff --git a/bertos/mware/rle.h b/bertos/mware/rle.h index 6adcaf31..6e056d22 100644 --- a/bertos/mware/rle.h +++ b/bertos/mware/rle.h @@ -31,27 +31,11 @@ * * --> * - * \brief General-purpose run-length {en,de}coding algorithm (interface) - * * \version $Id$ * \author Bernie Innocenti + * + * \brief General-purpose run-length {en,de}coding algorithm (interface) */ - -/*#* - *#* $Log$ - *#* Revision 1.4 2006/07/19 12:56:28 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.3 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.2 2004/08/25 14:12:09 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* Revision 1.1 2004/08/04 02:35:54 bernie - *#* Import simple RLE algorithm. - *#* - *#*/ #ifndef RLE_H #define RLE_H -- 2.25.1