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 732d4c477fb2ef8cb4a1b5841ac86e01cf8be5de..4a02d1f0a97c48796189fa7a112f06da27b4f40c 100755 (executable)
--- a/software/SCSI2SD/src/config.c
+++ b/software/SCSI2SD/src/config.c
@@ -53,30 +53,8 @@ static int usbInEpState;
 static int usbDebugEpState;\r
 static int usbReady;\r
 \r
-uint8_t DEFAULT_CONFIG[256]\r
-       __attribute__ ((section(".DEFAULT_CONFIG"))) =\r
-{\r
-       CONFIG_TARGET_ENABLED,\r
-       CONFIG_FIXED,\r
-       0,\r
-       0,\r
-       0, 0, 0, 0,\r
-       0xff, 0xff, 0x3f, 0x00, // 4194303, 2GB - 1 sector\r
-       0x00, 0x02, //512\r
-       63, 0,\r
-       255, 0,\r
-       ' ', 'c', 'o', 'd', 'e', 's', 'r', 'c',\r
-       ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'S', 'C', 'S', 'I', '2', 'S', 'D',\r
-       ' ', '4', '.', '2',\r
-       '1','2','3','4','5','6','7','8','1','2','3','4','5','6','7','8'\r
-};\r
-// otherwise linker removes unused section.\r
-volatile uint8_t trickLinker;\r
-\r
 void configInit()\r
 {\r
-       trickLinker = DEFAULT_CONFIG[0];\r
-\r
        // The USB block will be powered by an internal 3.3V regulator.\r
        // The PSoC must be operating between 4.6V and 5V for the regulator\r
        // to work.\r

diff --git a/software/SCSI2SD/src/disk.c b/software/SCSI2SD/src/disk.c
index 5b6a70d0d930dd8ef34cb6d67d02c4a9a4018b6d..a2f5cc6bac05050e73d77ef0fbe1804f27360e9d 100755 (executable)
--- a/software/SCSI2SD/src/disk.c
+++ b/software/SCSI2SD/src/disk.c
@@ -494,8 +494,6 @@ int scsiDiskCommand()
 \r
 void scsiDiskPoll()\r
 {\r
-       debugPause(); // TODO comment re. timeouts.\r
-\r
        if (scsiDev.phase == DATA_IN &&\r
                transfer.currentBlock != transfer.blocks)\r
        {\r
@@ -738,7 +736,6 @@ void scsiDiskPoll()
                }\r
                scsiDiskReset();\r
        }\r
-       debugResume(); // TODO comment re. timeouts.\r
 }\r
 \r
 void scsiDiskReset()\r

diff --git a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj
index e30584eb0016b0dda3531911233044c2da06653a..2f7d469276b2c19d6be6945e73629b3d303edb16 100755 (executable)
--- 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" />\r
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Optimization Level" v="Size" />\r
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Optimization@Remove Unused Functions" v="True" />\r
-<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="-Wl,--section-start=.DEFAULT_CONFIG=0x0001BC00" />\r
+<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@Linker@Command Line@Command Line" v="" />\r
 </name>\r
 </platform>\r
 <platform>\r

diff --git a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj
index 465dedebd18f2100e95ec8c793d029c7f2b19c4c..0f6ea55877f20ad2dd50ea463d2afc3ef9653828 100755 (executable)
--- 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>