80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix more cases of hardcoding where we had a macro

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-30 18:55:12 -05:00
parent 9bb3669be9
commit afdb2b1644
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/lpt.h
View File

@@ -24,9 +24,11 @@ extern void lpt1_remove_ams(void);
#define lpt1_init(a) lpt_port_init(0, a)
#define lpt1_irq(a) lpt_port_irq(0, a)
#define lpt1_remove() lpt_port_remove(0)
#define lpt2_init(a) lpt_port_init(1, a)
#define lpt2_irq(a) lpt_port_irq(1, a)
#define lpt2_remove() lpt_port_remove(1)
#define lpt3_init(a) lpt_port_init(2, a)
#define lpt3_irq(a) lpt_port_irq(2, a)
#define lpt3_remove() lpt_port_remove(2)
@@ -45,7 +47,7 @@ typedef struct {
void * priv;
} lpt_port_t;
extern lpt_port_t lpt_ports[3];
extern lpt_port_t lpt_ports[PARALLEL_MAX];
extern void lpt_write(uint16_t port, uint8_t val, void *priv);
extern uint8_t lpt_read(uint16_t port, void *priv);

12
src/lpt.c
View File

@@ -14,7 +14,7 @@
#include <86box/net_plip.h>
lpt_port_t lpt_ports[3];
lpt_port_t lpt_ports[PARALLEL_MAX];
static const struct {
@@ -74,7 +74,7 @@ lpt_devices_init(void)
{
int i = 0;
for (i = 0; i < 3; i++) {
for (i = 0; i < PARALLEL_MAX; i++) {
lpt_ports[i].dt = (lpt_device_t *) lpt_devices[lpt_ports[i].device].device;
if (lpt_ports[i].dt)
@@ -89,7 +89,7 @@ lpt_devices_close(void)
int i = 0;
lpt_port_t *dev;
for (i = 0; i < 3; i++) {
for (i = 0; i < PARALLEL_MAX; i++) {
dev = &lpt_ports[i];
if (dev->dt)
@@ -176,10 +176,10 @@ void
lpt_init(void)
{
int i;
uint16_t default_ports[3] = { 0x378, 0x278, 0x3bc };
uint8_t default_irqs[3] = { 7, 5, 7 };
uint16_t default_ports[PARALLEL_MAX] = { 0x378, 0x278, 0x3bc };
uint8_t default_irqs[PARALLEL_MAX] = { 7, 5, 7 };
for (i = 0; i < 3; i++) {
for (i = 0; i < PARALLEL_MAX; i++) {
lpt_ports[i].addr = 0xffff;
lpt_ports[i].irq = 0xff;
lpt_ports[i].enable_irq = 0x10;

24
src/win/win_settings.c
View File

@@ -99,8 +99,8 @@ static int temp_net_type, temp_net_card;
static char temp_pcap_dev[522];
/* Ports category */
static int temp_lpt_devices[3];
static int temp_serial[4], temp_lpt[3];
static int temp_lpt_devices[PARALLEL_MAX];
static int temp_serial[SERIAL_MAX], temp_lpt[PARALLEL_MAX];
/* Other peripherals category */
static int temp_fdc_card, temp_hdc, temp_ide_ter, temp_ide_qua, temp_cassette;
@@ -357,11 +357,11 @@ win_settings_init(void)
temp_net_card = network_card;
/* Ports category */
for (i = 0; i < 3; i++) {
for (i = 0; i < PARALLEL_MAX; i++) {
temp_lpt_devices[i] = lpt_ports[i].device;
temp_lpt[i] = lpt_ports[i].enabled;
}
for (i = 0; i < 4; i++)
for (i = 0; i < SERIAL_MAX; i++)
temp_serial[i] = serial_enabled[i];
/* Storage devices category */
@@ -477,11 +477,11 @@ win_settings_changed(void)
i = i || (network_card != temp_net_card);
/* Ports category */
for (j = 0; j < 3; j++) {
for (j = 0; j < PARALLEL_MAX; j++) {
i = i || (temp_lpt_devices[j] != lpt_ports[j].device);
i = i || (temp_lpt[j] != lpt_ports[j].enabled);
}
for (j = 0; j < 4; j++)
for (j = 0; j < SERIAL_MAX; j++)
i = i || (temp_serial[j] != serial_enabled[j]);
/* Storage devices category */
@@ -568,11 +568,11 @@ win_settings_save(void)
network_card = temp_net_card;
/* Ports category */
for (i = 0; i < 3; i++) {
for (i = 0; i < PARALLEL_MAX; i++) {
lpt_ports[i].device = temp_lpt_devices[i];
lpt_ports[i].enabled = temp_lpt[i];
}
for (i = 0; i < 4; i++)
for (i = 0; i < SERIAL_MAX; i++)
serial_enabled[i] = temp_serial[i];
/* Storage devices category */
@@ -1504,7 +1504,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_INITDIALOG:
lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
for (i = 0; i < 3; i++) {
for (i = 0; i < PARALLEL_MAX; i++) {
c = 0;
while (1) {
s = lpt_device_get_name(c);
@@ -1527,7 +1527,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_enable_window(hdlg, IDC_COMBO_LPT1 + i, temp_lpt[i]);
}
for (i = 0; i < 4; i++)
for (i = 0; i < SERIAL_MAX; i++)
settings_set_check(hdlg, IDC_CHECK_SERIAL1 + i, temp_serial[i]);
free(lptsTemp);
@@ -1547,12 +1547,12 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
break;
case WM_SAVESETTINGS:
for (i = 0; i < 3; i++) {
for (i = 0; i < PARALLEL_MAX; i++) {
temp_lpt_devices[i] = settings_get_cur_sel(hdlg, IDC_COMBO_LPT1 + i);
temp_lpt[i] = settings_get_check(hdlg, IDC_CHECK_PARALLEL1 + i);
}
for (i = 0; i < 4; i++)
for (i = 0; i < SERIAL_MAX; i++)
temp_serial[i] = settings_get_check(hdlg, IDC_CHECK_SERIAL1 + i);
default: