Fix demo app to compiling with new version of bertos. Clean up. Reformat.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1392 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/app/demo/demo.c b/app/demo/demo.c
index c13fdf78cb68d31192f5a484bba89ba75000886e..bec5f9775a7df6b0caf396ee103d61896ffbbe7d 100644 (file)
--- a/app/demo/demo.c
+++ b/app/demo/demo.c
@@ -37,20 +37,25 @@
  * \brief Windowing system test.
  */
 
+#include <cfg/macros.h>
+
 #include <emul/emul.h>
+
 #include <kern/proc.h>
 #include <kern/msg.h>
+
 #include <drv/timer.h>
 #include <drv/buzzer.h>
 #include <drv/lcd_gfx.h>
 #include <drv/kbd.h>
+
 #include <gfx/gfx.h>
 #include <gfx/win.h>
 #include <gfx/text.h>
 #include <gfx/font.h>
+
 #include <gui/menu.h>
 #include <icons/logo.h>
-#include <cfg/macros.h>
 
 /**
  * Draw a pentacle in the provided bitmap.

diff --git a/app/demo/demo.mk b/app/demo/demo.mk
index 6b78790d110d997f70aad3c21dc64fac6a3ef74b..f9dbd8186fa932ac4530f562879b629300d0abb5 100644 (file)
--- a/app/demo/demo.mk
+++ b/app/demo/demo.mk
@@ -51,27 +51,27 @@ demo_CSRC = \
        bertos/mware/resource.c \
        bertos/mware/sprintf.c \
        bertos/kern/proc.c \
+       bertos/kern/proc_test.c \
        bertos/kern/sem.c \
        bertos/kern/signal.c \
        bertos/kern/monitor.c \
-       bertos/kern/proc_test.c \
        bertos/verstag.c
 
 demo_CPPASRC = \
-       bertos/kern/switch.S
+       bertos/emul/switch.S
 
 # FIXME: maybe this junk should go in emul/emul.mk?
 $(OBJDIR)/demo/bertos/emul/emulwin.o: bertos/emul/emulwin_moc.cpp 
 $(OBJDIR)/demo/bertos/drv/lcd_gfx_qt.o: bertos/drv/lcd_gfx_qt_moc.cpp
-$(OBJDIR)/demo/bertos/drv/timer.o: bertos/drv/timer_qt_moc.cpp
+$(OBJDIR)/demo/bertos/drv/timer.o: bertos/emul/timer_qt_moc.cpp
 $(OBJDIR)/demo/bertos/emul/emulkbd.o: bertos/emul/emulkbd_moc.cpp
 
 #FIXME: isn't there a way to avoid repeating the pattern rule?
-bertos/drv/timer_qt_moc.cpp: bertos/emul/timer_qt.c
+bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c
        $(QT_MOC) -o $@ $<
 
 
-demo_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS)
+demo_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ibertos/emul $(EMUL_CFLAGS)
 demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS)
 demo_LDFLAGS = $(EMUL_LDFLAGS)
 

diff --git a/app/demo/verstag.h b/app/demo/verstag.h
index 3a20c6fe94f7f68d56e84dc6087db83fe4cb7010..4679d772d515b29bdfded09228d52d8993d9c55d 100644 (file)
--- a/app/demo/verstag.h
+++ b/app/demo/verstag.h
@@ -37,15 +37,16 @@
  *
  * \brief Declare application version strings
  */
-#ifndef DEVLIB_VERSTAG_H
-#define DEVLIB_VERSTAG_H
 
-#ifndef ARCH_CONFIG_H
-       #include "cfg/arch_config.h"
+#ifndef BERTOS_VERSTAG_H
+#define BERTOS_VERSTAG_H
+
+#ifndef CFG_ARCH_CONFIG_H
+       #include "cfg/cfg_arch.h"
 #endif
 
-#define APP_NAME "Devlib Demo"
-#define APP_DESCRIPTION "DevLib Multidemo Application"
+#define APP_NAME "BeRTOS Demo"
+#define APP_DESCRIPTION "BeRTOS Multidemo Application"
 #define APP_AUTHOR "Develer"
 #define APP_COPYRIGHT "Copyright 2006 Develer (http://www.develer.com/)"
 
@@ -91,4 +92,4 @@ extern const int vers_build_nr;
 /** Hostname of the machine used to build this binary (contains VERS_HOST) */
 extern const char vers_host[];
 
-#endif /* DEVLIB_VERSTAG_H */
+#endif /* BERTOS_VERSTAG_H */