|
From: <st...@us...> - 2008-05-25 18:37:05
|
Revision: 18807
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18807&view=rev
Author: strik
Date: 2008-05-25 11:37:11 -0700 (Sun, 25 May 2008)
Log Message:
-----------
2008-05-24 Marco van den Heuvel <bla...@ya...>
* Makefile.am: Added a '@' in front of the 'make install' echo.
2008-05-24 Marco van den Heuvel <bla...@ya...>
* joystick.c, keyboard.c: Added #ifdef COMMON_KBD around common
keyboard specific elements.
* vic20/vic20cartridge.c, c64/cart/c64cart.c,
monitor/mon_parse.c, monitor/mon_command.c, monitor/mon_parse.h,
monitor/mon_lex.c, monitor/mon_parse.y, monitor/mon_lex.l,
monitor/mon_memory.c, monitor/montypes.h, monitor/monitor.c,
monitor/mon_file.c, monitor/mon_file.h, translate.txt,
monitor.h: Added most of the new VICEplus monitor features, as
provided by Hannu Nuotio <han...@tu...> and Daniel Kahlin
<da...@ka...>.
* network.c, sounddrv/soundallegro.c, sounddrv/soundvoc.c,
sounddrv/soundmmos2.c, sounddrv/soundwav.c, sounddrv/soundmp3.c,
sounddrv/soundarts.c, c64/c64io.c, c64/mmc64.c, tape/tape.c,
translate.c, fsdevice/fsdevice-close.c, crtc/crtc.c,
drive/rotation.c, arch/amigaos/intl.c, arch/amigaos/video.c,
arch/amigaos/mui/uivideoc128.c, arch/amigaos/mui/mui.h,
arch/amigaos/mui/uisnapshot.c, arch/amigaos/catweaselmkiii.c,
arch/amigaos/joyai.c, arch/amigaos/screen-shot.c,
arch/riscos/videoarch.h, arch/riscos/ui.c, arch/riscos/video.c,
arch/riscos/spritedrv.c, arch/win32/intl.c, arch/win32/ui.c,
arch/win32/watcom/monitor.tgt, arch/win32/watcom/vic20.tgt,
arch/win32/watcom/plus4.tgt, arch/win32/watcom/c64.tgt,
arch/os2/archdep.c, arch/os2/fullscr.c, arch/os2/ui.c,
arch/os2/dialogs/dlg-joystick.c, arch/os2/dialogs/menubar.c,
arch/os2/dialogs/dlg-fileio.c, arch/os2/dialogs/dlg-drive.c,
arch/os2/dialogs/dlg-cmdopt.c, arch/os2/dialogs/dlg-monitor.c,
arch/os2/vsidui.c, arch/os2/video.c, arch/os2/kbd/parse.c,
arch/os2/uimon.c, arch/os2/blockdev.c, arch/unix/joy.h,
arch/unix/gp2x/vic20ui.c, arch/unix/gp2x/minimal.c,
arch/unix/gp2x/vkeyboard_gp2x.c, arch/unix/gp2x/c64ui.c,
arch/unix/gp2x/input_gp2x.c, arch/unix/gp2x/audio_gp2x.c,
arch/unix/gp2x/vsidui.c, arch/unix/gp2x/input_gp2x.h,
arch/unix/gp2x/plus4ui.c, arch/unix/gp2x/video.c,
arch/unix/gp2x/c128ui.c, arch/unix/gp2x/prefs_gp2x.c,
arch/unix/gp2x/uiarch.h, arch/unix/gp2x/cbm2ui.c,
arch/unix/gp2x/petui.c, arch/unix/gui/vsidui.c,
arch/unix/x11/xaw/x11video.c,
arch/unix/x11/xaw/widgets/FileSel.c,
arch/unix/x11/gnome/uipalcontrol.c,
arch/unix/x11/gnome/uicolor.c, arch/msdos/joy.c,
arch/msdos/console.c, arch/msdos/uiperipherial.c,
arch/msdos/uinetplay.c, arch/msdos/video.c, arch/msdos/petui.c,
arch/msdos/ui.c, arch/msdos/plus4ui.c, arch/msdos/cbm2ui.c,
arch/msdos/uijoystick.c, zfile.c, cartconv.c: Fixed some
warnings and other issues.
* arch/unix/readline/editline2.c, arch/unix/readline/editline.h,
arch/unix/readline/sysunix.c, arch/unix/readline/complete.c,
arch/unix/readline/editline.c: Updated the prototypes.
Modified Paths:
--------------
trunk/vice/Makefile.am
trunk/vice/src/ChangeLog
trunk/vice/src/arch/amigaos/catweaselmkiii.c
trunk/vice/src/arch/amigaos/intl.c
trunk/vice/src/arch/amigaos/joyai.c
trunk/vice/src/arch/amigaos/mui/mui.h
trunk/vice/src/arch/amigaos/mui/uisnapshot.c
trunk/vice/src/arch/amigaos/mui/uivideoc128.c
trunk/vice/src/arch/amigaos/screen-shot.c
trunk/vice/src/arch/amigaos/video.c
trunk/vice/src/arch/msdos/cbm2ui.c
trunk/vice/src/arch/msdos/console.c
trunk/vice/src/arch/msdos/joy.c
trunk/vice/src/arch/msdos/petui.c
trunk/vice/src/arch/msdos/plus4ui.c
trunk/vice/src/arch/msdos/ui.c
trunk/vice/src/arch/msdos/uijoystick.c
trunk/vice/src/arch/msdos/uinetplay.c
trunk/vice/src/arch/msdos/uiperipherial.c
trunk/vice/src/arch/msdos/video.c
trunk/vice/src/arch/os2/archdep.c
trunk/vice/src/arch/os2/blockdev.c
trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c
trunk/vice/src/arch/os2/dialogs/dlg-drive.c
trunk/vice/src/arch/os2/dialogs/dlg-fileio.c
trunk/vice/src/arch/os2/dialogs/dlg-joystick.c
trunk/vice/src/arch/os2/dialogs/dlg-monitor.c
trunk/vice/src/arch/os2/dialogs/menubar.c
trunk/vice/src/arch/os2/fullscr.c
trunk/vice/src/arch/os2/kbd/parse.c
trunk/vice/src/arch/os2/ui.c
trunk/vice/src/arch/os2/uimon.c
trunk/vice/src/arch/os2/video.c
trunk/vice/src/arch/os2/vsidui.c
trunk/vice/src/arch/riscos/spritedrv.c
trunk/vice/src/arch/riscos/ui.c
trunk/vice/src/arch/riscos/video.c
trunk/vice/src/arch/riscos/videoarch.h
trunk/vice/src/arch/unix/gp2x/audio_gp2x.c
trunk/vice/src/arch/unix/gp2x/c128ui.c
trunk/vice/src/arch/unix/gp2x/c64ui.c
trunk/vice/src/arch/unix/gp2x/cbm2ui.c
trunk/vice/src/arch/unix/gp2x/input_gp2x.c
trunk/vice/src/arch/unix/gp2x/input_gp2x.h
trunk/vice/src/arch/unix/gp2x/minimal.c
trunk/vice/src/arch/unix/gp2x/petui.c
trunk/vice/src/arch/unix/gp2x/plus4ui.c
trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c
trunk/vice/src/arch/unix/gp2x/uiarch.h
trunk/vice/src/arch/unix/gp2x/vic20ui.c
trunk/vice/src/arch/unix/gp2x/video.c
trunk/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c
trunk/vice/src/arch/unix/gp2x/vsidui.c
trunk/vice/src/arch/unix/gui/vsidui.c
trunk/vice/src/arch/unix/joy.h
trunk/vice/src/arch/unix/readline/complete.c
trunk/vice/src/arch/unix/readline/editline.c
trunk/vice/src/arch/unix/readline/editline.h
trunk/vice/src/arch/unix/readline/editline2.c
trunk/vice/src/arch/unix/readline/sysunix.c
trunk/vice/src/arch/unix/x11/gnome/uicolor.c
trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c
trunk/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
trunk/vice/src/arch/unix/x11/xaw/x11video.c
trunk/vice/src/arch/win32/intl.c
trunk/vice/src/arch/win32/ui.c
trunk/vice/src/arch/win32/watcom/c64.tgt
trunk/vice/src/arch/win32/watcom/monitor.tgt
trunk/vice/src/arch/win32/watcom/plus4.tgt
trunk/vice/src/arch/win32/watcom/vic20.tgt
trunk/vice/src/c64/c64io.c
trunk/vice/src/c64/cart/c64cart.c
trunk/vice/src/c64/mmc64.c
trunk/vice/src/cartconv.c
trunk/vice/src/crtc/crtc.c
trunk/vice/src/drive/rotation.c
trunk/vice/src/fsdevice/fsdevice-close.c
trunk/vice/src/joystick.c
trunk/vice/src/keyboard.c
trunk/vice/src/monitor/mon_command.c
trunk/vice/src/monitor/mon_file.c
trunk/vice/src/monitor/mon_file.h
trunk/vice/src/monitor/mon_lex.c
trunk/vice/src/monitor/mon_lex.l
trunk/vice/src/monitor/mon_memory.c
trunk/vice/src/monitor/mon_parse.c
trunk/vice/src/monitor/mon_parse.h
trunk/vice/src/monitor/mon_parse.y
trunk/vice/src/monitor/monitor.c
trunk/vice/src/monitor/montypes.h
trunk/vice/src/monitor.h
trunk/vice/src/network.c
trunk/vice/src/sounddrv/soundallegro.c
trunk/vice/src/sounddrv/soundarts.c
trunk/vice/src/sounddrv/soundmmos2.c
trunk/vice/src/sounddrv/soundmp3.c
trunk/vice/src/sounddrv/soundvoc.c
trunk/vice/src/sounddrv/soundwav.c
trunk/vice/src/tape/tape.c
trunk/vice/src/translate.c
trunk/vice/src/translate.txt
trunk/vice/src/vic20/vic20cartridge.c
trunk/vice/src/zfile.c
Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
@@ -147,7 +147,7 @@
endif
@MAKE_BINDIST_TRUE@installvice:
-@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
+@MAKE_BINDIST_TRUE@ @echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
@MAKE_BINDIST_FALSE@installvice: install-recursive
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/ChangeLog 2008-05-25 18:37:11 UTC (rev 18807)
@@ -1,3 +1,61 @@
+2008-05-24 Marco van den Heuvel <bla...@ya...>
+
+ * Makefile.am: Added a '@' in front of the 'make install' echo.
+
+2008-05-24 Marco van den Heuvel <bla...@ya...>
+
+ * joystick.c, keyboard.c: Added #ifdef COMMON_KBD around common
+ keyboard specific elements.
+
+ * vic20/vic20cartridge.c, c64/cart/c64cart.c,
+ monitor/mon_parse.c, monitor/mon_command.c, monitor/mon_parse.h,
+ monitor/mon_lex.c, monitor/mon_parse.y, monitor/mon_lex.l,
+ monitor/mon_memory.c, monitor/montypes.h, monitor/monitor.c,
+ monitor/mon_file.c, monitor/mon_file.h, translate.txt,
+ monitor.h: Added most of the new VICEplus monitor features, as
+ provided by Hannu Nuotio <han...@tu...> and Daniel Kahlin
+ <da...@ka...>.
+
+ * network.c, sounddrv/soundallegro.c, sounddrv/soundvoc.c,
+ sounddrv/soundmmos2.c, sounddrv/soundwav.c, sounddrv/soundmp3.c,
+ sounddrv/soundarts.c, c64/c64io.c, c64/mmc64.c, tape/tape.c,
+ translate.c, fsdevice/fsdevice-close.c, crtc/crtc.c,
+ drive/rotation.c, arch/amigaos/intl.c, arch/amigaos/video.c,
+ arch/amigaos/mui/uivideoc128.c, arch/amigaos/mui/mui.h,
+ arch/amigaos/mui/uisnapshot.c, arch/amigaos/catweaselmkiii.c,
+ arch/amigaos/joyai.c, arch/amigaos/screen-shot.c,
+ arch/riscos/videoarch.h, arch/riscos/ui.c, arch/riscos/video.c,
+ arch/riscos/spritedrv.c, arch/win32/intl.c, arch/win32/ui.c,
+ arch/win32/watcom/monitor.tgt, arch/win32/watcom/vic20.tgt,
+ arch/win32/watcom/plus4.tgt, arch/win32/watcom/c64.tgt,
+ arch/os2/archdep.c, arch/os2/fullscr.c, arch/os2/ui.c,
+ arch/os2/dialogs/dlg-joystick.c, arch/os2/dialogs/menubar.c,
+ arch/os2/dialogs/dlg-fileio.c, arch/os2/dialogs/dlg-drive.c,
+ arch/os2/dialogs/dlg-cmdopt.c, arch/os2/dialogs/dlg-monitor.c,
+ arch/os2/vsidui.c, arch/os2/video.c, arch/os2/kbd/parse.c,
+ arch/os2/uimon.c, arch/os2/blockdev.c, arch/unix/joy.h,
+ arch/unix/gp2x/vic20ui.c, arch/unix/gp2x/minimal.c,
+ arch/unix/gp2x/vkeyboard_gp2x.c, arch/unix/gp2x/c64ui.c,
+ arch/unix/gp2x/input_gp2x.c, arch/unix/gp2x/audio_gp2x.c,
+ arch/unix/gp2x/vsidui.c, arch/unix/gp2x/input_gp2x.h,
+ arch/unix/gp2x/plus4ui.c, arch/unix/gp2x/video.c,
+ arch/unix/gp2x/c128ui.c, arch/unix/gp2x/prefs_gp2x.c,
+ arch/unix/gp2x/uiarch.h, arch/unix/gp2x/cbm2ui.c,
+ arch/unix/gp2x/petui.c, arch/unix/gui/vsidui.c,
+ arch/unix/x11/xaw/x11video.c,
+ arch/unix/x11/xaw/widgets/FileSel.c,
+ arch/unix/x11/gnome/uipalcontrol.c,
+ arch/unix/x11/gnome/uicolor.c, arch/msdos/joy.c,
+ arch/msdos/console.c, arch/msdos/uiperipherial.c,
+ arch/msdos/uinetplay.c, arch/msdos/video.c, arch/msdos/petui.c,
+ arch/msdos/ui.c, arch/msdos/plus4ui.c, arch/msdos/cbm2ui.c,
+ arch/msdos/uijoystick.c, zfile.c, cartconv.c: Fixed some
+ warnings and other issues.
+
+ * arch/unix/readline/editline2.c, arch/unix/readline/editline.h,
+ arch/unix/readline/sysunix.c, arch/unix/readline/complete.c,
+ arch/unix/readline/editline.c: Updated the prototypes.
+
2008-05-19 Spiro Trikaliotis <spi...@gm...>
* resid/configure, resid/depcomp, resid/config.guess,
Modified: trunk/vice/src/arch/amigaos/catweaselmkiii.c
===================================================================
--- trunk/vice/src/arch/amigaos/catweaselmkiii.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/catweaselmkiii.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,7 +113,7 @@
int catweaselmkiii_open(void)
{
static int atexitinitialized = 0;
- int i;
+ unsigned int i;
if (atexitinitialized) {
catweaselmkiii_close();
@@ -190,7 +190,7 @@
int catweaselmkiii_close(void)
{
- int i;
+ unsigned int i;
/* mute all sids */
memset(sidbuf, 0, sizeof(sidbuf));
Modified: trunk/vice/src/arch/amigaos/intl.c
===================================================================
--- trunk/vice/src/arch/amigaos/intl.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/intl.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -4802,7 +4802,7 @@
static char *intl_get_string_by_id(int id)
{
- int k;
+ unsigned int k;
for (k = 0; k < countof(intl_string_table); k++)
{
@@ -4814,7 +4814,7 @@
char *intl_translate_text(int en_resource)
{
- int i;
+ unsigned int i;
for (i = 0; i < countof(intl_translate_text_table); i++)
{
@@ -4840,7 +4840,7 @@
void intl_init(void)
{
- int i,j;
+ unsigned int i,j;
for (i = 0; i < countof(language_table); i++)
{
Modified: trunk/vice/src/arch/amigaos/joyai.c
===================================================================
--- trunk/vice/src/arch/amigaos/joyai.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/joyai.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -312,7 +312,7 @@
{
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
char *tmp, txt[256];
- int i;
+ unsigned int i;
sprintf(txt, "JOYAI%d_ID", joy);
tmp = NULL;
@@ -335,7 +335,7 @@
{
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
char tmp[256], txt[256];
- int i;
+ unsigned int i;
sprintf(txt, "JOYAI%d_ID", joy);
sprintf(tmp, "%lu", joy_id[joy-1]);
@@ -400,7 +400,7 @@
static void ai_attach(void)
{
- int i;
+ unsigned int i;
for (i=0; i<2; i++) {
get_cfg(i+1);
if ((CTX != NULL) && (joy_id[i] != -1)) {
@@ -553,7 +553,8 @@
static void update_inputs(ULONG ID)
{
char name[256];
- int i, num, offset;
+ unsigned int i;
+ int num, offset;
for (i=0; i<inputs.count; i++) {
if (inputs.names[i] != NULL) {
@@ -616,7 +617,8 @@
static int offset_to_index(int offset)
{
- int i;
+ unsigned int i;
+
for (i=0; i<inputs.count; i++) {
if ((inputs.types[i] != TYPE_NONE) && (inputs.offsets[i] == offset)) {
return i;
@@ -643,7 +645,8 @@
static int offset_to_active(int type, int offset)
{
- int i;
+ unsigned int i;
+
for (i=0; i<inputs.count; i++) {
if ((inputs.types[i] == type) && (inputs.offsets[i] == offset)) {
return i;
@@ -747,7 +750,7 @@
End;
if (app) {
- int i;
+ unsigned int i;
DoMethod(window,
MUIM_Notify, MUIA_Window_CloseRequest, TRUE,
@@ -824,7 +827,7 @@
}
if (app) {
- int i;
+ unsigned int i;
set(window, MUIA_Window_Open, TRUE);
while (running) {
unsigned long retval = DoMethod(app, MUIM_Application_Input, &signals);
@@ -898,7 +901,8 @@
}
if (AIN_ReadDevice(CTX, ai_handle[joy-1], &ptr) == TRUE) {
- int i, *data = ptr;
+ unsigend int i, *data = ptr;
+
for (i=0; i<NUM_KEYSYM; i++) {
switch (keysym[i].type) {
@@ -998,7 +1002,7 @@
{
BYTE value = 0;
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
- int i;
+ unsigend int i;
for (i=0; i<NUM_KEYSYM; i++) {
if ((keysym[i].type == TYPE_NONE) && (keysym[i].rawkey == kcode)) {
Modified: trunk/vice/src/arch/amigaos/mui/mui.h
===================================================================
--- trunk/vice/src/arch/amigaos/mui/mui.h 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/mui/mui.h 2008-05-25 18:37:11 UTC (rev 18807)
@@ -47,6 +47,9 @@
#ifdef AMIGA_MORPHOS
#include <proto/alib.h> /* for DoMethod */
#endif
+#ifdef AMIGA_M68K
+#include <clib/alib_protos.h> /* for DoMethod */
+#endif
#ifdef AMIGA_AROS
#define MUI_OBSOLETE
#endif
Modified: trunk/vice/src/arch/amigaos/mui/uisnapshot.c
===================================================================
--- trunk/vice/src/arch/amigaos/mui/uisnapshot.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/mui/uisnapshot.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -60,7 +60,7 @@
static APTR build_gui(void)
{
- APTR app, ui, ok, browse_button, cancel, label;
+ APTR app, ui, ok, browse_button, cancel;
#ifdef AMIGA_MORPHOS
static const struct Hook BrowseFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)Browse, NULL};
Modified: trunk/vice/src/arch/amigaos/mui/uivideoc128.c
===================================================================
--- trunk/vice/src/arch/amigaos/mui/uivideoc128.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/mui/uivideoc128.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -111,7 +111,7 @@
static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)BrowseVDC, NULL};
#else
static const struct Hook BrowseVICIIFileHook = { { NULL,NULL },(VOID *)BrowseVICII,NULL,NULL };
- static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)BrowseVICII,NULL,NULL };
+ static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)BrowseVDC,NULL,NULL };
#endif
app = mui_get_app();
Modified: trunk/vice/src/arch/amigaos/screen-shot.c
===================================================================
--- trunk/vice/src/arch/amigaos/screen-shot.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/screen-shot.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,7 +113,6 @@
void ui_screenshot_dialog(video_canvas_t *canvas)
{
int format;
- char *name;
char choices[100]="";
strcat(choices,"BMP|");
Modified: trunk/vice/src/arch/amigaos/video.c
===================================================================
--- trunk/vice/src/arch/amigaos/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -515,7 +515,9 @@
}
}
else {
+#if defined(HAVE_PROTO_CYBERGRAPHICS_H) && defined(HAVE_XVIDEO)
reopenwindow:
+#endif
/* if window already is open, just resize it, otherwise, open it */
if (canvas->os->window != NULL) {
ChangeWindowBox(canvas->os->window,
@@ -951,6 +953,7 @@
return c;
}
+#ifdef HAVE_PROTO_CYBERGRAPHICS_H
static int makecol_BGR565BE(int r, int g, int b)
{
int c = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
@@ -962,6 +965,7 @@
int c = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
return c;
}
+#endif
static int makecol_BGR555BE(int r, int g, int b)
{
@@ -1110,7 +1114,7 @@
struct palette_s *palette)
{
int (*makecol)(int r, int g, int b);
- int i;
+ unsigned int i;
int col;
canvas->palette = palette;
Modified: trunk/vice/src/arch/msdos/cbm2ui.c
===================================================================
--- trunk/vice/src/arch/msdos/cbm2ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/cbm2ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "cbm2ui.h"
#include "menudefs.h"
Modified: trunk/vice/src/arch/msdos/console.c
===================================================================
--- trunk/vice/src/arch/msdos/console.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/console.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -33,6 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
#include "console.h"
#include "lib.h"
Modified: trunk/vice/src/arch/msdos/joy.c
===================================================================
--- trunk/vice/src/arch/msdos/joy.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/joy.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -40,9 +40,6 @@
#include "types.h"
-/* Notice that this has to be `int' to make resources work. */
-static int keyset1[9], keyset2[9];
-
#ifdef COMMON_KBD
int joystick_port_map[2];
#endif
Modified: trunk/vice/src/arch/msdos/petui.c
===================================================================
--- trunk/vice/src/arch/msdos/petui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/petui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "lib.h"
#include "menudefs.h"
Modified: trunk/vice/src/arch/msdos/plus4ui.c
===================================================================
--- trunk/vice/src/arch/msdos/plus4ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/plus4ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "lib.h"
#include "menudefs.h"
Modified: trunk/vice/src/arch/msdos/ui.c
===================================================================
--- trunk/vice/src/arch/msdos/ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <sys/movedata.h>
#include <unistd.h>
+#include <string.h>
#include "cmdline.h"
#include "datasette.h"
@@ -75,19 +76,19 @@
/* UI-related resources and command-line options. */
/* Flag: Use keyboard LEDs? */
-static int use_leds;
+static unsigned int use_leds;
-static int statusbar_is_enabled;
+static unsigned int statusbar_is_enabled;
-static int set_use_leds(resource_value_t v, void *param)
+static int set_use_leds(int v, void *param)
{
- use_leds = (int)v;
+ use_leds = v;
return 0;
}
-static int set_statusbar_enabled(resource_value_t v, void *param)
+static int set_statusbar_enabled(int v, void *param)
{
- statusbar_is_enabled = (int)v;
+ statusbar_is_enabled = v;
if (statusbar_enabled()) {
statusbar_prepare();
statusbar_update();
Modified: trunk/vice/src/arch/msdos/uijoystick.c
===================================================================
--- trunk/vice/src/arch/msdos/uijoystick.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/uijoystick.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <allegro.h>
+#include <string.h>
#include "joy.h"
#include "lib.h"
Modified: trunk/vice/src/arch/msdos/uinetplay.c
===================================================================
--- trunk/vice/src/arch/msdos/uinetplay.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/uinetplay.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -104,7 +104,7 @@
char buf[10];
resources_get_int("NetworkServerPort", ¤t_port);
- sprintf(buf,"%d\0",current_port);
+ sprintf(buf,"%d",current_port);
if (tui_input_string("TCP Port", "Enter TCP Port to use:", buf, 10) == 0)
{
Modified: trunk/vice/src/arch/msdos/uiperipherial.c
===================================================================
--- trunk/vice/src/arch/msdos/uiperipherial.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/uiperipherial.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include "fsdevice.h"
#include "lib.h"
@@ -68,7 +69,7 @@
if (been_activated) {
char *path;
- int len = 255;
+ unsigned int len = 255;
resources_get_string(rname, &v);
if (len < strlen(v) * 2)
Modified: trunk/vice/src/arch/msdos/video.c
===================================================================
--- trunk/vice/src/arch/msdos/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -348,7 +348,7 @@
static void canvas_change_palette(video_canvas_t *c)
{
- int i;
+ unsigned int i;
int col;
int next_avail = 0;
Modified: trunk/vice/src/arch/os2/archdep.c
===================================================================
--- trunk/vice/src/arch/os2/archdep.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/archdep.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -234,7 +234,9 @@
FILE *archdep_open_default_log_file()
{
+#ifndef __X1541__
int val;
+#endif
char *fname = util_concat(archdep_boot_path(), "\\vice2.log", NULL);
fLog = fopen(fname, "w");
Modified: trunk/vice/src/arch/os2/blockdev.c
===================================================================
--- trunk/vice/src/arch/os2/blockdev.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/blockdev.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -37,9 +37,6 @@
/*static log_t blockdev_log = LOG_DEFAULT;*/
-static int device;
-
-
int blockdev_open(const char *name, unsigned int *read_only)
{
return -1;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -39,6 +39,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "menubar.h"
Modified: trunk/vice/src/arch/os2/dialogs/dlg-drive.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-drive.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-drive.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -327,7 +327,6 @@
{
const HWND lbox = WinWindowFromID(hwnd, CBS_TYPE);
- int i;
int type=0;
int val;
int res;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-fileio.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -122,12 +122,14 @@
{NULL}
};
+#if defined(__X64__) || defined(__X128__) || defined(__XPET__) || defined(__XCBM__)
static filter_t FilterCart[] = {
{"*.crt; *.bin", "All Cartridge Images" },
{"*.crt", "CRT" },
{"*.bin", "BIN" },
{NULL}
};
+#endif
static filter_t FilterPal[] = {{"*.vpl", "Vice/2 Color Palette" }, {NULL}};
static filter_t FilterVsf[] = {{"*.vsf", "Vice/2 Snapshot File" }, {NULL}};
@@ -140,7 +142,11 @@
static filter_t FilterKernal[] = {{"kernal*", "Kernal ROM" }, {NULL}};
static filter_t FilterBasic[] = {{"basic*", "Basic ROM" }, {NULL}};
static filter_t FilterChargen[] = {{"charg*", "Character ROM" }, {NULL}};
+
+#ifdef __X128__
static filter_t FilterZ80[] = {{"z80bios*", "Z80 BIOS" }, {NULL}};
+#endif
+
static filter_t Filter1541[] = {{"dos1541*", "1541 ROM" }, {NULL}};
static filter_t Filter15412[] = {{"d1541II*", "1541-II ROM" }, {NULL}};
static filter_t Filter1571[] = {{"dos1571*", "1571 ROM" }, {NULL}};
@@ -168,7 +174,11 @@
static subaction_t SubTape[] = {{ "as Tape to Datasette", FilterTape }, {NULL}};
static subaction_t SubKbd[] = {{ "as new keyboard mapping", FilterKbd }, {NULL}};
static subaction_t SubCfg[] = {{ "as new configuration", FilterCfg }, {NULL}};
+
+#if defined __X64__ || defined __X128__
static subaction_t SubCart2[] = {{ "as cartridge image", FilterCart }, {NULL}};
+#endif
+
static subaction_t SubVsf[] = {{ "as Vice/2 snapshot file", FilterVsf }, {NULL}};
static subaction_t SubRomSet[] = {{ "as Vice/2 rom set", FilterRomSet},{NULL}};
@@ -629,8 +639,6 @@
static void ShowContents(HWND hwnd, char *image_name)
{
- int ascii;
- char *text;
image_contents_t *image;
image_contents_screencode_t *line;
image_contents_screencode_t *lines;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-joystick.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-joystick.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-joystick.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -61,9 +61,6 @@
static MRESULT EXPENTRY pm_joystick(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
{
- const int ID_ON = 1;
- const int ID_OFF = 2;
-
switch (msg)
{
case WM_INITDLG:
@@ -160,8 +157,6 @@
break;
case WM_SETDLGS:
{
- HWND hwnd2;
-
int joy1 = (int)mp1;
int joy2 = (int)mp2;
int joys = joy1 | joy2;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-monitor.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-monitor.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-monitor.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -38,6 +38,10 @@
#include <os2.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "dlg-monitor.h"
@@ -73,17 +77,6 @@
// --------------------------------------------------------------------------
-static char *fmt(unsigned int val, unsigned char sz)
-{
- static char txt[5];
-
- char tmp[7];
- sprintf(tmp, "%%0%ix", sz);
- sprintf(txt, tmp, val);
-
- return txt;
-}
-
static const char *mon_dis(MEMSPACE mem, WORD loc, unsigned int *size)
{
const BYTE op = mon_get_mem_val(mem, loc);
Modified: trunk/vice/src/arch/os2/dialogs/menubar.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/menubar.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/menubar.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,9 +113,11 @@
#if defined HAVE_CRTC && !defined __XCBM__
static const char *VIDEO_CACHE="CrtcVideoCache";
+#ifdef HAVE_PAL
static const char *DOUBLE_SIZE="CrtcDoubleSize";
static const char *DOUBLE_SCAN="CrtcDoubleScan";
#endif
+#endif
/*
#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __XPLUS4__
static const char *VIDEO_CACHE="ViciiVideoCache";
@@ -698,7 +700,7 @@
case IDM_VCACHE:
#ifdef __XCBM__
{
- long val;
+ int val;
resources_get_int("UseVicII", &val);
toggle(val?VIDEO_CACHE:"CrtcVideoCache");
}
Modified: trunk/vice/src/arch/os2/fullscr.c
===================================================================
--- trunk/vice/src/arch/os2/fullscr.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/fullscr.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -376,11 +376,7 @@
SWP swp;
GDDMODEINFO *mode;
- unsigned int maxw = -1;
- unsigned int maxh = -1;
- unsigned int rate = -1;
FOURCC fcc = fccColorEncoding;
- int l;
WinQueryWindowPos(hwnd, &swp);
@@ -444,8 +440,6 @@
GDDMODEINFO *mode;
FOURCC fcc = fccColorEncoding;
- int l;
-
if (!hmodVMAN || !fFullScreenMode)
return;
Modified: trunk/vice/src/arch/os2/kbd/parse.c
===================================================================
--- trunk/vice/src/arch/os2/kbd/parse.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/kbd/parse.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -127,7 +127,6 @@
shift = atoi(p);
{
- int s;
switch (buffer[0])
{
case '#':
@@ -162,7 +161,7 @@
case '!': // keyword handling
{
char *p;
- int num, row, col, shift;
+ int row, col;
p = strtok(buffer+1, " \t:");
if (!p)
Modified: trunk/vice/src/arch/os2/ui.c
===================================================================
--- trunk/vice/src/arch/os2/ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -279,9 +279,6 @@
void ui_display_drive_current_image(unsigned int drive_number,
const char *image)
{
- const ULONG flCmd =
- DT_TEXTATTRS|DT_VCENTER|DT_LEFT|DT_ERASERECT|DT_WORDBREAK;
-
if (image && *image)
{
int pos=0, i;
Modified: trunk/vice/src/arch/os2/uimon.c
===================================================================
--- trunk/vice/src/arch/os2/uimon.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/uimon.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,7 +113,7 @@
if (!out) out = lib_calloc(1,1);
- txt=buffer;
+ txt=(char *)buffer;
eol = strchr(txt, '\n');
while (strrchr(txt,'\n') && eol!= txt+strlen(txt))
Modified: trunk/vice/src/arch/os2/video.c
===================================================================
--- trunk/vice/src/arch/os2/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -61,6 +61,10 @@
#include <graph.h>
#endif
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "video.h"
#include "videoarch.h"
@@ -254,19 +258,19 @@
lib_free(txt);
}
}
- /*
+#if 0
else
{
- extern FNVMIENTRY *pfnVMIEntry; // The entry of VMAN.DLL
+ extern FNVMIENTRY *pfnVMIEntry;
TEXTBLTINFO txt;
memset(&txt, 0, sizeof(TEXTBLTINFO));
txt.ulLength = sizeof(TEXTBLTINFO);
- (*pfnVMIEntry)(0, 18/*VMI_CMD_TEXT/, &txt, 0);
+ (*pfnVMIEntry)(0, 18 VMI_CMD_TEXT/, &txt, 0);
}
- */
+#endif
}
/* ------------------------------------------------------------------------ */
@@ -886,8 +890,6 @@
void WmDestroy(HWND hwnd)
{
- ULONG rc;
-
video_canvas_t *c = GetCanvas(hwnd);
if (!c)
@@ -1081,19 +1083,6 @@
log_message(vidlog, "Debug - fbuf read y: %d + %d > %d, c->height=%d", ys, h, bufh, c->height);
h = bufh-ys;
}
- if (xs<0)
- {
- log_message(vidlog, "Debug - fbuf read x: %d < 0", xs);
- w += xs;
- xs = 0;
- }
- if (ys<0)
- {
- log_message(vidlog, "Debug - fbuf read y: %d < 0", ys);
- h += ys;
- ys = 0;
-
- }
if (xi+w > c->width)
{
log_message(vidlog, "Debug - scr write x x%d: %d + %d > %d", dsx, xi, w, c->width);
@@ -1104,18 +1093,6 @@
log_message(vidlog, "Debug - scr write y x%d: %d + %d > %d", dsy, yi, h, c->height);
h = c->height-yi;
}
- if (xi<0)
- {
- log_message(vidlog, "Debug - scr write x: %d < 0", xi);
- w += xi;
- xi = 0;
- }
- if (yi<0)
- {
- log_message(vidlog, "Debug - scr write y: %d < 0", yi);
- h += yi;
- yi = 0;
- }
#ifndef DIRECT_ACCESS
//
@@ -1351,6 +1328,7 @@
return FALSE;
}
+#ifdef HAVE_MOUSE
static void DisplayPopupMenu(HWND hwnd, POINTS *pts)
{
const video_canvas_t *c = GetCanvas(hwnd);
@@ -1358,6 +1336,7 @@
WinPopupMenu(hwnd, hwnd, c->hwndPopupMenu, pts->x, pts->y, 0,
PU_MOUSEBUTTON2DOWN|PU_HCONSTRAIN|PU_VCONSTRAIN);
}
+#endif
MRESULT EXPENTRY CanvasWinProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
{
@@ -1551,7 +1530,7 @@
// WM_UPDATEFRAME also hides the loaded popup menu
// the size is also corrected
//
- set_menu((void*)menu, (void*)c->hwndClient);
+ set_menu(menu, (void*)c->hwndClient);
}
/*
void InitStatusBar(video_canvas_t *c)
@@ -1945,7 +1924,6 @@
// dive_alloc/free and video_canvas_refresh
//
SWP swp;
- ULONG rc;
UINT wold = c->width;
UINT hold = c->height;
Modified: trunk/vice/src/arch/os2/vsidui.c
===================================================================
--- trunk/vice/src/arch/os2/vsidui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/vsidui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -32,6 +32,10 @@
#include <stdlib.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "dlg-vsid.h"
#include "dlg-emulator.h" // hwndVsidEmulator
Modified: trunk/vice/src/arch/riscos/spritedrv.c
===================================================================
--- trunk/vice/src/arch/riscos/spritedrv.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/spritedrv.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -68,7 +68,7 @@
int bpp, pal_size, pal_bytes, header_size;
unsigned int *sprpalette;
sprite_area_t *sarea;
- int x;
+ unsigned int x;
if (pal->num_entries <= 2)
{
Modified: trunk/vice/src/arch/riscos/ui.c
===================================================================
--- trunk/vice/src/arch/riscos/ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -216,7 +216,7 @@
static int WasAutoPaused = 0;
static int SoundVolume;
static int DisplayFPS = 0;
-static int DisplayDriveTrack = 0;
+static unsigned int DisplayDriveTrack = 0;
static int WimpScrapUsed = 0;
static int JoystickWindowOpen = 0;
static int WithinUiPoll = 0;
@@ -1526,7 +1526,7 @@
}
else
{
- if (ui_image_contents_disk(name) != 0);
+ if (ui_image_contents_disk(name) != 0)
return -1;
}
}
Modified: trunk/vice/src/arch/riscos/video.c
===================================================================
--- trunk/vice/src/arch/riscos/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -646,7 +646,7 @@
trans[i] = ct[i];
}
}
- for (; i<maxVideoCanvasColours; i++) trans[i] = 0;
+ for (; i<(unsigned int)maxVideoCanvasColours; i++) trans[i] = 0;
}
canvas->fb.transdirty = 0;
@@ -1080,7 +1080,7 @@
const palette_entry_t *p;
unsigned int numsprpal;
unsigned int *ct;
- int i;
+ unsigned int i;
if (palette == NULL) return 0;
@@ -1089,7 +1089,7 @@
lib_free(canvas->current_palette);
}
canvas->num_colours = palette->num_entries;
- if (canvas->num_colours > maxVideoCanvasColours)
+ if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
canvas->num_colours = maxVideoCanvasColours;
canvas->current_palette = lib_malloc((canvas->num_colours)*sizeof(int));
@@ -1185,7 +1185,7 @@
canvas->height *= 2;
canvas->num_colours = (canvas->palette == NULL) ? 16 : canvas->palette->num_entries;
- if (canvas->num_colours > maxVideoCanvasColours)
+ if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
canvas->num_colours = maxVideoCanvasColours;
canvas->current_palette = NULL;
canvas->shiftx = 0; canvas->shifty = 0; canvas->scale = 1;
Modified: trunk/vice/src/arch/riscos/videoarch.h
===================================================================
--- trunk/vice/src/arch/riscos/videoarch.h 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/videoarch.h 2008-05-25 18:37:11 UTC (rev 18807)
@@ -31,6 +31,7 @@
#include "vice.h"
#include "types.h"
+#include "video.h"
#include "wlsprite.h"
Modified: trunk/vice/src/arch/unix/gp2x/audio_gp2x.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/audio_gp2x.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/audio_gp2x.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -28,7 +28,7 @@
#include "minimal.h"
-static volume=100;
+static int volume=100;
void gp2x_sound_frame(void *blah, void *buff, int samples) {}
Modified: trunk/vice/src/arch/unix/gp2x/c128ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/c128ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/c128ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,8 +29,11 @@
#include <stdio.h>
#include <string.h>
+#include "cartridge.h"
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
Modified: trunk/vice/src/arch/unix/gp2x/c64ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/c64ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/c64ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,8 +29,11 @@
#include <stdio.h>
#include <string.h>
+#include "cartridge.h"
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
@@ -178,13 +181,6 @@
23, 4, 0,1, /* return */
24, 4, 0,1, /* return */
-#if 0
- 23, 5, 0|128,7, /* crsr up */
- 23, 6, 0,7, /* crsr down */
- 22, 6, 0|128,2, /* crsr left */
- 24, 6, 0,2, /* crsr right */
-#endif
-
21, 2, 0,0, /* delete */
22, 2, 0,0, /* delete */
23, 2, 0,0, /* delete */
Modified: trunk/vice/src/arch/unix/gp2x/cbm2ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/cbm2ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/cbm2ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,8 +29,10 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
Modified: trunk/vice/src/arch/unix/gp2x/input_gp2x.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/input_gp2x.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/input_gp2x.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -53,18 +53,11 @@
int input_select=0;
void gp2x_poll_input() {
- static int swap_button;
static int stats_button;
static int prefs_button;
static int vkeyb_button;
-#if 0
- static int choose_button;
-#endif
static int joy_time=0;
- static int a_held=0;
- static int b_held=0;
static int x_held=0;
- static int y_held=0;
unsigned int joy_state=gp2x_joystick_read();
@@ -72,9 +65,6 @@
if(!(joy_state&GP2X_SELECT)) prefs_button=0;
if(joy_state&GP2X_SELECT && !prefs_button) {
prefs_open=~prefs_open;
-#if 0
- ui_pause_emulation(1);
-#endif
prefs_button=1;
}
@@ -91,11 +81,8 @@
if(!rrate) rrate++;
if(joy_state&(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT)) joy_time+=rrate;
else joy_time=0;
-#if 0
- if(joy_time==rrate || !(joy_time%(4+rrate)) || joy_time>35) {
-#endif
if(joy_time==rrate || (joy_time>6)) {
- if(joy_time>4) joy_time==rrate;
+ if(joy_time>4) joy_time=rrate;
input_up=joy_state&GP2X_UP;
input_down=joy_state&GP2X_DOWN;
input_select=joy_state&GP2X_SELECT;
@@ -103,16 +90,7 @@
input_right=joy_state&GP2X_RIGHT;
}
-#if 0
/* B button */
- if(!(joy_state&(GP2X_B|GP2X_PUSH))) {
- input_b=0;
- input_b_deselected=1;
- } else if(input_b_deselected && (joy_state&(GP2X_B|GP2X_PUSH))) {
- input_b=1;
- }
-#endif
- /* B button */
if((joy_state&(GP2X_B|GP2X_PUSH))!=input_b_last) {
input_b=joy_state&(GP2X_B|GP2X_PUSH);
input_b_last=input_b;
@@ -144,41 +122,12 @@
keyboard_set_keyarr(7,4,0);
}
-#if 0
- /* a */
- if((joy_state&GP2X_A)&&!a_held) {
- a_held=1;
- keyboard_set_keyarr(1,2,1);
- } else if(a_held&&(!(joy_state&GP2X_A))) {
- a_held=0;
- keyboard_set_keyarr(1,2,0);
- }
- if((joy_state&GP2X_Y)&&!y_held) {
- y_held=1;
- keyboard_set_keyarr(1,7,1);
- } else if(y_held&&(!(joy_state&GP2X_Y))) {
- y_held=0;
- keyboard_set_keyarr(1,7,0);
- }
-#endif
-
if(gp2x_joystick_read()&GP2X_VOL_UP) volume_up();
else if(gp2x_joystick_read()&GP2X_VOL_DOWN) volume_down();
if(prefs_open||vkeyb_open) return;
-#if 0
- BYTE j=0xff;
- unsigned int joy_state=gp2x_joystick_read();
- if(joy_state&GP2X_UP) j&=0xfe;
- else if(joy_state&GP2X_DOWN) j&=0xfd;
- if(joy_state&GP2X_LEFT) j&=0xfb;
- else if(joy_state&GP2X_RIGHT) j&=0xf7;
- if(joy_state&GP2X_B) j&=0xef; /* fire */
- joystick_value[cur_port]=~j;
-#endif
-
BYTE j=joystick_value[cur_port];
if(joy_state&GP2X_UP) j|=0x01;
else j&=~0x01;
Modified: trunk/vice/src/arch/unix/gp2x/input_gp2x.h
===================================================================
--- trunk/vice/src/arch/unix/gp2x/input_gp2x.h 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/input_gp2x.h 2008-05-25 18:37:11 UTC (rev 18807)
@@ -33,4 +33,6 @@
extern int cur_port;
+extern void gp2x_poll_input();
+
#endif
Modified: trunk/vice/src/arch/unix/gp2x/minimal.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/minimal.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/minimal.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -126,9 +126,6 @@
{
unsigned long address=gp2x_physvram[gp2x_physvram[7]];
-#if 0
- if(++gp2x_physvram[7]==4) gp2x_physvram[7]=0;
-#endif
if(gp2x_physvram[7]==0) gp2x_physvram[7]=1;
else gp2x_physvram[7]=0;
@@ -208,22 +205,6 @@
void gp2x_sound_pause(int yes) { gp2x_sound_pausei=yes; }
-static void *gp2x_sound_play(void *blah)
-{
- int flip=0, flyp=gp2x_sound_buffer[1];
- struct timespec ts; ts.tv_sec=0, ts.tv_nsec=gp2x_sound_buffer[2];
-
- while(!gp2x_sound) { nanosleep(&ts, NULL);
-
- if(!gp2x_sound_pausei) { gp2x_sound_frame(blah, (void *)(&gp2x_sound_buffer[4+flip]), gp2x_sound_buffer[0]);
- write(gp2x_dev[3], (void *)(&gp2x_sound_buffer[4+flyp]), gp2x_sound_buffer[1]);
-
- flip+=gp2x_sound_buffer[1]; if(flip==gp2x_sound_buffer[1]*8) flip=0;
- flyp+=gp2x_sound_buffer[1]; if(flyp==gp2x_sound_buffer[1]*8) flyp=0;
- }}
- return NULL;
-}
-
static void gp2x_initqueue(gp2x_queue *q, unsigned long queue_items, unsigned long *position920t, unsigned long *position940t)
{
q->head = q->tail = q->items = 0;
@@ -240,16 +221,6 @@
q->items++;
}
-#if 0
-/* UNUSED */
- static unsigned long gp2x_dequeue(gp2x_queue *q)
-{
- while(!q->items); /* waiting for head to increase... */
- q->items--;
- return q->place920t[q->tail = (q->tail < q->max_items ? q->tail+1 : 0)];
-}
-#endif
-
void gp2x_dualcore_pause(int yes) { if(yes) gp2x_memregs[0x0904>>1] &= 0xFFFE; else gp2x_memregs[0x0904>>1] |= 1; }
static void gp2x_940t_reset(int yes) { gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (0x03); }
static void gp2x_940t_pause(int yes) { gp2x_dualcore_pause(yes); }
@@ -329,16 +300,10 @@
if(!gp2x_dev[0]) gp2x_dev[0] = open("/dev/fb0", O_RDWR);
if(!gp2x_dev[1]) gp2x_dev[1] = open("/dev/fb1", O_RDWR);
if(!gp2x_dev[2]) gp2x_dev[2] = open("/dev/mem", O_RDWR);
-#if 0
- md if(!gp2x_dev[3]) gp2x_dev[3] = open("/dev/dsp", O_WRONLY);
-#endif
if(!gp2x_dev[4]) gp2x_dev[4] = open("/dev/mixer", O_RDWR);
gp2x_dualcore_ram=(unsigned long *)mmap(0, 0x1000000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0x03000000);
-#if 0
- gp2x_dualcore_ram=(unsigned long *)mmap(0, 0x2000000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0x02000000);
-#endif
gp2x_memregl=(unsigned long *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0xc0000000);
gp2x_memregs=(unsigned short *)gp2x_memregl;
@@ -366,20 +331,6 @@
if(bpp==8) gp2x_physvram[2]+=320*240, gp2x_physvram[3]+=320*240,
gp2x_logvram15[2]+=320*240/2, gp2x_logvram15[3]+=320*240/2;
-#if 0
- md ioctl(gp2x_dev[3], SNDCTL_DSP_SPEED, &rate);
- md ioctl(gp2x_dev[3], SNDCTL_DSP_SETFMT, &bits);
- md ioctl(gp2x_dev[3], SNDCTL_DSP_STEREO, &stereo);
-
- md gp2x_sound_buffer[1]=(gp2x_sound_buffer[0]=(rate/Hz)) << (stereo + (bits==16));
- md gp2x_sound_buffer[2]=(1000000/Hz);
-
- stereo = 0x00100009;ioctl(gp2x_dev[3], SNDCTL_DSP_SETFRAGMENT, &stereo);
-
- md if(first) { pthread_create( &gp2x_sound_thread, NULL, gp2x_sound_play, NULL);
- atexit(gp2x_deinit);
- first=0; }
-#endif
}
Modified: trunk/vice/src/arch/unix/gp2x/petui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/petui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/petui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
#include "videoarch.h"
@@ -37,9 +38,6 @@
/* reserved for future sid cart support */
void petui_handle_sidengine_resource(int value)
{
-#if 0
- resources_set_int("SidEngine", value);
-#endif
}
int petui_handle_X(int Xvalue)
@@ -50,19 +48,6 @@
/* reserved for future sid cart support */
void petui_draw_resid_string(unsigned char *screen, int menu_x, int menu_y)
{
-#if 0
- int sidengine;
-
- resources_get_int("SidEngine", &sidengine);
- if(sidengine)
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "ReSID", menu_fg, menu_bg);
- }
- else
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "FastSID", menu_fg, menu_bg);
- }
-#endif
}
void petui_draw_memory_string(unsigned char *screen, int menu_x, int menu_y, int mem)
@@ -176,15 +161,6 @@
10,5, 0,0, /* runstop fixme */
11,5, 0,0, /* runstop fixme */
-#if 0
- 4,5, 8,2, /* space */
- 5,5, 8,2, /* */
- 6,5, 8,2, /* */
- 7,5, 8,2, /* */
- 8,5, 8,2, /* */
-/* keys found 1,4 is 7(diff keypad?) 0,4 is 8 (diff keypad?) 1,5, is an up arrow */
-/* 0,6 odd screen effect? moves it up */
-#endif
0
};
Modified: trunk/vice/src/arch/unix/gp2x/plus4ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/plus4ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/plus4ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
#include "videoarch.h"
@@ -37,9 +38,6 @@
/* reserved for future sid cart support */
void plus4ui_handle_sidengine_resource(int value)
{
-#if 0
- resources_set_int("SidEngine", value);
-#endif
}
int plus4ui_handle_X(int Xvalue)
@@ -50,19 +48,6 @@
/* reserved for future sid cart support */
void plus4ui_draw_resid_string(unsigned char *screen, int menu_x, int menu_y)
{
-#if 0
- int sidengine;
-
- resources_get_int("SidEngine", &sidengine);
- if(sidengine)
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "ReSID", menu_fg, menu_bg);
- }
- else
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "FastSID", menu_fg, menu_bg);
- }
-#endif
}
void plus4ui_draw_memory_string(unsigned char *screen, int menu_x, int menu_y, int mem)
Modified: trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -30,22 +30,25 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include "minimal.h"
-#include "machine.h"
-#include "ui_gp2x.h"
-#include "input_gp2x.h"
-#include "prefs_gp2x.h"
-#include "videoarch.h"
#include <sys/types.h>
#include <dirent.h>
#include <sys/stat.h>
+
#include "attach.h"
#include "autostart.h"
-#include "resources.h"
-#include "imagecontents.h"
#include "cartridge.h"
+#include "imagecontents.h"
+#include "input_gp2x.h"
+#include "interrupt.h"
+#include "machine.h"
+#include "minimal.h"
+#include "prefs_gp2x.h"
+#include "resources.h"
#include "screenshot.h"
+#include "ui_gp2x.h"
#include "uiarch.h"
+#include "uitext_gp2x.h"
+#include "videoarch.h"
extern unsigned short *gp2x_memregs;
@@ -84,10 +87,6 @@
unsigned mdiv,pdiv=3,scale=0;
MHZ*=1000000;
mdiv=(MHZ*pdiv)/SYS_CLK_FREQ;
-#if 0
- printf ("Old value = %04X\r",MEM_REG[0x924>>1]," ");
- printf ("APLL = %04X\r",MEM_REG[0x91A>>1]," ");
-#endif
mdiv=((mdiv-8)<<8) & 0xff00;
pdiv=((pdiv-2)<<2) & 0xfc;
scale&=3;
@@ -110,9 +109,6 @@
gp2x_memregs[0x2906>>1]=614; /* scale horizontal */
if(tvout_pal) gp2x_memregs[0x2908>>1]=384; /* scale vertical PAL */
else gp2x_memregs[0x2908>>1]=460; /* scale vertical NTSC */
-#if 0
- gp2x_memregs[0x2908>>1]=430; /* scale vertical */
-#endif
} else {
gp2x_memregs[0x2906>>1]=1228; /* scale horizontal */
gp2x_memregs[0x2908>>1]=430; /* vertical */
@@ -185,23 +181,8 @@
char *contents_str;
static char *contents_list[255];
int row;
- static image_contents_t *contents;
- image_contents_file_list_t *prg_list;
-#if 0
- char tmp_string[255];
-#endif
int i;
-#if 0
- contents_list[0]="test1";
- contents_list[1]="test2";
- contents_list[2]="test3";
- contents_list[3]=NULL;
- num_items=3;
- cursor_pos=0;
- first_visible=0;
-#endif
-
if(num_items==0) {
contents_str=image_contents_read_string(IMAGE_CONTENTS_AUTO,
image, 8, IMAGE_CONTENTS_STRING_PETSCII);
@@ -223,51 +204,16 @@
draw_petscii_string(screen, display_width, MENU_X, MENU_Y,
contents_list[0], menu_fg, menu_bg);
-#if 0
- if(num_items==0) {
- contents=image_contents_read(IMAGE_CONTENTS_AUTO, image, 8);
- if(contents==NULL) return (char *)-1;
- prg_list=contents->file_list;
- for(num_items=0; prg_list!=NULL; num_items++) {
- prg_list=prg_list->next;
- }
- cursor_pos=0;
- first_visible=0;
- }
-
- draw_ascii_string(screen, display_width, MENU_X, MENU_Y, blank_line, menu_fg, menu_bg);
- draw_ascii_string(screen, display_width, MENU_X, MENU_Y,
- (char *)contents->name, menu_fg, menu_bg);
-
- prg_list=contents->file_list;
- for(i=0; i<first_visible; i++) prg_list=prg_list->next;
-#endif
-
row=0;
while(row<(num_items-1) && row<MENU_HEIGHT) {
if(row==(cursor_pos-first_visible)) {
bg=menu_hl;
-#if 0
- selected=(char *)prg_list->name;
-#endif
selected=contents_list[row+first_visible+1];
} else bg=menu_bg;
-#if 0
- if(dir_items[row+first_visible].type==0) {
- draw_ascii_string(screen, display_width, MENU_X, MENU_LS+(8*row), "<DIR> ", menu_fg, bg);
- }
- snprintf(tmp_string, 16, "%s", dir_items[row+first_visible].name);
- draw_ascii_string(screen, display_width, MENU_X+(8*6), MENU_LS+(8*row), tmp_string, menu_fg, bg);
- strncpy(tmp_string, prg_list->name, 255);
-#endif
draw_ascii_string(screen, display_width, MENU_X, MENU_LS+(8*row),
blank_line, menu_fg, bg);
draw_petscii_string(screen, display_width, MENU_X, MENU_LS+(8*row),
contents_list[row+first_visible+1], menu_fg, bg);
-#if 0
- (char *)prg_list->name, menu_fg, bg);
- prg_list=prg_list->next;
-#endif
row++;
}
while(row<MENU_HEIGHT) {
@@ -455,10 +401,6 @@
+strlen(dir_items[cursor_pos].name)
+2);
sprintf(path, "%s/%s", cwd, dir_items[cursor_pos].name);
-#if 0
- /* FIXME */
- for(i=0; i<num_items; i++) free(dir_items[i].name);
-#endif
if(dir_items[cursor_pos].type==0) {
/* directory selected */
pathlength=strlen(path);
@@ -466,16 +408,10 @@
/* check for . selected */
&& path[pathlength-2]=='/') {
path[pathlength-2]='\0';
-#if 0
- return path;
-#endif
} else if(path[pathlength-1]=='.'
/* check for .. selected */
&& path[pathlength-2]=='.'
&& path[pathlength-3]=='/') {
-#if 0
- &&pathlength>4) {
-#endif
for(i=4; i<pathlength && path[pathlength-i]!='/'; i++);
if(i<pathlength
&& path[(pathlength-i)+1]!='.'
@@ -485,12 +421,6 @@
path[0]='.';
path[1]='\0';
}
-#if 0
- if(strlen(path)<=5) {
- path[5]='/';
- path[6]='\0';
- }
-#endif
cwd=path;
} else {
cwd=path;
@@ -503,9 +433,6 @@
/* file selected */
return path;
}
-#if 0
- } else if(input_select) {
-#endif
} else if(input_x) {
input_x=0;
return (char *)-1;
@@ -526,7 +453,7 @@
void draw_prefs(unsigned char *screen) {
static int cursor_pos=0;
- unsigned char bg, fg;
+ unsigned char bg;
char tmp_string[1024];
char tmp_string2[1024];
char tmp_string3[1024];
@@ -542,12 +469,7 @@
static int attach_cart_vic20_a000=0;
static int attach_cart_vic20_b000=0;
static char *imagefile;
-#if 0
- static int xfiletype;
-#endif
- int update_prefs=0;
- int i,j;
- char zip_error_str[255];
+ int i;
option_txt[AUTOSTART]= "Autostart image... ";
option_txt[START]= "Browse d64... ";
@@ -630,40 +552,6 @@
imagefile=tmp_string2;
}
#endif
-#if 0
- if(!strcmp(imagefile+(strlen(imagefile)-4), ".sna")
- || !strcmp(imagefile+(strlen(imagefile)-4), ".SNA")) {
- TheC64->LoadSnapshot(imagefile);
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(!strcmp(imagefile+(strlen(imagefile)-4), ".prg")
- || !strcmp(imagefile+(strlen(imagefile)-4), ".PRG")) {
- char loadprg[255];
- for(i=strlen(imagefile); i>0; i--) {
- if(imagefile[i]=='/') break;
- }
- strcpy(loadprg, "\rLOAD\"");
- for(j=0; imagefile[i+1+j]; j++) {
- unsigned char c;
- c=imagefile[i+1+j];
- if ((c >= 'A') && (c <= 'Z') || (c >= 'a') && (c <= 'z')) c ^= 0x20;
- tmp_string[j]=c;
- }
- tmp_string[j]='\0';
- strcat(loadprg, tmp_string);
- strcat(loadprg, "\",8,1\rRUN\r");
- imagefile[i]='\0';
- strcpy(prefs->DrivePath[0], imagefile);
- kbd_buf_feed(loadprg);
- update_prefs=1;
- TheC64->Resume();
- sdl_prefs_open=false;
- } else {
- strcpy(prefs->DrivePath[0], imagefile);
- update_prefs=1;
- cursor_pos=LOADSTAR;
- }
-#endif
if(auto_start) {
autostart_autodetect(imagefile, NULL, 0, 0);
auto_start=0;
@@ -677,10 +565,6 @@
imagefile=NULL;
gotfilename=0;
} else {
-#if 0
- fprintf(stderr, "calling autostart %s, %s\n",
- imagefile, image_prg);
-#endif
autostart_autodetect(imagefile, image_prg, 0, 0);
manual_start=0;
getfilename=0;
@@ -756,21 +640,8 @@
} else if(cursor_pos==SIDENGINE) {
ui_handle_sidengine_resource(0);
} else if(cursor_pos==SCALED) {
-#if 0
- gp2x_memregs[0x2906>>1]=1024; /* scale horizontal */
- gp2x_memregs[0x2908>>1]=320; /* vertical */
- display_width=320;
- gp2x_memregs[0x290c>>1]=display_width; /* screen width */
-#endif
hwscaling=0;
display_set();
-#if 0
- } else if(cursor_pos==TVOUT) {
- gp2x_memregs[0x2800>>1]&=~0x300;
- tvout=0;
- tvout_pal=0;
- display_set();
-#endif
} else if(cursor_pos==CENTRED) {
xoffset=xoffset_uncentred;
yoffset=yoffset_uncentred;
@@ -806,23 +677,8 @@
} else if(cursor_pos==SIDENGINE) {
ui_handle_sidengine_resource(1);
} else if(cursor_pos==SCALED) {
-#if 0
- gp2x_memregs[0x2906>>1]=1228; /* scale horizontal */
- gp2x_memregs[0x2908>>1]=430; /* scale vertical */
- gp2x_memregs[0x2908>>1]=384; /* scale vertical */
- display_width=384;
- gp2x_memregs[0x290c>>1]=display_width; /* screen width */
-#endif
hwscaling=1;
display_set();
-#if 0
- } else if(cursor_pos==TVOUT) {
- gp2x_memregs[0x2800>>1]|=0x300;
- hwscaling=1;
- tvout=1;
- tvout_pal=1;
- display_set();
-#endif
} else if(cursor_pos==CENTRED) {
xoffset=xoffset_centred;
yoffset=yoffset_centred;
@@ -838,24 +694,6 @@
} else if(cursor_pos==X8) {
if (ui_set_ramblocks(1)==1) vic20_mem=5;
}
-#if 0
- if(cursor_pos==LIMITSPEED) {
- prefs->LimitSpeed=true;
- update_prefs=1;
- } else if(cursor_pos==RESET) {
- prefs->FastReset=true;
- update_prefs=1;
- } else if(cursor_pos==SOUND) {
- prefs->SIDType=SIDTYPE_DIGITAL;
- update_prefs=1;
- } else if(cursor_pos==RCONTROL) {
- control_reversed=1;
- } else if(cursor_pos==BRIGHTNESS) {
- set_luma(brightness+1, contrast);
- } else if(cursor_pos==CONTRAST) {
- set_luma(brightness, contrast+1);
- }
-#endif
}
if(input_b) {
@@ -920,10 +758,6 @@
}
closedir(snaps_dir);
}
-#if 0
- char *fname="test.sna";
- interrupt_maincpu_trigger_trap(write_snapshot, (void *)fname);
-#endif
sprintf(tmp_string2, "%s/%s", "./snapshots", tmp_string);
interrupt_maincpu_trigger_trap(write_snapshot, (void *)tmp_string2);
sprintf(tmp_string3, "%s/screen%04d.bmp", "./snapshots", snapnum-1);
@@ -933,64 +767,8 @@
resources_save("vicerc");
exit(0);
}
-#if 0
- if(cursor_pos==D64) {
- xfiletype=0;
- getfilename=true;
- } else if(cursor_pos==LOADSTAR) {
- kbd_buf_feed("\rLOAD\":*\",8,1\rRUN\r");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==LOADER) {
- load_prg(TheC64, c64loader, sizeof(c64loader));
- kbd_buf_feed("\rLOAD\"X\",8,1\rRUN\r");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==PRG) {
- xfiletype=1;
- getfilename=true;
- } else if(cursor_pos==LOAD_SNAP) {
- TheC64->LoadSnapshot("test.sna");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==SAVE_SNAP) {
-#ifdef __gp2x__
- chdir(AppDirPath);
- chdir("c64/snapshots/");
-#else
- chdir("/tmp/c64/snapshots/");
-#endif
- int freename=0;
- for(int snapnum=0; !freename; snapnum++) {
- DIR *...
[truncated message content] |