From e2b76c46c6d26d26b1666f94f4d22fb2e7cb0f86 Mon Sep 17 00:00:00 2001 From: Nélio Laranjeiro Date: Mon, 10 Nov 2008 21:11:44 +0100 Subject: avr/modules/trace: unit tests * Moved the tests to the test_host (test sub-directory) * Added a target test. --- digital/avr/modules/trace/test/Makefile | 14 --- digital/avr/modules/trace/test/avrconfig.h | 95 ----------------- digital/avr/modules/trace/test/flash_stub.c | 44 -------- digital/avr/modules/trace/test/test-trace.c | 62 ----------- digital/avr/modules/trace/test/test_host/Makefile | 10 ++ .../avr/modules/trace/test/test_host/flash_stub.c | 56 ++++++++++ .../avr/modules/trace/test/test_host/test-trace.c | 62 +++++++++++ .../avr/modules/trace/test/test_target/Makefile | 14 +++ .../avr/modules/trace/test/test_target/avrconfig.h | 95 +++++++++++++++++ .../modules/trace/test/test_target/test-trace.c | 117 +++++++++++++++++++++ 10 files changed, 354 insertions(+), 215 deletions(-) delete mode 100644 digital/avr/modules/trace/test/Makefile delete mode 100644 digital/avr/modules/trace/test/avrconfig.h delete mode 100644 digital/avr/modules/trace/test/flash_stub.c delete mode 100644 digital/avr/modules/trace/test/test-trace.c create mode 100644 digital/avr/modules/trace/test/test_host/Makefile create mode 100644 digital/avr/modules/trace/test/test_host/flash_stub.c create mode 100644 digital/avr/modules/trace/test/test_host/test-trace.c create mode 100644 digital/avr/modules/trace/test/test_target/Makefile create mode 100644 digital/avr/modules/trace/test/test_target/avrconfig.h create mode 100644 digital/avr/modules/trace/test/test_target/test-trace.c (limited to 'digital/avr/modules') 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/avrconfig.h b/digital/avr/modules/trace/test/avrconfig.h deleted file mode 100644 index c4d9f159..00000000 --- a/digital/avr/modules/trace/test/avrconfig.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef avrconfig_h -#define avrconfig_h -/* avrconfig.h */ -/* avr.spi - SPI AVR module. {{{ - * - * 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. - * - * }}} */ - -/* global */ -/** AVR Frequency : 1000000, 1843200, 2000000, 3686400, 4000000, 7372800, - * 8000000, 11059200, 14745600, 16000000, 18432000, 20000000. */ -#define AC_FREQ 14745600 - -/* uart - UART module. */ -/** Select hardware uart for primary uart: 0, 1 or -1 to disable. */ -#define AC_UART0_PORT 1 -/** Baudrate: 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 76800, - * 115200, 230400, 250000, 500000, 1000000. */ -#define AC_UART0_BAUDRATE 38400 -/** Send mode: - * - POLLING: no interrupts. - * - RING: interrupts, ring buffer. */ -#define AC_UART0_SEND_MODE POLLING -/** Recv mode, same as send mode. */ -#define AC_UART0_RECV_MODE POLLING -/** Character size: 5, 6, 7, 8, 9 (only 8 implemented). */ -#define AC_UART0_CHAR_SIZE 8 -/** Parity : ODD, EVEN, NONE. */ -#define AC_UART0_PARITY EVEN -/** Stop bits : 1, 2. */ -#define AC_UART0_STOP_BITS 1 -/** Send buffer size, should be power of 2 for RING mode. */ -#define AC_UART0_SEND_BUFFER_SIZE 32 -/** Recv buffer size, should be power of 2 for RING mode. */ -#define AC_UART0_RECV_BUFFER_SIZE 32 -/** If the send buffer is full when putc: - * - DROP: drop the new byte. - * - WAIT: wait until there is room in the send buffer. */ -#define AC_UART0_SEND_BUFFER_FULL WAIT -/** In HOST compilation: - * - STDIO: use stdin/out. - * - PTS: use pseudo terminal. */ -#define AC_UART0_HOST_DRIVER STDIO -/** Same thing for secondary port. */ -#define AC_UART1_PORT -1 -#define AC_UART1_BAUDRATE 115200 -#define AC_UART1_SEND_MODE RING -#define AC_UART1_RECV_MODE RING -#define AC_UART1_CHAR_SIZE 8 -#define AC_UART1_PARITY EVEN -#define AC_UART1_STOP_BITS 1 -#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. */ -#define AC_PROTO_ARGS_MAX_SIZE 8 -/** Callback function name. */ -#define AC_PROTO_CALLBACK proto_callback -/** Putchar function name. */ -#define AC_PROTO_PUTC uart0_putc -/** Support for quote parameter. */ -#define AC_PROTO_QUOTE 1 - -/* flash - Flash SPI AVR module. */ -/** Flash PORT used. */ -#define AC_FLASH_PORT PORTD -/** Flash DDR used. */ -#define AC_FLASH_DDR DDRD -/** Flash SS pin. */ -#define AC_FLASH_BIT_SS 5 - - -#endif /* avrconfig_h */ diff --git a/digital/avr/modules/trace/test/flash_stub.c b/digital/avr/modules/trace/test/flash_stub.c deleted file mode 100644 index cd250884..00000000 --- a/digital/avr/modules/trace/test/flash_stub.c +++ /dev/null @@ -1,44 +0,0 @@ -/* flash_stub.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 "modules/flash/flash.h" -#include - -uint8_t -flash_init (void) -{ - return 0x1; -} - -uint32_t -flash_sector_next(uint32_t addr) -{ - return 0; -} - -void -flash_write (uint32_t addr, uint8_t arg) -{ - printf ("%s -- %x\n", __FUNCTION__, arg); -} diff --git a/digital/avr/modules/trace/test/test-trace.c b/digital/avr/modules/trace/test/test-trace.c deleted file mode 100644 index aba9caf5..00000000 --- a/digital/avr/modules/trace/test/test-trace.c +++ /dev/null @@ -1,62 +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 - -int -main (void) -{ - uint8_t val1 = 0xEF; - uint16_t val2 = 0x1234; - uint32_t val3 = 0x456789AB; - - trace_init (); - - printf ("First trace\n"); - TRACE (val1); - - printf ("Second trace\n"); - TRACE (val2); - - printf ("Third trace\n"); - TRACE (val3); - - printf ("Fourth trace\n"); - TRACE (val1, val2); - - printf ("Fifth trace\n"); - TRACE (val1, val3); - - printf ("sixth one\n"); - TRACE (val1, val2, val3); - - printf ("last one\n"); - TRACE (val3, val1, val2); - - return 0; -} - 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/test_host/flash_stub.c b/digital/avr/modules/trace/test/test_host/flash_stub.c new file mode 100644 index 00000000..849e3b34 --- /dev/null +++ b/digital/avr/modules/trace/test/test_host/flash_stub.c @@ -0,0 +1,56 @@ +/* flash_stub.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 "modules/flash/flash.h" +#include + +uint8_t +flash_init (void) +{ + return 0x1; +} + +uint32_t +flash_sector_next(uint32_t addr) +{ + return 0; +} + +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_host/test-trace.c b/digital/avr/modules/trace/test/test_host/test-trace.c new file mode 100644 index 00000000..e56be24f --- /dev/null +++ b/digital/avr/modules/trace/test/test_host/test-trace.c @@ -0,0 +1,62 @@ +/* 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 + +int +main (void) +{ + uint8_t val1 = 0xEF; + uint16_t val2 = 0x1234; + uint32_t val3 = 0x456789AB; + + trace_init (); + + printf ("First trace\n"); + TRACE (val1); + + printf ("Second trace\n"); + TRACE (val2); + + printf ("Third trace\n"); + TRACE (val3); + + printf ("Fourth trace\n"); + TRACE (val1, val2); + + printf ("Fifth trace\n"); + TRACE (val1, val3); + + printf ("sixth one\n"); + TRACE (val1, val2, val3); + + printf ("last one\n"); + TRACE (val3, val1, val2); + + return 0; +} + 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/test_target/avrconfig.h b/digital/avr/modules/trace/test/test_target/avrconfig.h new file mode 100644 index 00000000..c4d9f159 --- /dev/null +++ b/digital/avr/modules/trace/test/test_target/avrconfig.h @@ -0,0 +1,95 @@ +#ifndef avrconfig_h +#define avrconfig_h +/* avrconfig.h */ +/* avr.spi - SPI AVR module. {{{ + * + * 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. + * + * }}} */ + +/* global */ +/** AVR Frequency : 1000000, 1843200, 2000000, 3686400, 4000000, 7372800, + * 8000000, 11059200, 14745600, 16000000, 18432000, 20000000. */ +#define AC_FREQ 14745600 + +/* uart - UART module. */ +/** Select hardware uart for primary uart: 0, 1 or -1 to disable. */ +#define AC_UART0_PORT 1 +/** Baudrate: 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 76800, + * 115200, 230400, 250000, 500000, 1000000. */ +#define AC_UART0_BAUDRATE 38400 +/** Send mode: + * - POLLING: no interrupts. + * - RING: interrupts, ring buffer. */ +#define AC_UART0_SEND_MODE POLLING +/** Recv mode, same as send mode. */ +#define AC_UART0_RECV_MODE POLLING +/** Character size: 5, 6, 7, 8, 9 (only 8 implemented). */ +#define AC_UART0_CHAR_SIZE 8 +/** Parity : ODD, EVEN, NONE. */ +#define AC_UART0_PARITY EVEN +/** Stop bits : 1, 2. */ +#define AC_UART0_STOP_BITS 1 +/** Send buffer size, should be power of 2 for RING mode. */ +#define AC_UART0_SEND_BUFFER_SIZE 32 +/** Recv buffer size, should be power of 2 for RING mode. */ +#define AC_UART0_RECV_BUFFER_SIZE 32 +/** If the send buffer is full when putc: + * - DROP: drop the new byte. + * - WAIT: wait until there is room in the send buffer. */ +#define AC_UART0_SEND_BUFFER_FULL WAIT +/** In HOST compilation: + * - STDIO: use stdin/out. + * - PTS: use pseudo terminal. */ +#define AC_UART0_HOST_DRIVER STDIO +/** Same thing for secondary port. */ +#define AC_UART1_PORT -1 +#define AC_UART1_BAUDRATE 115200 +#define AC_UART1_SEND_MODE RING +#define AC_UART1_RECV_MODE RING +#define AC_UART1_CHAR_SIZE 8 +#define AC_UART1_PARITY EVEN +#define AC_UART1_STOP_BITS 1 +#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. */ +#define AC_PROTO_ARGS_MAX_SIZE 8 +/** Callback function name. */ +#define AC_PROTO_CALLBACK proto_callback +/** Putchar function name. */ +#define AC_PROTO_PUTC uart0_putc +/** Support for quote parameter. */ +#define AC_PROTO_QUOTE 1 + +/* flash - Flash SPI AVR module. */ +/** Flash PORT used. */ +#define AC_FLASH_PORT PORTD +/** Flash DDR used. */ +#define AC_FLASH_DDR DDRD +/** Flash SS pin. */ +#define AC_FLASH_BIT_SS 5 + + +#endif /* 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 ()); +} + -- cgit v1.2.3