From 64824b4ebc69977d8a23e8fd23a4c715ffbdf103 Mon Sep 17 00:00:00 2001
From: Mariano Alvira <mar@devl.org>
Date: Fri, 26 Feb 2010 14:21:46 -0500
Subject: [PATCH] place all the config into config.h

---
 tests/config.h    | 26 ++++++++++++++++++++++++++
 tests/nvm-read.c  | 14 ++++----------
 tests/nvm-write.c | 20 ++++++--------------
 tests/tests.c     |  3 ++-
 tests/tests.h     |  2 +-
 5 files changed, 39 insertions(+), 26 deletions(-)
 create mode 100644 tests/config.h

diff --git a/tests/config.h b/tests/config.h
new file mode 100644
index 000000000..1dafb0344
--- /dev/null
+++ b/tests/config.h
@@ -0,0 +1,26 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/* Baud rate */
+/* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */
+#define INC 767
+#define MOD 9999
+
+/* use uart1 for console */
+#define uart_init uart1_init
+
+/* nvm-read */
+#define READ_ADDR 0x1F000
+#define READ_NBYTES 1024
+
+/* nvm-write */
+#define WRITE_NBYTES 8
+#define WRITE_ADDR 0x1e000
+#define WRITEVAL0 0xdeadbeef 
+#define WRITEVAL1 0xdeadbeef
+
+/* romimg */
+#define DUMP_BASE 0x00000000
+#define DUMP_LEN  0x00014000
+
+#endif
diff --git a/tests/nvm-read.c b/tests/nvm-read.c
index 53d8ac02b..7b7d11981 100644
--- a/tests/nvm-read.c
+++ b/tests/nvm-read.c
@@ -2,18 +2,12 @@
 #include <board.h>
 
 #include "tests.h"
-
-/* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */
-#define INC 767
-#define MOD 9999
-
-#define READ_ADDR 0x1F000
-#define NBYTES 1024
+#include "config.h"
 
 void main(void) {
 	nvmType_t type=0;
 	nvmErr_t err;
-	uint32_t buf[NBYTES/4];
+	uint32_t buf[READ_NBYTES/4];
 	uint32_t i;
 
 	uart_init(INC, MOD);
@@ -34,12 +28,12 @@ void main(void) {
 
 	nvm_setsvar(0);
 
-	err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, READ_ADDR, NBYTES);
+	err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, READ_ADDR, READ_NBYTES);
 	puts("nvm_read returned: 0x");
 	put_hex(err);
 	puts("\n\r");
 
-	for(i=0; i<NBYTES/4; i++) {
+	for(i=0; i<READ_NBYTES/4; i++) {
 		puts("0x");
 		put_hex32(buf[i]);
 		puts("\n\r");
diff --git a/tests/nvm-write.c b/tests/nvm-write.c
index 838bc51e0..ba0f8c246 100644
--- a/tests/nvm-write.c
+++ b/tests/nvm-write.c
@@ -2,20 +2,12 @@
 #include <board.h>
 
 #include "tests.h"
-
-/* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */
-#define INC 767
-#define MOD 9999
-
-#define NBYTES 8
-#define WRITE_ADDR 0x1e000
-#define WRITEVAL0 0xdeadbeef 
-#define WRITEVAL1 0xdeadbeef
+#include "config.h"
 
 void main(void) {
 	nvmType_t type=0;
 	nvmErr_t err;
-	uint32_t buf[NBYTES/4];
+	uint32_t buf[WRITE_NBYTES/4];
 	uint32_t i;
 
 	uart_init(INC, MOD);
@@ -43,24 +35,24 @@ void main(void) {
 	put_hex(err);
 	puts("\n\r");
 
-	err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)buf, WRITE_ADDR, NBYTES);
+	err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)buf, WRITE_ADDR, WRITE_NBYTES);
 	puts("nvm_write returned: 0x");
 	put_hex(err);
 	puts("\n\r");
 	puts("writing\n\r");
-	for(i=0; i<NBYTES/4; i++) {
+	for(i=0; i<WRITE_NBYTES/4; i++) {
 		puts("0x");
 		put_hex32(buf[i]);
 		puts("\n\r");
 		buf[i] = 0x00000000; /* clear buf for the read */
 	}
 
-	err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, WRITE_ADDR, NBYTES);
+	err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, WRITE_ADDR, WRITE_NBYTES);
 	puts("nvm_read returned: 0x");
 	put_hex(err);
 	puts("\n\r");
 	puts("reading\n\r");
-	for(i=0; i<NBYTES/4; i++) {
+	for(i=0; i<WRITE_NBYTES/4; i++) {
 		puts("0x");
 		put_hex32(buf[i]);
 		puts("\n\r");
diff --git a/tests/tests.c b/tests/tests.c
index 2be580783..065dfa2d4 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -1,7 +1,7 @@
 #include <mc1322x.h>
 #include "put.h"
 
-void uart_init(uint16_t inc, uint16_t mod) {
+void uart1_init(uint16_t inc, uint16_t mod) {
 	/* Restore UART regs. to default */
 	/* in case there is still bootloader state leftover */
 	
@@ -29,4 +29,5 @@ void print_welcome(char* testname) {
 #elif (BOARD == redbee-r1)
 	puts("redbee-dev");
 #endif
+	puts("\n\r");
 }
diff --git a/tests/tests.h b/tests/tests.h
index d3970d28a..39fe17f3c 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -3,7 +3,7 @@
 
 #include "put.h"
 
-void uart_init(uint16_t inc, uint16_t mod);
+void uart1_init(uint16_t inc, uint16_t mod);
 void print_welcome(char* testname);
 
 #endif