summaryrefslogtreecommitdiff
path: root/digital/avr
diff options
context:
space:
mode:
authorNélio Laranjeiro2008-11-10 21:11:44 +0100
committerNélio Laranjeiro2008-11-10 21:11:44 +0100
commite2b76c46c6d26d26b1666f94f4d22fb2e7cb0f86 (patch)
tree73a8b11ab9ce2b5f3f08077ddc96d1eab09c044e /digital/avr
parente15619e199eed4a40aa401f1f6db8c1d81d87c65 (diff)
avr/modules/trace: unit tests
* Moved the tests to the test_host (test sub-directory) * Added a target test.
Diffstat (limited to 'digital/avr')
-rw-r--r--digital/avr/modules/trace/test/Makefile14
-rw-r--r--digital/avr/modules/trace/test/test_host/Makefile10
-rw-r--r--digital/avr/modules/trace/test/test_host/flash_stub.c (renamed from digital/avr/modules/trace/test/flash_stub.c)12
-rw-r--r--digital/avr/modules/trace/test/test_host/test-trace.c (renamed from digital/avr/modules/trace/test/test-trace.c)2
-rw-r--r--digital/avr/modules/trace/test/test_target/Makefile14
-rw-r--r--digital/avr/modules/trace/test/test_target/avrconfig.h (renamed from digital/avr/modules/trace/test/avrconfig.h)0
-rw-r--r--digital/avr/modules/trace/test/test_target/test-trace.c117
7 files changed, 154 insertions, 15 deletions
diff --git a/digital/avr/modules/trace/test/Makefile b/digital/avr/modules/trace/test/Makefile
deleted file mode 100644
index 93cffc5a..00000000
--- a/digital/avr/modules/trace/test/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-BASE = ../../..
-HOST_PROGS = test-trace
-
-test-trace_SOURCES = test-trace.c flash_stub.c
-
-MODULES = trace
-#CONFIGFILE = avrconfig.h
-# atmega8, atmega8535, atmega128...
-#AVR_MCU = atmega128
-# -O2 : speed
-# -Os : size
-OPTIMIZE = -O2
-
-include $(BASE)/make/Makefile.gen
diff --git a/digital/avr/modules/trace/test/test_host/Makefile b/digital/avr/modules/trace/test/test_host/Makefile
new file mode 100644
index 00000000..cc22a863
--- /dev/null
+++ b/digital/avr/modules/trace/test/test_host/Makefile
@@ -0,0 +1,10 @@
+BASE = ../../../..
+
+HOST_PROGS = test-trace
+
+test-trace_SOURCES = test-trace.c flash_stub.c
+
+MODULES = trace
+OPTIMIZE = -O2
+
+include $(BASE)/make/Makefile.gen
diff --git a/digital/avr/modules/trace/test/flash_stub.c b/digital/avr/modules/trace/test/test_host/flash_stub.c
index cd250884..849e3b34 100644
--- a/digital/avr/modules/trace/test/flash_stub.c
+++ b/digital/avr/modules/trace/test/test_host/flash_stub.c
@@ -41,4 +41,16 @@ void
flash_write (uint32_t addr, uint8_t arg)
{
printf ("%s -- %x\n", __FUNCTION__, arg);
+ printf ("addr : %x\n", addr);
+}
+
+uint8_t
+flash_read (uint32_t addr)
+{
+ return 0;
+}
+
+void
+flash_erase (uint8_t cmd, uint32_t addr)
+{
}
diff --git a/digital/avr/modules/trace/test/test-trace.c b/digital/avr/modules/trace/test/test_host/test-trace.c
index aba9caf5..e56be24f 100644
--- a/digital/avr/modules/trace/test/test-trace.c
+++ b/digital/avr/modules/trace/test/test_host/test-trace.c
@@ -23,7 +23,7 @@
*
* }}} */
#include "common.h"
-#include "../trace.h"
+#include "../../trace.h"
#include <stdio.h>
diff --git a/digital/avr/modules/trace/test/test_target/Makefile b/digital/avr/modules/trace/test/test_target/Makefile
new file mode 100644
index 00000000..010ba999
--- /dev/null
+++ b/digital/avr/modules/trace/test/test_target/Makefile
@@ -0,0 +1,14 @@
+BASE = ../../../..
+AVR_PROGS = test-trace
+
+test-trace_SOURCES = test-trace.c
+
+MODULES = utils spi flash proto uart trace
+CONFIGFILE = avrconfig.h
+# atmega8, atmega8535, atmega128...
+AVR_MCU = atmega128
+# -O2 : speed
+# -Os : size
+OPTIMIZE = -O2
+
+include $(BASE)/make/Makefile.gen
diff --git a/digital/avr/modules/trace/test/avrconfig.h b/digital/avr/modules/trace/test/test_target/avrconfig.h
index c4d9f159..c4d9f159 100644
--- a/digital/avr/modules/trace/test/avrconfig.h
+++ b/digital/avr/modules/trace/test/test_target/avrconfig.h
diff --git a/digital/avr/modules/trace/test/test_target/test-trace.c b/digital/avr/modules/trace/test/test_target/test-trace.c
new file mode 100644
index 00000000..6a86a82a
--- /dev/null
+++ b/digital/avr/modules/trace/test/test_target/test-trace.c
@@ -0,0 +1,117 @@
+/* test-erase.c */
+/* avr.trace - AVR trace use. {{{
+ *
+ * Copyright (C) 2008 Nélio Laranjeiro
+ *
+ * APBTeam:
+ * Web: http://apbteam.org/
+ * Email: team AT apbteam DOT org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * }}} */
+#include "common.h"
+#include "io.h"
+#include "modules/flash/flash.h"
+#include "modules/trace/trace.h"
+#include "modules/proto/proto.h"
+#include "modules/utils/utils.h"
+#include "modules/utils/byte.h"
+#include "modules/uart/uart.h"
+
+void
+proto_callback (uint8_t cmd, uint8_t size, uint8_t *args)
+{
+ /* May be unused. */
+ uint32_t addr = v8_to_v32 (0, args[0], args[1], args[2]);
+ uint8_t buf[16];
+#define c(cmd, size) (cmd << 8 | size)
+ switch (c (cmd, size))
+ {
+ case c ('z', 0):
+ /* Reset */
+ utils_reset ();
+ break;
+ case c ('e', 0):
+ /* Erase full */
+ flash_erase (FLASH_ERASE_FULL, 0);
+ break;
+ case c ('e', 3):
+ /* Erase 4k:
+ * - 3b: address. */
+ flash_erase (FLASH_ERASE_4K, addr);
+ break;
+ case c ('i', 0):
+ /* Initialise the trace module. */
+ trace_init ();
+ proto_send1b ('i', trace_status ());
+ addr = trace_addr_current ();
+ proto_send3b ('a', addr >> 16, addr >> 8, addr);
+ break;
+ case c ('u', 0):
+ /* Uninitialise the trace module. */
+ trace_uninit ();
+ proto_send1b ('u', trace_status ());
+ addr = trace_addr_current ();
+ proto_send3b ('a', addr >> 16, addr >> 8, addr);
+ break;
+ case c ('t', 2):
+ /* Trace data:
+ * - 1b: id.
+ * - 1b: first data. */
+ TRACE (args[0], args[1]);
+ break;
+ case c ('r', 3):
+ /* Read one byte:
+ * - 3b: address. */
+ proto_send1b ('r', flash_read (addr));
+ break;
+ case c ('r', 4):
+ /* Read several bytes:
+ * - 3b: address.
+ * - 1b: number of bytes. */
+ if (args[3] > sizeof (buf))
+ {
+ proto_send0 ('?');
+ return;
+ }
+ else
+ {
+ flash_read_array (addr, buf, args[3]);
+ proto_send ('r', args[3], buf);
+ }
+ break;
+ default:
+ /* Error */
+ proto_send0 ('?');
+ return;
+ }
+ /* Acknowledge what has been done */
+ proto_send (cmd, size, args);
+}
+
+int
+main (void)
+{
+ uart0_init ();
+ proto_send0 ('z');
+ proto_send0 ('c');
+
+ proto_send1b ('o', sizeof (uint8_t));
+
+ while (1)
+ proto_accept (uart0_getc ());
+}
+