Update preset.

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

diff --git a/examples/demo/demo.c b/examples/demo/demo.c
index de9ddeb0bfa78a9235f47a56f23bbe394d815eb3..efdf37ec334aa26b5e161433b424e659f4accd06 100644 (file)
--- a/examples/demo/demo.c
+++ b/examples/demo/demo.c
@@ -31,10 +31,8 @@
  *
  * \brief Multifunction system test for BeRTOS modules.
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
-
 #include <cfg/macros.h>
 
 #include <emul/emul.h>
@@ -42,13 +40,14 @@
 
 #include <kern/irq.h>
 #include <kern/proc.h>
+#include <kern/sem.h>
 #include <kern/monitor.h>
 #include <kern/msg.h>
 
 #include <drv/timer.h>
 #include <drv/buzzer.h>
-#include <drv/lcd_gfx.h>
 #include <drv/kbd.h>
+#include <drv/lcd_gfx_qt.h>
 
 #include <gfx/gfx.h>
 #include <gfx/win.h>
@@ -58,12 +57,15 @@
 #include <gui/menu.h>
 #include <icons/logo.h>
 
+/** Default LCD bitmap */
+static Bitmap lcd_bitmap;
+
 /**
  * Refresh the GUI.
  */
 void schedule(void)
 {
-       lcd_blitBitmap(&lcd_bitmap);
+       lcd_gfx_qt_blitBitmap(&lcd_bitmap);
        emul_idle();
 }
 
@@ -92,7 +94,7 @@ static void hello_world(Bitmap *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!");
        schedule();
        while (1)
@@ -187,7 +189,6 @@ void win_demo(Bitmap *bm)
                if (y >= bm->height) ydir = -1;
                if (y <= -50)        ydir = +1;
 
-               /* Large window animation */
                bm = large_win.bitmap;
                gfx_bitmapClear(bm);
                for (i = 0; i < bm->height / 2; i += 2)
@@ -227,6 +228,12 @@ void proc_demo(void)
        proc_testRun();
 }
 
+void sem_demo(void)
+{
+       sem_testRun();
+       sem_testTearDown();
+}
+
 void timer_demo(void)
 {
        timer_testRun();
@@ -245,7 +252,7 @@ static struct MenuItem settings_items[] =
        { (const_iptr_t)"Power Saving", MIF_TOGGLE, (MenuHook)0, (iptr_t)0 },
        { (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 };
+static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 
 /* MX SUBMENU */
@@ -259,7 +266,7 @@ static struct MenuItem mx_items[] =
        { (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
 
-static struct Menu mx_menu = { mx_items, (const_iptr_t)0, MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 };
+static struct Menu mx_menu = { mx_items, (const_iptr_t)0, MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 
 /* DISPLAY SUBMENU */
@@ -272,7 +279,7 @@ static struct MenuItem display_items[] =
        { (const_iptr_t)"Icon Theme", 0, (MenuHook)0, (iptr_t)0 },
        { (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0 };
+static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 
 /* MAIN MENU */
@@ -283,13 +290,14 @@ static struct MenuItem main_items[] =
        { (const_iptr_t)"Bounce!",     0, (MenuHook)bouncing_logo,(iptr_t)&lcd_bitmap    },
        { (const_iptr_t)"Hello World", 0, (MenuHook)hello_world,  (iptr_t)&lcd_bitmap    },
        { (const_iptr_t)"Scheduling",  0, (MenuHook)proc_demo,    (iptr_t)&lcd_bitmap    },
+       { (const_iptr_t)"Semaphores",  0, (MenuHook)sem_demo,     (iptr_t)&lcd_bitmap    },
        { (const_iptr_t)"Timer Test",  0, (MenuHook)timer_demo,   (iptr_t)&lcd_bitmap    },
        { (const_iptr_t)"Menu MX",     0, (MenuHook)menu_handle,  (iptr_t)&mx_menu       },
        { (const_iptr_t)"Display",     0, (MenuHook)menu_handle,  (iptr_t)&display_menu  },
        { (const_iptr_t)"Settings",    0, (MenuHook)menu_handle,  (iptr_t)&settings_menu },
        { (const_iptr_t)0, 0, NULL, (iptr_t)0 }
 };
-static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0 };
+static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap };
 
 #if CONFIG_KERN_HEAP
 #define monitor_stack NULL
@@ -302,10 +310,10 @@ int main(int argc, char *argv[])
        emul_init(&argc, argv);
 
        timer_init();
+       proc_init();
        buz_init();
        kbd_init();
-       lcd_init();
-       proc_init();
+       lcd_gfx_qt_init(&lcd_bitmap);
        monitor_start(KERN_MINSTACKSIZE, monitor_stack);
 
        menu_handle(&main_menu);