X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Fdemo%2Fdemo.c;h=cd9487cd93d9b6ef6150b8aea7c3b11fc6efc3f7;hb=e47f203a5648786cd782d921880a77a395570059;hp=f4928c10fd0c75c79c03967ff04565a614f67673;hpb=b026f319cf43d9a82f682eb8c7f314a6e638a54e;p=bertos.git

diff --git a/examples/demo/demo.c b/examples/demo/demo.c
index f4928c10..cd9487cd 100644
--- a/examples/demo/demo.c
+++ b/examples/demo/demo.c
@@ -31,13 +31,14 @@
  *
  * \brief Multifunction system test for BeRTOS modules.
  *
- * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $
+ * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #include <cfg/macros.h>
 
 #include <emul/emul.h>
+#include <emul/kfile_posix.h>
 
 #include <kern/irq.h>
 #include <kern/proc.h>
@@ -58,10 +59,7 @@
 #include <icons/logo.h>
 
 /**
- * Draw a pentacle in the provided bitmap.
- *
- * This is invoked by the keyboard polling routine, as a poor man's surrogate
- * of true task switching.
+ * Refresh the GUI.
  */
 void schedule(void)
 {
@@ -85,21 +83,24 @@ static void magic(struct Bitmap *bitmap, coord_t x, coord_t y)
 static void hello_world(Bitmap *bm)
 {
 	extern const Font font_ncenB18;
-    const Font *old_font = bm->font;
+	const Font *old_font;
+
+	old_font = bm->font;
 
 	gfx_bitmapClear(bm);
 
 	/* Set big font */
 	gfx_setFont(bm, &font_ncenB18);
 
-	text_xprintf(bm, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER,
+	text_xprintf(bm, 0, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER,
 			"Hello, world!");
-
-	lcd_blitBitmap(bm);
-	timer_delay(1000);
+	schedule();
+	while (1)
+		if (kbd_peek())
+			break;
 
 	/* Restore old font */
-    gfx_setFont(bm, old_font);
+	gfx_setFont(bm, old_font);
 }
 
 /**
@@ -135,8 +136,7 @@ static void bouncing_logo(Bitmap *bm)
 			(bm->width - bertos_logo.width) / 2,
 			h / SPEED_SCALE,
 			&bertos_logo);
-		lcd_blitBitmap(bm);
-
+		schedule();
 		timer_delay(10);
 	}
 }
@@ -176,9 +176,9 @@ void win_demo(Bitmap *bm)
 		/* Background animation */
 		bm = root_win.bitmap;
 		gfx_bitmapClear(bm);
-//		gfx_setClipRect(bm, 0, 0, bm->width, bm->height);
-//		gfx_rectDraw(bm, 10, 10, bm->width-10, bm->height-10);
-//		gfx_setClipRect(bm, 11, 11, bm->width-11, bm->height-11);
+		// gfx_setClipRect(bm, 0, 0, bm->width, bm->height);
+		// gfx_rectDraw(bm, 10, 10, bm->width-10, bm->height-10);
+		// gfx_setClipRect(bm, 11, 11, bm->width-11, bm->height-11);
 		magic(bm, x, y);
 		x += xdir;
 		y += ydir;
@@ -193,7 +193,6 @@ void win_demo(Bitmap *bm)
 		for (i = 0; i < bm->height / 2; i += 2)
 			gfx_rectDraw(bm, 0 + i, 0 + i, bm->width - i, bm->height - i);
 
-
 		/* Small window animation */
 		bm = small_win.bitmap;
 		gfx_bitmapClear(bm);
@@ -217,7 +216,6 @@ void win_demo(Bitmap *bm)
 			win_raise(&large_win);
 
 		win_compose(&root_win);
-
 		/* Also does LCD refresh, etc. */
 		if (kbd_peek())
 			break;
@@ -293,22 +291,22 @@ static struct MenuItem main_items[] =
 };
 static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0 };
 
-
-static cpu_stack_t monitor_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)];
+#if CONFIG_KERN_HEAP
+#define monitor_stack NULL
+#else
+static PROC_DEFINE_STACK(monitor_stack, KERN_MINSTACKSIZE);
+#endif
 
 int main(int argc, char *argv[])
 {
 	emul_init(&argc, argv);
 
-	#if CONFIG_KERN_PREEMPT
-		irq_init();
-	#endif
 	timer_init();
 	buz_init();
 	kbd_init();
 	lcd_init();
 	proc_init();
-	monitor_start(sizeof(monitor_stack), monitor_stack);
+	monitor_start(KERN_MINSTACKSIZE, monitor_stack);
 
 	menu_handle(&main_menu);