From cdb415ef0fa63d161a26464c34c08f04a0e14544 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Mon, 7 Aug 2023 17:41:13 +0200
Subject: [PATCH] Turned serial_attach() into a #define for serial_attach_ex().

---
 src/device/serial.c        | 17 -----------------
 src/include/86box/serial.h |  8 ++++----
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/device/serial.c b/src/device/serial.c
index e4cf493e6..c6222d11f 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -797,23 +797,6 @@ serial_setup(serial_t *dev, uint16_t addr, uint8_t irq)
     dev->irq = irq;
 }
 
-serial_t *
-serial_attach(int port,
-              void (*rcr_callback)(struct serial_s *serial, void *p),
-              void (*dev_write)(struct serial_s *serial, void *p, uint8_t data),
-              void *priv)
-{
-    serial_device_t *sd = &serial_devices[port];
-
-    sd->rcr_callback             = rcr_callback;
-    sd->dev_write                = dev_write;
-    sd->transmit_period_callback = NULL;
-    sd->lcr_callback             = NULL;
-    sd->priv                     = priv;
-
-    return sd->serial;
-}
-
 serial_t *
 serial_attach_ex(int port,
                  void (*rcr_callback)(struct serial_s *serial, void *p),
diff --git a/src/include/86box/serial.h b/src/include/86box/serial.h
index 831d68231..2b31a153b 100644
--- a/src/include/86box/serial.h
+++ b/src/include/86box/serial.h
@@ -113,16 +113,16 @@ typedef struct serial_port_s {
 
 extern serial_port_t com_ports[SERIAL_MAX];
 
-extern serial_t *serial_attach(int port,
-                               void (*rcr_callback)(struct serial_s *serial, void *p),
-                               void (*dev_write)(struct serial_s *serial, void *p, uint8_t data),
-                               void *priv);
 extern serial_t *serial_attach_ex(int port,
                                   void (*rcr_callback)(struct serial_s *serial, void *p),
                                   void (*dev_write)(struct serial_s *serial, void *p, uint8_t data),
                                   void (*transmit_period_callback)(struct serial_s *serial, void *p, double transmit_period),
                                   void (*lcr_callback)(struct serial_s *serial, void *p, uint8_t data_bits),
                                   void *priv);
+
+#define serial_attach(port, rcr_callback, dev_write, priv) \
+        serial_attach_ex(port, rcr_callback, dev_write, NULL, NULL, priv);
+
 extern void      serial_remove(serial_t *dev);
 extern void      serial_set_type(serial_t *dev, int type);
 extern void      serial_setup(serial_t *dev, uint16_t addr, uint8_t irq);