summaryrefslogtreecommitdiff
path: root/n/avr/modules
diff options
context:
space:
mode:
authorschodet2006-01-18 13:21:58 +0000
committerschodet2006-01-18 13:21:58 +0000
commitcc043098a8d15c4c6adc8f7fd7fb986057740938 (patch)
tree2da54a1af973f890a622577b89fe09f3c12a3621 /n/avr/modules
parent5262fffd973ce7475c1e62ff5b30f98cc50aeea2 (diff)
Clarification des makefiles.
Modifications cosmétiques. Mise à jour d'un début de doc. meilleur support des cibles simu.
Diffstat (limited to 'n/avr/modules')
-rw-r--r--n/avr/modules/host/test/Makefile5
-rw-r--r--n/avr/modules/math/fixed/test/Makefile4
-rw-r--r--n/avr/modules/math/random/test/Makefile5
-rw-r--r--n/avr/modules/math/random/test/avrconfig.h1
-rw-r--r--n/avr/modules/proto/test/Makefile5
-rw-r--r--n/avr/modules/twi/master/test/Makefile5
-rw-r--r--n/avr/modules/twi/master/test/avrconfig.h1
-rw-r--r--n/avr/modules/twi/slave/test/Makefile5
-rw-r--r--n/avr/modules/twi/slave/test/avrconfig.h1
-rw-r--r--n/avr/modules/uart/test/Makefile8
-rw-r--r--n/avr/modules/utils/test/Makefile5
-rw-r--r--n/avr/modules/utils/test/test_utils.c3
12 files changed, 7 insertions, 41 deletions
diff --git a/n/avr/modules/host/test/Makefile b/n/avr/modules/host/test/Makefile
index 6c3ec51..5f8343c 100644
--- a/n/avr/modules/host/test/Makefile
+++ b/n/avr/modules/host/test/Makefile
@@ -1,8 +1,6 @@
BASE = ../../..
HOST_PROGS = test_host
test_host_SOURCES = test_host.c
-DOC =
-EXTRACTDOC =
MODULES = host
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
@@ -11,7 +9,4 @@ AVR_MCU = none
# -Os : size
OPTIMIZE = -O2
-DEFS =
-LIBS =
-
include $(BASE)/make/Makefile.gen
diff --git a/n/avr/modules/math/fixed/test/Makefile b/n/avr/modules/math/fixed/test/Makefile
index f35e939..04aa4cf 100644
--- a/n/avr/modules/math/fixed/test/Makefile
+++ b/n/avr/modules/math/fixed/test/Makefile
@@ -1,8 +1,7 @@
BASE = ../../../..
PROGS = test_fixed
+SIMU_PROGS = test_fixed
test_fixed_SOURCES = test_fixed.c
-DOC =
-EXTRACTDOC =
MODULES = uart proto utils math/fixed math/random
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
@@ -11,7 +10,6 @@ AVR_MCU = atmega128
# -Os : size
OPTIMIZE = -O2
-DEFS =
HOST_LIBS = -lm
include $(BASE)/make/Makefile.gen
diff --git a/n/avr/modules/math/random/test/Makefile b/n/avr/modules/math/random/test/Makefile
index 354961c..0bc3c0e 100644
--- a/n/avr/modules/math/random/test/Makefile
+++ b/n/avr/modules/math/random/test/Makefile
@@ -1,8 +1,6 @@
BASE = ../../../..
PROGS = test_random
test_random_SOURCES = test_random.c
-DOC =
-EXTRACTDOC =
MODULES = uart proto math/random
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
@@ -11,7 +9,4 @@ AVR_MCU = atmega8
# -Os : size
OPTIMIZE = -Os
-DEFS =
-LIBS =
-
include $(BASE)/make/Makefile.gen
diff --git a/n/avr/modules/math/random/test/avrconfig.h b/n/avr/modules/math/random/test/avrconfig.h
index fa460aa..5f25426 100644
--- a/n/avr/modules/math/random/test/avrconfig.h
+++ b/n/avr/modules/math/random/test/avrconfig.h
@@ -71,6 +71,7 @@
#define AC_UART1_SEND_BUFFER_SIZE 32
#define AC_UART1_RECV_BUFFER_SIZE 32
#define AC_UART1_SEND_BUFFER_FULL WAIT
+#define AC_UART1_HOST_DRIVER STDIO
/* proto - Protocol module. */
/** Maximum argument size. */
diff --git a/n/avr/modules/proto/test/Makefile b/n/avr/modules/proto/test/Makefile
index a1506be..801870a 100644
--- a/n/avr/modules/proto/test/Makefile
+++ b/n/avr/modules/proto/test/Makefile
@@ -1,8 +1,6 @@
BASE = ../../..
PROGS = test_proto
test_proto_SOURCES = test_proto.c
-DOC =
-EXTRACTDOC =
MODULES = proto uart utils
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
@@ -11,7 +9,4 @@ AVR_MCU = atmega8
# -Os : size
OPTIMIZE = -O2
-DEFS =
-LIBS =
-
include $(BASE)/make/Makefile.gen
diff --git a/n/avr/modules/twi/master/test/Makefile b/n/avr/modules/twi/master/test/Makefile
index 80e6caa..e018323 100644
--- a/n/avr/modules/twi/master/test/Makefile
+++ b/n/avr/modules/twi/master/test/Makefile
@@ -1,8 +1,6 @@
BASE = ../../../..
AVR_PROGS = test_twi_master
test_twi_master_SOURCES = test_twi_master.c
-DOC =
-EXTRACTDOC =
MODULES = uart proto twi/master
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
@@ -11,9 +9,6 @@ AVR_MCU = atmega8
# -Os : size
OPTIMIZE = -O2
-DEFS =
-LIBS =
-
# Test compilations.
TEST_MCU = atmega8535 atmega128
TEST_CONFIGFILES = avrconfig.h
diff --git a/n/avr/modules/twi/master/test/avrconfig.h b/n/avr/modules/twi/master/test/avrconfig.h
index 2115fab..dc2c28b 100644
--- a/n/avr/modules/twi/master/test/avrconfig.h
+++ b/n/avr/modules/twi/master/test/avrconfig.h
@@ -71,6 +71,7 @@
#define AC_UART1_SEND_BUFFER_SIZE 32
#define AC_UART1_RECV_BUFFER_SIZE 32
#define AC_UART1_SEND_BUFFER_FULL WAIT
+#define AC_UART1_HOST_DRIVER PTS
/* proto - Protocol module. */
/** Maximum argument size. */
diff --git a/n/avr/modules/twi/slave/test/Makefile b/n/avr/modules/twi/slave/test/Makefile
index 219ae62..f28b954 100644
--- a/n/avr/modules/twi/slave/test/Makefile
+++ b/n/avr/modules/twi/slave/test/Makefile
@@ -1,8 +1,6 @@
BASE = ../../../..
AVR_PROGS = test_twi_slave
test_twi_slave_SOURCES = test_twi_slave.c
-DOC =
-EXTRACTDOC =
MODULES = uart twi/slave
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
@@ -11,9 +9,6 @@ AVR_MCU = atmega8
# -Os : size
OPTIMIZE = -O2
-DEFS =
-LIBS =
-
# Test compilations.
TEST_MCU = atmega8535 atmega128
TEST_CONFIGFILES = avrconfig.h
diff --git a/n/avr/modules/twi/slave/test/avrconfig.h b/n/avr/modules/twi/slave/test/avrconfig.h
index b18877a..bc1e909 100644
--- a/n/avr/modules/twi/slave/test/avrconfig.h
+++ b/n/avr/modules/twi/slave/test/avrconfig.h
@@ -71,6 +71,7 @@
#define AC_UART1_SEND_BUFFER_SIZE 32
#define AC_UART1_RECV_BUFFER_SIZE 32
#define AC_UART1_SEND_BUFFER_FULL WAIT
+#define AC_UART1_HOST_DRIVER PTS
/* twi.slave - TWI slave module. */
/** Reception buffer size. */
diff --git a/n/avr/modules/uart/test/Makefile b/n/avr/modules/uart/test/Makefile
index 3f162fc..4f394f2 100644
--- a/n/avr/modules/uart/test/Makefile
+++ b/n/avr/modules/uart/test/Makefile
@@ -1,8 +1,7 @@
BASE = ../../..
PROGS = test_uart
+SIMU_PROGS = test_uart
test_uart_SOURCES = test_uart.c
-DOC =
-EXTRACTDOC =
MODULES = uart utils
CONFIGFILE = avrconfig_ring.h
# atmega8, atmega8535, atmega128...
@@ -11,12 +10,9 @@ AVR_MCU = atmega8
# -Os : size
OPTIMIZE = -O2
-DEFS =
-LIBS =
-
# Test compilations.
TEST_MCU = atmega8 atmega8535 atmega128
TEST_CONFIGFILES = avrconfig_ring.h avrconfig_polling.h avrconfig_twoports.h
-avrconfig_twoports_MCU = atmega128
+avrconfig_twoports_TEST_MCU = atmega128
include $(BASE)/make/Makefile.gen
diff --git a/n/avr/modules/utils/test/Makefile b/n/avr/modules/utils/test/Makefile
index 535ac0e..783d792 100644
--- a/n/avr/modules/utils/test/Makefile
+++ b/n/avr/modules/utils/test/Makefile
@@ -4,8 +4,6 @@ AVR_PROGS = test_byte_methods
test_utils_SOURCES = test_utils.c
test_byte_SOURCES = test_byte.c
test_byte_methods_SOURCES = test_byte_methods.c
-DOC =
-EXTRACTDOC =
MODULES = utils
CONFIGFILE = avrconfig.h
# atmega8, atmega8535, atmega128...
@@ -14,7 +12,4 @@ AVR_MCU = atmega128
# -Os : size
OPTIMIZE = -O2
-DEFS =
-LIBS =
-
include $(BASE)/make/Makefile.gen
diff --git a/n/avr/modules/utils/test/test_utils.c b/n/avr/modules/utils/test/test_utils.c
index 5d5408b..4c85c45 100644
--- a/n/avr/modules/utils/test/test_utils.c
+++ b/n/avr/modules/utils/test/test_utils.c
@@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
+#include "common.h"
#include "modules/utils/utils.h"
#include "io.h"
@@ -34,8 +35,6 @@ main (void)
0, 0, 0, 0, 0, 1, 1, 1);
TCCR0 = regv (FOC0, WGM00, COM01, COM0, WGM01, CS02, CS01, CS00,
0, 0, 0, 0, 0, 1, 1, 1);
-#else
- printf ("TODO: reset message\n");
#endif
/* Test delays, use sei to separate loops in assembly listing. */
sei (); utils_delay_ns (1);