X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.c;h=226463eded893ad96f0605beb33170b2544bd9f2;hb=56a07f2d54911b40c6f14e25a342e0a8742a6938;hp=35ece014397c938f45e337e60d4dadb84b82a80d;hpb=460402019f6f63ae31bcc19911bb93f58fbc4051;p=bertos.git

diff --git a/app/demo/demo.c b/app/demo/demo.c
old mode 100755
new mode 100644
index 35ece014..226463ed
--- a/app/demo/demo.c
+++ b/app/demo/demo.c
@@ -1,8 +1,33 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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
+ *
+ * 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.
+ *
  * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -14,6 +39,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.10  2007/09/29 16:30:37  bernie
+ *#* RASTER_SIZE(): Remove obsolete macro.
+ *#*
  *#* Revision 1.9  2006/09/20 14:29:34  marco
  *#* Add proc demo (not yet working).
  *#*
@@ -82,14 +110,14 @@ static void magic(struct Bitmap *bitmap, coord_t x, coord_t y)
 		gfx_lineTo(bitmap, coords[i]/2 + x, coords[i+1]/3 + y);
 }
 
-void hello_world(Bitmap *bm)
+static void hello_world(Bitmap *bm)
 {
+	extern const Font font_ncenB18;
     const Font *old_font = bm->font;
 
 	gfx_bitmapClear(bm);
 
 	/* Set big font */
-	extern const Font font_ncenB18;
 	gfx_setFont(bm, &font_ncenB18);
 
 	text_xprintf(bm, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER,
@@ -105,7 +133,7 @@ void hello_world(Bitmap *bm)
 /**
  * Show the splash screen
  */
-void bouncing_logo(Bitmap *bm)
+static void bouncing_logo(Bitmap *bm)
 {
 	const long SPEED_SCALE = 1000;
 	const long GRAVITY_ACCEL = 10;
@@ -148,8 +176,8 @@ void win_demo(Bitmap *bm)
 
 	Window root_win, small_win, large_win;
 	Bitmap small_bm, large_bm;
-	uint8_t small_raster[RASTER_SIZE(small_width, small_height)];
-	uint8_t large_raster[RASTER_SIZE(large_width, large_height)];
+	uint8_t small_raster[RAST_SIZE(small_width, small_height)];
+	uint8_t large_raster[RAST_SIZE(large_width, large_height)];
 
 	win_create(&root_win, bm);