Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Serial controller is no longer reset when serial port/IRQ updated - fixes mouse on 430VX in Windows 98.

Browse source
This commit is contained in:
TomW 2014-07-31 15:57:24 +01:00
commit a1a3068ac0
4 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/serial.c
View file

@ -249,6 +249,12 @@ void serial1_init(uint16_t addr, int irq)
serial1.rcr_callback = NULL; serial1.rcr_callback = NULL;
timer_add(serial_recieve_callback, &serial1.recieve_delay, &serial1.recieve_delay, &serial1); timer_add(serial_recieve_callback, &serial1.recieve_delay, &serial1.recieve_delay, &serial1);
} }
void serial1_set(uint16_t addr, int irq)
{
serial1_remove();
io_sethandler(addr, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, &serial1);
serial1.irq = irq;
}
void serial1_remove() void serial1_remove()
{ {
io_removehandler(0x2e8, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, &serial1); io_removehandler(0x2e8, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, &serial1);
@ -265,6 +271,12 @@ void serial2_init(uint16_t addr, int irq)
serial2.rcr_callback = NULL; serial2.rcr_callback = NULL;
timer_add(serial_recieve_callback, &serial2.recieve_delay, &serial2.recieve_delay, &serial2); timer_add(serial_recieve_callback, &serial2.recieve_delay, &serial2.recieve_delay, &serial2);
} }
void serial2_set(uint16_t addr, int irq)
{
serial2_remove();
io_sethandler(addr, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, &serial2);
serial2.irq = irq;
}
void serial2_remove() void serial2_remove()
{ {
io_removehandler(0x2e8, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, &serial2); io_removehandler(0x2e8, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, &serial2);

2
src/serial.h
View file

@ -1,5 +1,7 @@
void serial1_init(uint16_t addr, int irq); void serial1_init(uint16_t addr, int irq);
void serial2_init(uint16_t addr, int irq); void serial2_init(uint16_t addr, int irq);
void serial1_set(uint16_t addr, int irq);
void serial2_set(uint16_t addr, int irq);
void serial1_remove(); void serial1_remove();
void serial2_remove(); void serial2_remove();
void serial_reset(); void serial_reset();

21
src/um8669f.c
View file

@ -52,6 +52,7 @@ static uint8_t um8669f_regs[256];
void um8669f_write(uint16_t port, uint8_t val, void *priv) void um8669f_write(uint16_t port, uint8_t val, void *priv)
{ {
int temp; int temp;
// pclog("um8669f_write : port=%04x reg %02X = %02X locked=%i\n", port, um8669f_curreg, val, um8669f_locked);
if (um8669f_locked) if (um8669f_locked)
{ {
if (port == 0x108 && val == 0xaa) if (port == 0x108 && val == 0xaa)
@ -69,13 +70,11 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv)
else else
{ {
um8669f_regs[um8669f_curreg] = val; um8669f_regs[um8669f_curreg] = val;
pclog("um8669f_write : reg %02X = %02X\n", um8669f_curreg, val);
fdc_remove(); fdc_remove();
if (um8669f_regs[0xc0] & 1) if (um8669f_regs[0xc0] & 1)
fdc_add(); fdc_add();
serial1_remove();
if (um8669f_regs[0xc0] & 2) if (um8669f_regs[0xc0] & 2)
{ {
temp = um8669f_regs[0xc3] & 1; /*might be & 2*/ temp = um8669f_regs[0xc3] & 1; /*might be & 2*/
@ -83,14 +82,13 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv)
temp |= 2; temp |= 2;
switch (temp) switch (temp)
{ {
case 0: serial1_init(0x3f8, 4); break; case 0: serial1_set(0x3f8, 4); break;
case 1: serial1_init(0x2f8, 4); break; case 1: serial1_set(0x2f8, 4); break;
case 2: serial1_init(0x3e8, 4); break; case 2: serial1_set(0x3e8, 4); break;
case 3: serial1_init(0x2e8, 4); break; case 3: serial1_set(0x2e8, 4); break;
} }
} }
serial2_remove();
if (um8669f_regs[0xc0] & 4) if (um8669f_regs[0xc0] & 4)
{ {
temp = (um8669f_regs[0xc3] & 4) ? 0 : 1; /*might be & 8*/ temp = (um8669f_regs[0xc3] & 4) ? 0 : 1; /*might be & 8*/
@ -98,10 +96,10 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv)
temp |= 2; temp |= 2;
switch (temp) switch (temp)
{ {
case 0: serial2_init(0x3f8, 3); break; case 0: serial2_set(0x3f8, 3); break;
case 1: serial2_init(0x2f8, 3); break; case 1: serial2_set(0x2f8, 3); break;
case 2: serial2_init(0x3e8, 3); break; case 2: serial2_set(0x3e8, 3); break;
case 3: serial2_init(0x2e8, 3); break; case 3: serial2_set(0x2e8, 3); break;
} }
} }
@ -122,6 +120,7 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv)
uint8_t um8669f_read(uint16_t port, void *priv) uint8_t um8669f_read(uint16_t port, void *priv)
{ {
// pclog("um8669f_read : port=%04x reg %02X locked=%i\n", port, um8669f_curreg, um8669f_locked);
if (um8669f_locked) if (um8669f_locked)
return 0xff; return 0xff;

19
src/wd76c10.c
View file

@ -44,22 +44,19 @@ void wd76c10_write(uint16_t port, uint16_t val, void *priv)
case 0x2072: case 0x2072:
wd76c10_2072 = val; wd76c10_2072 = val;
serial1_remove();
serial2_remove();
switch ((val >> 5) & 7) switch ((val >> 5) & 7)
{ {
case 1: serial1_init(0x3f8, 4); break; case 1: serial1_set(0x3f8, 4); break;
case 2: serial1_init(0x2f8, 4); break; case 2: serial1_set(0x2f8, 4); break;
case 3: serial1_init(0x3e8, 4); break; case 3: serial1_set(0x3e8, 4); break;
case 4: serial1_init(0x2e8, 4); break; case 4: serial1_set(0x2e8, 4); break;
} }
switch ((val >> 1) & 7) switch ((val >> 1) & 7)
{ {
case 1: serial2_init(0x3f8, 3); break; case 1: serial2_set(0x3f8, 3); break;
case 2: serial2_init(0x2f8, 3); break; case 2: serial2_set(0x2f8, 3); break;
case 3: serial2_init(0x3e8, 3); break; case 3: serial2_set(0x3e8, 3); break;
case 4: serial2_init(0x2e8, 3); break; case 4: serial2_set(0x2e8, 3); break;
} }
break; break;