From a1a3068ac014373056c0ec1e0611b45ce6a305b8 Mon Sep 17 00:00:00 2001
From: TomW <TomW@localhost>
Date: Thu, 31 Jul 2014 15:57:24 +0100
Subject: [PATCH] Serial controller is no longer reset when serial port/IRQ
 updated - fixes mouse on 430VX in Windows 98.

---
 src/serial.c  | 12 ++++++++++++
 src/serial.h  |  2 ++
 src/um8669f.c | 21 ++++++++++-----------
 src/wd76c10.c | 19 ++++++++-----------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/serial.c b/src/serial.c
index db3c897..e294039 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -249,6 +249,12 @@ void serial1_init(uint16_t addr, int irq)
         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 @@ void serial2_init(uint16_t addr, int irq)
         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 --git a/src/serial.h b/src/serial.h
index d0a6b54..e57e066 100644
--- a/src/serial.h
+++ b/src/serial.h
@@ -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 --git a/src/um8669f.c b/src/um8669f.c
index 2ba6f37..2f0120a 100644
--- a/src/um8669f.c
+++ b/src/um8669f.c
@@ -52,6 +52,7 @@ static uint8_t um8669f_regs[256];
 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 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv)
                 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 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv)
                                    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 @@ void um8669f_write(uint16_t port, uint8_t val, void *priv)
                                    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 @@ void um8669f_write(uint16_t port, uint8_t val, 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)
            return 0xff;
         
diff --git a/src/wd76c10.c b/src/wd76c10.c
index c3859f1..e164ed6 100644
--- a/src/wd76c10.c
+++ b/src/wd76c10.c
@@ -44,22 +44,19 @@ void wd76c10_write(uint16_t port, uint16_t val, void *priv)
                 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;