X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.c;h=ed64a12d404f78ac6ef3e2703955d8da9c5e18fc;hb=03eac0b24146fe73d585c998eca4c1c2873f1acb;hp=bec5f9775a7df6b0caf396ee103d61896ffbbe7d;hpb=f5ad98d91dc7e83a1b4797dec2458676441f4daf;p=bertos.git diff --git a/app/demo/demo.c b/app/demo/demo.c index bec5f977..ed64a12d 100644 --- a/app/demo/demo.c +++ b/app/demo/demo.c @@ -32,7 +32,7 @@ * * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $ * - * \author Bernardo Innocenti + * \author Bernie Innocenti * * \brief Windowing system test. */ @@ -223,9 +223,13 @@ void win_demo(Bitmap *bm) void proc_demo(void) { - extern void proc_test(void); -// FIXME: proc_test() cause segmentation fault. - proc_test(); + proc_testRun(); +} + +void timer_demo(void) +{ + timer_testRun(); + timer_testTearDown(); } @@ -278,6 +282,7 @@ 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)"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 }, @@ -297,6 +302,7 @@ int main(int argc, char *argv[]) menu_handle(&main_menu); + timer_cleanup(); emul_cleanup(); return 0; }