From b32a0a25819a87a7c6d77d8dc63060c8c9c2fda2 Mon Sep 17 00:00:00 2001
From: Patrick Linstruth <patrick@deltecent.com>
Date: Sun, 17 May 2026 14:41:11 -0400
Subject: [PATCH] Altair8800: Codebase cleanup

fix: eliminate implicit conversions
fix: eliminate C++ keyword usage
---
 Altair8800/altair8800_dsk.c | 2 +-
 Altair8800/s100_bram.c      | 2 +-
 Altair8800/s100_bus.c       | 4 ++--
 Altair8800/s100_bus.h       | 2 +-
 Altair8800/s100_z80.c       | 4 ++--
 Altair8800/wd_17xx.c        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Altair8800/altair8800_dsk.c b/Altair8800/altair8800_dsk.c
index 3ad89e0a..b85a697a 100644
--- a/Altair8800/altair8800_dsk.c
+++ b/Altair8800/altair8800_dsk.c
@@ -333,7 +333,7 @@ t_stat dsk_write_track(DSK_INFO *d, int32 track, int32 head, uint8 fill)
     ssize = dsk_sector_size(d, track, head);
     start = dsk_start_sector(d, track, head);
 
-    if ((b = malloc(ssize)) == NULL) {
+    if ((b = (unsigned char *) malloc(ssize)) == NULL) {
         return 0;
     }
 
diff --git a/Altair8800/s100_bram.c b/Altair8800/s100_bram.c
index 6a389d31..f362e511 100644
--- a/Altair8800/s100_bram.c
+++ b/Altair8800/s100_bram.c
@@ -370,7 +370,7 @@ static t_stat bram_type_command(UNIT *uptr, int32 value, const char *cptr, void
 
 static t_stat bram_set_banks(int32 banks) {
     if (banks > 0 && banks <= MAXBANK) {
-        M = realloc(M, banks * MAXBANKSIZE);
+        M = (int32 *) realloc(M, banks * MAXBANKSIZE);
     }
     else if (M != NULL) {
         free(M);
diff --git a/Altair8800/s100_bus.c b/Altair8800/s100_bus.c
index f988cec7..8b1327ac 100644
--- a/Altair8800/s100_bus.c
+++ b/Altair8800/s100_bus.c
@@ -438,9 +438,9 @@ void s100_bus_memw(t_addr addr, int32 data)
     mdev_table[page].routine(addr, S100_IO_WRITE, data);
 }
 
-uint32 s100_bus_set_addr(uint32 new)
+uint32 s100_bus_set_addr(uint32 addr)
 {
-    bus_addr = new;
+    bus_addr = addr;
 
     return bus_addr;
 }
diff --git a/Altair8800/s100_bus.h b/Altair8800/s100_bus.h
index 1ee4a131..b86984d8 100644
--- a/Altair8800/s100_bus.h
+++ b/Altair8800/s100_bus.h
@@ -120,7 +120,7 @@ extern void s100_bus_get_idev(int32 port, IDEV *idev_in, IDEV *idev_out);
 extern void s100_bus_get_mdev(int32 addr, MDEV *mdev);
 extern int32 nulldev(const int32 addr, const int32 io, const int32 data);
 
-extern uint32 s100_bus_set_addr(uint32 pc);
+extern uint32 s100_bus_set_addr(uint32 addr);
 extern uint32 s100_bus_get_addr(void);
 
 extern t_stat s100_bus_console(UNIT *uptr);
diff --git a/Altair8800/s100_z80.c b/Altair8800/s100_z80.c
index e3656d40..dc1e0c5b 100644
--- a/Altair8800/s100_z80.c
+++ b/Altair8800/s100_z80.c
@@ -5761,10 +5761,10 @@ static t_stat z80_set_chiptype(UNIT *uptr, int32 value, const char *cptr, void *
 {
     if (z80_chiptype != value) {
         if (z80_unit.flags & UNIT_CPU_VERBOSE) {
-            sim_printf("CPU changed from %s to %s\n", cpu_get_chipname(z80_chiptype), cpu_get_chipname(value));
+            sim_printf("CPU changed from %s to %s\n", cpu_get_chipname(z80_chiptype), cpu_get_chipname((ChipType) value));
         }
 
-        cpu_set_chiptype(value);
+        cpu_set_chiptype((ChipType) value);
     }
 
     return SCPE_OK;
diff --git a/Altair8800/wd_17xx.c b/Altair8800/wd_17xx.c
index aee9d7d4..7a6c59ab 100644
--- a/Altair8800/wd_17xx.c
+++ b/Altair8800/wd_17xx.c
@@ -51,7 +51,7 @@ WD17XX_INFO * wd17xx_init(DEVICE *dptr)
 {
     WD17XX_INFO *wd;
 
-    if ((dptr == NULL) || (wd = malloc(sizeof(WD17XX_INFO))) == NULL) {
+    if ((dptr == NULL) || (wd = (WD17XX_INFO *) malloc(sizeof(WD17XX_INFO))) == NULL) {
         return NULL;
     }