From 9d2929b79b22765701e9db240d967877d7f7bab8 Mon Sep 17 00:00:00 2001 From: Dan Everton Date: Sat, 12 Aug 2006 10:28:30 +0000 Subject: Remove Win32 and X11 simulator sources. They've been deprecated for a while in favour of the SDL sim. Time to go. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10543 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/win32/Makefile | 69 ---- uisimulator/win32/Makefile.vc6 | 101 ------ uisimulator/win32/SOURCES | 12 - uisimulator/win32/UI-fmrecorder.bmp | Bin 236864 -> 0 bytes uisimulator/win32/UI-gmini120.bmp | Bin 195416 -> 0 bytes uisimulator/win32/UI-h100.bmp | Bin 194120 -> 0 bytes uisimulator/win32/UI-h120.bmp | Bin 194120 -> 0 bytes uisimulator/win32/UI-h300.bmp | Bin 168408 -> 0 bytes uisimulator/win32/UI-ipod4g.bmp | Bin 217604 -> 0 bytes uisimulator/win32/UI-ipodcolor.bmp | Bin 131232 -> 0 bytes uisimulator/win32/UI-ipodnano.bmp | Bin 85280 -> 0 bytes uisimulator/win32/UI-ondiofm.bmp | Bin 104264 -> 0 bytes uisimulator/win32/UI-ondiosp.bmp | Bin 104264 -> 0 bytes uisimulator/win32/UI-player.bmp | Bin 238616 -> 0 bytes uisimulator/win32/UI-recorder.bmp | Bin 219296 -> 0 bytes uisimulator/win32/UI-recorderv2.bmp | Bin 236864 -> 0 bytes uisimulator/win32/atoi.h | 20 -- uisimulator/win32/button.c | 286 ---------------- uisimulator/win32/debug-win32.c | 66 ---- uisimulator/win32/dir-win32.c | 91 ------ uisimulator/win32/dir-win32.h | 46 --- uisimulator/win32/kernel.c | 167 ---------- uisimulator/win32/lcd-win32.c | 326 ------------------- uisimulator/win32/lcd-win32.h | 47 --- uisimulator/win32/panic-win32.c | 43 --- uisimulator/win32/plugin-win32.h | 48 --- uisimulator/win32/plugin.def | 2 - uisimulator/win32/resource.h | 19 -- uisimulator/win32/rockbox.dsp | 626 ------------------------------------ uisimulator/win32/rockbox.ico | Bin 3638 -> 0 bytes uisimulator/win32/sound.c | 201 ------------ uisimulator/win32/sound.h | 22 -- uisimulator/win32/sprintf.h | 36 --- uisimulator/win32/stdbool.h | 46 --- uisimulator/win32/string-win32.c | 34 -- uisimulator/win32/thread-win32.c | 80 ----- uisimulator/win32/thread-win32.h | 23 -- uisimulator/win32/timefuncs.h | 8 - uisimulator/win32/uisw32.c | 344 -------------------- uisimulator/win32/uisw32.h | 168 ---------- uisimulator/win32/uisw32.rc | 76 ----- uisimulator/win32/uisw32.sln | 21 -- uisimulator/win32/uisw32.suo | Bin 13312 -> 0 bytes uisimulator/win32/uisw32.vcproj | 280 ---------------- 44 files changed, 3308 deletions(-) delete mode 100644 uisimulator/win32/Makefile delete mode 100644 uisimulator/win32/Makefile.vc6 delete mode 100644 uisimulator/win32/SOURCES delete mode 100644 uisimulator/win32/UI-fmrecorder.bmp delete mode 100644 uisimulator/win32/UI-gmini120.bmp delete mode 100644 uisimulator/win32/UI-h100.bmp delete mode 100644 uisimulator/win32/UI-h120.bmp delete mode 100644 uisimulator/win32/UI-h300.bmp delete mode 100644 uisimulator/win32/UI-ipod4g.bmp delete mode 100644 uisimulator/win32/UI-ipodcolor.bmp delete mode 100644 uisimulator/win32/UI-ipodnano.bmp delete mode 100644 uisimulator/win32/UI-ondiofm.bmp delete mode 100644 uisimulator/win32/UI-ondiosp.bmp delete mode 100644 uisimulator/win32/UI-player.bmp delete mode 100644 uisimulator/win32/UI-recorder.bmp delete mode 100644 uisimulator/win32/UI-recorderv2.bmp delete mode 100644 uisimulator/win32/atoi.h delete mode 100644 uisimulator/win32/button.c delete mode 100644 uisimulator/win32/debug-win32.c delete mode 100644 uisimulator/win32/dir-win32.c delete mode 100644 uisimulator/win32/dir-win32.h delete mode 100644 uisimulator/win32/kernel.c delete mode 100644 uisimulator/win32/lcd-win32.c delete mode 100644 uisimulator/win32/lcd-win32.h delete mode 100644 uisimulator/win32/panic-win32.c delete mode 100644 uisimulator/win32/plugin-win32.h delete mode 100755 uisimulator/win32/plugin.def delete mode 100644 uisimulator/win32/resource.h delete mode 100644 uisimulator/win32/rockbox.dsp delete mode 100644 uisimulator/win32/rockbox.ico delete mode 100644 uisimulator/win32/sound.c delete mode 100644 uisimulator/win32/sound.h delete mode 100644 uisimulator/win32/sprintf.h delete mode 100644 uisimulator/win32/stdbool.h delete mode 100644 uisimulator/win32/string-win32.c delete mode 100644 uisimulator/win32/thread-win32.c delete mode 100644 uisimulator/win32/thread-win32.h delete mode 100644 uisimulator/win32/timefuncs.h delete mode 100644 uisimulator/win32/uisw32.c delete mode 100644 uisimulator/win32/uisw32.h delete mode 100644 uisimulator/win32/uisw32.rc delete mode 100644 uisimulator/win32/uisw32.sln delete mode 100644 uisimulator/win32/uisw32.suo delete mode 100644 uisimulator/win32/uisw32.vcproj (limited to 'uisimulator/win32') diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile deleted file mode 100644 index 160924a0f3..0000000000 --- a/uisimulator/win32/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################ -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# $Id$ -# -# Copyright (C) 2002 by Daniel Stenberg -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -############################################################################ - -SIMCOMMON = ../common - -DEPFILE = $(OBJDIR)/dep-simwin - -RM = rm -f -DEBUG = -g - -INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) \ - -I$(BUILDDIR) - -DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ -$(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) - -# This sets up 'SRC' based on the files mentioned in SOURCES -include $(TOOLSDIR)/makesrc.inc - -OBJS := $(SRC:%.c=$(OBJDIR)/%.o) - -SOURCES = $(SRC) -DIRS = . - -CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin - -OUTFILE = $(BUILDDIR)/libsim.a - -all: $(OUTFILE) - -$(OUTFILE): $(OBJS) $(OBJDIR)/UI256.bmp $(OBJDIR)/uisw32-res.o - @echo "AR+RANLIB $@" - @$(AR) ruv $@ $(OBJS) $(OBJDIR)/uisw32-res.o >/dev/null 2>&1 - @$(RANLIB) $@ - -clean: - @echo "cleaning simwin" - @$(RM) $(OBJS) *~ core $(OUTFILE) $(OBJDIR)/uisw32-res.o \ - $(OBJDIR)/UI256.bmp $(DEPFILE) - @$(MAKE) -C $(SIMCOMMON) clean - -################## Specific dependencies ################## -$(OBJDIR)/UI256.bmp: UI-$(ARCHOS).bmp - @echo UI - @cp $< $@ - -$(OBJDIR)/uisw32-res.o: uisw32.rc $(OBJDIR)/UI256.bmp - @echo "WINDRES" - @$(WINDRES) --include-dir $(OBJDIR) -i $< -o $@ - -include $(TOOLSDIR)/make.inc - --include $(DEPFILE) diff --git a/uisimulator/win32/Makefile.vc6 b/uisimulator/win32/Makefile.vc6 deleted file mode 100644 index d92f18d86d..0000000000 --- a/uisimulator/win32/Makefile.vc6 +++ /dev/null @@ -1,101 +0,0 @@ -############################################################################ -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# $Id$ -# -# Copyright (C) 2002 by Felix Arends -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -############################################################################ - - -#CHANGE THIS FIELD TO SPECIFY RECORDER OR PLAYER (Player does not work very well atm) -TARGET = RECORDER - -FIRMWAREDIR = ../../firmware -DRIVERS = $(FIRMWAREDIR)/drivers -COMMON = $(FIRMWAREDIR)/common -APPSCOMMON = ../common -TOOLSDIR = ..\..\tools -SIMDIR = ../win32/ -APPDIR = ../../apps/ -PLAYERDIR = $(APPDIR)player/ -RECDIR = $(APPDIR)recorder/ -RM = del -LANGUAGE = english -FONT = $(FIRMWAREDIR)/fonts/clR6x8.bdf - -!IF ("$(TARGET)" == "RECORDER") -DISPLAY = -DHAVE_LCD_BITMAP -KEYPAD = -DHAVE_RECORDER_KEYPAD -MODEL_SPECIFIC_DIR = $(RECDIR) -!ELSE -DISPLAY = -DHAVE_LCD_CHARCELLS -KEYPAD = -DHAVE_PLAYER_KEYPAD -MODEL_SPECIFIC_DIR = $(PLAYERDIR) -!ENDIF - -CC = cl -RC = rc -LINK = link -DEFINES = $(DEFINES) -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\" -LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows /NOLOGO /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib -INCLUDES = -I$(FIRMWAREDIR)/export -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(MODEL_SPECIFIC_DIR) -LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib /NODEFAULTLIB:libc.lib - -CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c - -SRCS = *.c \ - $(DRIVERS)/power.c \ - $(APPDIR)*.c \ - $(APPSCOMMON)/lcd-common.c $(APPSCOMMON)/mpegplay.c $(APPSCOMMON)/sim_icons.c $(APPSCOMMON)/stubs.c \ - $(FIRMWAREDIR)/mpeg.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c $(FIRMWAREDIR)/font.c $(FIRMWAREDIR)/powermgmt.c \ - $(COMMON)/sprintf.c $(COMMON)/strtok.c $(COMMON)/errno.c - -!IF ("$(DISPLAY)" == "-DHAVE_LCD_BITMAP") -SRCS = $(SRCS) $(RECDIR)/bmp.c $(RECDIR)/bounce.c $(RECDIR)/cube.c $(RECDIR)/icons.c $(RECDIR)/keyboard.c $(RECDIR)/peakmeter.c \ - $(RECDIR)/snow.c $(RECDIR)/sokoban.c $(RECDIR)/tetris.c $(RECDIR)/widgets.c $(RECDIR)/wormlet.c $(DRIVERS)/lcd-recorder.c -!ELSE -SRCS = $(SRCS) $(APPSCOMMON)/lcd-playersim.c $(DRIVERS)/lcd-player.c $(PLAYERDIR)*.c -!ENDIF - -OBJS = lang.obj $(SRCS:.c=.obj) uisw32.res - -all : uisw32.exe - -$(APPDIR)credits.raw: - perl $(APPDIR)credits.pl < ../../docs/CREDITS > $(APPDIR)credits.raw - -kernel.obj: - $(CC) $(CFLAGS) *.c - -sysfont.c: $(FONT) - $(TOOLSDIR)\convbdf -c -o sysfont.c $(FONT) - -sysfont.obj: sysfont.c - $(CC) $(CFLAGS) sysfont.c - -uisw32.exe: $(APPDIR)credits.raw $(OBJS) sysfont.obj kernel.obj - $(LINK) $(LIBS) $(LDFLAGS) *.obj uisw32.res - -uisw32.res: - $(RC) /r uisw32.rc - -build.lang: $(APPDIR)/lang/$(LANGUAGE).lang - perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $(APPDIR)/lang/$(LANGUAGE).lang > build.lang - -lang.obj: build.lang - perl -s $(TOOLSDIR)/genlang -p=lang build.lang - $(CC) $(CFLAGS) -c lang.c -o lang.obj - -clean: - $(RM) *.obj ..\..\apps\lang.c ..\..\apps\lang.h ..\..\apps\credits.raw lang.build uisw32.res uisw32.exe diff --git a/uisimulator/win32/SOURCES b/uisimulator/win32/SOURCES deleted file mode 100644 index 29710fd82c..0000000000 --- a/uisimulator/win32/SOURCES +++ /dev/null @@ -1,12 +0,0 @@ -button.c -debug-win32.c -#if 0 /* this is only for non-cygwin simulator builds */ -dir-win32.c -#endif -kernel.c -lcd-win32.c -panic-win32.c -string-win32.c -thread-win32.c -uisw32.c -sound.c diff --git a/uisimulator/win32/UI-fmrecorder.bmp b/uisimulator/win32/UI-fmrecorder.bmp deleted file mode 100644 index 53f705b9ef..0000000000 Binary files a/uisimulator/win32/UI-fmrecorder.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-gmini120.bmp b/uisimulator/win32/UI-gmini120.bmp deleted file mode 100644 index afeaf74801..0000000000 Binary files a/uisimulator/win32/UI-gmini120.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-h100.bmp b/uisimulator/win32/UI-h100.bmp deleted file mode 100644 index caeb81bc4b..0000000000 Binary files a/uisimulator/win32/UI-h100.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-h120.bmp b/uisimulator/win32/UI-h120.bmp deleted file mode 100644 index caeb81bc4b..0000000000 Binary files a/uisimulator/win32/UI-h120.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-h300.bmp b/uisimulator/win32/UI-h300.bmp deleted file mode 100644 index 5f099b717a..0000000000 Binary files a/uisimulator/win32/UI-h300.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-ipod4g.bmp b/uisimulator/win32/UI-ipod4g.bmp deleted file mode 100644 index 85af574d7c..0000000000 Binary files a/uisimulator/win32/UI-ipod4g.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-ipodcolor.bmp b/uisimulator/win32/UI-ipodcolor.bmp deleted file mode 100644 index de5dad4ffe..0000000000 Binary files a/uisimulator/win32/UI-ipodcolor.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-ipodnano.bmp b/uisimulator/win32/UI-ipodnano.bmp deleted file mode 100644 index e33f7e81da..0000000000 Binary files a/uisimulator/win32/UI-ipodnano.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-ondiofm.bmp b/uisimulator/win32/UI-ondiofm.bmp deleted file mode 100644 index e258720d28..0000000000 Binary files a/uisimulator/win32/UI-ondiofm.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-ondiosp.bmp b/uisimulator/win32/UI-ondiosp.bmp deleted file mode 100644 index c62c2334a3..0000000000 Binary files a/uisimulator/win32/UI-ondiosp.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-player.bmp b/uisimulator/win32/UI-player.bmp deleted file mode 100644 index db4003b120..0000000000 Binary files a/uisimulator/win32/UI-player.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-recorder.bmp b/uisimulator/win32/UI-recorder.bmp deleted file mode 100644 index 98937fea2d..0000000000 Binary files a/uisimulator/win32/UI-recorder.bmp and /dev/null differ diff --git a/uisimulator/win32/UI-recorderv2.bmp b/uisimulator/win32/UI-recorderv2.bmp deleted file mode 100644 index 53f705b9ef..0000000000 Binary files a/uisimulator/win32/UI-recorderv2.bmp and /dev/null differ diff --git a/uisimulator/win32/atoi.h b/uisimulator/win32/atoi.h deleted file mode 100644 index c95cfca64f..0000000000 --- a/uisimulator/win32/atoi.h +++ /dev/null @@ -1,20 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -int atoi(const char *); diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c deleted file mode 100644 index 8f21fe4396..0000000000 --- a/uisimulator/win32/button.c +++ /dev/null @@ -1,286 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include "uisw32.h" -#include "config.h" -#include "button.h" -#include "kernel.h" -#include "backlight.h" -#include "misc.h" - -/* how long until repeat kicks in */ -#define REPEAT_START 6 - -/* the speed repeat starts at */ -#define REPEAT_INTERVAL_START 4 - -/* speed repeat finishes at */ -#define REPEAT_INTERVAL_FINISH 2 - -struct event_queue button_queue; - -static int btn = 0; /* Hopefully keeps track of currently pressed keys... */ - -void button_event(int key, bool pressed) -{ - int new_btn = 0; - int diff = 0; - static int count = 0; - static int lastbtn; - static int repeat_speed = REPEAT_INTERVAL_START; - static int repeat_count = 0; - static bool repeat = false; - static bool post = false; - - switch (key) - { - case VK_NUMPAD4: - case VK_LEFT: - new_btn = BUTTON_LEFT; - break; - case VK_NUMPAD6: - case VK_RIGHT: - new_btn = BUTTON_RIGHT; - break; - - case VK_NUMPAD8: - case VK_UP: -#ifdef BUTTON_UP - new_btn = BUTTON_UP; -#elif defined BUTTON_SCROLL_FWD - new_btn = BUTTON_SCROLL_FWD; -#elif defined BUTTON_PLAY - new_btn = BUTTON_PLAY; -#endif - break; - - case VK_NUMPAD2: - case VK_DOWN: -#ifdef BUTTON_DOWN - new_btn = BUTTON_DOWN; -#elif defined BUTTON_SCROLL_BACK - new_btn = BUTTON_SCROLL_BACK; -#elif defined BUTTON_STOP - new_btn = BUTTON_STOP; -#endif - break; - - case VK_ADD: -#ifdef BUTTON_ON - new_btn = BUTTON_ON; -#elif defined(BUTTON_SELECT) && defined(BUTTON_PLAY) - new_btn = BUTTON_PLAY; -#endif - break; - -#ifdef BUTTON_OFF - case VK_RETURN: - new_btn = BUTTON_OFF; - break; -#endif - -#ifdef BUTTON_F1 - case VK_DIVIDE: - case VK_F1: - new_btn = BUTTON_F1; - break; - case VK_MULTIPLY: - case VK_F2: - new_btn = BUTTON_F2; - break; - case VK_SUBTRACT: - case VK_F3: - new_btn = BUTTON_F3; - break; -#elif defined(BUTTON_REC) - case VK_DIVIDE: - case VK_F1: - new_btn = BUTTON_REC; - break; -#endif - - case VK_NUMPAD5: - case VK_SPACE: -#if defined(BUTTON_PLAY) && !defined(BUTTON_SELECT) - new_btn = BUTTON_PLAY; -#elif defined(BUTTON_SELECT) - new_btn = BUTTON_SELECT; -#endif - break; - -#ifdef HAVE_LCD_BITMAP - case VK_NUMPAD0: - case VK_F5: - if(pressed) - { - screen_dump(); - return; - } - break; -#endif - - case VK_DECIMAL: - case VK_INSERT: -#ifdef BUTTON_MENU - new_btn = BUTTON_MENU; -#elif defined(BUTTON_MODE) - new_btn = BUTTON_MODE; -#endif - break; - } - - if (pressed) - btn |= new_btn; - else - btn &= ~new_btn; - - /* Lots of stuff copied from real button.c. Not good, I think... */ - - /* Find out if a key has been released */ - diff = btn ^ lastbtn; - - if(diff && (btn & diff) == 0) - { - queue_post(&button_queue, BUTTON_REL | diff, NULL); - } - else - { - if ( btn ) - { - /* normal keypress */ - if ( btn != lastbtn ) - { - post = true; - repeat = false; - repeat_speed = REPEAT_INTERVAL_START; - - } - else /* repeat? */ - { - if ( repeat ) - { - if (!post) - count--; - if (count == 0) - { - post = true; - /* yes we have repeat */ - repeat_speed--; - if (repeat_speed < REPEAT_INTERVAL_FINISH) - repeat_speed = REPEAT_INTERVAL_FINISH; - count = repeat_speed; - - repeat_count++; - } - } - else - { - if (count++ > REPEAT_START) - { - post = true; - repeat = true; - repeat_count = 0; - /* initial repeat */ - count = REPEAT_INTERVAL_START; - } - } - } - if ( post ) - { - if(repeat) - { - if (queue_empty(&button_queue)) - { - queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); - post = false; - } - } - else - { - queue_post(&button_queue, btn, NULL); - post = false; - } - -#ifdef HAVE_REMOTE_LCD - if(btn & BUTTON_REMOTE) - remote_backlight_on(); - else -#endif - backlight_on(); - - } - } - else - { - repeat = false; - count = 0; - } - } - lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT); -} - -/* Again copied from real button.c... */ - -long button_get(bool block) -{ - struct event ev; - - if ( block || !queue_empty(&button_queue) ) { - queue_wait(&button_queue, &ev); - return ev.id; - } - return BUTTON_NONE; -} - -long button_get_w_tmo(int ticks) -{ - struct event ev; - queue_wait_w_tmo(&button_queue, &ev, ticks); - return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE; -} - -void button_init(void) -{ -} - -int button_status(void) -{ - return btn; -} - -void button_clear_queue(void) -{ - queue_clear(&button_queue); -} - -#ifdef HAS_BUTTON_HOLD -bool button_hold(void) { - /* temp fix for hold button on irivers */ - return false; -} -#endif - -#ifdef HAS_REMOTE_BUTTON_HOLD -bool remote_button_hold(void) { - /* temp fix for hold button on irivers */ - return false; -} -#endif - diff --git a/uisimulator/win32/debug-win32.c b/uisimulator/win32/debug-win32.c deleted file mode 100644 index dbc0f10e85..0000000000 --- a/uisimulator/win32/debug-win32.c +++ /dev/null @@ -1,66 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include - -char debugmembuf[200]; - -void debug( const char *message ) -{ - static int debugger = -1; - - if (debugger == -1) - { - HINSTANCE hInst = LoadLibrary("kernel32.dll"); - debugger = 0; - - if (hInst != NULL) - { - FARPROC pIsDebuggerPresent = GetProcAddress(hInst, "IsDebuggerPresent"); - if (pIsDebuggerPresent != NULL) - debugger = pIsDebuggerPresent(); - } - } - - if (debugger) - OutputDebugString (message); - else - printf("%s", message); -} - -void debugf(const char *fmt, ...) -{ - va_list ap; - - va_start( ap, fmt ); - wvsprintf( debugmembuf, fmt, ap ); - va_end( ap ); - debug ( debugmembuf ); -} - -void Logf(char *fmt, ...) -{ - va_list ap; - - va_start( ap, fmt ); - wvsprintf( debugmembuf, fmt, ap ); - va_end( ap ); - debug ( debugmembuf ); -} diff --git a/uisimulator/win32/dir-win32.c b/uisimulator/win32/dir-win32.c deleted file mode 100644 index 6f14e798be..0000000000 --- a/uisimulator/win32/dir-win32.c +++ /dev/null @@ -1,91 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include -#include -#include "dir-win32.h" - -// Directory operations -// - -// opendir -// open directory for scanning -DIR *opendir ( - const char *dirname // directory name - ) -{ - DIR *p = (DIR*)malloc(sizeof(DIR)); - struct _finddata_t fd; - unsigned int i; - char *s = (char*)malloc(strlen(dirname) + 5); - wsprintf (s, "%s", dirname); - - for (i = 0; i < strlen(s); i++) - if (s[i] == '/') - s[i] = '\\'; - - if (s[i - 1] != '\\') - { - s[i] = '\\'; - s[++i] = '\0'; - } - - OutputDebugString (s); - - wsprintf (s, "%s*.*", s); - - if ((p->handle = _findfirst (s, &fd)) == -1) - { - free (s); - free (p); - return 0; - } - free (s); - return p; -} - -// closedir -// close directory -int closedir ( - DIR *dir // previously opened dir search - ) -{ - free(dir); - return 0; -} - -// read dir -// read next entry in directory -struct dirent *readdir ( - DIR *dir - ) -{ - struct _finddata_t fd; - if (_findnext (dir->handle, &fd) == -1) - return 0; - memcpy (dir->fd.d_name, fd.name, 256); - - dir->fd.attribute = fd.attrib & 0x3f; - dir->fd.size = fd.size; - dir->fd.startcluster = 0 ; - - - return &dir->fd; -} diff --git a/uisimulator/win32/dir-win32.h b/uisimulator/win32/dir-win32.h deleted file mode 100644 index 95ce326e9f..0000000000 --- a/uisimulator/win32/dir-win32.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef _DIR_WIN32_H_ -#define _DIR_WIN32_H_ - -#include - -struct dirent { - unsigned char d_name[MAX_PATH]; - int attribute; - int size; - int startcluster; -}; - -typedef struct -{ - struct dirent fd; - int handle; -} DIR; - -extern DIR* opendir(const char* name); -extern int closedir(DIR* dir); -extern int mkdir(const char* name); -extern int rmdir(const char* name); - -extern struct dirent* readdir(DIR* dir); - -#define S_ISDIR(x) (((x) & _S_IFDIR) == _S_IFDIR) - -#endif diff --git a/uisimulator/win32/kernel.c b/uisimulator/win32/kernel.c deleted file mode 100644 index 34100a234e..0000000000 --- a/uisimulator/win32/kernel.c +++ /dev/null @@ -1,167 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include "uisw32.h" -#include "kernel.h" -#include "thread-win32.h" -#include "thread.h" -#include "debug.h" - -static void (*tick_funcs[MAX_NUM_TICK_TASKS])(void); - -int set_irq_level (int level) -{ - static int _lv = 0; - return (_lv = level); -} - -void queue_init(struct event_queue *q) -{ - q->read = 0; - q->write = 0; -} - -void queue_delete(struct event_queue *q) -{ - (void)q; -} - -void queue_wait(struct event_queue *q, struct event *ev) -{ - while(q->read == q->write) - { - switch_thread(); - } - - *ev = q->events[(q->read++) & QUEUE_LENGTH_MASK]; -} - -void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks) -{ - unsigned int timeout = current_tick + ticks; - - while(q->read == q->write && TIME_BEFORE( current_tick, timeout )) - { - sleep(1); - } - - if(q->read != q->write) - { - *ev = q->events[(q->read++) & QUEUE_LENGTH_MASK]; - } - else - { - ev->id = SYS_TIMEOUT; - } -} - -void queue_post(struct event_queue *q, long id, void *data) -{ - int wr; - int oldlevel; - - oldlevel = set_irq_level(15<<4); - wr = (q->write++) & QUEUE_LENGTH_MASK; - - q->events[wr].id = id; - q->events[wr].data = data; - set_irq_level(oldlevel); -} - -bool queue_empty(const struct event_queue* q) -{ - return ( q->read == q->write ); -} - -void queue_clear(struct event_queue* q) -{ - /* fixme: This is potentially unsafe in case we do interrupt-like processing */ - q->read = 0; - q->write = 0; -} - -void switch_thread (void) -{ - yield (); -} - -void sim_tick_tasks(void) -{ - int i; - - /* Run through the list of tick tasks */ - for(i = 0;i < MAX_NUM_TICK_TASKS;i++) - { - if(tick_funcs[i]) - { - tick_funcs[i](); - } - } -} - -int tick_add_task(void (*f)(void)) -{ - int i; - - /* Add a task if there is room */ - for(i = 0;i < MAX_NUM_TICK_TASKS;i++) - { - if(tick_funcs[i] == NULL) - { - tick_funcs[i] = f; - return 0; - } - } - DEBUGF("Error! tick_add_task(): out of tasks"); - return -1; -} - -int tick_remove_task(void (*f)(void)) -{ - int i; - - /* Remove a task if it is there */ - for(i = 0;i < MAX_NUM_TICK_TASKS;i++) - { - if(tick_funcs[i] == f) - { - tick_funcs[i] = NULL; - return 0; - } - } - - return -1; -} - -/* TODO: Implement mutexes for win32 */ -void mutex_init(struct mutex *m) -{ - (void)m; -} - -void mutex_lock(struct mutex *m) -{ - (void)m; -} - -void mutex_unlock(struct mutex *m) -{ - (void)m; -} diff --git a/uisimulator/win32/lcd-win32.c b/uisimulator/win32/lcd-win32.c deleted file mode 100644 index 8afd025a16..0000000000 --- a/uisimulator/win32/lcd-win32.c +++ /dev/null @@ -1,326 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include -#include "uisw32.h" -#include "lcd.h" -#include "lcd-playersim.h" -#include "debug.h" - -#if LCD_DEPTH == 16 -unsigned short bitmap[LCD_HEIGHT][LCD_WIDTH]; /* the ui display */ - -BITMAPINFO256 bmi = -{ - {sizeof (BITMAPINFOHEADER), - LCD_WIDTH, -LCD_HEIGHT, 1, 16, - BI_BITFIELDS, 0, 0, 0, 3, 3, - }, /* bitfield masks (RGB565) */ - {{0x00, 0xf8, 0, 0}, {0xe0, 0x07, 0, 0}, {0x1f, 0x00, 0, 0}} -}; /* bitmap information */ -#else -unsigned char bitmap[LCD_HEIGHT][LCD_WIDTH]; /* the ui display */ -RGBQUAD color_zero = {UI_LCD_BGCOLORLIGHT, 0}; -RGBQUAD color_max = {0, 0, 0, 0}; - -BITMAPINFO256 bmi = -{ - {sizeof (BITMAPINFOHEADER), - LCD_WIDTH, -LCD_HEIGHT, 1, 8, - BI_RGB, 0, 0, 0, 2, 2, - }, - {} /* colour lookup table gets filled later */ -}; /* bitmap information */ -#endif - -#ifdef HAVE_LCD_BITMAP - -#ifdef HAVE_REMOTE_LCD -unsigned char remote_bitmap[LCD_REMOTE_HEIGHT][LCD_REMOTE_WIDTH]; -RGBQUAD remote_color_zero = {UI_REMOTE_BGCOLORLIGHT, 0}; -RGBQUAD remote_color_max = {0, 0, 0, 0}; - -BITMAPINFO256 remote_bmi = -{ - {sizeof (BITMAPINFOHEADER), - LCD_REMOTE_WIDTH, -LCD_REMOTE_HEIGHT, 1, 8, - BI_RGB, 0, 0, 0, 2, 2, - }, - {} /* colour lookup table gets filled later */ -}; -#endif - -void lcd_update(void) -{ - lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); -} - -void lcd_update_rect(int x_start, int y_start, - int width, int height) -{ - int x, y; - int xmax, ymax; - RECT r; - - ymax = y_start + height; - xmax = x_start + width; - - if (hGUIWnd == NULL) - _endthread (); - - if(xmax > LCD_WIDTH) - xmax = LCD_WIDTH; - if(ymax >= LCD_HEIGHT) - ymax = LCD_HEIGHT; - - for (x = x_start; x < xmax; x++) - for (y = y_start; y < ymax; y++) - { -#if LCD_DEPTH == 1 - bitmap[y][x] = ((lcd_framebuffer[y/8][x] >> (y & 7)) & 1); -#elif LCD_DEPTH == 2 -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - bitmap[y][x] = ((lcd_framebuffer[y][x/4] >> (2 * (x & 3))) & 3); -#else - bitmap[y][x] = ((lcd_framebuffer[y/4][x] >> (2 * (y & 3))) & 3); -#endif -#elif LCD_DEPTH == 16 -#if LCD_PIXELFORMAT == RGB565SWAPPED - unsigned bits = lcd_framebuffer[y][x]; - bitmap[y][x] = (bits >> 8) | (bits << 8); -#else - bitmap[y][x] = lcd_framebuffer[y][x]; -#endif -#endif - } - - /* Invalidate only the window part that actually did change */ - GetClientRect (hGUIWnd, &r); - r.left = (UI_LCD_POSX + (UI_LCD_WIDTH * x_start / LCD_WIDTH)) - * r.right / UI_WIDTH; - r.top = (UI_LCD_POSY + (UI_LCD_HEIGHT * y_start / LCD_HEIGHT)) - * r.bottom / UI_HEIGHT; - r.right = (UI_LCD_POSX + (UI_LCD_WIDTH * xmax / LCD_WIDTH)) - * r.right / UI_WIDTH; - r.bottom = (UI_LCD_POSY + (UI_LCD_HEIGHT * ymax / LCD_HEIGHT)) - * r.bottom / UI_HEIGHT; - InvalidateRect (hGUIWnd, &r, FALSE); -} - -#ifdef HAVE_REMOTE_LCD - -extern unsigned char lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH]; - -void lcd_remote_update (void) -{ - lcd_remote_update_rect(0, 0, LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT); -} - -void lcd_remote_update_rect(int x_start, int y_start, - int width, int height) -{ - int x, y; - int xmax, ymax; - RECT r; - - ymax = y_start + height; - xmax = x_start + width; - - if (hGUIWnd == NULL) - _endthread (); - - if(xmax > LCD_REMOTE_WIDTH) - xmax = LCD_REMOTE_WIDTH; - if(ymax >= LCD_REMOTE_HEIGHT) - ymax = LCD_REMOTE_HEIGHT; - - for (x = x_start; x < xmax; x++) - for (y = y_start; y < ymax; y++) - remote_bitmap[y][x] = ((lcd_remote_framebuffer[y/8][x] >> (y & 7)) & 1); - - /* Invalidate only the window part that actually did change */ - GetClientRect (hGUIWnd, &r); - r.left = (UI_REMOTE_POSX + (UI_REMOTE_WIDTH * x_start / LCD_REMOTE_WIDTH)) - * r.right / UI_WIDTH; - r.top = (UI_REMOTE_POSY + (UI_REMOTE_HEIGHT * y_start / LCD_REMOTE_HEIGHT)) - * r.bottom / UI_HEIGHT; - r.right = (UI_REMOTE_POSX + (UI_REMOTE_WIDTH * xmax / LCD_REMOTE_WIDTH)) - * r.right / UI_WIDTH; - r.bottom = (UI_REMOTE_POSY + (UI_REMOTE_HEIGHT * ymax / LCD_REMOTE_HEIGHT)) - * r.bottom / UI_HEIGHT; - InvalidateRect (hGUIWnd, &r, FALSE); -} - -#endif /* HAVE_REMOTE_LCD */ -#endif /* HAVE_LCD_BITMAP */ - -#ifdef HAVE_LCD_CHARCELLS -/* Defined in lcd-playersim.c */ -extern void lcd_print_char(int x, int y); -extern bool lcd_display_redraw; -extern unsigned char hardware_buffer_lcd[11][2]; -static unsigned char lcd_buffer_copy[11][2]; - -void lcd_update(void) -{ - int x, y; - bool changed = false; - RECT r; - - if (hGUIWnd == NULL) - _endthread (); - - for (y = 0; y < 2; y++) - { - for (x = 0; x < 11; x++) - { - if (lcd_display_redraw || - lcd_buffer_copy[x][y] != hardware_buffer_lcd[x][y]) - { - lcd_buffer_copy[x][y] = hardware_buffer_lcd[x][y]; - lcd_print_char(x, y); - changed = true; - } - } - } - if (changed) - { - /* Invalidate only the window part that actually did change */ - GetClientRect (hGUIWnd, &r); - r.left = UI_LCD_POSX * r.right / UI_WIDTH; - r.top = UI_LCD_POSY * r.bottom / UI_HEIGHT; - r.right = (UI_LCD_POSX + UI_LCD_WIDTH) * r.right / UI_WIDTH; - r.bottom = (UI_LCD_POSY + UI_LCD_HEIGHT) * r.bottom / UI_HEIGHT; - InvalidateRect (hGUIWnd, &r, FALSE); - } - lcd_display_redraw = false; -} - -void drawdots(int color, struct coordinate *points, int count) -{ - while (count--) - { - bitmap[points[count].y][points[count].x] = color; - } -} - -void drawrectangles(int color, struct rectangle *points, int count) -{ - while (count--) - { - int x; - int y; - int ix; - int iy; - - for (x = points[count].x, ix = 0; ix < points[count].width; x++, ix++) - { - for (y = points[count].y, iy = 0; iy < points[count].height; y++, iy++) - { - bitmap[y][x] = color; - } - } - } -} -#endif /* HAVE_LCD_CHARCELLS */ - -#if 0 -/* set backlight state of lcd */ -void lcd_backlight (bool on) -{ - if (on) - color_zero = {UI_LCD_BGCOLORLIGHT, 0}; - else - color_zero = {UI_LCD_BGCOLOR, 0}; - - lcdcolors(0, (1<rgbRed - + (end->rgbRed - start->rgbRed) * i / count; - bmi.bmiColors[i+index].rgbGreen = start->rgbGreen - + (end->rgbGreen - start->rgbGreen) * i / count; - bmi.bmiColors[i+index].rgbBlue = start->rgbBlue - + (end->rgbBlue - start->rgbBlue) * i / count; - } -} -#endif - -#ifdef HAVE_REMOTE_LCD -/* set a range of bitmap indices to a gradient from startcolour to endcolour */ -void lcdremotecolors(int index, int count, RGBQUAD *start, RGBQUAD *end) -{ - int i; - - remote_bmi.bmiHeader.biClrUsed = index + count; - remote_bmi.bmiHeader.biClrImportant = index + count; - - count--; - for (i = 0; i <= count; i++) - { - remote_bmi.bmiColors[i+index].rgbRed = start->rgbRed - + (end->rgbRed - start->rgbRed) * i / count; - remote_bmi.bmiColors[i+index].rgbGreen = start->rgbGreen - + (end->rgbGreen - start->rgbGreen) * i / count; - remote_bmi.bmiColors[i+index].rgbBlue = start->rgbBlue - + (end->rgbBlue - start->rgbBlue) * i / count; - } -} -#endif - -/* initialise simulator lcd driver */ -void simlcdinit(void) -{ -#if LCD_DEPTH <= 8 - lcdcolors(0, (1< 0) ? "on" : "off"); -} -#endif - -#ifdef HAVE_REMOTE_LCD -void sim_remote_backlight(int value) -{ - DEBUGF("remote backlight: %s\n", (value > 0) ? "on" : "off"); -} -#endif - diff --git a/uisimulator/win32/lcd-win32.h b/uisimulator/win32/lcd-win32.h deleted file mode 100644 index b3533ad0cb..0000000000 --- a/uisimulator/win32/lcd-win32.h +++ /dev/null @@ -1,47 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef __LCDWIN32_H__ -#define __LCDWIN32_H__ - -#include "uisw32.h" -#include "lcd.h" - -// BITMAPINFO256 -typedef struct -{ - BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[256]; -} BITMAPINFO256; - -#if LCD_DEPTH <= 8 -extern unsigned char bitmap[LCD_HEIGHT][LCD_WIDTH]; // the ui display -#elif LCD_DEPTH <= 16 -extern unsigned short bitmap[LCD_HEIGHT][LCD_WIDTH]; // the ui display -#endif -extern BITMAPINFO256 bmi; // bitmap information - -#ifdef HAVE_REMOTE_LCD -extern unsigned char remote_bitmap[LCD_REMOTE_HEIGHT][LCD_REMOTE_WIDTH]; -extern BITMAPINFO256 remote_bmi; // bitmap information -#endif - -void simlcdinit(void); - -#endif // #ifndef __LCDWIN32_H__ diff --git a/uisimulator/win32/panic-win32.c b/uisimulator/win32/panic-win32.c deleted file mode 100644 index 614510f3a8..0000000000 --- a/uisimulator/win32/panic-win32.c +++ /dev/null @@ -1,43 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include "debug.h" - -char panic_buf[128]; - -// panic -// whatever it says ;) -void panic( char *message ) -{ - debugf ( message ); - PostQuitMessage (-1); -} - - -// panicf -// formatted panic -void panicf( char *fmt, ...) -{ - va_list ap; - va_start( ap, fmt ); - wsprintf( panic_buf, fmt, ap ); - va_end( ap ); - panic( panic_buf ); -} diff --git a/uisimulator/win32/plugin-win32.h b/uisimulator/win32/plugin-win32.h deleted file mode 100644 index dd1c79080b..0000000000 --- a/uisimulator/win32/plugin-win32.h +++ /dev/null @@ -1,48 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef _PLUGIN_WIN32_H_ -#define _PLUGIN_WIN32_H_ - -#define BOOL win32_BOOL /* Avoid conflicts with BOOL/INT defined as */ -#define INT win32_INT /* enum values in settings.h */ - -#include -#include "plugin.h" -#include "file.h" - -#define RTLD_NOW 0 - -#undef filesize -#define filesize win32_filesize - -#undef ftruncate -#define ftruncate NULL - -typedef enum plugin_status (*plugin_fn)(struct plugin_api* api, void* param); - -#define dlopen(_x_, _y_) LoadLibrary(_x_) -#define dlsym(_x_, _y_) (plugin_fn)GetProcAddress(_x_, _y_) -#define dlclose(_x_) FreeLibrary(_x_) -#define dlerror() "Unknown" - -int strcasecmp (const char *a, const char *b); -int strncasecmp (const char *a, const char *b, size_t n); - -#endif diff --git a/uisimulator/win32/plugin.def b/uisimulator/win32/plugin.def deleted file mode 100755 index e37ce20d8f..0000000000 --- a/uisimulator/win32/plugin.def +++ /dev/null @@ -1,2 +0,0 @@ -EXPORTS - __header diff --git a/uisimulator/win32/resource.h b/uisimulator/win32/resource.h deleted file mode 100644 index dc8a238d78..0000000000 --- a/uisimulator/win32/resource.h +++ /dev/null @@ -1,19 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by uisw32.rc -// -#define IDB_BITMAP1 102 -#define IDR_JPG1 103 -#define IDB_BITMAP2 104 -#define IDB_UI 104 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/uisimulator/win32/rockbox.dsp b/uisimulator/win32/rockbox.dsp deleted file mode 100644 index ae43fdf7bb..0000000000 --- a/uisimulator/win32/rockbox.dsp +++ /dev/null @@ -1,626 +0,0 @@ -# Microsoft Developer Studio Project File - Name="rockbox" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=rockbox - Win32 Player -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "rockbox.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "rockbox.mak" CFG="rockbox - Win32 Player" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "rockbox - Win32 Recorder" (based on "Win32 (x86) Application") -!MESSAGE "rockbox - Win32 Player" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "rockbox___Win32_Recorder" -# PROP BASE Intermediate_Dir "rockbox___Win32_Recorder" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "rockbox___Win32_Recorder" -# PROP Intermediate_Dir "rockbox___Win32_Recorder" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../win32" /I "../../apps/recorder" /I "../../firmware/export" /I "../../firmware/drivers" /I "../../firmware/common" /I "../common" /I "../../apps" /D "ARCHOS_RECORDER" /D "HAVE_LCD_BITMAP" /D "HAVE_RECORDER_KEYPAD" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "GETTIMEOFDAY_TWO_ARGS" /D "SIMULATOR" /D "HAVE_RTC" /D APPSVERSION=\"WIN32SIM\" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcmtd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "rockbox___Win32_Player" -# PROP BASE Intermediate_Dir "rockbox___Win32_Player" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "rockbox___Win32_Player" -# PROP Intermediate_Dir "rockbox___Win32_Player" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../win32" /I "../../apps/player" /I "../../firmware/export" /I "../../firmware/drivers" /I "../../firmware/common" /I "../common" /I "../../apps" /D "ARCHOS_PLAYER" /D "HAVE_LCD_CHARCELLS" /D "HAVE_PLAYER_KEYPAD" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "GETTIMEOFDAY_TWO_ARGS" /D "SIMULATOR" /D APPSVERSION=\"WIN32SIM\" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcmtd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "rockbox - Win32 Recorder" -# Name "rockbox - Win32 Player" -# Begin Group "Firmware" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\firmware\buffer.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\font.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\id3.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\mp3_playback.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\mp3data.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\mpeg.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\powermgmt.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\usb.c -# End Source File -# End Group -# Begin Group "Drivers" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE="..\..\firmware\drivers\lcd-player-charset.c" - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE="..\..\firmware\drivers\lcd-player.c" - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE="..\common\lcd-playersim.c" - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE="..\..\firmware\drivers\lcd-recorder.c" - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\drivers\power.c -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\firmware\common\errno.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\common\random.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\common\sprintf.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\common\strtok.c -# End Source File -# Begin Source File - -SOURCE=..\..\firmware\common\timefuncs.c -# End Source File -# End Group -# Begin Group "Apps" - -# PROP Default_Filter "" -# Begin Group "Player" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\apps\player\icons.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\apps\player\icons.h - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\apps\player\keyboard.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Recorder" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\apps\recorder\bmp.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\apps\recorder\icons.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\apps\recorder\keyboard.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\apps\recorder\peakmeter.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\apps\recorder\widgets.c - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\apps\alarm_menu.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\bookmark.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\credits.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\debug_menu.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\filetypes.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\language.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\main.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\main_menu.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\menu.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\misc.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\onplay.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\playlist.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\playlist_menu.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\playlist_viewer.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\plugin.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\screens.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\settings.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\settings_menu.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\sleeptimer.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\sound_menu.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\status.c -# End Source File -# Begin Source File - -SOURCE=..\..\apps\tree.c -# End Source File -# Begin Source File - -SOURCE="..\..\apps\wps-display.c" -# End Source File -# Begin Source File - -SOURCE=..\..\apps\wps.c -# End Source File -# End Group -# Begin Group "Win32" - -# PROP Default_Filter "" -# Begin Group "AppsCommon" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE="..\common\lcd-common.c" -# End Source File -# Begin Source File - -SOURCE=..\common\mpegplay.c -# End Source File -# Begin Source File - -SOURCE=..\common\sim_icons.c -# End Source File -# Begin Source File - -SOURCE=..\common\stubs.c -# End Source File -# End Group -# Begin Source File - -SOURCE=.\button.c -# End Source File -# Begin Source File - -SOURCE=".\debug-win32.c" -# End Source File -# Begin Source File - -SOURCE=".\dir-win32.c" -# End Source File -# Begin Source File - -SOURCE="..\common\font-player.c" - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\io.c -# End Source File -# Begin Source File - -SOURCE=.\kernel.c -# End Source File -# Begin Source File - -SOURCE=.\lang.c -# End Source File -# Begin Source File - -SOURCE=".\lcd-win32.c" -# End Source File -# Begin Source File - -SOURCE=".\mpeg-win32.c" -# End Source File -# Begin Source File - -SOURCE=".\panic-win32.c" -# End Source File -# Begin Source File - -SOURCE=".\string-win32.c" -# End Source File -# Begin Source File - -SOURCE=.\sysfont.c -# End Source File -# Begin Source File - -SOURCE=".\thread-win32.c" -# End Source File -# Begin Source File - -SOURCE=.\uisw32.c -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\uisw32.rc -# End Source File -# End Group -# Begin Group "Script inputs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\firmware\fonts\clR6x8.bdf - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# Begin Custom Build - Creating font from $(InputPath) -InputPath=..\..\firmware\fonts\clR6x8.bdf - -"sysfont.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ..\..\tools\convbdf -c -o sysfont.c $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# Begin Custom Build - Creating font from $(InputPath) -InputPath=..\..\firmware\fonts\clR6x8.bdf - -"sysfont.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ..\..\tools\convbdf -c -o sysfont.c $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\docs\CREDITS - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating credits from $(InputPath) -InputPath=..\..\docs\CREDITS - -"../../apps/credits.raw" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - perl ../../apps/credits.pl < $(InputPath) > ../../apps/credits.raw - -# End Custom Build - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating credits from $(InputPath) -InputPath=..\..\docs\CREDITS - -"../../apps/credits.raw" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - perl ../../apps/credits.pl < $(InputPath) > ../../apps/credits.raw - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\apps\lang\english.lang - -!IF "$(CFG)" == "rockbox - Win32 Recorder" - -# Begin Custom Build - Creating language files from $(InputPath) -InputPath=..\..\apps\lang\english.lang - -BuildCmds= \ - perl -s ..\..\tools\genlang -p=lang $(InputPath) - -"lang.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"lang.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "rockbox - Win32 Player" - -# Begin Custom Build - Creating language files from $(InputPath) -InputPath=..\..\apps\lang\english.lang - -BuildCmds= \ - perl -s ..\..\tools\genlang -p=lang $(InputPath) - -"lang.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"lang.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# End Target -# End Project diff --git a/uisimulator/win32/rockbox.ico b/uisimulator/win32/rockbox.ico deleted file mode 100644 index 0769e6aec8..0000000000 Binary files a/uisimulator/win32/rockbox.ico and /dev/null differ diff --git a/uisimulator/win32/sound.c b/uisimulator/win32/sound.c deleted file mode 100644 index 54140f59e4..0000000000 --- a/uisimulator/win32/sound.c +++ /dev/null @@ -1,201 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2005 by Magnus Holmgren - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "autoconf.h" - -#ifdef ROCKBOX_HAS_SIMSOUND - -#define WINDOWS_LEAN_AND_MEAN -#include - -#include -#include -#include - -#include "sound.h" -#include "kernel.h" -#include "thread-win32.h" -#include "debug.h" - -static bool playing = false; - -void pcm_play_stop(void); - -static void sound_play_chunk(HWAVEOUT wave_out, LPWAVEHDR header, - HANDLE event) -{ - unsigned char* buf; - long len; - - if (!(header->dwFlags & WHDR_DONE) || !sound_get_pcm) - { - return; - } - - EnterCriticalSection(&CriticalSection); - sound_get_pcm(&buf, &len); - LeaveCriticalSection(&CriticalSection); - - if (len == 0) - { - DEBUGF("simulator got no pcm\n"); - sound_get_pcm = NULL; - return; - } - - header->lpData = buf; - header->dwBufferLength = len; - header->dwBytesRecorded = 0; - header->dwUser = 0; - header->dwFlags = 0; - header->dwLoops = 1; - header->lpNext = NULL; - header->reserved = 0; - - if (MMSYSERR_NOERROR != waveOutPrepareHeader(wave_out, header, - sizeof(*header))) - { - return; - } - - ResetEvent(event); - - waveOutWrite(wave_out, header, sizeof(*header)); -} - -static int sound_init(LPHWAVEOUT wave_out, HANDLE event) -{ - static const WAVEFORMATEX format = - { - WAVE_FORMAT_PCM, /* Format */ - 2, /* Number of channels */ - 44100, /* Samples per second */ - 44100 * 4, /* Bytes per second */ - 4, /* Block align */ - 16, /* Bits per sample */ - 0 /* Extra size */ - }; - - if (MMSYSERR_NOERROR != waveOutOpen(wave_out, WAVE_MAPPER, &format, - (DWORD_PTR) event, 0, CALLBACK_EVENT)) - { - return -1; - } - - /* Full volume on left and right */ - waveOutSetVolume(*wave_out, 0xffffffff); - - return 0; -} - -void sound_playback_thread(void) -{ - /* To get smooth playback, two buffers are needed, which are queued for - * playback. (There can still be glitches though.) - */ - HWAVEOUT wave_out; - WAVEHDR header1; - WAVEHDR header2; - HANDLE event; - int result = -1; - - if ((event = CreateEvent(NULL, FALSE, FALSE, NULL))) - { - result = sound_init(&wave_out, event); - } - - while(-1 == result || !event) - { - Sleep(100000); /* Wait forever, can't play sound! */ - } - - while (true) - { - while (!sound_get_pcm) - { - /* TODO: fix a fine thread-synch mechanism here */ - Sleep(100); - } - - DEBUGF("starting simulator playback\n"); - header1.dwFlags = WHDR_DONE; - header2.dwFlags = WHDR_DONE; - sound_play_chunk(wave_out, &header1, event); - sound_play_chunk(wave_out, &header2, event); - - while (sound_get_pcm - && (WAIT_FAILED != WaitForSingleObject(event, 1000))) - { - sound_play_chunk(wave_out, &header1, event); - sound_play_chunk(wave_out, &header2, event); - } - - pcm_play_stop(); - - DEBUGF("stopping simulator playback\n"); - - waveOutReset(wave_out); - } -} - - -/* Stubs for PCM audio playback. */ -bool pcm_is_playing(void) -{ - return playing; -} - -void pcm_mute(bool state) -{ - (void)state; -} - -void pcm_play_pause(bool state) -{ - (void)state; -} - -bool pcm_is_paused(void) -{ - return false; -} - -void pcm_play_stop(void) -{ - playing = false; -} - -void pcm_init(void) -{ -} - -void (*sound_get_pcm)(unsigned char** start, long* size); -void pcm_play_data(void (*get_more)(unsigned char** start, long* size)) -{ - sound_get_pcm = get_more; - playing = true; -} - -long pcm_get_bytes_waiting(void) -{ - return 0; -} - - -#endif /* ROCKBOX_HAS_SIMSOUND */ diff --git a/uisimulator/win32/sound.h b/uisimulator/win32/sound.h deleted file mode 100644 index 87499cac8e..0000000000 --- a/uisimulator/win32/sound.h +++ /dev/null @@ -1,22 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2005 by Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -void sound_playback_thread(void); - -extern void (*sound_get_pcm)(unsigned char** start, long* size); diff --git a/uisimulator/win32/sprintf.h b/uisimulator/win32/sprintf.h deleted file mode 100644 index 24e1d4e352..0000000000 --- a/uisimulator/win32/sprintf.h +++ /dev/null @@ -1,36 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef __SPRINTF_H__ -#define __SPRINTF_H__ - -#include -#include -#include - -int snprintf (char *buf, size_t size, const char *fmt, ...); -char *strtok_r (char *, const char *, char **); - -int rockbox_fprintf (int fd, const char *fmt, ...); -#define fprintf rockbox_fprintf - -int rockbox_vsnprintf (char *buf, int size, const char *fmt, va_list ap); -#define vsnprintf rockbox_vsnprintf - -#endif /* __SPRINTF_H__ */ diff --git a/uisimulator/win32/stdbool.h b/uisimulator/win32/stdbool.h deleted file mode 100644 index d91ef374b9..0000000000 --- a/uisimulator/win32/stdbool.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef __STDBOOL_H__ -#define __STDBOOL_H__ 1 - -#ifndef __MINGW32__ -typedef unsigned int bool; -#define __attribute__(s) - -#define true 1 -#define false 0 -#else - -typedef enum -{ - false = 0, - true = 1 -} bool; - -#define false false -#define true true - -/* Signal that all the definitions are present. */ -#define __bool_true_false_are_defined 1 - -#endif - -#endif /* __STDBOOL_H__ */ - diff --git a/uisimulator/win32/string-win32.c b/uisimulator/win32/string-win32.c deleted file mode 100644 index ced1a410ca..0000000000 --- a/uisimulator/win32/string-win32.c +++ /dev/null @@ -1,34 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef __MINGW32__ - -#include - -int strcasecmp (const char *a, const char *b) -{ - return stricmp (a, b); -} - -int strncasecmp (const char *a, const char *b, size_t n) -{ - return _strnicmp (a, b, n); -} - -#endif diff --git a/uisimulator/win32/thread-win32.c b/uisimulator/win32/thread-win32.c deleted file mode 100644 index 7c33017c7e..0000000000 --- a/uisimulator/win32/thread-win32.c +++ /dev/null @@ -1,80 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#define WINDOWS_LEAN_AND_MEAN -#include -#include -#include "thread-win32.h" -#include "kernel.h" -#include "debug.h" - -HANDLE lpThreads[256]; -int nThreads = 0, - nPos = 0; -long current_tick = 0; -CRITICAL_SECTION CriticalSection; - - -void yield(void) -{ - LeaveCriticalSection(&CriticalSection); - Sleep(1); - EnterCriticalSection(&CriticalSection); -} - -void sim_sleep(int ticks) -{ - LeaveCriticalSection(&CriticalSection); - Sleep((1000/HZ) * ticks); - EnterCriticalSection(&CriticalSection); -} - -DWORD WINAPI runthread (LPVOID lpParameter) -{ - EnterCriticalSection(&CriticalSection); - ((void(*)())lpParameter) (); - LeaveCriticalSection(&CriticalSection); - return 0; -} - -int create_thread(void (*fp)(void), void* sp, int stk_size) -{ - DWORD dwThreadID; - - (void)sp; - (void)stk_size; - - if (nThreads == 256) - return -1; - - lpThreads[nThreads++] = CreateThread (NULL, - 0, - runthread, - fp, - 0, - &dwThreadID); - - return 0; -} - -void init_threads(void) -{ - InitializeCriticalSection(&CriticalSection); - EnterCriticalSection(&CriticalSection); -} diff --git a/uisimulator/win32/thread-win32.h b/uisimulator/win32/thread-win32.h deleted file mode 100644 index 467c47ee39..0000000000 --- a/uisimulator/win32/thread-win32.h +++ /dev/null @@ -1,23 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -extern HANDLE lpThreads[256]; -extern int nPos, - nThreads; -extern CRITICAL_SECTION CriticalSection; diff --git a/uisimulator/win32/timefuncs.h b/uisimulator/win32/timefuncs.h deleted file mode 100644 index 8fbc5b1c85..0000000000 --- a/uisimulator/win32/timefuncs.h +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include -#include - -/* struct tm defined */ -struct tm *get_time(void); -int set_time(const struct tm *tm); -bool valid_time(const struct tm *tm); diff --git a/uisimulator/win32/uisw32.c b/uisimulator/win32/uisw32.c deleted file mode 100644 index 1b4dbbd410..0000000000 --- a/uisimulator/win32/uisw32.c +++ /dev/null @@ -1,344 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include -#include -#include -#include "autoconf.h" -#include "uisw32.h" -#include "resource.h" -#include "button.h" -#include "thread.h" -#include "thread-win32.h" -#include "kernel.h" -#include "sound.h" - -#ifndef LR_VGACOLOR /* Should be under MINGW32 builds? */ -#define LR_VGACOLOR LR_COLOR -#endif - -// extern functions -extern void app_main (void *); // mod entry point -extern void new_key(int key); -extern void sim_tick_tasks(void); - -void button_event(int key, bool pressed); - -// variables -HWND hGUIWnd; // the GUI window handle -unsigned int uThreadID; // id of mod thread -PBYTE lpKeys; -bool bActive; // window active? -HANDLE hGUIThread; // thread for GUI -#ifdef ROCKBOX_HAS_SIMSOUND -HANDLE hSoundThread; // thread for sound -#endif -bool bIsWinNT; // Windows NT derivate? - -bool lcd_display_redraw=true; // Used for player simulator -char having_new_lcd=true; // Used for player simulator - -// GUIWndProc -// window proc for GUI simulator -LRESULT CALLBACK GUIWndProc ( - HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam - ) -{ - static HBITMAP hBkgnd; - static HDC hMemDc; - - static LARGE_INTEGER persec, tick1, ticknow; - long new_tick; - - switch (uMsg) - { - case WM_TIMER: - QueryPerformanceCounter(&ticknow); - new_tick = ((ticknow.QuadPart-tick1.QuadPart)*HZ)/persec.QuadPart; - if (new_tick != current_tick) - { - long i; - for (i = new_tick - current_tick; i > 0; i--) - sim_tick_tasks(); - current_tick = new_tick; - } - return TRUE; - case WM_ACTIVATE: - if (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE) - bActive = true; - else - bActive = false; - return TRUE; - case WM_CREATE: - QueryPerformanceFrequency(&persec); - QueryPerformanceCounter(&tick1); - SetTimer (hWnd, TIMER_EVENT, 1, NULL); - - // load background image - hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), - MAKEINTRESOURCE(IDB_UI), IMAGE_BITMAP, 0, 0, LR_VGACOLOR); - hMemDc = CreateCompatibleDC (GetDC (hWnd)); - SelectObject (hMemDc, hBkgnd); - return TRUE; - case WM_SIZING: - { - LPRECT r = (LPRECT)lParam; - char s[256]; - int v; - int h_add = GetSystemMetrics (SM_CXSIZEFRAME) * 2 + 4; - int v_add = GetSystemMetrics (SM_CYSIZEFRAME) * 2 - + GetSystemMetrics (SM_CYCAPTION) + 4; - - switch (wParam) - { - case WMSZ_BOTTOM: - v = (r->bottom - r->top) / (UI_HEIGHT / 5); - r->bottom = r->top + v * UI_HEIGHT / 5 + v_add; - r->right = r->left + v * UI_WIDTH / 5 + h_add; - break; - case WMSZ_RIGHT: - v = (r->right - r->left) / (UI_WIDTH / 5); - r->bottom = r->top + v * UI_HEIGHT / 5 + v_add; - r->right = r->left + v * UI_WIDTH / 5 + h_add; - break; - case WMSZ_TOP: - v = (r->bottom - r->top) / (UI_HEIGHT / 5); - r->top = r->bottom - v * UI_HEIGHT / 5 - v_add; - r->right = r->left + v * UI_WIDTH / 5 + h_add; - break; - case WMSZ_LEFT: - v = (r->right - r->left) / (UI_WIDTH / 5); - r->bottom = r->top + v * UI_HEIGHT / 5 + v_add; - r->left = r->right - v * UI_WIDTH / 5 - h_add; - break; - case WMSZ_BOTTOMRIGHT: - v = ((r->right - r->left) * UI_HEIGHT - +(r->bottom - r->top) * UI_WIDTH) - / (2 * UI_WIDTH * UI_HEIGHT / 5); - r->bottom = r->top + v * UI_HEIGHT / 5 + v_add; - r->right = r->left + v * UI_WIDTH / 5 + h_add; - break; - case WMSZ_BOTTOMLEFT: - v = ((r->right - r->left) * UI_HEIGHT - +(r->bottom - r->top) * UI_WIDTH) - / (2 * UI_WIDTH * UI_HEIGHT / 5); - r->bottom = r->top + v * UI_HEIGHT / 5 + v_add; - r->left = r->right - v * UI_WIDTH / 5 - h_add; - break; - case WMSZ_TOPRIGHT: - v = ((r->right - r->left) * UI_HEIGHT - +(r->bottom - r->top) * UI_WIDTH) - / (2 * UI_WIDTH * UI_HEIGHT / 5); - r->top = r->bottom - v * UI_HEIGHT / 5 - v_add; - r->right = r->left + v * UI_WIDTH / 5 + h_add; - break; - case WMSZ_TOPLEFT: - v = ((r->right - r->left) * UI_HEIGHT - +(r->bottom - r->top) * UI_WIDTH) - / (2 * UI_WIDTH * UI_HEIGHT / 5); - r->top = r->bottom - v * UI_HEIGHT / 5 - v_add; - r->left = r->right - v * UI_WIDTH / 5 - h_add; - break; - } - - wsprintf (s, UI_TITLE " @%d%%", - (r->right - r->left - h_add + 1) * 100 / UI_WIDTH); - SetWindowText (hWnd, s); - - return TRUE; - } - case WM_ERASEBKGND: - { - HDC hDc = (HDC) wParam; - RECT r; - - GetClientRect (hWnd, &r); - // blit background image to screen - SetStretchBltMode(hDc, bIsWinNT ? HALFTONE : COLORONCOLOR); - StretchBlt (hDc, 0, 0, r.right, r.bottom, - hMemDc, 0, 0, UI_WIDTH, UI_HEIGHT, SRCCOPY); - return TRUE; - } - case WM_PAINT: - { - PAINTSTRUCT ps; - RECT r; - HDC hDc = BeginPaint (hWnd, &ps); - - GetClientRect (hWnd, &r); - // draw lcd screen - SetStretchBltMode(hDc, bIsWinNT ? HALFTONE : COLORONCOLOR); - StretchDIBits (hDc, - UI_LCD_POSX * r.right / UI_WIDTH, - UI_LCD_POSY * r.bottom / UI_HEIGHT, - UI_LCD_WIDTH * r.right / UI_WIDTH, - UI_LCD_HEIGHT * r.bottom / UI_HEIGHT, - 0, 0, LCD_WIDTH, LCD_HEIGHT, - bitmap, (BITMAPINFO *) &bmi, DIB_RGB_COLORS, - SRCCOPY); -#ifdef HAVE_REMOTE_LCD - StretchDIBits (hDc, - UI_REMOTE_POSX * r.right / UI_WIDTH, - UI_REMOTE_POSY * r.bottom / UI_HEIGHT, - UI_REMOTE_WIDTH * r.right / UI_WIDTH, - UI_REMOTE_HEIGHT * r.bottom / UI_HEIGHT, - 0, 0, LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT, - remote_bitmap, (BITMAPINFO *) &remote_bmi, - DIB_RGB_COLORS, SRCCOPY); -#endif - EndPaint (hWnd, &ps); - return TRUE; - } - case WM_CLOSE: - // close simulator - KillTimer (hWnd, TIMER_EVENT); - hGUIWnd = NULL; - PostQuitMessage (0); - break; - case WM_DESTROY: - // close simulator - hGUIWnd = NULL; - PostQuitMessage (0); - break; - case WM_KEYDOWN: - button_event(wParam, true); - break; - case WM_KEYUP: - button_event(wParam, false); - break; - } - - return DefWindowProc (hWnd, uMsg, wParam, lParam); -} - -// GUIStartup -// register window class, show window, init GUI -BOOL GUIStartup () -{ - WNDCLASS wc; - - // create window class - ZeroMemory (&wc, sizeof(wc)); - wc.hbrBackground = GetSysColorBrush (COLOR_WINDOW); - wc.hCursor = LoadCursor (NULL, IDC_ARROW); - wc.hInstance = GetModuleHandle (NULL); - wc.lpfnWndProc = GUIWndProc; - wc.lpszClassName = "RockBoxUISimulator"; - wc.style = CS_HREDRAW | CS_VREDRAW; - - if (RegisterClass (&wc) == 0) - return FALSE; - - // create window - hGUIWnd = CreateWindowEx ( - WS_EX_OVERLAPPEDWINDOW, - "RockBoxUISimulator", UI_TITLE, - WS_VISIBLE | WS_SYSMENU | WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, - UI_WIDTH + GetSystemMetrics (SM_CXSIZEFRAME) * 2 +4, - UI_HEIGHT + GetSystemMetrics (SM_CYSIZEFRAME) * 2 + - GetSystemMetrics (SM_CYCAPTION) +4, - NULL, NULL, GetModuleHandle (NULL), NULL); - - if (hGUIWnd == NULL) - return FALSE; - - simlcdinit(); - - return TRUE; -} - -// GUIDown -// destroy window, unregister window class -int GUIDown () -{ - int i; - - DestroyWindow (hGUIWnd); - CloseHandle (hGUIThread); -#ifdef ROCKBOX_HAS_SIMSOUND - CloseHandle (hSoundThread); -#endif - - for (i = 0; i < nThreads; i++) - { - CloseHandle (lpThreads[i]); - } - return 0; -} - -// GUIMessageLoop -// standard message loop for GUI window -void GUIMessageLoop () -{ - MSG msg; - while (GetMessage (&msg, NULL, 0, 0)) - { - TranslateMessage (&msg); - DispatchMessage (&msg); - } -} - - -// WinMain -// program entry point -int WINAPI WinMain ( - HINSTANCE hInstance, // current instance - HINSTANCE hPrevInstance, // previous instance - LPSTR lpCmd, // command line - int nShowCmd // show command - ) -{ - DWORD dwThreadID; - - (void)hInstance; - (void)hPrevInstance; - (void)lpCmd; - (void)nShowCmd; - - /* default file mode should be O_BINARY to be consistent with rockbox */ - _fmode = _O_BINARY; - - bIsWinNT = ((GetVersion() & 0x80000000) == 0); - - if (!GUIStartup ()) - return 0; - - hGUIThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE)app_main, - NULL, 0, &dwThreadID); - - if (hGUIThread == NULL) - return MessageBox (NULL, "Error creating gui thread!", "Error", MB_OK); - -#ifdef ROCKBOX_HAS_SIMSOUND - hSoundThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) - sound_playback_thread, NULL, 0, &dwThreadID); - - if (hSoundThread == NULL) - MessageBox (NULL, "Error creating sound thread!", "Warning", MB_OK); -#endif - - GUIMessageLoop (); - - return GUIDown (); -} diff --git a/uisimulator/win32/uisw32.h b/uisimulator/win32/uisw32.h deleted file mode 100644 index 22a9015196..0000000000 --- a/uisimulator/win32/uisw32.h +++ /dev/null @@ -1,168 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef __UISW32_H__ -#define __UISW32_H__ - -#ifdef _MSC_VER -typedef unsigned short wchar_t; -#define _WCHAR_T_DEFINED -#endif -#include -#include "lcd-win32.h" - -#if defined(ARCHOS_RECORDER) -#define UI_TITLE "Jukebox Recorder" -#define UI_WIDTH 270 // width of GUI window -#define UI_HEIGHT 406 // height of GUI window -#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) -#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) -#define UI_LCD_BLACK 0, 0, 0 // black -#define UI_LCD_POSX 80 // x position of lcd -#define UI_LCD_POSY 104 // y position of lcd (96 for real aspect) -#define UI_LCD_WIDTH 112 -#define UI_LCD_HEIGHT 64 // (80 for real aspect) - -#elif defined(ARCHOS_PLAYER) -#define UI_TITLE "Jukebox Player" -#define UI_WIDTH 284 // width of GUI window -#define UI_HEIGHT 420 // height of GUI window -#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) -#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) -#define UI_LCD_BLACK 0, 0, 0 // black -#define UI_LCD_POSX 75 // x position of lcd -#define UI_LCD_POSY 116 // y position of lcd -#define UI_LCD_WIDTH 132 -#define UI_LCD_HEIGHT 64 - -#elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2) -#define UI_TITLE "Jukebox FM Recorder" -#define UI_WIDTH 285 // width of GUI window -#define UI_HEIGHT 414 // height of GUI window -#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) -#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) -#define UI_LCD_BLACK 0, 0, 0 // black -#define UI_LCD_POSX 87 // x position of lcd -#define UI_LCD_POSY 77 // y position of lcd (69 for real aspect) -#define UI_LCD_WIDTH 112 -#define UI_LCD_HEIGHT 64 // (80 for real aspect) - -#elif defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM) -#define UI_TITLE "Ondio" -#define UI_WIDTH 155 // width of GUI window -#define UI_HEIGHT 334 // height of GUI window -#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) -#define UI_LCD_BGCOLORLIGHT 90, 145, 90 // bkgnd color of LCD (backlight) -#define UI_LCD_BLACK 0, 0, 0 // black -#define UI_LCD_POSX 21 // x position of lcd -#define UI_LCD_POSY 82 // y position of lcd (74 for real aspect) -#define UI_LCD_WIDTH 112 -#define UI_LCD_HEIGHT 64 // (80 for real aspect) - -#elif defined(IRIVER_H100_SERIES) -#define UI_TITLE "iriver H1x0" -#define UI_WIDTH 379 // width of GUI window -#define UI_HEIGHT 508 // height of GUI window -#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) -#define UI_LCD_BGCOLORLIGHT 230, 216, 173 // bkgnd color of LCD (backlight) -#define UI_LCD_BLACK 0, 0, 0 // black -#define UI_LCD_POSX 109 // x position of lcd -#define UI_LCD_POSY 23 // y position of lcd -#define UI_LCD_WIDTH 160 -#define UI_LCD_HEIGHT 128 -#define UI_REMOTE_BGCOLOR 90, 145, 90 // bkgnd of remote lcd (no bklight) -#define UI_REMOTE_BGCOLORLIGHT 250, 180, 130 // bkgnd of remote lcd (bklight) -#define UI_REMOTE_POSX 50 // x position of remote lcd -#define UI_REMOTE_POSY 403 // y position of remote lcd -#define UI_REMOTE_WIDTH 128 -#define UI_REMOTE_HEIGHT 64 - -#elif defined(IRIVER_H300_SERIES) -#define UI_TITLE "iriver H300" -#define UI_WIDTH 288 // width of GUI window -#define UI_HEIGHT 581 // height of GUI window -/* high-colour */ -#define UI_LCD_POSX 26 // x position of lcd -#define UI_LCD_POSY 36 // y position of lcd -#define UI_LCD_WIDTH 220 -#define UI_LCD_HEIGHT 176 -#define UI_REMOTE_BGCOLOR 90, 145, 90 // bkgnd of remote lcd (no bklight) -#define UI_REMOTE_BGCOLORLIGHT 250, 180, 130 // bkgnd of remote lcd (bklight) -#define UI_REMOTE_POSX 12 // x position of remote lcd -#define UI_REMOTE_POSY 478 // y position of remote lcd -#define UI_REMOTE_WIDTH 128 -#define UI_REMOTE_HEIGHT 64 - -#elif defined(IPOD_4G) -#define UI_TITLE "iPod 4G" -#define UI_WIDTH 196 // width of GUI window -#define UI_HEIGHT 370 // height of GUI window -#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) -#define UI_LCD_BGCOLORLIGHT 173, 216, 230 // bkgnd color of LCD (backlight) -#define UI_LCD_BLACK 0, 0, 0 // black -#define UI_LCD_POSX 19 // x position of lcd -#define UI_LCD_POSY 14 // y position of lcd -#define UI_LCD_WIDTH 160 -#define UI_LCD_HEIGHT 128 - -#elif defined(IPOD_COLOR) -#define UI_TITLE "iPod Color" -#define UI_WIDTH 261 // width of GUI window -#define UI_HEIGHT 493 // height of GUI window -/* high-colour */ -#define UI_LCD_POSX 21 // x position of lcd -#define UI_LCD_POSY 16 // y position of lcd -#define UI_LCD_WIDTH 220 -#define UI_LCD_HEIGHT 176 - -#elif defined(IPOD_NANO) -#define UI_TITLE "iPod Nano" -#define UI_WIDTH 199 // width of GUI window -#define UI_HEIGHT 421 // height of GUI window -/* high-colour */ -#define UI_LCD_POSX 13 // x position of lcd -#define UI_LCD_POSY 14 // y position of lcd -#define UI_LCD_WIDTH 176 -#define UI_LCD_HEIGHT 132 - -#elif defined(ARCHOS_GMINI120) -#define UI_TITLE "Gmini 120" -#define UI_WIDTH 370 // width of GUI window -#define UI_HEIGHT 264 // height of GUI window -#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) -#define UI_LCD_BGCOLORLIGHT 230, 160, 60 // bkgnd color of LCD (backlight) -#define UI_LCD_BLACK 0, 0, 0 // black -#define UI_LCD_POSX 85 // x position of lcd -#define UI_LCD_POSY 61 // y position of lcd (74 for real aspect) -#define UI_LCD_WIDTH 192 // * 1.5 -#define UI_LCD_HEIGHT 96 // * 1.5 - -#endif - -#define TIMER_EVENT 0x34928340 - -extern HWND hGUIWnd; // the GUI window handle -extern unsigned int uThreadID; // id of mod thread -extern bool bActive; - -// typedefs -typedef unsigned char uchar; -typedef unsigned int uint32; - -#endif // #ifndef __UISW32_H__ diff --git a/uisimulator/win32/uisw32.rc b/uisimulator/win32/uisw32.rc deleted file mode 100644 index 379b76ecb1..0000000000 --- a/uisimulator/win32/uisw32.rc +++ /dev/null @@ -1,76 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// - -#ifndef __MINGW32__ - #include "afxres.h" -#endif - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -#ifndef __MINGW32__ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#endif -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_UI BITMAP "UI256.bmp" -IDI_ICON1 ICON DISCARDABLE "rockbox.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/uisimulator/win32/uisw32.sln b/uisimulator/win32/uisw32.sln deleted file mode 100644 index ada5e11e7c..0000000000 --- a/uisimulator/win32/uisw32.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uisw32", "uisw32.vcproj", "{A81A8EFA-647A-427A-BD04-F6B469752E7A}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {A81A8EFA-647A-427A-BD04-F6B469752E7A}.Debug.ActiveCfg = Debug|Win32 - {A81A8EFA-647A-427A-BD04-F6B469752E7A}.Debug.Build.0 = Debug|Win32 - {A81A8EFA-647A-427A-BD04-F6B469752E7A}.Release.ActiveCfg = Release|Win32 - {A81A8EFA-647A-427A-BD04-F6B469752E7A}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo deleted file mode 100644 index be68cf93f9..0000000000 Binary files a/uisimulator/win32/uisw32.suo and /dev/null differ diff --git a/uisimulator/win32/uisw32.vcproj b/uisimulator/win32/uisw32.vcproj deleted file mode 100644 index 449bb19adf..0000000000 --- a/uisimulator/win32/uisw32.vcproj +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3