Fix logo name.

[bertos.git] / app / demo / demo.c

diff --git a/app/demo/demo.c b/app/demo/demo.c
old mode 100755 (executable)
new mode 100644 (file)
index 5ac10d8..f28576e
--- a/app/demo/demo.c
+++ b/app/demo/demo.c
@@ -1,54 +1,42 @@
 /**
  * \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$
+ * \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>
@@ -113,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 */
@@ -135,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);