Created enums netProtoTranslation_t and netProtoOpenMode_t (#1060)

Removed a ton more hardcoded values, set types to fujiCommandID_t,
netProtoTranslation_t, and netProtoOpenMode_t to help compiler catch
things.

No logic changes, just more cleanup in preparation for unified and fujiversal.

Author: FozzTexx

include/fujiCommandID.h

@@ -90,6 +90,10 @@ enum fujiCommandID_t {
   FUJICMD_GETTZTIME                  = 0x9A,
   FUJICMD_SETTZ                      = 0x99,
   FUJICMD_GETTIME                    = 0x93,
+  FUJICMD_JSON_QUERY                 = 0x81,
+  FUJICMD_JSON_PARSE                 = 0x80,
+  FUJICMD_GET_REMOTE                 = 0x72, // r
+  FUJICMD_CLOSE_CLIENT               = 0x63, // c
   FUJICMD_TIMER                      = 0x5A, // Z
   FUJICMD_STREAM                     = 0x58, // X
   FUJICMD_WRITE                      = 0x57, // W
@@ -106,6 +110,8 @@ enum fujiCommandID_t {
   FUJICMD_PERCOM_READ                = 0x4E, // N
   FUJICMD_UNLISTEN                   = 0x4D, // M
   FUJICMD_LISTEN                     = 0x4C, // L
+  FUJICMD_GET_ERROR                  = 0x45, // E
+  FUJICMD_SET_DESTINATION            = 0x44, // D
   FUJICMD_SET_DUMP                   = 0x44, // D
   FUJICMD_CLOSE                      = 0x43, // C
   FUJICMD_CONFIGURE                  = 0x42, // B

lib/device/adamnet/network.cpp

@@ -583,7 +583,7 @@ void adamNetwork::adamnet_special_inquiry()
 {
 }
 
-void adamNetwork::do_inquiry(unsigned char inq_cmd)
+void adamNetwork::do_inquiry(fujiCommandID_t inq_cmd)
 {
     // Reset inq_dstats
     inq_dstats = 0xff;
@@ -599,30 +599,30 @@ void adamNetwork::do_inquiry(unsigned char inq_cmd)
     {
         switch (inq_cmd)
         {
-        case 0x20:
-        case 0x21:
-        case 0x23:
-        case 0x24:
-        case 0x2A:
-        case 0x2B:
-        case 0x2C:
-        case 0xFD:
-        case 0xFE:
+        case FUJICMD_RENAME:
+        case FUJICMD_DELETE:
+        case FUJICMD_LOCK:
+        case FUJICMD_UNLOCK:
+        case FUJICMD_MKDIR:
+        case FUJICMD_RMDIR:
+        case FUJICMD_CHDIR:
+        case FUJICMD_SCAN_NETWORKS:
+        case FUJICMD_GET_SSID:
             inq_dstats = 0x80;
             break;
-        case 0x30:
+        case FUJICMD_GETCWD:
             inq_dstats = 0x40;
             break;
-        case 'Z': // Set interrupt rate
+        case FUJICMD_TIMER: // Set interrupt rate
             inq_dstats = 0x00;
             break;
-        case 'T': // Set Translation
+        case FUJICMD_TRANSLATION:
             inq_dstats = 0x00;
             break;
-        case 0x80: // JSON Parse
+        case FUJICMD_JSON_PARSE:
             inq_dstats = 0x00;
             break;
-        case 0x81: // JSON Query
+        case FUJICMD_JSON_QUERY:
             inq_dstats = 0x80;
             break;
         default:
@@ -741,49 +741,49 @@ void adamNetwork::adamnet_control_ack()
 void adamNetwork::adamnet_control_send()
 {
     uint16_t s = adamnet_recv_length(); // receive length
-    uint8_t c = adamnet_recv();         // receive command
+    fujiCommandID_t c = (fujiCommandID_t) adamnet_recv();         // receive command
 
     s--; // Because we've popped the command off the stack
 
     switch (c)
     {
-    case ' ':
+    case FUJICMD_RENAME:
         rename(s);
         break;
-    case '!':
+    case FUJICMD_DELETE:
         del(s);
         break;
-    case '*':
+    case FUJICMD_MKDIR:
         mkdir(s);
         break;
-    case ',':
+    case FUJICMD_CHDIR:
         set_prefix(s);
         break;
-    case '0':
+    case FUJICMD_GETCWD:
         get_prefix();
         break;
-    case 'E':
+    case FUJICMD_GET_ERROR:
         get_error();
         break;
-    case 'O':
+    case FUJICMD_OPEN:
         open(s);
         break;
-    case 'C':
+    case FUJICMD_CLOSE:
         close();
         break;
-    case 'S':
+    case FUJICMD_STATUS:
         status();
         break;
-    case 'W':
+    case FUJICMD_WRITE:
         write(s);
         break;
-    case 0xFC:
+    case FUJICMD_JSON:
         channel_mode();
         break;
-    case 0xFD: // login
+    case FUJICMD_USERNAME: // login
         set_login(s);
         break;
-    case 0xFE: // password
+    case FUJICMD_PASSWORD: // password
         set_password(s);
         break;
     default:
@@ -805,12 +805,14 @@ void adamNetwork::adamnet_control_send()
         case JSON:
             switch (c)
             {
-            case 'P':
+            case FUJICMD_PARSE:
                 json_parse();
                 break;
-            case 'Q':
+            case FUJICMD_QUERY:
                 json_query(s);
                 break;
+            default:
+                break;
             }
             break;
         default:

lib/device/adamnet/network.h

@@ -402,7 +402,7 @@ class adamNetwork : public virtualDevice
      * @brief Perform the inquiry, handle both local and protocol commands.
      * @param inq_cmd the command to check against.
      */
-    void do_inquiry(unsigned char inq_cmd);
+    void do_inquiry(fujiCommandID_t inq_cmd);
 
     /**
      * @brief set translation specified by aux1 to aux2_translation mode.

lib/device/drivewire/network.cpp

@@ -716,7 +716,7 @@ void drivewireNetwork::set_password()
  */
 void drivewireNetwork::special()
 {
-    do_inquiry(cmdFrame.comnd);
+    do_inquiry((fujiCommandID_t) cmdFrame.comnd);
 
     switch (inq_dstats)
     {
@@ -744,13 +744,13 @@ void drivewireNetwork::special_inquiry()
 {
     Debug_printf("drivewireNetwork::special_inquiry(%02x)\n", cmdFrame.aux1);
 
-    do_inquiry(cmdFrame.aux1);
+    do_inquiry((fujiCommandID_t) cmdFrame.aux1);
 
     // Finally, return the completed inq_dstats value back to CoCo
     SYSTEM_BUS.write(&inq_dstats, sizeof(inq_dstats));
 }
 
-void drivewireNetwork::do_inquiry(unsigned char inq_cmd)
+void drivewireNetwork::do_inquiry(fujiCommandID_t inq_cmd)
 {
     // Reset inq_dstats
     inq_dstats = 0xff;

lib/device/drivewire/network.h

@@ -414,7 +414,7 @@ class drivewireNetwork : public virtualDevice
      * @brief Perform the inquiry, handle both local and protocol commands.
      * @param inq_cmd the command to check against.
      */
-    void do_inquiry(unsigned char inq_cmd);
+    void do_inquiry(fujiCommandID_t inq_cmd);
 
     /**
      * @brief set translation specified by aux1 to aux2_translation mode.

lib/device/iec/network.cpp

@@ -71,7 +71,7 @@ void iecNetwork::iec_open()
 
     // Check if the payload is RAW (i.e. from fujinet-lib) by the presence of "01" as the first uint8_t, which can't happen for BASIC.
     // If it is, then the next 2 bytes are the aux1/aux2 values (mode and trans), and the rest is the actual URL.
-    // This is an efficiency so we don't have to send a 2nd command to tell it what the parameters should have been. 
+    // This is an efficiency so we don't have to send a 2nd command to tell it what the parameters should have been.
     // BASIC will still need to use "openparams" command, as the OPEN line doesn't have capacity for the parameters (can't use a "," as that's a valid URL character)
     if (payload[0] == 0x01) {
         channel_aux1 = payload[1];
@@ -80,7 +80,7 @@ void iecNetwork::iec_open()
         // capture the trans mode as though "settrans" had been invoked
         channel_data.translationMode = channel_aux2;
         // translationMode[commanddata.channel] = channel_aux2;
-        
+
         // remove the marker bytes so the payload can continue as with BASIC setup
         if (payload.length() > 3)
             payload = payload.substr(3);
@@ -102,7 +102,7 @@ void iecNetwork::iec_open()
     channel_data.urlParser = std::move(PeoplesUrlParser::parseURL(channel_data.deviceSpec));
 
     // Convert scheme to uppercase
-    std::transform(channel_data.urlParser->scheme.begin(), channel_data.urlParser->scheme.end(), channel_data.urlParser->scheme.begin(), 
+    std::transform(channel_data.urlParser->scheme.begin(), channel_data.urlParser->scheme.end(), channel_data.urlParser->scheme.begin(),
                    [](unsigned char c) { return std::toupper(c); });
 
     // Instantiate protocol based on the scheme
@@ -385,7 +385,7 @@ void iecNetwork::parse_bite()
 
         count++;
     } while ( end < channel_data.receiveBuffer.size() );
- 
+
     //bites += "\"";
     //Debug_printv("[%s]", bites.c_str());
     channel_data.receiveBuffer = mstr::toPETSCII2(bites);
@@ -510,13 +510,13 @@ void iecNetwork::iec_command()
                 return;
             }
 
-            uint8_t m = channel_data.protocol->special_inquiry(pt[0][0]);
+            AtariSIODirection m = channel_data.protocol->special_inquiry((fujiCommandID_t) pt[0][0]);
             Debug_printv("pt[0][0]=[%2X] pt[1]=[%d] size[%d] m[%d]", pt[0][0], channel, pt.size(), m);
-            if (m == 0x00)
+            if (m == SIO_DIRECTION_NONE)
                 perform_special_00();
-            else if (m == 0x40)
+            else if (m == SIO_DIRECTION_READ)
                 perform_special_40();
-            else if (m == 0x80)
+            else if (m == SIO_DIRECTION_WRITE)
                 perform_special_80();
         }
     }
@@ -970,7 +970,7 @@ void iecNetwork::set_open_params()
         iecStatus.msg = "invalid # of parameters";
         return;
     }
-    
+
     int channel = atoi(pt[1].c_str());
     int mode = atoi(pt[2].c_str());
     int trans = atoi(pt[3].c_str());
@@ -1017,14 +1017,14 @@ bool iecNetwork::transmit(NetworkData &channel_data)
       Debug_printf("iec_reopen_channel_listen() - Not connected");
       return false;
     }
-  
+
   // force incoming data from HOST to fixed ascii
   // Debug_printv("[1] DATA: >%s< [%s]", channel_data.transmitBuffer.c_str(), mstr::toHex(channel_data.transmitBuffer).c_str());
   clean_transform_petscii_to_ascii(channel_data.transmitBuffer);
   // Debug_printv("[2] DATA: >%s< [%s]", channel_data.transmitBuffer.c_str(), mstr::toHex(channel_data.transmitBuffer).c_str());
-  
+
   Debug_printf("Received %u bytes. Transmitting.", channel_data.transmitBuffer.length());
-  
+
   channel_data.protocol->write(channel_data.transmitBuffer.length());
   channel_data.transmitBuffer.clear();
   channel_data.transmitBuffer.shrink_to_fit();
@@ -1035,19 +1035,19 @@ bool iecNetwork::transmit(NetworkData &channel_data)
 bool iecNetwork::receive(NetworkData &channel_data, uint16_t rxBytes)
 {
   NetworkStatus ns;
-  
-  if (!channel_data.protocol) 
+
+  if (!channel_data.protocol)
     {
       //Debug_printv("No protocol set");
       return false;
     }
-  
+
   if (file_not_found)
     {
       Debug_printv("file not found");
       return false;
     }
-  
+
   // Get status
   channel_data.protocol->status(&ns);
   if( ns.rxBytesWaiting>0 )
@@ -1122,7 +1122,7 @@ uint8_t iecNetwork::getStatusData(char *buffer, uint8_t bufferSize)
     {
       if( is_binary_status )
         {
-          if (!active_status_channel) 
+          if (!active_status_channel)
             Debug_printf("No active status channel\r\n");
 
           if( !network_data_map[active_status_channel].protocol )
@@ -1135,17 +1135,17 @@ uint8_t iecNetwork::getStatusData(char *buffer, uint8_t bufferSize)
           Debug_printf("msg: %s\r\n", iecStatus.msg.c_str());
           util_petscii_to_ascii_str(iecStatus.msg); // are the util pescii/asccii functions reversed?
           Debug_printf("msgPETSCII: %s\r\n", iecStatus.msg.c_str());
-          snprintf(buffer, bufferSize, "%d,%s,%02d,%02d\r\n", 
+          snprintf(buffer, bufferSize, "%d,%s,%02d,%02d\r\n",
                    iecStatus.error, iecStatus.msg.c_str(), iecStatus.channel, iecStatus.connected);
 
           Debug_printf("Sending status: %s\r\n", buffer);
-          
+
           // reset status
           iecStatus.error = 0;
           iecStatus.channel = 0;
           iecStatus.connected = 0;
           iecStatus.msg = "ok";
-          
+
           return strlen(buffer);
         }
     }

lib/device/iwm/iwmFuji.cpp

@@ -1101,7 +1101,7 @@ void iwmFuji::iwm_stat_read_device_slots()
         int returnsize;
 
         // Load the data from our current device array
-        for (int i = 0; i < MAX_DISK_DEVICES; i++)
+        for (int i = 0; i < MAX_A2DISK_DEVICES; i++)
         {
                 diskSlots[i].mode = _fnDisks[i].access_mode;
                 diskSlots[i].hostSlot = _fnDisks[i].host_slot;
@@ -1199,7 +1199,7 @@ void iwmFuji::_populate_config_from_slots()
                 }
         }
 
-        for (int i = 0; i < MAX_DISK_DEVICES; i++)
+        for (int i = 0; i < MAX_A2DISK_DEVICES; i++)
         {
                 if (_fnDisks[i].host_slot >= MAX_HOSTS || _fnDisks[i].filename[0] == '\0')
                         Config.clear_mount(i);