|
From: <gp...@us...> - 2025-07-29 22:02:27
|
Revision: 45717
http://sourceforge.net/p/vice-emu/code/45717
Author: gpz
Date: 2025-07-29 22:02:24 +0000 (Tue, 29 Jul 2025)
Log Message:
-----------
add support for the PAL DTV Hummer
Modified Paths:
--------------
trunk/vice/doc/vice.texi
trunk/vice/src/arch/gtk3/c64dtvui.c
trunk/vice/src/arch/gtk3/widgets/settings_c64dtvflash.c
trunk/vice/src/arch/gtk3/widgets/settings_model.c
trunk/vice/src/arch/sdl/menu_c64dtvhw.c
trunk/vice/src/c64dtv/c64dtv-cmdline-options.c
trunk/vice/src/c64dtv/c64dtvflash.c
trunk/vice/src/c64dtv/c64dtvmodel.c
trunk/vice/src/c64dtv/c64dtvmodel.h
Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/doc/vice.texi 2025-07-29 22:02:24 UTC (rev 45717)
@@ -13935,11 +13935,16 @@
Specify filename of the C64DTV PAL v3 ROM image
(@code{DTVPALV3FlashName}).
-@findex -hummerromimage
-@item -hummerromimage <name>
-Specify filename of the C64DTV Hummer ROM image
-(@code{DTVHummerFlashName}).
+@findex -hummerntscromimage
+@item -hummerntscromimage <name>
+Specify filename of the C64DTV NTSC Hummer ROM image
+(@code{DTVNTSCHummerFlashName}).
+@findex -hummerpalromimage
+@item -hummerpalromimage <name>
+Specify filename of the C64DTV PAL Hummer ROM image
+(@code{DTVPALHummerFlashName}).
+
@findex -c64dtvromrw, +c64dtvromrw
@item -c64dtvromrw
@itemx +c64dtvromrw
@@ -14110,10 +14115,14 @@
@item DTVPALV3FlashName
String specifying the filename of the DTV PAL v3 Flash ROM image.
-@vindex DTVHummerFlashName
-@item DTVHummerFlashName
-String specifying the filename of the DTV Hummer Flash ROM image.
+@vindex DTVNTSCHummerFlashName
+@item DTVNTSCHummerFlashName
+String specifying the filename of the DTV NTSC Hummer Flash ROM image.
+@vindex DTVPALHummerFlashName
+@item DTVPALHummerFlashName
+String specifying the filename of the DTV PAL Hummer Flash ROM image.
+
@vindex DTVFlashRevision
@item DTVFlashRevision
Integer specifying which of the above Flash ROM images will be used.
Modified: trunk/vice/src/arch/gtk3/c64dtvui.c
===================================================================
--- trunk/vice/src/arch/gtk3/c64dtvui.c 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/arch/gtk3/c64dtvui.c 2025-07-29 22:02:24 UTC (rev 45717)
@@ -53,6 +53,7 @@
"V2 NTSC",
"V3 PAL",
"V3 NTSC",
+ "Hummer (PAL)",
"Hummer (NTSC)",
NULL
};
Modified: trunk/vice/src/arch/gtk3/widgets/settings_c64dtvflash.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/settings_c64dtvflash.c 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/arch/gtk3/widgets/settings_c64dtvflash.c 2025-07-29 22:02:24 UTC (rev 45717)
@@ -5,14 +5,15 @@
*/
/*
- * $VICERES DTVPALV2FlashName x64dtv
- * $VICERES DTVNTSCV2FlashName x64dtv
- * $VICERES DTVPALV3FlashName x64dtv
- * $VICERES DTVNTSCV3FlashName x64dtv
- * $VICERES DTVHummerFlashName x64dtv
- * $VICERES c64dtvromrw x64dtv
- * $VICERES FSFlashDir x64dtv
- * $VICERES FlashTrueFS x64dtv
+ * $VICERES DTVPALV2FlashName x64dtv
+ * $VICERES DTVNTSCV2FlashName x64dtv
+ * $VICERES DTVPALV3FlashName x64dtv
+ * $VICERES DTVNTSCV3FlashName x64dtv
+ * $VICERES DTVPALHummerFlashName x64dtv
+ * $VICERES DTVNTSCHummerFlashName x64dtv
+ * $VICERES c64dtvromrw x64dtv
+ * $VICERES FSFlashDir x64dtv
+ * $VICERES FlashTrueFS x64dtv
*/
/*
@@ -59,7 +60,8 @@
"DTVNTSCV2FlashName",
"DTVPALV3FlashName",
"DTVNTSCV3FlashName",
- "DTVHummerFlashName"
+ "DTVPALHummerFlashName",
+ "DTVNTSCHummerFlashName"
};
chooser = vice_gtk3_resource_filechooser_new(resnames[idx],
@@ -144,15 +146,20 @@
gtk_grid_attach(GTK_GRID(grid), label, 0, 3, 1, 1);
gtk_grid_attach(GTK_GRID(grid), rom_file, 1, 3, 1, 1);
- label = label_helper("Hummer ROM file");
- rom_file = create_rom_widget(DTVMODEL_HUMMER_NTSC);
+ label = label_helper("PAL Hummer ROM file");
+ rom_file = create_rom_widget(DTVMODEL_HUMMER_PAL);
gtk_grid_attach(GTK_GRID(grid), label, 0, 4, 1, 1);
gtk_grid_attach(GTK_GRID(grid), rom_file, 1, 4, 1, 1);
+ label = label_helper("NTSC Hummer ROM file");
+ rom_file = create_rom_widget(DTVMODEL_HUMMER_NTSC);
+ gtk_grid_attach(GTK_GRID(grid), label, 0, 5, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), rom_file, 1, 5, 1, 1);
+
rom_write = vice_gtk3_resource_check_button_new(
"c64dtvromrw",
"Enable writes to C64DTV ROM image");
- gtk_grid_attach(GTK_GRID(grid), rom_write, 1, 5, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), rom_write, 1, 6, 1, 1);
/* Flash dir and true HW flash check button */
label = label_helper("Flash FS directory");
@@ -162,9 +169,9 @@
"Enable true hardware flash file system");
gtk_widget_set_margin_top(label, 16);
gtk_widget_set_margin_top(flash_dir, 16);
- gtk_grid_attach(GTK_GRID(grid), label, 0, 6, 1, 1);
- gtk_grid_attach(GTK_GRID(grid), flash_dir, 1, 6, 1, 1);
- gtk_grid_attach(GTK_GRID(grid), flash_hw, 1, 7, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), label, 0, 7, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), flash_dir, 1, 7, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), flash_hw, 1, 8, 1, 1);
gtk_widget_show_all(grid);
return grid;
Modified: trunk/vice/src/arch/gtk3/widgets/settings_model.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/settings_model.c 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/arch/gtk3/widgets/settings_model.c 2025-07-29 22:02:24 UTC (rev 45717)
@@ -770,6 +770,7 @@
break;
case DTVMODEL_V3_PAL: /* fall through */
case DTVMODEL_V3_NTSC: /* fall through */
+ case DTVMODEL_HUMMER_PAL:
case DTVMODEL_HUMMER_NTSC:
rev = DTVREV_3;
break;
Modified: trunk/vice/src/arch/sdl/menu_c64dtvhw.c
===================================================================
--- trunk/vice/src/arch/sdl/menu_c64dtvhw.c 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/arch/sdl/menu_c64dtvhw.c 2025-07-29 22:02:24 UTC (rev 45717)
@@ -86,6 +86,11 @@
.callback = custom_DTVModel_callback,
.data = (ui_callback_data_t)DTVMODEL_V3_NTSC
},
+ { .string = "Hummer PAL",
+ .type = MENU_ENTRY_RESOURCE_RADIO,
+ .callback = custom_DTVModel_callback,
+ .data = (ui_callback_data_t)DTVMODEL_HUMMER_PAL
+ },
{ .string = "Hummer NTSC",
.type = MENU_ENTRY_RESOURCE_RADIO,
.callback = custom_DTVModel_callback,
@@ -100,7 +105,8 @@
UI_MENU_DEFINE_FILE_STRING(DTVPALV2FlashName)
UI_MENU_DEFINE_FILE_STRING(DTVNTSCV3FlashName)
UI_MENU_DEFINE_FILE_STRING(DTVPALV3FlashName)
-UI_MENU_DEFINE_FILE_STRING(DTVHummerFlashName)
+UI_MENU_DEFINE_FILE_STRING(DTVPALHummerFlashName)
+UI_MENU_DEFINE_FILE_STRING(DTVNTSCHummerFlashName)
UI_MENU_DEFINE_TOGGLE(c64dtvromrw)
UI_MENU_DEFINE_TOGGLE(FlashTrueFS)
@@ -162,11 +168,16 @@
.callback = file_string_DTVPALV3FlashName_callback,
.data = (ui_callback_data_t)"Select C64DTV PAL v3 ROM image file"
},
- { .string = "Hummer",
+ { .string = "PAL Hummer",
.type = MENU_ENTRY_DIALOG,
- .callback = file_string_DTVHummerFlashName_callback,
- .data = (ui_callback_data_t)"Select C64DTV Hummer ROM image file"
+ .callback = file_string_DTVPALHummerFlashName_callback,
+ .data = (ui_callback_data_t)"Select C64DTV PAL Hummer ROM image file"
},
+ { .string = "NTSC Hummer",
+ .type = MENU_ENTRY_DIALOG,
+ .callback = file_string_DTVNTSCHummerFlashName_callback,
+ .data = (ui_callback_data_t)"Select C64DTV NTSC Hummer ROM image file"
+ },
SDL_MENU_ITEM_SEPARATOR,
{ .string = "Enable writes",
Modified: trunk/vice/src/c64dtv/c64dtv-cmdline-options.c
===================================================================
--- trunk/vice/src/c64dtv/c64dtv-cmdline-options.c 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/c64dtv/c64dtv-cmdline-options.c 2025-07-29 22:02:24 UTC (rev 45717)
@@ -48,6 +48,8 @@
{ "v3pal", DTVMODEL_V3_PAL },
{ "v3ntsc", DTVMODEL_V3_NTSC },
{ "hummer", DTVMODEL_HUMMER_NTSC },
+ { "hummerpal", DTVMODEL_HUMMER_PAL },
+ { "hummerntsc", DTVMODEL_HUMMER_NTSC },
{ NULL, DTVMODEL_UNKNOWN }
};
Modified: trunk/vice/src/c64dtv/c64dtvflash.c
===================================================================
--- trunk/vice/src/c64dtv/c64dtvflash.c 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/c64dtv/c64dtvflash.c 2025-07-29 22:02:24 UTC (rev 45717)
@@ -49,11 +49,12 @@
/* #define DEBUG */
-#define DTVROM_PALV2_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
-#define DTVROM_PALV3_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
-#define DTVROM_NTSCV2_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
-#define DTVROM_NTSCV3_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
-#define DTVROM_HUMMER_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
+#define DTVROM_PALV2_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
+#define DTVROM_PALV3_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
+#define DTVROM_NTSCV2_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
+#define DTVROM_NTSCV3_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
+#define DTVROM_HUMMER_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
+#define DTVROM_HUMMER_PAL_NAME_DEFAULT "dtvrom.bin" /* FIXME: rename (who made this?) */
static log_t c64dtvflash_log = LOG_DEFAULT;
#ifdef DEBUG
@@ -634,8 +635,10 @@
&c64dtvflash_filename[DTVMODEL_V3_NTSC], set_c64dtvflash_filename, (void*)DTVMODEL_V3_NTSC },
{ "DTVPALV3FlashName", DTVROM_PALV3_NAME_DEFAULT, RES_EVENT_NO, NULL,
&c64dtvflash_filename[DTVMODEL_V3_PAL], set_c64dtvflash_filename, (void*)DTVMODEL_V3_PAL },
- { "DTVHummerFlashName", DTVROM_HUMMER_NAME_DEFAULT, RES_EVENT_NO, NULL,
+ { "DTVNTSCHummerFlashName", DTVROM_HUMMER_NAME_DEFAULT, RES_EVENT_NO, NULL,
&c64dtvflash_filename[DTVMODEL_HUMMER_NTSC], set_c64dtvflash_filename, (void*)DTVMODEL_HUMMER_NTSC },
+ { "DTVPALHummerFlashName", DTVROM_HUMMER_PAL_NAME_DEFAULT, RES_EVENT_NO, NULL,
+ &c64dtvflash_filename[DTVMODEL_HUMMER_PAL], set_c64dtvflash_filename, (void*)DTVMODEL_HUMMER_PAL },
RESOURCE_STRING_LIST_END
};
@@ -682,9 +685,12 @@
{ "-palv3romimage", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
NULL, NULL, "DTVPALV3FlashName", NULL,
"<Name>", "Specify name of C64DTV PAL v3 ROM image" },
- { "-hummerromimage", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
- NULL, NULL, "DTVHummerFlashName", NULL,
- "<Name>", "Specify name of C64DTV Hummer ROM image" },
+ { "-hummerntscromimage", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+ NULL, NULL, "DTVNTSCHummerFlashName", NULL,
+ "<Name>", "Specify name of C64DTV NTSC Hummer ROM image" },
+ { "-hummerpalromimage", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+ NULL, NULL, "DTVPALHummerFlashName", NULL,
+ "<Name>", "Specify name of C64DTV PAL Hummer ROM image" },
{ "-c64dtvromrw", SET_RESOURCE, CMDLINE_ATTRIB_NONE,
NULL, NULL, "c64dtvromrw", (void *)1,
NULL, "Enable writes to C64DTV ROM image" },
Modified: trunk/vice/src/c64dtv/c64dtvmodel.c
===================================================================
--- trunk/vice/src/c64dtv/c64dtvmodel.c 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/c64dtv/c64dtvmodel.c 2025-07-29 22:02:24 UTC (rev 45717)
@@ -83,6 +83,7 @@
{ MACHINE_SYNC_NTSC, DTVREV_2, IS_DTV, DTVMODEL_V2_NTSC }, /* DTV v2 (ntsc) */
{ MACHINE_SYNC_PAL, DTVREV_3, IS_DTV, DTVMODEL_V3_PAL }, /* DTV v3 (pal) */
{ MACHINE_SYNC_NTSC, DTVREV_3, IS_DTV, DTVMODEL_V3_NTSC }, /* DTV v3 (ntsc) */
+ { MACHINE_SYNC_PAL, DTVREV_3, IS_HUMMER, DTVMODEL_HUMMER_PAL }, /* Hummer (pal) */
{ MACHINE_SYNC_NTSC, DTVREV_3, IS_HUMMER, DTVMODEL_HUMMER_NTSC }, /* Hummer (ntsc) */
};
Modified: trunk/vice/src/c64dtv/c64dtvmodel.h
===================================================================
--- trunk/vice/src/c64dtv/c64dtvmodel.h 2025-07-29 15:23:08 UTC (rev 45716)
+++ trunk/vice/src/c64dtv/c64dtvmodel.h 2025-07-29 22:02:24 UTC (rev 45717)
@@ -35,6 +35,7 @@
DTVMODEL_V2_NTSC, /* DTV v2 (ntsc) */
DTVMODEL_V3_PAL, /* DTV v3 (pal) */
DTVMODEL_V3_NTSC, /* DTV v3 (ntsc) */
+ DTVMODEL_HUMMER_PAL, /* Hummer (pal) */
DTVMODEL_HUMMER_NTSC, /* Hummer (ntsc) */
/* This entry always needs to be at the end */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|