Added XEX support.

Author: Daniel Noguerol

SIO2Arduino.ino

@@ -194,14 +194,17 @@ void changeDisk() {
 boolean isValidFilename(char *s) {
   return (  s[0] != '.' &&    // ignore hidden directories 
             s[0] != '_' && (  // ignore bogus files created by OS X
-              (s[8] == 'A' && s[9] == 'T' && s[10] == 'R') || 
-              (s[8] == 'P' && s[9] == 'R' && s[10] == 'O') || 
-              (s[8] == 'X' && s[9] == 'F' && s[10] == 'D')
+             (s[8] == 'A' && s[9] == 'T' && s[10] == 'R')
+          || (s[8] == 'P' && s[9] == 'R' && s[10] == 'O')
+          || (s[8] == 'X' && s[9] == 'F' && s[10] == 'D')
+#ifdef XEX_IMAGES
+          || (s[8] == 'X' && s[9] == 'E' && s[10] == 'X')
+#endif              
 #ifdef ATX_IMAGES              
-              || (s[8] == 'A' && s[9] == 'T' && s[10] == 'X')
+          || (s[8] == 'A' && s[9] == 'T' && s[10] == 'X')
 #endif              
-            )
-         );
+          )
+        );
 }
 
 void createFilename(char* filename, char* name) {

config.h

@@ -39,12 +39,15 @@
 // Uncomment this line if you are using a hardware button for image selection
 #define SELECTOR_BUTTON
 
-// uncomment if using an Ethernet sheild for SD capabilities
+// uncomment if using an Ethernet shield for SD capabilities
 //#define ETHERNET_SHIELD
 
 // uncomment for ATX image format support (Mega 2560 only)
 //#define ATX_IMAGES
 
+// uncomment for XEX "image" support
+#define XEX_IMAGES
+
 // uncomment this to enable debug logging -- make sure the HARDWARE_UART isn't the same as
 // the LOGGING_UART defined at the bottom of the file
 #define DEBUG 

disk_image.cpp

@@ -23,6 +23,27 @@
 #include "disk_image.h"
 #include "config.h"
 
+#ifdef XEX_IMAGES
+byte KBOOT_LOADER[] = {
+  0x00,0x03,0x00,0x07,0x14,0x07,0x4c,0x14,0x07,0xAA,0xBB,0x00,0x00,0xa9,0x46,0x8d,0xc6,0x02,0xd0,0xfe,0xa0,0x00,0xa9,0x6b,
+  0x91,0x58,0x20,0xd9,0x07,0xb0,0xee,0x20,0xc4,0x07,0xad,0x7a,0x08,0x0d,0x76,0x08,0xd0,0xe3,0xa5,0x80,0x8d,0xe0,0x02,0xa5,
+  0x81,0x8d,0xe1,0x02,0xa9,0x00,0x8d,0xe2,0x02,0x8d,0xe3,0x02,0x20,0xeb,0x07,0xb0,0xcc,0xa0,0x00,0x91,0x80,0xa5,0x80,0xc5,
+  0x82,0xd0,0x06,0xa5,0x81,0xc5,0x83,0xf0,0x08,0xe6,0x80,0xd0,0x02,0xe6,0x81,0xd0,0xe3,0xad,0x76,0x08,0xd0,0xaf,0xad,0xe2,
+  0x02,0x8d,0x70,0x07,0x0d,0xe3,0x02,0xf0,0x0e,0xad,0xe3,0x02,0x8d,0x71,0x07,0x20,0xff,0xff,0xad,0x7a,0x08,0xd0,0x13,0xa9,
+  0x00,0x8d,0xe2,0x02,0x8d,0xe3,0x02,0x20,0xae,0x07,0xad,0x7a,0x08,0xd0,0x03,0x4c,0x3c,0x07,0xa9,0x00,0x85,0x80,0x85,0x81,
+  0x85,0x82,0x85,0x83,0xad,0xe0,0x02,0x85,0x0a,0x85,0x0c,0xad,0xe1,0x02,0x85,0x0b,0x85,0x0d,0xa9,0x01,0x85,0x09,0xa9,0x00,
+  0x8d,0x44,0x02,0x6c,0xe0,0x02,0x20,0xeb,0x07,0x85,0x80,0x20,0xeb,0x07,0x85,0x81,0xa5,0x80,0xc9,0xff,0xd0,0x10,0xa5,0x81,
+  0xc9,0xff,0xd0,0x0a,0x20,0xeb,0x07,0x85,0x80,0x20,0xeb,0x07,0x85,0x81,0x20,0xeb,0x07,0x85,0x82,0x20,0xeb,0x07,0x85,0x83,
+  0x60,0x20,0xeb,0x07,0xc9,0xff,0xd0,0x09,0x20,0xeb,0x07,0xc9,0xff,0xd0,0x02,0x18,0x60,0x38,0x60,0xad,0x09,0x07,0x0d,0x0a,
+  0x07,0x0d,0x0b,0x07,0xf0,0x79,0xac,0x79,0x08,0x10,0x50,0xee,0x77,0x08,0xd0,0x03,0xee,0x78,0x08,0xa9,0x31,0x8d,0x00,0x03,
+  0xa9,0x01,0x8d,0x01,0x03,0xa9,0x52,0x8d,0x02,0x03,0xa9,0x40,0x8d,0x03,0x03,0xa9,0x80,0x8d,0x04,0x03,0xa9,0x08,0x8d,0x05,
+  0x03,0xa9,0x1f,0x8d,0x06,0x03,0xa9,0x80,0x8d,0x08,0x03,0xa9,0x00,0x8d,0x09,0x03,0xad,0x77,0x08,0x8d,0x0a,0x03,0xad,0x78,
+  0x08,0x8d,0x0b,0x03,0x20,0x59,0xe4,0xad,0x03,0x03,0xc9,0x02,0xb0,0x22,0xa0,0x00,0x8c,0x79,0x08,0xb9,0x80,0x08,0xaa,0xad,
+  0x09,0x07,0xd0,0x0b,0xad,0x0a,0x07,0xd0,0x03,0xce,0x0b,0x07,0xce,0x0a,0x07,0xce,0x09,0x07,0xee,0x79,0x08,0x8a,0x18,0x60,
+  0xa0,0x01,0x8c,0x76,0x08,0x38,0x60,0xa0,0x01,0x8c,0x7a,0x08,0x38,0x60,0x00,0x03,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00
+};
+#endif
+
 DiskImage::DiskImage() {
   m_fileRef = NULL;
 }
@@ -56,6 +77,11 @@ SectorPacket* DiskImage::getSectorData(unsigned long sector) {
   m_sectorBuffer.error = false;
   m_sectorBuffer.validStatusFrame = false;
 
+  // delay if necessary
+  if (m_sectorReadDelay) {
+    delay(m_sectorReadDelay);
+  }
+
   // seek to proper offset in file
   if (m_type == TYPE_PRO) {
     // if this is a PRO image, we seek based on the sector number + the sector header size (omitting the header)
@@ -80,6 +106,18 @@ SectorPacket* DiskImage::getSectorData(unsigned long sector) {
       }
     }
     m_phantomFlip = !m_phantomFlip; // TODO: do bad sectors cause this to flip?
+#ifdef XEX_IMAGES
+  } else if (m_type == TYPE_XEX) {
+    if (sector < 4) {
+      unsigned long ix = (sector - 1) * m_sectorSize;
+      for (int i=0; i < m_sectorSize; i++) {
+        m_sectorBuffer.data[i] = KBOOT_LOADER[ix+i];
+      }
+      return &m_sectorBuffer;
+    } else {
+      m_fileRef->seekSet((sector - 4) * m_sectorSize);
+    }
+#endif
 #ifdef ATX_IMAGES
   } else if (m_type == TYPE_ATX) {
     int ix = -1;
@@ -120,11 +158,6 @@ SectorPacket* DiskImage::getSectorData(unsigned long sector) {
     m_fileRef->seekSet(m_headerSize + ((sector - 1) * m_sectorSize));
   }
 
-  // delay if necessary
-  if (m_sectorReadDelay) {
-    delay(m_sectorReadDelay);
-  }
-
   // read sector data into buffer
   for (int i=0; i < m_sectorSize; i++) {
     m_sectorBuffer.data[i] = (byte)m_fileRef->read();
@@ -340,11 +373,12 @@ boolean DiskImage::loadFile(SdFile *file) {
   }  
 #endif
 
-  // check if it's an XFD
-  // (since an XFD is just a raw data dump, we can only determine this by file name and size)
   file->getFilename((char*)&filename);
   int len = strlen(filename);
   char *extension = filename + len - 4;
+
+  // check if it's an XFD
+  // (since an XFD is just a raw data dump, we can only determine this by file name and size)
   if ((!strcmp(".XFD", extension) || !strcmp(".xfd", extension)) && (m_fileSize == FORMAT_SS_SD_40)) {
     m_type = TYPE_XFD;
     m_readOnly = false;
@@ -353,8 +387,22 @@ boolean DiskImage::loadFile(SdFile *file) {
     m_sectorReadDelay = 0;
 
     LOG_MSG("Loaded XFD with sector size 128: ");
+    return true;
+#ifdef XEX_IMAGES    
+  } else if ((!strcmp(".XEX", extension) || !strcmp(".xex", extension))) {
+    m_type = TYPE_XEX;
+    m_readOnly = true;
+    m_headerSize = 0;
+    m_sectorSize = SECTOR_SIZE_SD;
+    m_sectorReadDelay = 0;
 
+    // set the size of the XEX in the correct bootloader location    
+    KBOOT_LOADER[9] = m_fileSize & 0xFF;
+    KBOOT_LOADER[10] = m_fileSize >> 8;
+    
+    LOG_MSG("Loaded XEX with sector size 128: ");
     return true;
+#endif    
   }
 
   return false;

disk_image.h

@@ -11,6 +11,7 @@ const byte TYPE_ATR = 1;
 const byte TYPE_XFD = 2;
 const byte TYPE_PRO = 3;
 const byte TYPE_ATX = 4;
+const byte TYPE_XEX = 5;
 
 const unsigned long SECTOR_SIZE_SD  = 128;