# HG changeset patch
# User TomW
# Date 1406818644 -3600
# Node ID eee628bf93ded29df39ca507d04b234e2aedd7bf
# Parent  528f6c46c324acd73cc15b19ec0a2b42d6323799
Serial controller is no longer reset when serial port/IRQ updated - fixes mouse on 430VX in Windows 98.

diff -r 528f6c46c324 -r eee628bf93de src/serial.c
--- a/src/serial.c	Mon Jul 28 21:14:13 2014 +0100
+++ b/src/serial.c	Thu Jul 31 15:57:24 2014 +0100
@@ -249,6 +249,12 @@
         serial1.rcr_callback = NULL;
         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()
 {
         io_removehandler(0x2e8, 0x0008, serial_read,  NULL, NULL, serial_write,  NULL, NULL, &serial1);
@@ -265,6 +271,12 @@
         serial2.rcr_callback = NULL;
         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()
 {
         io_removehandler(0x2e8, 0x0008, serial_read, NULL, NULL, serial_write, NULL, NULL, &serial2);
diff -r 528f6c46c324 -r eee628bf93de src/serial.h
--- a/src/serial.h	Mon Jul 28 21:14:13 2014 +0100
+++ b/src/serial.h	Thu Jul 31 15:57:24 2014 +0100
@@ -1,5 +1,7 @@
 void serial1_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 serial2_remove();
 void serial_reset();
diff -r 528f6c46c324 -r eee628bf93de src/um8669f.c
--- a/src/um8669f.c	Mon Jul 28 21:14:13 2014 +0100
+++ b/src/um8669f.c	Thu Jul 31 15:57:24 2014 +0100
@@ -52,6 +52,7 @@
 void um8669f_write(uint16_t port, uint8_t val, void *priv)
 {
         int temp;
+//        pclog("um8669f_write : port=%04x reg %02X = %02X locked=%i\n", port, um8669f_curreg, val, um8669f_locked);
         if (um8669f_locked)
         {
                 if (port == 0x108 && val == 0xaa)
@@ -69,13 +70,11 @@
                 else
                 {
                         um8669f_regs[um8669f_curreg] = val;
-                        pclog("um8669f_write : reg %02X = %02X\n", um8669f_curreg, val);
 
                         fdc_remove();
                         if (um8669f_regs[0xc0] & 1)
                            fdc_add();
                            
-                        serial1_remove();
                         if (um8669f_regs[0xc0] & 2)
                         {
                                 temp = um8669f_regs[0xc3] & 1; /*might be & 2*/
@@ -83,14 +82,13 @@
                                    temp |= 2;
                                 switch (temp)
                                 {
-                                        case 0: serial1_init(0x3f8, 4); break;
-                                        case 1: serial1_init(0x2f8, 4); break;
-                                        case 2: serial1_init(0x3e8, 4); break;
-                                        case 3: serial1_init(0x2e8, 4); break;
+                                        case 0: serial1_set(0x3f8, 4); break;
+                                        case 1: serial1_set(0x2f8, 4); break;
+                                        case 2: serial1_set(0x3e8, 4); break;
+                                        case 3: serial1_set(0x2e8, 4); break;
                                 }
                         }
                         
-                        serial2_remove();
                         if (um8669f_regs[0xc0] & 4)
                         {
                                 temp = (um8669f_regs[0xc3] & 4) ? 0 : 1; /*might be & 8*/
@@ -98,10 +96,10 @@
                                    temp |= 2;
                                 switch (temp)
                                 {
-                                        case 0: serial2_init(0x3f8, 3); break;
-                                        case 1: serial2_init(0x2f8, 3); break;
-                                        case 2: serial2_init(0x3e8, 3); break;
-                                        case 3: serial2_init(0x2e8, 3); break;
+                                        case 0: serial2_set(0x3f8, 3); break;
+                                        case 1: serial2_set(0x2f8, 3); break;
+                                        case 2: serial2_set(0x3e8, 3); break;
+                                        case 3: serial2_set(0x2e8, 3); break;
                                 }
                         }
                         
@@ -122,6 +120,7 @@
 
 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)
            return 0xff;
         
diff -r 528f6c46c324 -r eee628bf93de src/wd76c10.c
--- a/src/wd76c10.c	Mon Jul 28 21:14:13 2014 +0100
+++ b/src/wd76c10.c	Thu Jul 31 15:57:24 2014 +0100
@@ -44,22 +44,19 @@
                 case 0x2072:
                 wd76c10_2072 = val;
                 
-                serial1_remove();
-                serial2_remove();
-                
                 switch ((val >> 5) & 7)
                 {
-                        case 1: serial1_init(0x3f8, 4); break;
-                        case 2: serial1_init(0x2f8, 4); break;
-                        case 3: serial1_init(0x3e8, 4); break;
-                        case 4: serial1_init(0x2e8, 4); break;
+                        case 1: serial1_set(0x3f8, 4); break;
+                        case 2: serial1_set(0x2f8, 4); break;
+                        case 3: serial1_set(0x3e8, 4); break;
+                        case 4: serial1_set(0x2e8, 4); break;
                 }
                 switch ((val >> 1) & 7)
                 {
-                        case 1: serial2_init(0x3f8, 3); break;
-                        case 2: serial2_init(0x2f8, 3); break;
-                        case 3: serial2_init(0x3e8, 3); break;
-                        case 4: serial2_init(0x2e8, 3); break;
+                        case 1: serial2_set(0x3f8, 3); break;
+                        case 2: serial2_set(0x2f8, 3); break;
+                        case 3: serial2_set(0x3e8, 3); break;
+                        case 4: serial2_set(0x2e8, 3); break;
                 }
                 break;