claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added 8088-1 (10MHz) CPU support.

Browse Source 
Added presetting a filename for NVR (so cards can use that.)
Updated some more translation files for STR_3480 and STR_3481.
Added a new card: ISA-based Clock/RTC cards for PC/XT systems.
Un-did previous change to XT ST506 driver.
This commit is contained in:
waltje
2018-08-29 03:58:50 -04:00
parent 65567ce7da
commit e0252036e6
36 changed files with 980 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/win/VARCem-common.rc
View File

@@ -8,7 +8,7 @@
*
* Common resources for the application.
*
* Version: @(#)VARCem-common.rc 1.0.7 2018/08/18
* Version: @(#)VARCem-common.rc 1.0.8 2018/08/27
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -423,7 +423,7 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,7,107,110,10
END
DLG_CFG_PERIPHERALS DIALOG 97, 0, 267, 180
DLG_CFG_PERIPHERALS DIALOG 97, 0, 267, 200
STYLE DS_CONTROL | WS_CHILD
FONT 9, FONT_NAME
BEGIN
@@ -448,23 +448,28 @@ BEGIN
CONTROL STR_3479,IDC_CHECK_BUGGER,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,80,94,10
GROUPBOX STR_3480,IDC_GROUP_ISAMEM,7,99,255,70
LTEXT "#1:",IDT_1763,12,111,21,10
COMBOBOX IDC_COMBO_ISAMEM_1,25,110,180,120,
LTEXT STR_3481,IDT_1767,7,99,61,10
COMBOBOX IDC_COMBO_ISARTC,71,98,140,120,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_1,209,110,46,12
LTEXT "#2:",IDT_1764,12,125,21,10
COMBOBOX IDC_COMBO_ISAMEM_2,25,124,180,120,
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISARTC,214,98,46,12
GROUPBOX STR_3480,IDC_GROUP_ISAMEM,7,118,255,70
LTEXT "#1:",IDT_1763,12,130,21,10
COMBOBOX IDC_COMBO_ISAMEM_1,25,129,180,120,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_2,209,124,46,12
LTEXT "#3:",IDT_1765,12,139,21,10
COMBOBOX IDC_COMBO_ISAMEM_3,25,138,180,120,
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_1,209,129,46,12
LTEXT "#2:",IDT_1764,12,144,21,10
COMBOBOX IDC_COMBO_ISAMEM_2,25,143,180,120,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_3,209,138,46,12
LTEXT "#4:",IDT_1766,12,153,21,10
COMBOBOX IDC_COMBO_ISAMEM_4,25,152,180,120,
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_2,209,143,46,12
LTEXT "#3:",IDT_1765,12,158,21,10
COMBOBOX IDC_COMBO_ISAMEM_3,25,157,180,120,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_4,209,152,46,12
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_3,209,157,46,12
LTEXT "#4:",IDT_1766,12,172,21,10
COMBOBOX IDC_COMBO_ISAMEM_4,25,171,180,120,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_4,209,171,46,12
END
DLG_CFG_DISK DIALOG 97, 0, 267, 154

4
src/win/mingw/Makefile.MinGW
View File

@@ -8,7 +8,7 @@
#
# Makefile for Windows systems using the MinGW32 environment.
#
# Version: @(#)Makefile.mingw 1.0.52 2018/08/26
# Version: @(#)Makefile.mingw 1.0.53 2018/08/27
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -599,7 +599,7 @@ INTELOBJ := intel.o \
intel_piix.o intel_piix4.o
DEVOBJ := bugger.o \
isamem.o \
isamem.o isartc.o \
game.o game_dev.o \
parallel.o parallel_dev.o serial.o \
sio_fdc37c66x.o sio_fdc37c669.o sio_fdc37c93x.o \

4
src/win/msvc/Makefile.VC
View File

@@ -8,7 +8,7 @@
#
# Makefile for Windows using Visual Studio 2015.
#
# Version: @(#)Makefile.VC 1.0.39 2018/08/26
# Version: @(#)Makefile.VC 1.0.40 2018/08/27
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -569,7 +569,7 @@ INTELOBJ := intel.obj \
intel_piix.obj intel_piix4.obj
DEVOBJ := bugger.obj \
isamem.obj \
isamem.obj isartc.obj \
game.obj game_dev.obj \
parallel.obj parallel_dev.obj serial.obj \
sio_fdc37c66x.obj sio_fdc37c669.obj sio_fdc37c93x.obj \

13
src/win/resource.h
View File

@@ -8,7 +8,7 @@
*
* Windows resource defines.
*
* Version: @(#)resource.h 1.0.17 2018/08/18
* Version: @(#)resource.h 1.0.18 2018/08/27
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -113,10 +113,11 @@
#define IDT_1758 1758 /* ZIP drives: */
#define IDT_1761 1761 /* Speed: */
#define IDT_1762 1762 /* ZIP drives: */
#define IDT_1763 1763 /* Board #1: */
#define IDT_1764 1764 /* Board #2: */
#define IDT_1765 1765 /* Board #3: */
#define IDT_1766 1766 /* Board #4: */
#define IDT_1763 1763 /* ISAMEM #1: */
#define IDT_1764 1764 /* ISAMEM #2: */
#define IDT_1765 1765 /* ISAMEM #3: */
#define IDT_1766 1766 /* ISAMEM #4: */
#define IDT_1767 1767 /* ISARTC: */
#define IDT_TITLE 1790 /* "VARCem for Plaform" */
#define IDT_VERSION 1791 /* "version.." */
@@ -188,6 +189,8 @@
#define IDC_COMBO_IDE_QUA 1126
#define IDC_CHECK_BUGGER 1127
#define IDC_CONFIGURE_BUGGER 1128
#define IDC_COMBO_ISARTC 1129
#define IDC_CONFIGURE_ISARTC 1130
#define IDC_GROUP_ISAMEM 1140
#define IDC_COMBO_ISAMEM_1 1141

7
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings.c 1.0.32 2018/08/18
* Version: @(#)win_settings.c 1.0.33 2018/08/27
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -59,6 +59,7 @@
#include "../devices/ports/parallel_dev.h"
#include "../devices/ports/serial.h"
#include "../devices/misc/isamem.h"
#include "../devices/misc/isartc.h"
#include "../devices/input/mouse.h"
#include "../devices/input/game/joystick.h"
#include "../devices/floppy/fdd.h"
@@ -114,6 +115,7 @@ static int temp_hdc_type,
temp_ide_ter, temp_ide_ter_irq,
temp_ide_qua, temp_ide_qua_irq;
static int temp_bugger,
temp_isartc,
temp_isamem[ISAMEM_MAX];
/* Floppy drives category. */
@@ -224,6 +226,7 @@ settings_init(void)
temp_ide_qua = ide_enable[3];
temp_ide_qua_irq = ide_irq[3];
temp_bugger = bugger_enabled;
temp_isartc = isartc_type;
/* ISA memory boards. */
for (i = 0; i < ISAMEM_MAX; i++)
@@ -303,6 +306,7 @@ settings_changed(void)
i = i || (temp_ide_qua != ide_enable[3]);
i = i || (temp_ide_qua_irq != ide_irq[3]);
i = i || (temp_bugger != bugger_enabled);
i = i || (temp_isartc != isartc_type);
/* ISA memory boards. */
for (j = 0; j < ISAMEM_MAX; j++)
@@ -410,6 +414,7 @@ settings_save(void)
ide_enable[3] = temp_ide_qua;
ide_irq[3] = temp_ide_qua_irq;
bugger_enabled = temp_bugger;
isartc_type = temp_isartc;
/* ISA memory boards. */
for (i = 0; i < ISAMEM_MAX; i++)

54
src/win/win_settings_periph.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_periph.h 1.0.10 2018/08/18
* Version: @(#)win_settings_periph.h 1.0.11 2018/08/27
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -210,12 +210,34 @@ peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
h = GetDlgItem(hdlg, IDC_CHECK_BUGGER);
SendMessage(h, BM_SETCHECK, temp_bugger, 0);
/* Populate the ISA RTC card dropdown. */
h = GetDlgItem(hdlg, IDC_COMBO_ISARTC);
for (d = 0; ; d++) {
stransi = isartc_get_internal_name(d);
if (stransi == NULL)
break;
if (d == 0) {
/* Translate "None". */
SendMessage(h, CB_ADDSTRING, 0,
(LPARAM)get_string(IDS_NONE));
} else {
stransi = isartc_get_name(d);
mbstowcs(temp, stransi, sizeof_w(temp));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
}
SendMessage(h, CB_SETCURSEL, temp_isartc, 0);
h = GetDlgItem(hdlg, IDC_CONFIGURE_ISARTC);
if (temp_isartc != 0)
EnableWindow(h, TRUE);
else
EnableWindow(h, FALSE);
/* Populate the ISA memory card dropdowns. */
for (c = 0; c < ISAMEM_MAX; c++) {
h = GetDlgItem(hdlg, IDC_COMBO_ISAMEM_1 + c);
d = 0;
for (;;) {
for (d = 0; ; d++) {
stransi = isamem_get_internal_name(d);
if (stransi == NULL)
break;
@@ -229,12 +251,8 @@ peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
mbstowcs(temp, stransi, sizeof_w(temp));
SendMessage(h, CB_ADDSTRING, 0, (LPARAM)temp);
}
d++;
}
SendMessage(h, CB_SETCURSEL, temp_isamem[c], 0);
h = GetDlgItem(hdlg, IDC_CONFIGURE_ISAMEM_1 + c);
if (temp_isamem[c] != 0)
EnableWindow(h, TRUE);
@@ -282,6 +300,16 @@ peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
EnableWindow(h, FALSE);
break;
case IDC_COMBO_ISARTC:
h = GetDlgItem(hdlg, IDC_COMBO_ISARTC);
temp_isartc = SendMessage(h, CB_GETCURSEL, 0, 0);
h = GetDlgItem(hdlg, IDC_CONFIGURE_ISARTC);
if (temp_isartc != 0)
EnableWindow(h, TRUE);
else
EnableWindow(h, FALSE);
break;
case IDC_COMBO_ISAMEM_1:
case IDC_COMBO_ISAMEM_2:
case IDC_COMBO_ISAMEM_3:
@@ -297,12 +325,20 @@ peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
EnableWindow(h, FALSE);
break;
case IDC_CONFIGURE_ISARTC:
dev = isartc_get_device(temp_isartc);
if (dev != NULL)
temp_deviceconfig |= dlg_devconf(hdlg, (void *)dev);
break;
case IDC_CONFIGURE_ISAMEM_1:
case IDC_CONFIGURE_ISAMEM_2:
case IDC_CONFIGURE_ISAMEM_3:
case IDC_CONFIGURE_ISAMEM_4:
c = LOWORD(wParam) - IDC_CONFIGURE_ISAMEM_1;
temp_deviceconfig |= dlg_devconf(hdlg, (void *)isamem_get_device(c));
dev = isamem_get_device(c);
if (dev != NULL)
temp_deviceconfig |= dlg_devconf(hdlg, (void *)dev);
break;
}
return FALSE;