Unification, part 1: Rename fuji device source code to match class name. (FujiNetWIFI#1050)

Rename fuji device source code to match class name.

Author: FozzTexx

coding-standard.py

@@ -70,6 +70,8 @@ def build_argparser():
   group = parser.add_mutually_exclusive_group()
   group.add_argument("--fix", action="store_true", help="rewrite improperly formatted files")
   group.add_argument("--show", action="store_true", help="print reformatted file on stdout")
+  group.add_argument("-l", "--list", action="store_true",
+                     help="only print filenames of improperly formatted files")
   return parser
 
 class ClangFormatter:
@@ -312,7 +314,8 @@ def displayErrors(self, errs, formatted):
 
   @property
   def isClang(self):
-    return self.path.suffix in ClangFormatter.TYPES
+    #return self.path.suffix in ClangFormatter.TYPES
+    return False
 
   @property
   def isMakefile(self):
@@ -454,6 +457,7 @@ def main():
 
   doFix = False
   doShow = False
+  doList = False
 
   script_mode = os.path.basename(sys.argv[0])
   if script_mode == "pre-commit":
@@ -465,6 +469,7 @@ def main():
   else:
     doFix = args.fix
     doShow = args.show
+    doList = args.list
     to_check = args.file
 
   if doShow and len(to_check) > 1:
@@ -480,7 +485,9 @@ def main():
 
     if TextFile.pathIsText(path):
       tfile = TextFile(path, repo.getContents(path))
-      if doShow:
+      if doList:
+        print(tfile.path)
+      elif doShow:
         tfile.show()
       elif doFix:
         tfile.update()

fujinet_pc.cmake

@@ -276,7 +276,7 @@ if(FUJINET_TARGET STREQUAL "ATARI")
     lib/device/sio/printer.h lib/device/sio/printer.cpp
     lib/device/sio/printerlist.h lib/device/sio/printerlist.cpp
     lib/device/sio/cassette.h lib/device/sio/cassette.cpp
-    lib/device/sio/fuji.h lib/device/sio/fuji.cpp
+    lib/device/sio/sioFuji.h lib/device/sio/sioFuji.cpp
     lib/device/sio/network.h lib/device/sio/network.cpp
     lib/device/sio/udpstream.h lib/device/sio/udpstream.cpp
     lib/device/sio/voice.h lib/device/sio/voice.cpp
@@ -336,7 +336,7 @@ if(FUJINET_TARGET STREQUAL "APPLE")
     lib/device/iwm/printer.h lib/device/iwm/printer.cpp
     lib/device/iwm/printerlist.h lib/device/iwm/printerlist.cpp
     lib/device/iwm/modem.h lib/device/iwm/modem.cpp
-    lib/device/iwm/fuji.h lib/device/iwm/fuji.cpp
+    lib/device/iwm/iwmFuji.h lib/device/iwm/iwmFuji.cpp
     lib/device/iwm/network.h lib/device/iwm/network.cpp
     lib/device/iwm/clock.h lib/device/iwm/clock.cpp
     lib/device/iwm/cpm.h lib/device/iwm/cpm.cpp
@@ -368,7 +368,7 @@ if(FUJINET_TARGET STREQUAL "COCO")
     lib/media/drivewire/mediaTypeMRM.h lib/media/drivewire/mediaTypeMRM.cpp
     lib/media/drivewire/mediaTypeVDK.h lib/media/drivewire/mediaTypeVDK.cpp
 
-    lib/device/drivewire/fuji.h lib/device/drivewire/fuji.cpp
+    lib/device/drivewire/drivewireFuji.h lib/device/drivewire/drivewireFuji.cpp
     lib/device/drivewire/network.h lib/device/drivewire/network.cpp
     lib/device/drivewire/dload.h lib/device/drivewire/dload.cpp
     lib/device/drivewire/disk.h lib/device/drivewire/disk.cpp

lib/bus/iec/iec.cpp

@@ -1,7 +1,7 @@
 #ifdef BUILD_IEC
 
 #include "iec.h"
-#include "../../device/iec/fuji.h"
+#include "../../device/iec/iecFuji.h"
 
 #include <cstring>
 #include <memory>
@@ -14,8 +14,8 @@
 #include "../../include/pinmap.h"
 #include "../../hardware/led.h"
 
-#define MAIN_STACKSIZE	 32768
-#define MAIN_PRIORITY	 17
+#define MAIN_STACKSIZE   32768
+#define MAIN_PRIORITY    17
 #define MAIN_CPUAFFINITY 1
 
 systemBus::systemBus() : IECBusHandler(PIN_IEC_ATN, PIN_IEC_CLK_OUT, PIN_IEC_DATA_OUT,
@@ -96,7 +96,7 @@ void systemBus::setup()
 void systemBus::service()
 {
   task();
-  
+
   bool error = false, active = false;
   for(int i = 0; i < MAX_DISK_DEVICES; i++)
     {

lib/bus/iwm/iwm.cpp

@@ -20,7 +20,7 @@
 
 #include "../device/iwm/disk.h"
 #include "../device/iwm/disk2.h"
-#include "../device/iwm/fuji.h"
+#include "../device/iwm/iwmFuji.h"
 #include "../device/iwm/cpm.h"
 #include "../device/iwm/clock.h"
 
@@ -630,7 +630,7 @@ bool IRAM_ATTR systemBus::serviceDiskIIWrite()
     return false;
 
   Debug_printf("\r\nDisk II iwm queue receive %u %u %u %u",
-	       item.length, item.track_begin, item.track_end, item.track_numbits);
+               item.length, item.track_begin, item.track_end, item.track_numbits);
   // gap 1            = 16 * 10
   // sector header    = 10 * 8          [D5 AA 96] + 4 + [DE AA EB]
   // gap 2            = 7 * 10
@@ -644,7 +644,7 @@ bool IRAM_ATTR systemBus::serviceDiskIIWrite()
 
   bitlen = (item.track_end + item.track_numbits - item.track_begin) % item.track_numbits;
   Debug_printf("\r\nDisk II write Qtrack/sector: %i/%i  bit_len: %i",
-	       item.quarter_track, sector_num, bitlen);
+               item.quarter_track, sector_num, bitlen);
   if (bitlen) {
     decoded = (uint8_t *) malloc(item.length);
     decode_len = diskii_xface.iwm_decode_buffer(item.buffer, item.length,

lib/bus/iwm/iwm_ll.cpp

@@ -12,7 +12,7 @@
 #include "iwm_ll.h"
 #include "iwm.h"
 #include "../device/iwm/disk2.h"
-#include "../device/iwm/fuji.h"
+#include "../device/iwm/iwmFuji.h"
 #include "fnSystem.h"
 #include "fnHardwareTimer.h"
 #include "../../include/debug.h"
@@ -1043,17 +1043,17 @@ void iwm_ll::disable_output()
 }
 
 size_t IRAM_ATTR encode_rmt_bitstream_forwarder(const void *src, size_t src_size,
-				      size_t symbols_written, size_t symbols_free,
-				      rmt_symbol_word_t *dest, bool *done, void *arg)
+                                      size_t symbols_written, size_t symbols_free,
+                                      rmt_symbol_word_t *dest, bool *done, void *arg)
 {
   iwm_diskii_ll *d2i = (iwm_diskii_ll *) arg;
   return d2i->encode_rmt_bitstream(src, src_size, symbols_written, symbols_free, dest, done);
 }
 
 //Convert track data to rmt format data.
 size_t IRAM_ATTR iwm_diskii_ll::encode_rmt_bitstream(const void *src, size_t src_size,
-				      size_t symbols_written, size_t symbols_free,
-				      rmt_symbol_word_t *dest, bool *done)
+                                      size_t symbols_written, size_t symbols_free,
+                                      rmt_symbol_word_t *dest, bool *done)
 {
   // *src is equal to *track_buffer
   // src_size is equal to track_numbits
@@ -1097,20 +1097,20 @@ size_t IRAM_ATTR iwm_diskii_ll::encode_rmt_bitstream(const void *src, size_t src
       window |= outbit;
       window &= 0x0f;
       if (window != 0)
-	outbit = window & 0x02;
+        outbit = window & 0x02;
       else
-	{
-	  const uint8_t MC3470[] = {0b01010000, 0b10110011, 0b01000010, 0b00000000, 0b10101101, 0b00000010, 0b01101000, 0b01000110, 0b00000001, 0b10010000, 0b00001000, 0b00111000, 0b00001000, 0b00100101, 0b10000100, 0b00001000, 0b10001000, 0b01100010, 0b10101000, 0b01101000, 0b10010000, 0b00100100, 0b00001011, 0b00110010, 0b11100000, 0b01000001, 0b10001010, 0b00000000, 0b11000001, 0b10001000, 0b10001000, 0b00000000};
+        {
+          const uint8_t MC3470[] = {0b01010000, 0b10110011, 0b01000010, 0b00000000, 0b10101101, 0b00000010, 0b01101000, 0b01000110, 0b00000001, 0b10010000, 0b00001000, 0b00111000, 0b00001000, 0b00100101, 0b10000100, 0b00001000, 0b10001000, 0b01100010, 0b10101000, 0b01101000, 0b10010000, 0b00100100, 0b00001011, 0b00110010, 0b11100000, 0b01000001, 0b10001010, 0b00000000, 0b11000001, 0b10001000, 0b10001000, 0b00000000};
 
-	  static int MC3470_byte_ctr;
-	  static int MC3470_bit_ctr;
+          static int MC3470_byte_ctr;
+          static int MC3470_bit_ctr;
 
-	  ++MC3470_bit_ctr %= 8;
-	  if (MC3470_bit_ctr == 0)
-	    ++MC3470_byte_ctr %= sizeof(MC3470);
+          ++MC3470_bit_ctr %= 8;
+          if (MC3470_bit_ctr == 0)
+            ++MC3470_byte_ctr %= sizeof(MC3470);
 
-	  outbit = (MC3470[MC3470_byte_ctr] & (0x01 << MC3470_bit_ctr)) != 0;
-	}
+          outbit = (MC3470[MC3470_byte_ctr] & (0x01 << MC3470_bit_ctr)) != 0;
+        }
 
       dest->val = bits[!!outbit].val;
     }
@@ -1144,7 +1144,7 @@ void iwm_diskii_ll::setup_rmt()
   };
 
   ESP_ERROR_CHECK(rmt_new_simple_encoder(&tx_encoder_config, &tx_encoder));
-  
+
 }
 
 bool IRAM_ATTR iwm_diskii_ll::nextbit()

lib/bus/mac/mac.cpp

@@ -1,7 +1,7 @@
 #ifdef BUILD_MAC
 #include "mac.h"
 #include "../../include/debug.h"
-#include "../device/mac/fuji.h"
+#include "../device/mac/macFuji.h"
 
 #include "mac_ll.h"
 
@@ -14,27 +14,27 @@ void systemBus::setup(void)
   // GPIO needs to read Head Select (SEL)
   floppy_ll.setup_gpio();
   Debug_printf("\r\nGPIO configured");
-  
+
   floppy_ll.setup_rmt();
   Debug_printf("\r\nRMT configured for Floppy Output");
 }
 
 /**
  * 699-0452-A Double Sided floppy requirement document
- * 
+ *
  * The host system can send four commands: /DIRTN,/STEP,
  * /MOTORON and EJECT. To send one of the control commands to the
  * drive, set CA2 to the value (a zero or a one) to which the host
  * system wishes the command to be set, and then set CAO, CA 1, and
  * SEL to the value which selects the desired command. Finally, bring
  * LSTRB first high and then low.
- * 
+ *
  *               SEL CA2 CA1 CA0   value
  * /DIRTN         0   0   0   0     0     increase track number
  * /DIRTN         0   1   0   0     4     decrease track number
  * /STEP          0   0   0   1     1     step the head in the direction
  * /STEP          0   1   0   1     5     probably not used
- * /MOTORON       0   0   1   0     2     turn motor on    
+ * /MOTORON       0   0   1   0     2     turn motor on
  * /MOTORON       0   1   1   0     6     turn motor off
  * EJECT          0   0   1   1     3     probably not used
  * EJECT          0   1   1   1     7     eject the disk
@@ -44,9 +44,9 @@ void systemBus::setup(void)
  * for DCD (HD20) the protocol is different.
  * need to read and write blocks
  * would be nice to fetch the image name so it can be displayed on the mac
- * 
+ *
  * block numbers are 3 bytes, 512 bytes/block - 8GB addressable, but MAC OS limites to 2 GB
- * 
+ *
 */
 
 uint8_t sector_buffer[512];
@@ -123,9 +123,9 @@ void systemBus::service(void)
       }
     }
     else // DCD
-    { 
+    {
       switch (c)
-      { 
+      {
       case 'A':
       case 'B':
       case 'C':