From 706da178076c7df78259bde6d0eff1e7548990c2 Mon Sep 17 00:00:00 2001
From: Mariano Alvira <mar@devl.org>
Date: Sat, 9 May 2009 15:30:54 -0400
Subject: [PATCH] clean up and flash type workaround.

---
 tests/flasher.c  | 90 ++++++++++++++++++++++++++++++------------------
 tests/nvm-read.c |  4 +--
 2 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/tests/flasher.c b/tests/flasher.c
index 74ec3b147..931b335d6 100644
--- a/tests/flasher.c
+++ b/tests/flasher.c
@@ -20,6 +20,11 @@
 
 #define DELAY 400000
 
+/* if both BOOT_OK and BOOT_SECURE are 0 then flash image will not be bootable */
+/* if both are 1 then flash image will be secure */
+#define BOOT_OK 1
+#define BOOT_SECURE 0
+
 #define DEBUG 1
 #if DEBUG
 #define dbg_putc(...) putc(__VA_ARGS__)
@@ -85,31 +90,26 @@ void main(void) {
 
 	vreg_init();
 
-//	puts("CRM status: 0x");
-//	put_hex32(reg(0x80003018));
-//	puts("\n\r");
-
-//	puts("Detecting internal nvm\n\r");
+	dbg_puts("Detecting internal nvm\n\r");
 
 	err = nvm_detect(gNvmInternalInterface_c, &type);
 		
-/*
-	puts("nvm_detect returned: 0x");
-	put_hex(err);
-	puts(" type is: 0x");
-	put_hex32(type);
-	puts("\n\r");
-*/
+	dbg_puts("nvm_detect returned: 0x");
+	dbg_put_hex(err);
+	dbg_puts(" type is: 0x");
+	dbg_put_hex32(type);
+	dbg_puts("\n\r");
 	
 	/* erase the flash */
-//	err = nvm_erase(gNvmInternalInterface_c, type, 0x4fffffff); 
-	err = nvm_erase(gNvmInternalInterface_c, 1, 0x4fffffff); 
+	err = nvm_erase(gNvmInternalInterface_c, type, 0x4fffffff); 
 
-/*
-	puts("nvm_erase returned: 0x");
-	put_hex(err);
-	puts("\n\r");
-*/
+	dbg_puts("nvm_erase returned: 0x");
+	dbg_put_hex(err);
+	dbg_puts("\n\r");
+
+	dbg_puts(" type is: 0x");
+	dbg_put_hex32(type);
+	dbg_puts("\n\r");
 
 	/* say we are ready */
 	len = 0;
@@ -123,21 +123,32 @@ void main(void) {
 		len += (c<<(i*8));
 	}
 
-//	puts("len: ");
-//	put_hex32(len);
-//	puts("\n\r");
+	dbg_puts("len: ");
+	dbg_put_hex32(len);
+	dbg_puts("\n\r");
 	
 	/* write the OKOK magic */
-	((uint8_t *)buf)[0] = 'O'; ((uint8_t *)buf)[1] = 'K'; ((uint8_t *)buf)[2] = 'O'; ((uint8_t *)buf)[3] = 'K';
-//	((uint8_t *)buf)[3] = 'x';
-//	err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)buf, 0, 4);
-	err = nvm_write(gNvmInternalInterface_c, 1, (uint8_t *)buf, 0, 4);
-//	puts("nvm_write returned: 0x");
-//	put_hex(err);
-//	puts("\n\r");
+
+#if BOOT_OK
+	((uint8_t *)buf)[0] = 'O'; ((uint8_t *)buf)[1] = 'K'; ((uint8_t *)buf)[2] = 'O'; ((uint8_t *)buf)[3] = 'K';	
+#elif BOOT_SECURE
+	((uint8_t *)buf)[0] = 'S'; ((uint8_t *)buf)[1] = 'E'; ((uint8_t *)buf)[2] = 'C'; ((uint8_t *)buf)[3] = 'U';	
+#else
+	((uint8_t *)buf)[0] = 'N'; ((uint8_t *)buf)[1] = 'O'; ((uint8_t *)buf)[2] = 'N'; ((uint8_t *)buf)[3] = 'O';
+#endif
+
+	dbg_puts(" type is: 0x");
+	dbg_put_hex32(type);
+	dbg_puts("\n\r");
+
+	err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)buf, 0, 4);
+
+	dbg_puts("nvm_write returned: 0x");
+	dbg_put_hex(err);
+	dbg_puts("\n\r");
 
 	/* write the length */
-	err = nvm_write(gNvmInternalInterface_c, 1, (uint8_t *)&len, 4, 4);
+	err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)&len, 4, 4);
 
 	/* read a byte, write a byte */
 	/* byte at a time will make this work as a contiki process better */
@@ -146,9 +157,22 @@ void main(void) {
 		c = getc();	       
 //		put_hex(c);
 //		puts(": ");
-//		err = nvm_write(gNvmInternalInterface_c, type, &c, 4+i, 1);
-		err = nvm_write(gNvmInternalInterface_c, 1, &c, 8+i, 1);
-//		if(err==0) { putc('.'); } else { putc('x'); }
+
+		/*for some reason I have to hard code the type here for it to work reliably */
+//		err = nvm_write(gNvmInternalInterface_c, type, &c, 4+i, 1); 
+		switch(type) 
+		{
+		case 1:
+			err = nvm_write(gNvmInternalInterface_c, 1, &c, 8+i, 1); 
+			break;
+		case 2:
+			err = nvm_write(gNvmInternalInterface_c, 2, &c, 8+i, 1); 
+			break;
+		case 3:
+			err = nvm_write(gNvmInternalInterface_c, 3, &c, 8+i, 1); 
+			break;
+		}
+
 //		puts("nvm_write returned: 0x");
 //		put_hex(err);
 //		puts("\n\r");
diff --git a/tests/nvm-read.c b/tests/nvm-read.c
index 54a912904..44ed25a1e 100644
--- a/tests/nvm-read.c
+++ b/tests/nvm-read.c
@@ -31,7 +31,7 @@ const uint8_t hex[16]={'0','1','2','3','4','5','6','7',
 
 #include "isr.h"
 
-#define NBYTES 1024
+#define NBYTES 16
 __attribute__ ((section ("startup")))
 void main(void) {
 	nvmType_t type=0;
@@ -76,7 +76,7 @@ void main(void) {
 
 	nvm_setsvar(0);
 
-	err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, 0x1F000, NBYTES);
+	err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, 0x1e000, NBYTES);
 	puts("nvm_read returned: 0x");
 	put_hex(err);
 	puts("\n\r");