FujiNetWIFI · tschak909 · Oct 17, 2025 · Oct 15, 2025
diff --git a/Makefile b/Makefile
@@ -21,6 +21,9 @@ all:
 zip:
 	$(call builder, -z)
 
+atari-lwm:
+	$(call builder, -p ATARI -g)
+
 coco-lwm:
 	$(call builder, -p COCO -g)
 

diff --git a/lib/bus/adamnet/adamnet.cpp b/lib/bus/adamnet/adamnet.cpp
@@ -162,11 +162,11 @@ void virtualDevice::reset()
 
 void virtualDevice::adamnet_response_ack(bool doNotWaitForIdle)
 {
-    int64_t t = esp_timer_get_time() - AdamNet.start_time;
+    int64_t t = esp_timer_get_time() - SYSTEM_BUS.start_time;
 
     if (!doNotWaitForIdle)
     {
-        AdamNet.wait_for_idle();
+        SYSTEM_BUS.wait_for_idle();
     }
 
     if (t < 300)
@@ -177,11 +177,11 @@ void virtualDevice::adamnet_response_ack(bool doNotWaitForIdle)
 
 void virtualDevice::adamnet_response_nack(bool doNotWaitForIdle)
 {
-    int64_t t = esp_timer_get_time() - AdamNet.start_time;
+    int64_t t = esp_timer_get_time() - SYSTEM_BUS.start_time;
 
     if (!doNotWaitForIdle)
     {
-        AdamNet.wait_for_idle();
+        SYSTEM_BUS.wait_for_idle();
     }
 
     if (t < 300)
@@ -226,7 +226,7 @@ void virtualDevice::adamnet_process(uint8_t b)
 
 void virtualDevice::adamnet_control_status()
 {
-    AdamNet.start_time=esp_timer_get_time();
+    SYSTEM_BUS.start_time=esp_timer_get_time();
    adamnet_response_status();
 }
 
@@ -434,6 +434,4 @@ void systemBus::disableDevice(uint8_t device_id)
     if (_daisyChain.find(device_id) != _daisyChain.end())
         _daisyChain[device_id]->device_active = false;
 }
-
-systemBus AdamNet;
-#endif /* BUILD_ADAM */
+#endif /* BUILD_ADAM */
diff --git a/lib/bus/adamnet/adamnet.h b/lib/bus/adamnet/adamnet.h
@@ -281,6 +281,6 @@ class systemBus
     bool getShuttingDown() { return shuttingDown; };
 };
 
-extern systemBus AdamNet;
+extern systemBus SYSTEM_BUS;
 
-#endif /* ADAMNET_H */
+#endif /* ADAMNET_H */
diff --git a/lib/bus/bus.h b/lib/bus/bus.h
@@ -3,7 +3,6 @@
 
 #ifdef BUILD_ATARI
 #include "sio/sio.h"
-#define SYSTEM_BUS SIO
 #ifdef ESP_PLATFORM
   #define FN_BUS_PORT fnUartBUS
 #else
@@ -13,73 +12,61 @@
 
 #ifdef BUILD_IEC
 #include "iec/iec.h"
-#define SYSTEM_BUS IEC
 #define FN_BUS_PORT fnUartBUS  // TBD
 #endif
 
 #ifdef BUILD_ADAM
 #include "adamnet/adamnet.h"
-#define SYSTEM_BUS AdamNet
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_LYNX
 #include "comlynx/comlynx.h"
-#define SYSTEM_BUS ComLynx
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef NEW_TARGET
 #include "new/adamnet.h"
-#define SYSTEM_BUS AdamNet
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_APPLE
 #include "iwm/iwm.h"
-#define SYSTEM_BUS IWM
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_MAC
 #include "mac/mac.h"
-#define SYSTEM_BUS MAC
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_S100
 #include "s100spi/s100spi.h"
-#define SYSTEM_BUS s100Bus
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_RS232
 #include "rs232/rs232.h"
-#define SYSTEM_BUS RS232
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_CX16
 #include "cx16_i2c/cx16_i2c.h"
-#define SYSTEM_BUS CX16
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_RC2014
 #include "rc2014bus/rc2014bus.h"
-#define SYSTEM_BUS rc2014Bus
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_H89
 #include "h89/h89.h"
-#define SYSTEM_BUS H89Bus
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_COCO
 #include "drivewire/drivewire.h"
-#define SYSTEM_BUS DRIVEWIRE
 #define FN_BUS_PORT fnDwCom
 #endif
 

diff --git a/lib/bus/comlynx/comlynx.cpp b/lib/bus/comlynx/comlynx.cpp
@@ -458,6 +458,4 @@ void systemBus::setUDPHost(const char *hostname, int port)
     if (_udpDev->udpstream_host_ip != IPADDR_NONE)
         _udpDev->comlynx_enable_udpstream();
 }
-
-systemBus ComLynx;
-#endif /* BUILD_LYNX */
+#endif /* BUILD_LYNX */
diff --git a/lib/bus/comlynx/comlynx.h b/lib/bus/comlynx/comlynx.h
@@ -273,6 +273,6 @@ class systemBus
     bool getShuttingDown() { return shuttingDown; };
 };
 
-extern systemBus ComLynx;
+extern systemBus SYSTEM_BUS;
 
-#endif /* COMLYNX_H */
+#endif /* COMLYNX_H */
diff --git a/lib/bus/cx16_i2c/cx16_i2c.cpp b/lib/bus/cx16_i2c/cx16_i2c.cpp
@@ -248,7 +248,4 @@ void systemBus::shutdown()
     }
     Debug_printf("All devices shut down.\n");
 }
-
-systemBus CX16;
-
-#endif /* BUILD_CX16 */
+#endif /* BUILD_CX16 */
diff --git a/lib/bus/cx16_i2c/cx16_i2c.h b/lib/bus/cx16_i2c/cx16_i2c.h
@@ -221,11 +221,6 @@ class virtualDevice
      * @brief is device active (turned on?)
      */
     bool device_active = true;
-
-    /**
-     * @brief Get the systemBus object that this virtualDevice is attached to.
-     */
-    systemBus get_bus();
 };
 
 /**
@@ -374,6 +369,6 @@ class systemBus
 /**
  * @brief Return
  */
-extern systemBus CX16;
+extern systemBus SYSTEM_BUS;
 
-#endif /* CX16_I2C_H */
+#endif /* CX16_I2C_H */
diff --git a/lib/bus/drivewire/drivewire.cpp b/lib/bus/drivewire/drivewire.cpp
@@ -92,8 +92,6 @@ static void drivewire_intr_task(void *arg)
 
 // Helper functions outside the class defintions
 
-systemBus virtualDevice::get_bus() { return DRIVEWIRE; }
-
 void systemBus::op_jeff()
 {
     fnDwCom.print("FUJINET");
@@ -829,6 +827,4 @@ void systemBus::setBaudrate(int baud)
     _drivewireBaud = baud;
     //_modemDev->get_uart()->set_baudrate(baud); // TODO COME BACK HERE.
 }
-
-systemBus DRIVEWIRE; // Global DRIVEWIRE object
 #endif               /* BUILD_COCO */
diff --git a/lib/bus/drivewire/drivewire.h b/lib/bus/drivewire/drivewire.h
@@ -166,11 +166,6 @@ class virtualDevice
      * @brief is device active (turned on?)
      */
     bool device_active = true;
-
-    /**
-     * @brief Get the systemBus object that this virtualDevice is attached to.
-     */
-    systemBus get_bus();
 };
 
 enum drivewire_message : uint16_t
@@ -328,6 +323,6 @@ class systemBus
 #endif
 };
 
-extern systemBus DRIVEWIRE;
+extern systemBus SYSTEM_BUS;
 
 #endif // guard
diff --git a/lib/bus/h89/h89.cpp b/lib/bus/h89/h89.cpp
@@ -165,6 +165,4 @@ bool systemBus::enabledDeviceStatus(uint8_t device_id)
 
     return false;
 }
-
-systemBus H89Bus;
 #endif /* H89 */
diff --git a/lib/bus/h89/h89.h b/lib/bus/h89/h89.h
@@ -117,6 +117,6 @@ class systemBus
     bool getShuttingDown() { return shuttingDown; };
 };
 
-extern systemBus H89Bus;
+extern systemBus SYSTEM_BUS;
 
 #endif /* H89_H */
diff --git a/lib/bus/iec/iec.cpp b/lib/bus/iec/iec.cpp
@@ -18,8 +18,6 @@
 #define MAIN_PRIORITY	 17
 #define MAIN_CPUAFFINITY 1
 
-systemBus IEC;
-
 systemBus::systemBus() : IECBusHandler(PIN_IEC_ATN, PIN_IEC_CLK_OUT, PIN_IEC_DATA_OUT,
                                        PIN_IEC_RESET==GPIO_NUM_NC ? 0xFF : PIN_IEC_RESET,
                                        0xFF,

diff --git a/lib/bus/iec/iec.h b/lib/bus/iec/iec.h
@@ -89,6 +89,6 @@ class systemBus : public IECBusHandler
 /**
  * @brief Return
  */
-extern systemBus IEC;
+extern systemBus SYSTEM_BUS;
 
 #endif /* IEC_H */