X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.c;h=f28576ea2677305c2c30bda4c4d149cb6fa83cd2;hb=f5207bd1f7e86dccc484802550cb1e53bb403c50;hp=226463eded893ad96f0605beb33170b2544bd9f2;hpb=9ba9dcf2a59a952609e19154e11de3e2478cbf42;p=bertos.git

diff --git a/app/demo/demo.c b/app/demo/demo.c
index 226463ed..f28576ea 100644
--- a/app/demo/demo.c
+++ b/app/demo/demo.c
@@ -30,50 +30,13 @@
  *
  * -->
  *
- * \version $Id$
+ * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $
  *
  * \author Bernardo Innocenti <bernie@develer.com>
  *
  * \brief Windowing system test.
  */
 
-/*#*
- *#* $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).
- *#*
- *#* Revision 1.8  2006/06/02 12:27:36  bernie
- *#* Tweak apparence; enable assertions.
- *#*
- *#* Revision 1.7  2006/05/27 22:31:18  bernie
- *#* Clean it up a bit more.
- *#*
- *#* Revision 1.6  2006/05/27 17:16:38  bernie
- *#* Make demos a bit more interesting.
- *#*
- *#* Revision 1.5  2006/05/15 07:25:29  bernie
- *#* Move menu to gui/.
- *#*
- *#* Revision 1.4  2006/04/27 05:43:07  bernie
- *#* Fix naming conventions.
- *#*
- *#* Revision 1.3  2006/04/11 00:07:32  bernie
- *#* Implemenent MF_SAVESEL flag.
- *#*
- *#* Revision 1.2  2006/03/27 04:49:50  bernie
- *#* Add bouncing logo demo.
- *#*
- *#* Revision 1.1  2006/03/22 09:52:13  bernie
- *#* Add demo application.
- *#*
- *#* Revision 1.1  2006/01/23 23:14:29  bernie
- *#* Implement simple, but impressive windowing system.
- *#*
- *#*/
-
 #include <emul/emul.h>
 #include <kern/proc.h>
 #include <drv/timer.h>
@@ -138,7 +101,7 @@ static void bouncing_logo(Bitmap *bm)
 	const long SPEED_SCALE = 1000;
 	const long GRAVITY_ACCEL = 10;
 	const long BOUNCE_ELASTICITY = 2;
-	long h = (long)(-project_grl_logo.height) * SPEED_SCALE;
+	long h = (long)(-bertos_logo.height) * SPEED_SCALE;
 	long speed = 1000;
 
 	/* Repeat until logo stands still on the bottom edge */
@@ -160,9 +123,9 @@ static void bouncing_logo(Bitmap *bm)
 		/* Update graphics */
 		gfx_bitmapClear(bm);
 		gfx_blitImage(bm,
-			(bm->width - project_grl_logo.width) / 2,
+			(bm->width - bertos_logo.width) / 2,
 			h / SPEED_SCALE,
-			&project_grl_logo);
+			&bertos_logo);
 		lcd_blitBitmap(bm);
 
 		timer_delay(10);