summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNélio Laranjeiro2009-06-09 23:40:41 +0200
committerNélio Laranjeiro2009-06-09 23:40:41 +0200
commitf82cc53fff791feed316ad538e52d2f6f37a6889 (patch)
tree8d3e4796d90f20bac4acd0fa2950db5ce2f48de3
parent5461f15893de0f34f163dec1a73aa59c38f15be9 (diff)
*digital/avr/modules/trace:
* Remove the test_target and test_host to be merged only in the test directory.
-rw-r--r--digital/avr/modules/trace/test/Makefile (renamed from digital/avr/modules/trace/test/test_target/Makefile)7
-rw-r--r--digital/avr/modules/trace/test/avrconfig.h (renamed from digital/avr/modules/trace/test/test_target/avrconfig.h)0
-rw-r--r--digital/avr/modules/trace/test/events.h (renamed from digital/avr/modules/trace/test/test_host/events.h)0
-rw-r--r--digital/avr/modules/trace/test/flood.c (renamed from digital/avr/modules/trace/test/test_target/flood.c)0
-rw-r--r--digital/avr/modules/trace/test/test-trace.c (renamed from digital/avr/modules/trace/test/test_target/test-trace.c)0
-rw-r--r--digital/avr/modules/trace/test/test_host/Makefile14
-rw-r--r--digital/avr/modules/trace/test/test_host/test-trace.c164
-rw-r--r--digital/avr/modules/trace/test/test_target/events.h36
8 files changed, 4 insertions, 217 deletions
diff --git a/digital/avr/modules/trace/test/test_target/Makefile b/digital/avr/modules/trace/test/Makefile
index f0162a8a..c3ea960e 100644
--- a/digital/avr/modules/trace/test/test_target/Makefile
+++ b/digital/avr/modules/trace/test/Makefile
@@ -1,7 +1,8 @@
-BASE = ../../../..
-AVR_PROGS = test-trace flood
+BASE = ../../..
+AVR_PROGS = test_trace flood
+HOST_PROGS = test_trace flood
-test-trace_SOURCES = test-trace.c
+test_trace_SOURCES = test-trace.c
flood_SOURCES = flood.c
MODULES = utils spi flash proto uart trace
diff --git a/digital/avr/modules/trace/test/test_target/avrconfig.h b/digital/avr/modules/trace/test/avrconfig.h
index 277c6386..277c6386 100644
--- a/digital/avr/modules/trace/test/test_target/avrconfig.h
+++ b/digital/avr/modules/trace/test/avrconfig.h
diff --git a/digital/avr/modules/trace/test/test_host/events.h b/digital/avr/modules/trace/test/events.h
index d5a972a1..d5a972a1 100644
--- a/digital/avr/modules/trace/test/test_host/events.h
+++ b/digital/avr/modules/trace/test/events.h
diff --git a/digital/avr/modules/trace/test/test_target/flood.c b/digital/avr/modules/trace/test/flood.c
index b919d0a6..b919d0a6 100644
--- a/digital/avr/modules/trace/test/test_target/flood.c
+++ b/digital/avr/modules/trace/test/flood.c
diff --git a/digital/avr/modules/trace/test/test_target/test-trace.c b/digital/avr/modules/trace/test/test-trace.c
index 7938103b..7938103b 100644
--- a/digital/avr/modules/trace/test/test_target/test-trace.c
+++ b/digital/avr/modules/trace/test/test-trace.c
diff --git a/digital/avr/modules/trace/test/test_host/Makefile b/digital/avr/modules/trace/test/test_host/Makefile
deleted file mode 100644
index 71ec0899..00000000
--- a/digital/avr/modules/trace/test/test_host/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-BASE = ../../../..
-
-HOST_PROGS = test-trace
-
-test-trace_SOURCES = test-trace.c
-
-MODULES = trace flash/stub
-#OPTIMIZE = -O2
-OPTIMIZE =
-
-include $(BASE)/make/Makefile.gen
-
-all:
- touch flash.apb
diff --git a/digital/avr/modules/trace/test/test_host/test-trace.c b/digital/avr/modules/trace/test/test_host/test-trace.c
deleted file mode 100644
index 59a82242..00000000
--- a/digital/avr/modules/trace/test/test_host/test-trace.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* test-erase.c */
-/* avr.flash - AVR Trace. {{{
- *
- * 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 "../../trace.h"
-#include "modules/flash/flash.h"
-
-#include <stdio.h>
-#include <string.h>
-#include "events.h"
-
-void
-flood (void)
-{
- uint8_t cmd;
- uint32_t count;
-
- uint32_t speed;
- uint32_t position;
- uint16_t acc;
-
- uint16_t arg1;
- uint8_t arg2;
- uint32_t arg3;
-
- trace_init ();
- flash_erase (FLASH_ERASE_FULL, 0);
-
- /* Flood the flash memory with traces. */
- for (count = 0; count < 2000; count ++)
- {
- /* Right motor. */
- speed = 10;
- position = 11;
- acc = 12;
- arg1 = 10;
- arg2 = 11;
- arg3 = 12;
-
- cmd = TRACE_ASSERV__RIGHT_MOTOR;
- TRACE (cmd, speed, position, acc);
- cmd = TRACE_ASSERV__LEFT_MOTOR;
- TRACE (cmd, speed, position, acc);
- cmd = TRACE_IA__IA_CMD;
- TRACE (cmd, arg1, arg2, arg3);
-
- if (trace_status () == TRACE_STATUS_OFF)
- return;
- }
-}
-
-uint8_t
-flood_overflow (void)
-{
- uint8_t cmd;
- uint32_t count;
- uint32_t i;
-
- uint32_t speed;
- uint32_t position;
- uint16_t acc;
-
- uint16_t arg1;
- uint8_t arg2;
- uint32_t arg3;
- uint32_t addr;
-
- if (trace_init () == TRACE_STATUS_OFF)
- return TRACE_STATUS_OFF;
- addr = trace_addr_current ();
- printf ("Addr begin : %x\n", addr);
-
- for (i = 0; i < FLASH_ADDRESS_HIGH; i++)
- {
- /* Flood the flash memory with traces. */
- for (count = 0; count < 2000; count ++)
- {
- /* Right motor. */
- speed = 10;
- position = 11;
- acc = 12;
- arg1 = 10;
- arg2 = 11;
- arg3 = 12;
-
- cmd = TRACE_ASSERV__RIGHT_MOTOR;
- TRACE (cmd, speed, position, acc);
- cmd = TRACE_ASSERV__LEFT_MOTOR;
- TRACE (cmd, speed, position, acc);
- cmd = TRACE_IA__IA_CMD;
- TRACE (cmd, arg1, arg2, arg3);
- }
-
- if (trace_status () == TRACE_STATUS_OFF)
- {
- addr = trace_addr_current ();
- printf ("End address : %x\n", addr);
- return TRACE_STATUS_OFF;
- }
- }
-
- addr = trace_addr_current ();
- printf ("End address : %x\n", addr);
- return TRACE_STATUS_ON;
-}
-
-
-void
-dump (void)
-{
- uint8_t status;
- uint32_t addr;
-
- status = flash_init ();
- if (status == TRACE_STATUS_OFF)
- return;
-
- for (addr = 0; addr < FLASH_ADDRESS_HIGH; addr ++)
- {
- printf ("%02x", flash_read (addr));
- }
-}
-
-int
-main (int argc, char **argv)
-{
- uint8_t i;
-
- if (strcmp (argv[1], "trace") == 0)
- {
- for (i = 0; i < 30; i++)
- flood ();
- }
- else if (strcmp (argv[1], "overflow") == 0)
- {
- return flood_overflow ();
- }
- else if (strcmp (argv[1], "dump") == 0)
- dump();
-
- return 0;
-}
-
diff --git a/digital/avr/modules/trace/test/test_target/events.h b/digital/avr/modules/trace/test/test_target/events.h
deleted file mode 100644
index d5a972a1..00000000
--- a/digital/avr/modules/trace/test/test_target/events.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef events_h
-#define events_h
-/* events_h */
-/* {{{
- *
- * Copyright (C) 2008 APBTeam
- *
- * 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.
- *
- * }}} */
-
-enum events_t
-{
- TRACE_ASSERV__RIGHT_MOTOR,
- TRACE_ASSERV__LEFT_MOTOR,
- TRACE_IA__IA_CMD,
- TRACE_NB
-};
-
-#endif /* events_h */