Changed pitch of disk images in flash

As reported in #15 the version 1.2 of esptool.py wont write to non-sector aligned addresses.
mengstr · Mar 28, 2017 · ad5e557 · ad5e557
1 parent 6a367a5
commit ad5e557
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 4 deletions.
diff --git a/code/Makefile b/code/Makefile
@@ -17,6 +17,7 @@ EMULATIONBAUD	=  9600
 PORT 		=  23
 
 DISKSIZE	=  0x3E900  # 256256 bytes (IMB 8-inch 26sec, 77trk, SS)
+DISKPITCH	=  0x3F000  # esptool1.2 won't write at non-sector boundries
 
 ifeq (NOSDK, $(BUILD))
  DISKS		=  A B C D E F G H I J K L M N O
@@ -222,8 +223,8 @@ readdisk$(1) :
 endef
 
 $(foreach DSK,$(DISKS), \
-	$(eval $(call WRITEDISK,$(DSK), $(DISKSIZE), $(DISKSIZE), $(DISKADDR) )); \
-	$(eval $(call  READDISK,$(DSK), $(DISKSIZE), $(DISKSIZE), $(DISKADDR) )); \
+	$(eval $(call WRITEDISK,$(DSK), $(DISKPITCH), $(DISKSIZE), $(DISKADDR) )); \
+	$(eval $(call  READDISK,$(DSK), $(DISKPITCH), $(DISKSIZE), $(DISKADDR) )); \
 )
 
 WRITEDISKTARGETS=$(foreach DSK,$(DISKS), writedisk$(DSK) )

diff --git a/code/disks/M/LINK.COM → code/disks/B/LINK.COM b/code/disks/M/LINK.COM → code/disks/B/LINK.COM
diff --git a/code/disks/M/MAC.COM → code/disks/B/MAC.COM b/code/disks/M/MAC.COM → code/disks/B/MAC.COM
diff --git a/code/disks/M/RMAC.COM → code/disks/B/RMAC.COM b/code/disks/M/RMAC.COM → code/disks/B/RMAC.COM
diff --git a/code/disks/M/ZASM.COM → code/disks/B/ZASM.COM b/code/disks/M/ZASM.COM → code/disks/B/ZASM.COM
diff --git a/code/disks/M/l80.com → code/disks/B/l80.com b/code/disks/M/l80.com → code/disks/B/l80.com
diff --git a/code/disks/M/m80.com → code/disks/B/m80.com b/code/disks/M/m80.com → code/disks/B/m80.com
diff --git a/code/disks/B/zexall.com b/code/disks/B/zexall.com
diff --git a/code/disks/B/zexdoc.com b/code/disks/B/zexdoc.com
diff --git a/code/disks/E/EDIT.COM b/code/disks/E/EDIT.COM
diff --git a/code/disks/E/EDIT.OVY b/code/disks/E/EDIT.OVY
diff --git a/code/disks/E/MIX.COM b/code/disks/E/MIX.COM
diff --git a/code/disks/E/SETEDIT.COM b/code/disks/E/SETEDIT.COM
diff --git a/code/disks/M/Z80ASM.COM b/code/disks/M/Z80ASM.COM
diff --git a/code/flash.c b/code/flash.c
@@ -25,6 +25,7 @@
 #define SECTORSPERTRACK 26    // A standard 8" IBM disk have 26 sectors...
 #define TRACKSPERDISK   77    // ... and 77 tracks
 #define DISKSIZE        (SECTORSIZE*SECTORSPERTRACK*TRACKSPERDISK)
+#define DISKPITCH	0x3f000 // Disks must be at sector boundries
 
 #ifdef NOSDK
  #define DISKFLASHOFFSET 0x3c0000 // Location in flash for first disk going backwards
@@ -57,7 +58,7 @@ void ICACHE_FLASH_ATTR ReadDiskBlock(uint16_t mdest, uint8_t sectorNo,
   if (sectorNo > (SECTORSPERTRACK - 1)) sectorNo = SECTORSPERTRACK - 1;
 
   uint32_t lba = SECTORSPERTRACK * trackNo + sectorNo;
-  uint32_t flashloc = (DISKFLASHOFFSET - DISKSIZE * diskNo) + SECTORSIZE * lba;
+  uint32_t flashloc = (DISKFLASHOFFSET - DISKPITCH * diskNo) + SECTORSIZE * lba;
   uint16_t myFlashSectorNo = flashloc / FLASHBLOCKSIZE;
   uint16_t fl = flashloc % FLASHBLOCKSIZE;
 
@@ -105,7 +106,7 @@ void ICACHE_FLASH_ATTR WriteDiskBlock(uint16_t msrc, uint8_t sectorNo,
   if (sectorNo > (SECTORSPERTRACK - 1)) sectorNo = SECTORSPERTRACK - 1;
 
   uint32_t lba = SECTORSPERTRACK * trackNo + sectorNo;
-  uint32_t flashloc = (DISKFLASHOFFSET - DISKSIZE * diskNo) + SECTORSIZE * lba;
+  uint32_t flashloc = (DISKFLASHOFFSET - DISKPITCH * diskNo) + SECTORSIZE * lba;
   uint16_t myFlashSectorNo = flashloc / FLASHBLOCKSIZE;
   uint16_t fl = flashloc % FLASHBLOCKSIZE;