claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General changes from the obattler_202406 branch

Browse Source 
Co-Authored-By: Miran Grča <oubattler@gmail.com>
This commit is contained in:
Jasmine Iwanek
2024-09-09 00:43:14 -04:00
parent 9d1b9b7d02
commit d00f80d3ce
57 changed files with 493 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/machine/m_at_286_386sx.c
View File

@@ -66,7 +66,7 @@ machine_at_mr286_init(const machine_t *model)
}
static void
machine_at_headland_common_init(int type)
machine_at_headland_common_init(const machine_t *model, int type)
{
device_add(&keyboard_at_ami_device);
@@ -94,7 +94,7 @@ machine_at_tg286m_init(const machine_t *model)
machine_at_common_ide_init(model);
machine_at_headland_common_init(1);
machine_at_headland_common_init(model, 1);
return ret;
}
@@ -115,7 +115,7 @@ machine_at_ama932j_init(const machine_t *model)
if (gfxcard[0] == VID_INTERNAL)
device_add(&oti067_ama932j_device);
machine_at_headland_common_init(2);
machine_at_headland_common_init(model, 2);
device_add(&ali5105_device);
@@ -755,7 +755,7 @@ machine_at_acer100t_init(const machine_t *model)
device_add(&ali1409_device);
if (gfxcard[0] == VID_INTERNAL)
device_add(&oti077_acer100t_device);
device_add(&oti077_acer100t_device);
device_add(&ali5105_device);

5
src/machine/m_at_386dx_486.c
View File

@@ -50,6 +50,7 @@
#include <86box/plat_unused.h>
#include <86box/sound.h>
/* 386DX */
int
machine_at_acc386_init(const machine_t *model)
{
@@ -252,7 +253,7 @@ machine_at_ecs386v_init(const machine_t *model)
int ret;
ret = bios_load_linear("roms/machines/ecs386v/PANDA_386V.BIN",
0x000f0000, 65536, 0);
0x000f0000, 65536, 0);
if (bios_only || !ret)
return ret;
@@ -1412,7 +1413,7 @@ machine_at_amis76_init(const machine_t *model)
{
int ret;
ret = bios_load_linear_inverted("roms/machines/s76p/S76P.ROM",
ret = bios_load_linear_inverted("roms/machines/s76p/S76P.ROM",
0x000e0000, 131072, 0);
if (bios_only || !ret)

6
src/machine/m_at_commodore.c
View File

@@ -64,13 +64,13 @@ cbm_io_write(UNUSED(uint16_t port), uint8_t val, UNUSED(void *priv))
switch (val & 3) {
case 1:
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
break;
case 2:
lpt1_init(LPT1_ADDR);
lpt1_setup(LPT1_ADDR);
break;
case 3:
lpt1_init(LPT2_ADDR);
lpt1_setup(LPT2_ADDR);
break;
default:

8
src/machine/m_ps1.c
View File

@@ -146,13 +146,13 @@ ps1_write(uint16_t port, uint8_t val, void *priv)
if (val & 0x10) {
switch ((val >> 5) & 3) {
case 0:
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
break;
case 1:
lpt1_init(LPT1_ADDR);
lpt1_setup(LPT1_ADDR);
break;
case 2:
lpt1_init(LPT2_ADDR);
lpt1_setup(LPT2_ADDR);
break;
default:
@@ -316,7 +316,7 @@ ps1_setup(int model)
ps->uart = device_add_inst(&ns16450_device, 1);
lpt1_remove();
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
mem_remap_top(384);

8
src/machine/m_ps2_isa.c
View File

@@ -64,13 +64,13 @@ ps2_write(uint16_t port, uint8_t val, void *priv)
if (val & 0x10) {
switch ((val >> 5) & 3) {
case 0:
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
break;
case 1:
lpt1_init(LPT1_ADDR);
lpt1_setup(LPT1_ADDR);
break;
case 2:
lpt1_init(LPT2_ADDR);
lpt1_setup(LPT2_ADDR);
break;
default:
@@ -167,7 +167,7 @@ ps2_isa_setup(int model, int cpu_type)
ps2->uart = device_add_inst(&ns16450_device, 1);
lpt1_remove();
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
device_add(&port_92_device);

26
src/machine/m_ps2_mca.c
View File

@@ -374,13 +374,13 @@ model_50_write(uint16_t port, uint8_t val)
if (val & 0x10) {
switch ((val >> 5) & 3) {
case 0:
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
break;
case 1:
lpt1_init(LPT1_ADDR);
lpt1_setup(LPT1_ADDR);
break;
case 2:
lpt1_init(LPT2_ADDR);
lpt1_setup(LPT2_ADDR);
break;
default:
@@ -506,13 +506,13 @@ model_55sx_write(uint16_t port, uint8_t val)
if (val & 0x10) {
switch ((val >> 5) & 3) {
case 0:
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
break;
case 1:
lpt1_init(LPT1_ADDR);
lpt1_setup(LPT1_ADDR);
break;
case 2:
lpt1_init(LPT2_ADDR);
lpt1_setup(LPT2_ADDR);
break;
default:
@@ -565,13 +565,13 @@ model_70_type3_write(uint16_t port, uint8_t val)
if (val & 0x10) {
switch ((val >> 5) & 3) {
case 0:
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
break;
case 1:
lpt1_init(LPT1_ADDR);
lpt1_setup(LPT1_ADDR);
break;
case 2:
lpt1_init(LPT2_ADDR);
lpt1_setup(LPT2_ADDR);
break;
default:
@@ -619,13 +619,13 @@ model_80_write(uint16_t port, uint8_t val)
if (val & 0x10) {
switch ((val >> 5) & 3) {
case 0:
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
break;
case 1:
lpt1_init(LPT1_ADDR);
lpt1_setup(LPT1_ADDR);
break;
case 2:
lpt1_init(LPT2_ADDR);
lpt1_setup(LPT2_ADDR);
break;
default:
@@ -846,7 +846,7 @@ ps2_mca_board_common_init(void)
ps2.setup = 0xff;
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
}
static uint8_t

4
src/machine/m_xt_compaq.c
View File

@@ -59,7 +59,7 @@ machine_xt_compaq_deskpro_init(const machine_t *model)
standalone_gameport_type = &gameport_device;
lpt1_remove();
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
return ret;
}
@@ -87,7 +87,7 @@ machine_xt_compaq_portable_init(const machine_t *model)
device_add(&gameport_device);
lpt1_remove();
lpt1_init(LPT_MDA_ADDR);
lpt1_setup(LPT_MDA_ADDR);
return ret;
}

4
src/machine/m_xt_zenith.c
View File

@@ -144,7 +144,7 @@ machine_xt_z184_init(const machine_t *model)
lpt1_remove(); /* only one parallel port */
lpt2_remove();
lpt1_init(0x278);
lpt1_setup(LPT2_ADDR);
device_add(&ns8250_device);
serial_set_next_inst(SERIAL_MAX); /* So that serial_standalone_init() won't do anything. */
@@ -198,7 +198,7 @@ machine_xt_z159_init(const machine_t *model)
/* parallel port is on the memory board */
lpt1_remove(); /* only one parallel port */
lpt2_remove();
lpt1_init(0x278);
lpt1_setup(LPT2_ADDR);
return ret;
}