[apple2] fujiCommandID_t with do_inquiry

Author: FozzTexx

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);

lib/device/iwm/network.cpp

@@ -359,7 +359,7 @@ void iwmNetwork::iwmnet_special_inquiry()
 {
 }
 
-void iwmNetwork::do_inquiry(unsigned char inq_cmd)
+void iwmNetwork::do_inquiry(fujiCommandID_t inq_cmd)
 {
     auto& current_network_data = network_data_map[current_network_unit];
     // Reset inq_dstats
@@ -770,7 +770,7 @@ void iwmNetwork::iwm_ctrl(iwm_decoded_cmd_t cmd)
 {
     uint8_t err_result = SP_ERR_NOERROR;
 
-    uint8_t control_code = get_status_code(cmd);
+    fujiCommandID_t control_code = (fujiCommandID_t) get_status_code(cmd);
 
     // fujinet-lib (with unit-id support) sends the count of bytes for a control as 4 to cater for the network unit.
     // Older code sends 3 as the count, so we can detect if the network unit byte is there or not.
@@ -792,43 +792,43 @@ void iwmNetwork::iwm_ctrl(iwm_decoded_cmd_t cmd)
 
     // Debug_printv("cmd (looking for network_unit in byte 6, i.e. hex[5]):\r\n%s\r\n", mstr::toHex(cmd.decoded, 9).c_str());
 
-    if (control_code != 'O' && current_network_data.json == nullptr) {
+    if (control_code != FUJICMD_OPEN && current_network_data.json == nullptr) {
         Debug_printv("control should not be called on a non-open channel - FN was probably reset");
     }
 
     switch (control_code)
     {
-    case ' ':
+    case FUJICMD_RENAME:
         rename();
         break;
-    case '!':
+    case FUJICMD_DELETE:
         del();
         break;
-    case '*':
+    case FUJICMD_MKDIR:
         mkdir();
         break;
-    case ',':
+    case FUJICMD_CHDIR:
         set_prefix();
         break;
-    case '0':
+    case FUJICMD_GETCWD:
         get_prefix();
         break;
-    case 'O':
+    case FUJICMD_OPEN:
         open();
         break;
-    case 'C':
+    case FUJICMD_CLOSE:
         close();
         break;
-    case 'W':
+    case FUJICMD_WRITE:
         net_write();
         break;
-    case 0xFC:
+    case FUJICMD_JSON:
         channel_mode();
         break;
-    case 0xFD: // login
+    case FUJICMD_USERNAME: // login
         set_login();
         break;
-    case 0xFE: // password
+    case FUJICMD_PASSWORD: // password
         set_password();
         break;
     default:
@@ -856,12 +856,14 @@ void iwmNetwork::iwm_ctrl(iwm_decoded_cmd_t cmd)
             } else {
                 switch (control_code)
                 {
-                case 'P':
+                case FUJICMD_PARSE:
                     json_parse();
                     break;
-                case 'Q':
+                case FUJICMD_QUERY:
                     json_query(cmd);
                     break;
+                default:
+                    break;
                 }
             }
             break;

lib/device/iwm/network.h

@@ -392,7 +392,7 @@ class iwmNetwork : public iwmDevice
      * @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/runcpm/abstraction_fujinet_apple2.h

@@ -624,7 +624,7 @@ uint8_t bdos_readDeviceSlots(uint16_t addr)
         disk_slot diskSlots[MAX_DISK_DEVICES];
 
         // 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 = theFuji->get_disk(i)->access_mode;
                 diskSlots[i].hostSlot = theFuji->get_disk(i)->host_slot;