Merge branch 'master' into freertos

5 files changed, 77 insertions, 68 deletions

diff --git a/demos/3rdparty/bubbles/demo.mk b/demos/3rdparty/bubbles/demo.mk
new file mode 100644
index 00000000..ca577508
--- /dev/null
+++ b/demos/3rdparty/bubbles/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/bubbles
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c
diff --git a/demos/3rdparty/bubbles/main.c b/demos/3rdparty/bubbles/main.c
index 62ef2830..f167b536 100644
--- a/demos/3rdparty/bubbles/main.c
+++ b/demos/3rdparty/bubbles/main.c
@@ -60,7 +60,7 @@ void matrix (int16_t xyz[3][N], color_t col[N])
       xyz[0][i] = x;
       xyz[1][i] = y;
 
-      d = sqrtf(x * x + y * y);	/* originally a fastsqrt() call */
+      d = sqrt(x * x + y * y);	/* originally a fastsqrt() call */
       s = sine[(t * 30) % SCALE] + SCALE;
 
       xyz[2][i] = sine[(d + s) % SCALE] * sine[(t * 10) % SCALE] / SCALE / 2;
@@ -151,11 +151,11 @@ int main (void)
 
   gfxInit();
 
-  chThdSleepMilliseconds (10);
+  gfxSleepMilliseconds (10);
   gdispClear (background); /* glitches.. */
-  chThdSleepMilliseconds (10);
+  gfxSleepMilliseconds (10);
   gdispClear (background);  /* glitches.. */
-  chThdSleepMilliseconds (10);
+  gfxSleepMilliseconds (10);
   gdispClear (background);  /* glitches.. */
 
   width = (uint16_t)gdispGetWidth();
diff --git a/demos/3rdparty/doom/demo.mk b/demos/3rdparty/doom/demo.mk
new file mode 100644
index 00000000..78faf4c2
--- /dev/null
+++ b/demos/3rdparty/doom/demo.mk
@@ -0,0 +1,65 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/doom
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	\
+		$(DEMODIR)/d_main.c			\
+		$(DEMODIR)/i_main.c			\
+		$(DEMODIR)/i_system.c		\
+		$(DEMODIR)/i_sound.c		\
+		$(DEMODIR)/i_video.c		\
+		$(DEMODIR)/i_net.c			\
+		$(DEMODIR)/doomdef.c		\
+		$(DEMODIR)/doomstat.c		\
+		$(DEMODIR)/dstrings.c		\
+		$(DEMODIR)/tables.c			\
+		$(DEMODIR)/f_finale.c		\
+		$(DEMODIR)/f_wipe.c 		\
+		$(DEMODIR)/d_net.c			\
+		$(DEMODIR)/d_items.c		\
+		$(DEMODIR)/g_game.c			\
+		$(DEMODIR)/m_menu.c			\
+		$(DEMODIR)/m_misc.c			\
+		$(DEMODIR)/m_argv.c  		\
+		$(DEMODIR)/m_bbox.c			\
+		$(DEMODIR)/m_fixed.c		\
+		$(DEMODIR)/m_swap.c			\
+		$(DEMODIR)/m_cheat.c		\
+		$(DEMODIR)/m_random.c		\
+		$(DEMODIR)/am_map.c			\
+		$(DEMODIR)/p_ceilng.c		\
+		$(DEMODIR)/p_doors.c		\
+		$(DEMODIR)/p_enemy.c		\
+		$(DEMODIR)/p_floor.c		\
+		$(DEMODIR)/p_inter.c		\
+		$(DEMODIR)/p_lights.c		\
+		$(DEMODIR)/p_map.c			\
+		$(DEMODIR)/p_maputl.c		\
+		$(DEMODIR)/p_plats.c		\
+		$(DEMODIR)/p_pspr.c			\
+		$(DEMODIR)/p_setup.c		\
+		$(DEMODIR)/p_sight.c		\
+		$(DEMODIR)/p_spec.c			\
+		$(DEMODIR)/p_switch.c		\
+		$(DEMODIR)/p_mobj.c			\
+		$(DEMODIR)/p_telept.c		\
+		$(DEMODIR)/p_tick.c			\
+		$(DEMODIR)/p_saveg.c		\
+		$(DEMODIR)/p_user.c			\
+		$(DEMODIR)/r_bsp.c			\
+		$(DEMODIR)/r_data.c			\
+		$(DEMODIR)/r_draw.c			\
+		$(DEMODIR)/r_main.c			\
+		$(DEMODIR)/r_plane.c		\
+		$(DEMODIR)/r_segs.c			\
+		$(DEMODIR)/r_sky.c			\
+		$(DEMODIR)/r_things.c		\
+		$(DEMODIR)/w_wad.c			\
+		$(DEMODIR)/wi_stuff.c		\
+		$(DEMODIR)/v_video.c		\
+		$(DEMODIR)/st_lib.c			\
+		$(DEMODIR)/st_stuff.c		\
+		$(DEMODIR)/hu_stuff.c		\
+		$(DEMODIR)/hu_lib.c			\
+		$(DEMODIR)/s_sound.c		\
+		$(DEMODIR)/z_zone.c			\
+		$(DEMODIR)/info.c			\
+		$(DEMODIR)/sounds.c
diff --git a/demos/3rdparty/doom/doom.mk b/demos/3rdparty/doom/doom.mk
deleted file mode 100644
index 6581f8c1..00000000
--- a/demos/3rdparty/doom/doom.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-MYFILES = $(GFXLIB)/demos/3rdparty/doom
-MYCSRC = \
-		$(MYFILES)/d_main.c			\
-		$(MYFILES)/i_main.c			\
-		$(MYFILES)/i_system.c		\
-		$(MYFILES)/i_sound.c		\
-		$(MYFILES)/i_video.c		\
-		$(MYFILES)/i_net.c			\
-		$(MYFILES)/doomdef.c		\
-		$(MYFILES)/doomstat.c		\
-		$(MYFILES)/dstrings.c		\
-		$(MYFILES)/tables.c			\
-		$(MYFILES)/f_finale.c		\
-		$(MYFILES)/f_wipe.c 		\
-		$(MYFILES)/d_net.c			\
-		$(MYFILES)/d_items.c		\
-		$(MYFILES)/g_game.c			\
-		$(MYFILES)/m_menu.c			\
-		$(MYFILES)/m_misc.c			\
-		$(MYFILES)/m_argv.c  		\
-		$(MYFILES)/m_bbox.c			\
-		$(MYFILES)/m_fixed.c		\
-		$(MYFILES)/m_swap.c			\
-		$(MYFILES)/m_cheat.c		\
-		$(MYFILES)/m_random.c		\
-		$(MYFILES)/am_map.c			\
-		$(MYFILES)/p_ceilng.c		\
-		$(MYFILES)/p_doors.c		\
-		$(MYFILES)/p_enemy.c		\
-		$(MYFILES)/p_floor.c		\
-		$(MYFILES)/p_inter.c		\
-		$(MYFILES)/p_lights.c		\
-		$(MYFILES)/p_map.c			\
-		$(MYFILES)/p_maputl.c		\
-		$(MYFILES)/p_plats.c		\
-		$(MYFILES)/p_pspr.c			\
-		$(MYFILES)/p_setup.c		\
-		$(MYFILES)/p_sight.c		\
-		$(MYFILES)/p_spec.c			\
-		$(MYFILES)/p_switch.c		\
-		$(MYFILES)/p_mobj.c			\
-		$(MYFILES)/p_telept.c		\
-		$(MYFILES)/p_tick.c			\
-		$(MYFILES)/p_saveg.c		\
-		$(MYFILES)/p_user.c			\
-		$(MYFILES)/r_bsp.c			\
-		$(MYFILES)/r_data.c			\
-		$(MYFILES)/r_draw.c			\
-		$(MYFILES)/r_main.c			\
-		$(MYFILES)/r_plane.c		\
-		$(MYFILES)/r_segs.c			\
-		$(MYFILES)/r_sky.c			\
-		$(MYFILES)/r_things.c		\
-		$(MYFILES)/w_wad.c			\
-		$(MYFILES)/wi_stuff.c		\
-		$(MYFILES)/v_video.c		\
-		$(MYFILES)/st_lib.c			\
-		$(MYFILES)/st_stuff.c		\
-		$(MYFILES)/hu_stuff.c		\
-		$(MYFILES)/hu_lib.c			\
-		$(MYFILES)/s_sound.c		\
-		$(MYFILES)/z_zone.c			\
-		$(MYFILES)/info.c			\
-		$(MYFILES)/sounds.c
diff --git a/demos/3rdparty/notepad-2/demo.mk b/demos/3rdparty/notepad-2/demo.mk
new file mode 100644
index 00000000..4fd08c23
--- /dev/null
+++ b/demos/3rdparty/notepad-2/demo.mk
@@ -0,0 +1,5 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/notepad-2
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c \
+			$(DEMODIR)/notepadApp.c \
+			$(DEMODIR)/notepadCore.c