Prepare for fujiDevice subclassing and polymorphism (#1056)

Prepare for fujiDevice polymorphism

Author: FozzTexx

lib/bus/drivewire/drivewire.cpp

@@ -113,8 +113,8 @@ void systemBus::op_reset()
     Debug_printv("op_reset()");
 
     // When a reset transaction occurs, set the mounted disk image to the CONFIG disk image.
-    theFuji.boot_config = true;
-    theFuji.insert_boot_device(Config.get_general_boot_mode());
+    theFuji->boot_config = true;
+    theFuji->insert_boot_device(Config.get_general_boot_mode());
     if (pNamedObjFp != NULL)
     {
         fclose(pNamedObjFp);
@@ -182,10 +182,10 @@ void systemBus::op_readex()
         if (true==bDragon && drive_num>=5) drive_num = drive_num-5;
     Debug_printf("OP_READ: DRIVE %3u - SECTOR %8lu\n", drive_num, lsn);
 
-        if (theFuji.boot_config && drive_num == 0)
-            d = theFuji.bootdisk();
+        if (theFuji->boot_config && drive_num == 0)
+            d = theFuji->bootdisk();
         else
-            d = &theFuji.get_disks(drive_num)->disk_dev;
+            d = &theFuji->get_disk(drive_num)->disk_dev;
 
         if (!d)
         {
@@ -306,7 +306,7 @@ void systemBus::op_write()
 
     Debug_printf("OP_WRITE DRIVE %3u - SECTOR %8lu\n", drive_num, lsn);
 
-    d = &theFuji.get_disks(drive_num)->disk_dev;
+    d = &theFuji->get_disk(drive_num)->disk_dev;
 
     if (!d)
     {
@@ -334,7 +334,7 @@ void systemBus::op_write()
 
 void systemBus::op_fuji()
 {
-    theFuji.process();
+    theFuji->process();
 }
 
 void systemBus::op_cpm()

lib/bus/iec/iec.cpp

@@ -100,7 +100,7 @@ void systemBus::service()
   bool error = false, active = false;
   for(int i = 0; i < MAX_DISK_DEVICES; i++)
     {
-      iecDrive *d = &(theFuji.get_disks(i)->disk_dev);
+      iecDrive *d = &(theFuji->get_disk(i)->disk_dev);
       error  |= d->hasError();
       active |= d->getNumOpenChannels()>0;
     }

lib/bus/iwm/iwm.h

@@ -353,6 +353,6 @@ class systemBus
 
 extern systemBus SYSTEM_BUS;
 
-#define IWM_ACTIVE_DISK2 ((iwmDisk2 *) theFuji.get_disk_dev(MAX_SPDISK_DEVICES + diskii_xface.iwm_active_drive() - 1))
+#define IWM_ACTIVE_DISK2 ((iwmDisk2 *) theFuji->get_disk_dev(MAX_SPDISK_DEVICES + diskii_xface.iwm_active_drive() - 1))
 #endif // guard
 #endif /* BUILD_APPLE */

lib/bus/mac/mac.cpp

@@ -64,14 +64,14 @@ void systemBus::service(void)
       case 0:
         // set direction to increase track number
         Debug_printf("%c", 'I');
-        theFuji.get_disks(4)->disk_dev.set_dir(+1);
+        theFuji->get_disk(4)->disk_dev.set_dir(+1);
         // fnUartBUS.write('I');
         // fnUartBUS.flush();
         break;
       case 4:
         // set direction to decrease track number
         Debug_printf("%c", 'D');
-        theFuji.get_disks(4)->disk_dev.set_dir(-1);
+        theFuji->get_disk(4)->disk_dev.set_dir(-1);
         // fnUartBUS.write('D');
         // fnUartBUS.flush();
         break;
@@ -81,7 +81,7 @@ void systemBus::service(void)
         {
           t0 = fnSystem.micros();
           track_not_copied = true;
-          int track_position = theFuji.get_disks(4)->disk_dev.step();
+          int track_position = theFuji->get_disk(4)->disk_dev.step();
           if (track_position < 0)
           {
             fnUartBUS.write('N');
@@ -110,7 +110,7 @@ void systemBus::service(void)
         // eject
         Debug_printf("\neject - unmounting");
         floppy_ll.stop();
-        theFuji.get_disks(4)->disk_dev.unmount();
+        theFuji->get_disk(4)->disk_dev.unmount();
         fnUartBUS.write('E');
         // fnUartBUS.flush();
         break;
@@ -136,7 +136,7 @@ void systemBus::service(void)
       case 'R':
       case 'T':
       case 'W':
-        theFuji.get_disks(_active_DCD_disk)->disk_dev.process(c);
+        theFuji->get_disk(_active_DCD_disk)->disk_dev.process(c);
         break;
       default:
         break;
@@ -145,7 +145,7 @@ void systemBus::service(void)
   }
   if (track_not_copied && stepper_timeout())
   {
-    theFuji.get_disks(4)->disk_dev.update_track_buffers();
+    theFuji->get_disk(4)->disk_dev.update_track_buffers();
     track_not_copied = false;
     fnUartBUS.write('S');
   }
@@ -733,7 +733,7 @@ void IRAM_ATTR iwmBus::service()
     break;
   case iwm_enable_state_t::off2on:
     // need to start a counter and wait to turn on enable output after 1 ms only iff enable state is on
-    if (theFuji._fnDisk2s[diskii_xface.iwm_enable_states() - 1].device_active)
+    if (theFuji->_fnDisk2s[diskii_xface.iwm_enable_states() - 1].device_active)
     {
       fnSystem.delay(1); // need a better way to figure out persistence
       if (iwm_drive_enabled() == iwm_enable_state_t::on)
@@ -750,7 +750,7 @@ void IRAM_ATTR iwmBus::service()
     return; // return so the SP code doesn't get checked
   case iwm_enable_state_t::on:
 #ifdef DEBUG
-    new_track = theFuji._fnDisk2s[diskii_xface.iwm_enable_states() - 1].get_track_pos();
+    new_track = theFuji->_fnDisk2s[diskii_xface.iwm_enable_states() - 1].get_track_pos();
     if (old_track != new_track)
     {
       Debug_printf("\ntrk pos %03d on d%d", new_track, diskii_xface.iwm_enable_states());
@@ -817,7 +817,7 @@ void iwmBus::handle_init()
     // tell the Fuji it's device no.
     if (it == _daisyChain.begin())
     {
-      theFuji._devnum = command_packet.dest;
+      theFuji->_devnum = command_packet.dest;
     }
     // assign dev numbers
     pDevice = (*it);

lib/console/Commands/VFSCommands.cpp

@@ -354,7 +354,7 @@ int mount(int argc, char **argv)
     int did = atoi(argv[1]);
     fprintf(stdout, "Mounted %d -> %s\r\n", did, argv[2]);
 
-    theFuji.mount_all();
+    theFuji->mount_all();
 
     return EXIT_SUCCESS;
 }

lib/device/adamnet/adamFuji.cpp

@@ -22,7 +22,8 @@
 
 #define COPY_SIZE 532
 
-adamFuji theFuji;         // global fuji device object
+adamFuji platformFuji;
+adamFuji *theFuji = &platformFuji;         // global fuji device object
 adamNetwork *theNetwork;  // global network device object (temporary)
 adamNetwork *theNetwork2; // another network device
 adamPrinter *thePrinter;  // global printer
@@ -1308,7 +1309,7 @@ void adamFuji::setup()
     theSerial = new adamSerial();
     SYSTEM_BUS.addDevice(theNetwork, 0x09);  // temporary.
     SYSTEM_BUS.addDevice(theNetwork2, 0x0A); // temporary
-    SYSTEM_BUS.addDevice(&theFuji, 0x0F);    // Fuji becomes the gateway device.
+    SYSTEM_BUS.addDevice(theFuji, 0x0F);    // Fuji becomes the gateway device.
 }
 
 // Mount all

lib/device/adamnet/adamFuji.h

@@ -111,8 +111,8 @@ class adamFuji : public virtualDevice
     int get_disk_id(int drive_slot);
     std::string get_host_prefix(int host_slot);
 
-    fujiHost *get_hosts(int i) { return &_fnHosts[i]; }
-    fujiDisk *get_disks(int i) { return &_fnDisks[i]; }
+    fujiHost *get_host(int i) { return &_fnHosts[i]; }
+    fujiDisk *get_disk(int i) { return &_fnDisks[i]; }
     fujiHost *set_slot_hostname(int host_slot, char *hostname);
 
     void _populate_slots_from_config();
@@ -133,7 +133,7 @@ class adamFuji : public virtualDevice
     TaskHandle_t copy_task_handle;
 };
 
-extern adamFuji theFuji;
+extern adamFuji *theFuji;
 extern adamSerial *theSerial;
 
 #endif // FUJI_H

lib/device/comlynx/lynxFuji.cpp

@@ -20,7 +20,8 @@
 
 #define COPY_SIZE 532
 
-lynxFuji theFuji;        // global fuji device object
+lynxFuji platformFuji;
+lynxFuji *theFuji = &platformFuji;        // global fuji device object
 lynxNetwork *theNetwork; // global network device object (temporary)
 lynxPrinter *thePrinter; // global printer
 lynxSerial *theSerial;   // global serial
@@ -1351,7 +1352,7 @@ void lynxFuji::setup()
     // Disable status_wait if our settings say to turn it off
     status_wait_enabled = false;
     SYSTEM_BUS.addDevice(&_fnDisks[0].disk_dev, 4);
-    SYSTEM_BUS.addDevice(&theFuji, 0x0F);   // Fuji becomes the gateway device.
+    SYSTEM_BUS.addDevice(theFuji, 0x0F);   // Fuji becomes the gateway device.
     theNetwork = new lynxNetwork();
     SYSTEM_BUS.addDevice(theNetwork, 0x09); // temporary.
 }

lib/device/comlynx/lynxFuji.h

@@ -111,8 +111,8 @@ class lynxFuji : public virtualDevice
     int get_disk_id(int drive_slot);
     std::string get_host_prefix(int host_slot);
 
-    fujiHost *get_hosts(int i) { return &_fnHosts[i]; }
-    fujiDisk *get_disks(int i) { return &_fnDisks[i]; }
+    fujiHost *get_host(int i) { return &_fnHosts[i]; }
+    fujiDisk *get_disk(int i) { return &_fnDisks[i]; }
     fujiHost *set_slot_hostname(int host_slot, char *hostname);
 
     void _populate_slots_from_config();
@@ -133,7 +133,7 @@ class lynxFuji : public virtualDevice
     TaskHandle_t copy_task_handle;
 };
 
-extern lynxFuji theFuji;
+extern lynxFuji *theFuji;
 extern lynxSerial *theSerial;
 
 #endif // FUJI_H

lib/device/cx16_i2c/cx16Fuji.cpp

@@ -20,7 +20,8 @@
 #include "utils.h"
 #include "string_utils.h"
 
-cx16Fuji theFuji; // global fuji device object
+cx16Fuji platformFuji;
+cx16Fuji *theFuji = &platformFuji; // global fuji device object
 
 using namespace std;