Fix some more hardcoded values

Author: FozzTexx

include/fujiCommandID.h

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

lib/media/drivewire/mediaTypeVDK.h

@@ -27,7 +27,7 @@ class MediaTypeVDK : public MediaType
 
     static bool create(FILE *f, uint32_t numBlock);
 
-    void get_block_buffer(uint8_t **p_buffer, uint16_t *p_blk_size);
+    void get_block_buffer(uint8_t **p_buffer, uint16_t *p_blk_size) override;
 };
 
 

lib/network-protocol/FTP.cpp

@@ -225,10 +225,10 @@ AtariSIODirection NetworkProtocolFTP::special_inquiry(fujiCommandID_t cmd)
 
     switch (cmd)
     {
-    case 0x20:      // RENAME
-    case 0x21:      // DELETE
-    case 0x2A:      // MKDIR
-    case 0x2B:      // RMDIR
+    case FUJICMD_RENAME:
+    case FUJICMD_DELETE:
+    case FUJICMD_MKDIR:
+    case FUJICMD_RMDIR:
         ret = SIO_DIRECTION_WRITE; // Atari to peripheral.
         break;
     default:

lib/network-protocol/HTTP.cpp

@@ -61,7 +61,7 @@ AtariSIODirection NetworkProtocolHTTP::special_inquiry(fujiCommandID_t cmd)
 
     switch (cmd)
     {
-    case 'M':
+    case FUJICMD_UNLISTEN:
         return (aux1_open > 8 ? SIO_DIRECTION_NONE : SIO_DIRECTION_INVALID);
     default:
         return SIO_DIRECTION_INVALID;
@@ -72,7 +72,7 @@ netProtoErr_t NetworkProtocolHTTP::special_00(cmdFrame_t *cmdFrame)
 {
     switch (cmdFrame->comnd)
     {
-    case 'M':
+    case FUJICMD_UNLISTEN:
         return special_set_channel_mode(cmdFrame);
     default:
         return NETPROTO_ERR_UNSPECIFIED;
@@ -92,21 +92,21 @@ netProtoErr_t NetworkProtocolHTTP::special_set_channel_mode(cmdFrame_t *cmdFrame
 
     switch (cmdFrame->aux2)
     {
-    case 0:
+    case HTTP_CHANMODE_BODY:
         httpChannelMode = DATA;
         fileSize = bodySize;
         break;
-    case 1:
+    case HTTP_CHANMODE_COLLECT_HEADERS:
         httpChannelMode = COLLECT_HEADERS;
         break;
-    case 2:
+    case HTTP_CHANMODE_GET_HEADERS:
         returned_header_cursor = 0;
         httpChannelMode = GET_HEADERS;
         break;
-    case 3:
+    case HTTP_CHANMODE_SET_HEADERS:
         httpChannelMode = SET_HEADERS;
         break;
-    case 4:
+    case HTTP_CHANMODE_SET_POST_DATA:
         httpChannelMode = SEND_POST_DATA;
         break;
     default:

lib/network-protocol/Protocol.cpp

@@ -225,6 +225,8 @@ void NetworkProtocol::translate_receive_buffer()
 #endif
         *receiveBuffer = mstr::toUTF8(*receiveBuffer);
         break;
+    default:
+        break;
     }
 
     if (translation_mode == NETPROTO_TRANS_CRLF)
@@ -263,6 +265,8 @@ unsigned short NetworkProtocol::translate_transmit_buffer()
     case NETPROTO_TRANS_PETSCII:
         *transmitBuffer = mstr::toUTF8(*transmitBuffer);
         break;
+    default:
+        break;
     }
 
     return transmitBuffer->length();

lib/network-protocol/SD.cpp

@@ -217,10 +217,10 @@ AtariSIODirection NetworkProtocolSD::special_inquiry(fujiCommandID_t cmd)
 
     switch (cmd)
     {
-    case 0x20:      // RENAME
-    case 0x21:      // DELETE
-    case 0x2A:      // MKDIR
-    case 0x2B:      // RMDIR
+    case FUJICMD_RENAME:
+    case FUJICMD_DELETE:
+    case FUJICMD_MKDIR:
+    case FUJICMD_RMDIR:
         ret = SIO_DIRECTION_WRITE; // Atari to peripheral.
         break;
     default:

lib/network-protocol/TCP.cpp

@@ -241,10 +241,12 @@ AtariSIODirection NetworkProtocolTCP::special_inquiry(fujiCommandID_t cmd)
 
     switch (cmd)
     {
-    case 'A':
+    case FUJICMD_CONTROL:
         return SIO_DIRECTION_NONE;
-    case 'c':
+    case FUJICMD_CLOSE_CLIENT:
         return SIO_DIRECTION_NONE;
+    default:
+        break;
     }
 
     return SIO_DIRECTION_INVALID;
@@ -261,10 +263,10 @@ netProtoErr_t NetworkProtocolTCP::special_00(cmdFrame_t *cmdFrame)
 
     switch (cmdFrame->comnd)
     {
-    case 'A':
+    case FUJICMD_CONTROL:
         return special_accept_connection();
         break;
-    case 'c':
+    case FUJICMD_CLOSE_CLIENT:
         Debug_printf("CLOSING CLIENT CONNECTION!!!\n");
         return special_close_client_connection();
         break;

lib/network-protocol/TNFS.cpp

@@ -223,10 +223,10 @@ AtariSIODirection NetworkProtocolTNFS::special_inquiry(fujiCommandID_t cmd)
 
     switch (cmd)
     {
-    case 0x20:      // RENAME
-    case 0x21:      // DELETE
-    case 0x2A:      // MKDIR
-    case 0x2B:      // RMDIR
+    case FUJICMD_RENAME:
+    case FUJICMD_DELETE:
+    case FUJICMD_MKDIR:
+    case FUJICMD_RMDIR:
         ret = SIO_DIRECTION_WRITE; // Atari to peripheral.
         break;
     default:

lib/network-protocol/Test.cpp

@@ -33,22 +33,24 @@ netProtoErr_t NetworkProtocolTest::open(PeoplesUrlParser *urlParser, cmdFrame_t
 
     switch (translation_mode)
     {
-    case 0:
+    case NETPROTO_TRANS_NONE:
         Debug_printf("Atari Translation\r\n");
         test_data += "\x9b";
         break;
-    case 1:
+    case NETPROTO_TRANS_CR:
         Debug_printf("CR Translation\r\n");
         test_data += "\x0d";
         break;
-    case 2:
+    case NETPROTO_TRANS_LF:
         Debug_printf("LF Translation\r\n");
         test_data += "\x0a";
         break;
-    case 3:
+    case NETPROTO_TRANS_CRLF:
         Debug_printf("CRLF Translation\r\n");
         test_data += "\x0d\x0a";
         break;
+    default:
+        break;
     }
 
     return NETPROTO_ERR_NONE;

lib/network-protocol/UDP.cpp

@@ -195,12 +195,14 @@ AtariSIODirection NetworkProtocolUDP::special_inquiry(fujiCommandID_t cmd)
 
     switch (cmd)
     {
-    case 'D':           // set destination
+    case FUJICMD_SET_DESTINATION:
         return SIO_DIRECTION_WRITE;
 #ifndef ESP_PLATFORM
-    case 'r':           // get remote
+    case FUJICMD_GET_REMOTE:
         return SIO_DIRECTION_READ;
 #endif
+    default:
+        break;
     }
 
     return SIO_DIRECTION_INVALID;
@@ -218,7 +220,7 @@ netProtoErr_t NetworkProtocolUDP::special_40(uint8_t *sp_buf, unsigned short len
 #else
     switch (cmdFrame->comnd)
     {
-    case 'r':
+    case FUJICMD_GET_REMOTE:
         return get_remote(sp_buf, len);
     default:
         return NETPROTO_ERR_UNSPECIFIED;
@@ -230,7 +232,7 @@ netProtoErr_t NetworkProtocolUDP::special_80(uint8_t *sp_buf, unsigned short len
 {
     switch (cmdFrame->comnd)
     {
-    case 'D':
+    case FUJICMD_SET_DESTINATION:
         return set_destination(sp_buf, len);
     default:
         return NETPROTO_ERR_UNSPECIFIED;