From: Michael McMaster <michael@codesrc.com>
Date: Sat, 25 Apr 2015 22:10:09 +0000 (+1000)
Subject: Removed default config from flash.
X-Git-Tag: v4.02.03^0
X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=1b14acad1a06fd9a0649174862ebdfa67f5af0c6;p=SCSI2SD.git

Removed default config from flash.

The bootloader checksum check fails if the configuration is changed.
---

diff --git a/software/SCSI2SD/src/config.c b/software/SCSI2SD/src/config.c
index 732d4c4..4a02d1f 100755
--- a/software/SCSI2SD/src/config.c
+++ b/software/SCSI2SD/src/config.c
@@ -53,30 +53,8 @@ static int usbInEpState;
 static int usbDebugEpState;
 static int usbReady;
 
-uint8_t DEFAULT_CONFIG[256]
-	__attribute__ ((section(".DEFAULT_CONFIG"))) =
-{
-	CONFIG_TARGET_ENABLED,
-	CONFIG_FIXED,
-	0,
-	0,
-	0, 0, 0, 0,
-	0xff, 0xff, 0x3f, 0x00, // 4194303, 2GB - 1 sector
-	0x00, 0x02, //512
-	63, 0,
-	255, 0,
-	' ', 'c', 'o', 'd', 'e', 's', 'r', 'c',
-	' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'S', 'C', 'S', 'I', '2', 'S', 'D',
-	' ', '4', '.', '2',
-	'1','2','3','4','5','6','7','8','1','2','3','4','5','6','7','8'
-};
-// otherwise linker removes unused section.
-volatile uint8_t trickLinker;
-
 void configInit()
 {
-	trickLinker = DEFAULT_CONFIG[0];
-
 	// The USB block will be powered by an internal 3.3V regulator.
 	// The PSoC must be operating between 4.6V and 5V for the regulator
 	// to work.
diff --git a/software/SCSI2SD/src/disk.c b/software/SCSI2SD/src/disk.c
index 5b6a70d..a2f5cc6 100755
--- a/software/SCSI2SD/src/disk.c
+++ b/software/SCSI2SD/src/disk.c
@@ -494,8 +494,6 @@ int scsiDiskCommand()
 
 void scsiDiskPoll()
 {
-	debugPause(); // TODO comment re. timeouts.
-
 	if (scsiDev.phase == DATA_IN &&
 		transfer.currentBlock != transfer.blocks)
 	{
@@ -738,7 +736,6 @@ void scsiDiskPoll()
 		}
 		scsiDiskReset();
 	}
-	debugResume(); // TODO comment re. timeouts.
 }
 
 void scsiDiskReset()
diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj
index e30584e..2f7d469 100755
--- a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj
+++ b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj
@@ -3357,7 +3357,7 @@
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@General@Enable printf Float" v="True" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Optimization Level" v="Size" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Remove Unused Functions" v="True" />
-<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="-Wl,--section-start=.DEFAULT_CONFIG=0x0001BC00" />
+<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="" />
 </name>
 </platform>
 <platform>
diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj
index 465dede..0f6ea55 100755
--- a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj
+++ b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj
@@ -2499,7 +2499,7 @@
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@General@Enable printf Float" v="True" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Optimization Level" v="Size" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Remove Unused Functions" v="True" />
-<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="-Wl,--section-start=.DEFAULT_CONFIG=0x0001BC00" />
+<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="" />
 </name>
 </platform>
 <platform>