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

serial_setup() in serial_old.c now returns without doing anything if the specified serial port is disabled in Settings, fixes ports being enabled where they shouldn't be on machines with Super I/O chips;

Browse Source 
LPT code now takes the lpt_enabled variable into account at all levels.
This commit is contained in:
OBattler
2017-08-06 00:33:47 +02:00
parent 064c9eb684
commit 523c6b65d1
2 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lpt.c
View File

@@ -61,32 +61,50 @@ uint16_t lpt_addr[2] = { 0x378, 0x278 };
void lpt_init()
{
io_sethandler(0x0378, 0x0003, lpt1_read, NULL, NULL, lpt1_write, NULL, NULL, NULL);
io_sethandler(0x0278, 0x0003, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
lpt_addr[0] = 0x378;
lpt_addr[1] = 0x278;
if (lpt_enabled)
{
io_sethandler(0x0378, 0x0003, lpt1_read, NULL, NULL, lpt1_write, NULL, NULL, NULL);
io_sethandler(0x0278, 0x0003, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
lpt_addr[0] = 0x378;
lpt_addr[1] = 0x278;
}
}
void lpt1_init(uint16_t port)
{
io_sethandler(port, 0x0003, lpt1_read, NULL, NULL, lpt1_write, NULL, NULL, NULL);
lpt_addr[0] = port;
if (lpt_enabled)
{
io_sethandler(port, 0x0003, lpt1_read, NULL, NULL, lpt1_write, NULL, NULL, NULL);
lpt_addr[0] = port;
}
}
void lpt1_remove()
{
io_removehandler(lpt_addr[0], 0x0003, lpt1_read, NULL, NULL, lpt1_write, NULL, NULL, NULL);
if (lpt_enabled)
{
io_removehandler(lpt_addr[0], 0x0003, lpt1_read, NULL, NULL, lpt1_write, NULL, NULL, NULL);
}
}
void lpt2_init(uint16_t port)
{
io_sethandler(port, 0x0003, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
lpt_addr[1] = port;
if (lpt_enabled)
{
io_sethandler(port, 0x0003, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
lpt_addr[1] = port;
}
}
void lpt2_remove()
{
io_removehandler(lpt_addr[1], 0x0003, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
if (lpt_enabled)
{
io_removehandler(lpt_addr[1], 0x0003, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
}
}
void lpt2_remove_ams()
{
io_removehandler(0x0379, 0x0002, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
if (lpt_enabled)
{
io_removehandler(0x0379, 0x0002, lpt2_read, NULL, NULL, lpt2_write, NULL, NULL, NULL);
}
}

8
src/serial_old.c
View File

@@ -286,6 +286,10 @@ void serial_setup(int port, uint16_t addr, int irq)
switch(port)
{
case 1:
if (!serial_enabled[0])
{
return;
}
if (base_address[0] != 0x0000)
{
serial_remove(port);
@@ -298,6 +302,10 @@ void serial_setup(int port, uint16_t addr, int irq)
serial1.irq = irq;
break;
case 2:
if (!serial_enabled[1])
{
return;
}
if (base_address[1] != 0x0000)
{
serial_remove(port);