mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 04:45:31 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #6422 from bozoscum/master

Browse Source 
complete the Multitech PC-500/PC-500+ onboard RTC and some more other modification
This commit is contained in:
Miran Grča
2025-10-30 20:12:51 +01:00
committed by GitHub
parent 2400021352 3689c53018
commit d10973c1d4
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/isartc.c
View File

@@ -680,11 +680,9 @@ isartc_init(const device_t *info)
case ISARTC_RTC58167: /* Multitech PC-500/PC-500+ onboard RTC */
dev->flags |= FLAG_YEARBCD;
//dev->base_addr = machine_get_config_int("rtc_port");
dev->base_addr = 0x2c0;
dev->base_addr = machine_get_config_int("rtc_port");
dev->base_addrsz = 8;
//dev->irq = machine_get_config_int("rtc_irq");
dev->irq = -1;
dev->irq = machine_get_config_int("rtc_irq");
dev->f_rd = rtc58167_read;
dev->f_wr = rtc58167_write;
dev->nvr.reset = mm67_reset;

12
src/machine/m_xt.c
View File

@@ -1259,7 +1259,7 @@ static const device_config_t pc500_config[] = {
{
.name = "rtc_port",
.description = "RTC Port Address",
.type = CONFIG_HEX16,
.type = CONFIG_SELECTION,
.default_string = NULL,
.default_int = 0,
.file_filter = NULL,
@@ -1310,7 +1310,7 @@ machine_xt_pc500_init(const machine_t *model)
if (bios_only || !ret)
return ret;
device_add(&kbc_xtclone_device);
device_add(&kbc_pc82_device);
machine_xt_common_init(model, 0);
@@ -1379,7 +1379,7 @@ static const device_config_t pc500plus_config[] = {
{
.name = "rtc_port",
.description = "Onboard RTC",
.type = CONFIG_HEX16,
.type = CONFIG_SELECTION,
.default_string = NULL,
.default_int = 0,
.file_filter = NULL,
@@ -1429,9 +1429,7 @@ machine_xt_pc500plus_init(const machine_t *model)
if (bios_only || !ret)
return ret;
device_add(&kbc_xtclone_device);
machine_xt_common_init(model, 0);
machine_xt_clone_init(model, 0);
if (rtc_port != 0)
device_add(&rtc58167_device);
@@ -1507,7 +1505,7 @@ machine_xt_pc700_init(const machine_t *model)
if (bios_only || !ret)
return ret;
device_add(&kbc_pc_device);
device_add(&kbc_pc82_device);
machine_xt_common_init(model, 0);

6
src/machine/machine_table.c
View File

@@ -1126,7 +1126,7 @@ const machine_t machines[] = {
.nvrmask = 0,
.jumpered_ecp_dma = 0,
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_pc_device,
.kbc_device = &kbc_pc82_device,
.kbc_params = 0x00000000,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
@@ -1169,7 +1169,7 @@ const machine_t machines[] = {
.nvrmask = 0,
.jumpered_ecp_dma = 0,
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_pc_device,
.kbc_device = &kbc_xtclone_device,
.kbc_params = 0x00000000,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
@@ -1212,7 +1212,7 @@ const machine_t machines[] = {
.nvrmask = 0,
.jumpered_ecp_dma = 0,
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_pc_device,
.kbc_device = &kbc_pc82_device,
.kbc_params = 0x00000000,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,

2
src/video/vid_et4000w32.c
View File

@@ -40,7 +40,7 @@
#define BIOS_ROM_PATH_W32_MACHSPEED_VGA_GUI_2400S "roms/video/et4000w32/ET4000W32VLB_bios_MX27C512.BIN"
#define BIOS_ROM_PATH_W32I_REVB_AXIS_MICRODEVICE "roms/video/et4000w32/ET4KW32I.VBI"
#define BIOS_ROM_PATH_W32I_REVB_HERCULES_DYNAMITE_VLB_PRO "roms/video/et4000w32/Hercules Dynamite VL Pro v8.00 c 1993 Hercules.bin"
#define BIOS_ROM_PATH_W32P_REVB_VIDEOMAGIC "roms/video/et4000w32/VideoMagic-BioS-HXIRTW32PWSRL.bin"
#define BIOS_ROM_PATH_W32P_REVB_VIDEOMAGIC "roms/video/et4000w32/VideoMagic-BioS-HXIRTW32PWSRL.BIN"
#define BIOS_ROM_PATH_W32P_REVC_CARDEX "roms/video/et4000w32/et4000w32pcardex.BIN"
#define BIOS_ROM_PATH_W32P_REVD "roms/video/et4000w32/ET4K_W32.BIN"
#define BIOS_ROM_PATH_W32P_REVD_CARDEX "roms/video/et4000w32/cardex.vbi"

2
src/video/vid_table.c
View File

@@ -327,8 +327,10 @@ video_prepare(void)
for (int i = 0; i < MONITORS_NUM; i++) {
/* Reset the CGA palette. */
#if 0
if (monitors[i].mon_cga_palette)
*monitors[i].mon_cga_palette = 0;
#endif
cgapal_rebuild_monitor(i);
/* Do an inform on the default values, so that that there's some sane values initialized