Merge branch 'master' into iic_disk2_check

Author: FozzTexx

lib/bus/iwm/iwm.cpp

@@ -260,13 +260,9 @@ void iwmDevice::iwm_return_badcmd(iwm_decoded_cmd_t cmd)
     case SP_ECMD_WRITEBLOCK:
     case SP_ECMD_CONTROL:
     case SP_ECMD_WRITE:
-    case SP_ECMD_UNKNOWN1:
-    case SP_ECMD_UNKNOWN2:
     case SP_CMD_WRITEBLOCK:
     case SP_CMD_CONTROL:
     case SP_CMD_WRITE:
-    case SP_CMD_UNKNOWN1:
-    case SP_CMD_UNKNOWN2:
       data_len = 512;
       IWM.iwm_decode_data_packet((uint8_t *)data_buffer, data_len);
       Debug_printf("\r\nUnit %02x Bad Command with data packet %02x\r\n", id(), cmd.command);
@@ -300,13 +296,9 @@ void iwmDevice::iwm_return_device_offline(iwm_decoded_cmd_t cmd)
     case SP_ECMD_WRITEBLOCK:
     case SP_ECMD_CONTROL:
     case SP_ECMD_WRITE:
-    case SP_ECMD_UNKNOWN1:
-    case SP_ECMD_UNKNOWN2:
     case SP_CMD_WRITEBLOCK:
     case SP_CMD_CONTROL:
     case SP_CMD_WRITE:
-    case SP_CMD_UNKNOWN1:
-    case SP_CMD_UNKNOWN2:
       data_len = 512;
       IWM.iwm_decode_data_packet((uint8_t *)data_buffer, data_len);
       Debug_printf("\r\nUnit %02x Offline, Command with data packet %02x\r\n", id(), cmd.command);

lib/bus/iwm/iwm.h

@@ -32,8 +32,6 @@ enum {
   SP_CMD_CLOSE          = 0x07,
   SP_CMD_READ           = 0x08,
   SP_CMD_WRITE          = 0x09,
-  SP_CMD_UNKNOWN1       = 0x0a,
-  SP_CMD_UNKNOWN2       = 0x0b,
   SP_ECMD_STATUS        = 0x40,
   SP_ECMD_READBLOCK     = 0x41,
   SP_ECMD_WRITEBLOCK    = 0x42,
@@ -44,8 +42,6 @@ enum {
   SP_ECMD_CLOSE         = 0x47,
   SP_ECMD_READ          = 0x48,
   SP_ECMD_WRITE         = 0x49,
-  SP_ECMD_UNKNOWN1      = 0x4a,
-  SP_ECMD_UNKNOWN2      = 0x4b,
 };
 
 // see page 81-82 in Apple IIc ROM reference and Table 7-5 in IIgs firmware ref

lib/bus/iwm/iwm_ll.cpp

@@ -75,9 +75,7 @@ void IRAM_ATTR phi_isr_handler(void *arg)
 
               if ((c == SP_CMD_WRITEBLOCK) ||
                   (c == SP_CMD_CONTROL) ||
-                  (c == SP_CMD_WRITE) ||
-                  (c == SP_CMD_UNKNOWN1) ||
-                  (c == SP_CMD_UNKNOWN2))
+                  (c == SP_CMD_WRITE))
               {
                 // Debug_printf("\nhello from ISR - control command!");
                 if (smartport.req_wait_for_falling_timeout(5500))

lib/bus/mac/mac.cpp

@@ -531,13 +531,9 @@ void iwmDevice::iwm_return_badcmd(iwm_decoded_cmd_t cmd)
   case SP_ECMD_WRITEBLOCK:
   case SP_ECMD_CONTROL:
   case SP_ECMD_WRITE:
-  case SP_ECMD_UNKNOWN1:
-  case SP_ECMD_UNKNOWN2:
   case SP_CMD_WRITEBLOCK:
   case SP_CMD_CONTROL:
   case SP_CMD_WRITE:
-  case SP_CMD_UNKNOWN1:
-  case SP_CMD_UNKNOWN2:
     data_len = 512;
     IWM.iwm_decode_data_packet((uint8_t *)data_buffer, data_len);
     Debug_printf("\r\nUnit %02x Bad Command with data packet %02x\r\n", id(), cmd.command);