From d55f6b28875a7f4ffc94d0303a49835ea13dc9de Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 4 May 2025 18:06:07 -0400
Subject: [PATCH] Some cleanups in isamem and isartc

---
 src/device/isamem.c        | 4 ++--
 src/device/isartc.c        | 4 ++--
 src/include/86box/isamem.h | 8 +-------
 src/include/86box/isartc.h | 5 +----
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/device/isamem.c b/src/device/isamem.c
index 62fb96f5d..b1095da1f 100644
--- a/src/device/isamem.c
+++ b/src/device/isamem.c
@@ -2165,12 +2165,12 @@ isamem_get_internal_name(int board)
 }
 
 int
-isamem_get_from_internal_name(const char *s)
+isamem_get_from_internal_name(const char *str)
 {
     int c = 0;
 
     while (boards[c].dev != NULL) {
-        if (!strcmp(boards[c].dev->internal_name, s))
+        if (!strcmp(boards[c].dev->internal_name, str))
             return c;
         c++;
     }
diff --git a/src/device/isartc.c b/src/device/isartc.c
index 5d6b4aea4..b5bbda7b0 100644
--- a/src/device/isartc.c
+++ b/src/device/isartc.c
@@ -919,12 +919,12 @@ isartc_get_internal_name(int board)
 }
 
 int
-isartc_get_from_internal_name(char *s)
+isartc_get_from_internal_name(const char *str)
 {
     int c = 0;
 
     while (boards[c].dev != NULL) {
-        if (!strcmp(boards[c].dev->internal_name, s))
+        if (!strcmp(boards[c].dev->internal_name, str))
             return c;
         c++;
     }
diff --git a/src/include/86box/isamem.h b/src/include/86box/isamem.h
index 51fe50e33..93f417e3e 100644
--- a/src/include/86box/isamem.h
+++ b/src/include/86box/isamem.h
@@ -42,7 +42,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifndef EMU_ISAMEM_H
 #define EMU_ISAMEM_H
 
@@ -52,17 +51,12 @@
 extern "C" {
 #endif
 
-/* Global variables. */
-extern const device_t isamem_device;
-extern const device_t isamem_brat80_device;
-extern const device_t isamem_ev159_device;
-
 /* Functions. */
 extern void isamem_reset(void);
 
 extern const char     *isamem_get_name(int t);
 extern const char     *isamem_get_internal_name(int t);
-extern int             isamem_get_from_internal_name(const char *s);
+extern int             isamem_get_from_internal_name(const char *str);
 extern const device_t *isamem_get_device(int t);
 extern int             isamem_has_config(int board);
 
diff --git a/src/include/86box/isartc.h b/src/include/86box/isartc.h
index 0224180b3..815daa5d6 100644
--- a/src/include/86box/isartc.h
+++ b/src/include/86box/isartc.h
@@ -42,7 +42,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING  IN ANY  WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifndef EMU_ISARTC_H
 #define EMU_ISARTC_H
 
@@ -50,13 +49,11 @@
 extern "C" {
 #endif
 
-/* Global variables. */
-
 /* Functions. */
 extern void isartc_reset(void);
 
 extern const char     *isartc_get_internal_name(int t);
-extern int             isartc_get_from_internal_name(char *s);
+extern int             isartc_get_from_internal_name(const char *str);
 extern const device_t *isartc_get_device(int t);
 extern int             isartc_has_config(int board);