From 34642177374d29f0cb4e180dc43a4ba297f2a53b Mon Sep 17 00:00:00 2001 From: demonchy Date: Mon, 24 Apr 2006 18:52:02 +0000 Subject: Ajout de la nouvelle version du module (fichier source commun pour le master et le slave) --- n/avr/modules/twi/Makefile | 5 + n/avr/modules/twi/Makefile.module | 1 + n/avr/modules/twi/README | 23 ++ n/avr/modules/twi/avrconfig.h | 31 ++ n/avr/modules/twi/master/Makefile.module | 1 - n/avr/modules/twi/master/README | 27 -- n/avr/modules/twi/master/test/Makefile | 16 -- n/avr/modules/twi/master/test/avrconfig.h | 86 ------ n/avr/modules/twi/master/test/test_twi_master.c | 89 ------ n/avr/modules/twi/master/twi_master.c | 214 -------------- n/avr/modules/twi/master/twi_master.h | 33 --- n/avr/modules/twi/slave/Makefile.module | 1 - n/avr/modules/twi/slave/README | 27 -- n/avr/modules/twi/slave/avrconfig.h | 34 --- n/avr/modules/twi/slave/test/Makefile | 16 -- n/avr/modules/twi/slave/test/avrconfig.h | 82 ------ n/avr/modules/twi/slave/test/test_twi_slave.c | 52 ---- n/avr/modules/twi/slave/twi_slave.c | 151 ---------- n/avr/modules/twi/slave/twi_slave.h | 37 --- n/avr/modules/twi/test/Makefile.master | 25 ++ n/avr/modules/twi/test/Makefile.slave | 24 ++ n/avr/modules/twi/test/avrconfig_master.h | 92 ++++++ n/avr/modules/twi/test/avrconfig_slave.h | 92 ++++++ n/avr/modules/twi/test/test_twi_master.c | 94 ++++++ n/avr/modules/twi/test/test_twi_sl.c | 51 ++++ n/avr/modules/twi/twi.avr.c | 363 ++++++++++++++++++++++++ n/avr/modules/twi/twi.c | 33 +++ n/avr/modules/twi/twi.h | 55 ++++ 28 files changed, 889 insertions(+), 866 deletions(-) create mode 100644 n/avr/modules/twi/Makefile create mode 100644 n/avr/modules/twi/Makefile.module create mode 100644 n/avr/modules/twi/README create mode 100644 n/avr/modules/twi/avrconfig.h delete mode 100644 n/avr/modules/twi/master/Makefile.module delete mode 100644 n/avr/modules/twi/master/README delete mode 100644 n/avr/modules/twi/master/test/Makefile delete mode 100644 n/avr/modules/twi/master/test/avrconfig.h delete mode 100644 n/avr/modules/twi/master/test/test_twi_master.c delete mode 100644 n/avr/modules/twi/master/twi_master.c delete mode 100644 n/avr/modules/twi/master/twi_master.h delete mode 100644 n/avr/modules/twi/slave/Makefile.module delete mode 100644 n/avr/modules/twi/slave/README delete mode 100644 n/avr/modules/twi/slave/avrconfig.h delete mode 100644 n/avr/modules/twi/slave/test/Makefile delete mode 100644 n/avr/modules/twi/slave/test/avrconfig.h delete mode 100644 n/avr/modules/twi/slave/test/test_twi_slave.c delete mode 100644 n/avr/modules/twi/slave/twi_slave.c delete mode 100644 n/avr/modules/twi/slave/twi_slave.h create mode 100644 n/avr/modules/twi/test/Makefile.master create mode 100644 n/avr/modules/twi/test/Makefile.slave create mode 100644 n/avr/modules/twi/test/avrconfig_master.h create mode 100644 n/avr/modules/twi/test/avrconfig_slave.h create mode 100644 n/avr/modules/twi/test/test_twi_master.c create mode 100644 n/avr/modules/twi/test/test_twi_sl.c create mode 100644 n/avr/modules/twi/twi.avr.c create mode 100644 n/avr/modules/twi/twi.c create mode 100644 n/avr/modules/twi/twi.h (limited to 'n/avr/modules/twi') diff --git a/n/avr/modules/twi/Makefile b/n/avr/modules/twi/Makefile new file mode 100644 index 0000000..731c2ce --- /dev/null +++ b/n/avr/modules/twi/Makefile @@ -0,0 +1,5 @@ +BASE = ../../.. +DOC = twi.html +EXTRACTDOC = twi.h avrconfig.h + +include $(BASE)/make/Makefile.gen diff --git a/n/avr/modules/twi/Makefile.module b/n/avr/modules/twi/Makefile.module new file mode 100644 index 0000000..422cc96 --- /dev/null +++ b/n/avr/modules/twi/Makefile.module @@ -0,0 +1 @@ +twi_SOURCES = twi.c diff --git a/n/avr/modules/twi/README b/n/avr/modules/twi/README new file mode 100644 index 0000000..8fd9677 --- /dev/null +++ b/n/avr/modules/twi/README @@ -0,0 +1,23 @@ +avr.twi - TWI AVR module. + +Twi module for AVR. + +Copyright (C) 2005 Demonchy Clément + +Robot APB Team/Efrei 2006. + Web: http://assos.efrei.fr/robot/ + Email: robot AT efrei DOT fr + +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. diff --git a/n/avr/modules/twi/avrconfig.h b/n/avr/modules/twi/avrconfig.h new file mode 100644 index 0000000..638a773 --- /dev/null +++ b/n/avr/modules/twi/avrconfig.h @@ -0,0 +1,31 @@ +#ifndef avrconfig_h +#define avrconfig_h +/* avrconfig.h */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2005 Demonchy Clément + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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. + * + * }}} */ + +#define TWI_SL_RCPT_SIZE 1 +#define TWI_SL_SEND_SIZE 1 + +#endif /* avrconfig_h */ diff --git a/n/avr/modules/twi/master/Makefile.module b/n/avr/modules/twi/master/Makefile.module deleted file mode 100644 index 30c39d8..0000000 --- a/n/avr/modules/twi/master/Makefile.module +++ /dev/null @@ -1 +0,0 @@ -twi_master_SOURCES = twi_master.c diff --git a/n/avr/modules/twi/master/README b/n/avr/modules/twi/master/README deleted file mode 100644 index 0ff606f..0000000 --- a/n/avr/modules/twi/master/README +++ /dev/null @@ -1,27 +0,0 @@ -avr.twi.master - TWI master module. - -TWI master only module for AVR. See modules README for more details about AVR -modules. - -TWI is Atmel name for I2C. - - -Copyright (C) 2005 Clément Demonchy - -Robot APB Team/Efrei 2006. - Web: http://assos.efrei.fr/robot/ - Email: robot AT efrei DOT fr - -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. diff --git a/n/avr/modules/twi/master/test/Makefile b/n/avr/modules/twi/master/test/Makefile deleted file mode 100644 index e018323..0000000 --- a/n/avr/modules/twi/master/test/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -BASE = ../../../.. -AVR_PROGS = test_twi_master -test_twi_master_SOURCES = test_twi_master.c -MODULES = uart proto twi/master -CONFIGFILE = avrconfig.h -# atmega8, atmega8535, atmega128... -AVR_MCU = atmega8 -# -O2 : speed -# -Os : size -OPTIMIZE = -O2 - -# Test compilations. -TEST_MCU = atmega8535 atmega128 -TEST_CONFIGFILES = avrconfig.h - -include $(BASE)/make/Makefile.gen diff --git a/n/avr/modules/twi/master/test/avrconfig.h b/n/avr/modules/twi/master/test/avrconfig.h deleted file mode 100644 index dc2c28b..0000000 --- a/n/avr/modules/twi/master/test/avrconfig.h +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef avrconfig_h -#define avrconfig_h -/* avrconfig.h */ -/* avr.twi.master - TWI master module. {{{ - * - * Copyright (C) 2005 Nicolas Schodet - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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 0 -/** Baudrate: 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 76800, - * 115200, 230400, 250000, 500000, 1000000. */ -#define AC_UART0_BAUDRATE 115200 -/** 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 PTS -/** 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 - -#endif /* avrconfig_h */ diff --git a/n/avr/modules/twi/master/test/test_twi_master.c b/n/avr/modules/twi/master/test/test_twi_master.c deleted file mode 100644 index 25793d7..0000000 --- a/n/avr/modules/twi/master/test/test_twi_master.c +++ /dev/null @@ -1,89 +0,0 @@ -/* test_twi_master.c */ -/* avr.twi.master - TWI master module. {{{ - * - * Copyright (C) 2005 Clément Demonchy - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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 "modules/uart/uart.h" -#include "modules/proto/proto.h" -#include "modules/twi/master/twi_master.h" -#include "io.h" - -void proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) -{ - uint8_t data[1] = {0x00}; - int8_t c; - sei (); - switch (cmd) - { - case 's': - if (size == 2) - { - proto_send ('s', 0, 0); - twi_master_send (args[0], &args[1], 1); - while (!twi_master_is_finished ()) - ; - proto_send ('f', 0, 0); - } - else - proto_send ('e', 0, 0); - break; - case 'r': - if (size == 2) - { - uart0_putc ('r'); - c = twi_master_read (args[0], data, 1); - if (c != 0) - proto_send ('e', 1 , 0); - else - { - while (!twi_master_is_finished ()) - ; - proto_send ('f', 1, data); - } - } - else - proto_send ('e', 1, 0); - break; - default: - proto_send ('e', 1, 0); - } -} - -int -main (void) -{ - uint8_t c; - uart0_init (); - twi_master_init (); - uart0_putc ('m'); - uart0_putc ('s'); - uart0_putc ('s'); - uart0_putc ('\n'); - while (42) - { - c = uart0_getc (); - proto_accept (c); - } - return 0; -} diff --git a/n/avr/modules/twi/master/twi_master.c b/n/avr/modules/twi/master/twi_master.c deleted file mode 100644 index 41a3f6d..0000000 --- a/n/avr/modules/twi/master/twi_master.c +++ /dev/null @@ -1,214 +0,0 @@ -/* twi_master.c */ -/* avr.twi.master - TWI master module. {{{ - * - * Copyright (C) 2005 Clément Demonchy - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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 "twi_master.h" - -#include "io.h" - -#include - -enum -{ - TWI_SUCCESS, - TWI_BUSY, - TWI_FREE, - TWI_FAILURE -}; - -#if 0 -#define TWI_DEBUG(x) uart0_putc (x) -#else -#define TWI_DEBUG(x) -#endif - -#define NB_RETRY 5 - -static uint8_t *buffer; -static uint8_t twi_dest_addr; -static uint8_t twi_len; -static uint8_t twi_idx; -static uint8_t twi_nb_retry; -volatile uint8_t twi_state = TWI_FREE; - -void -twi_master_init (void) -{ - /* initialize TWI clock: 100 kHz clock, TWPS = 0 => prescaler = 1 */ -#if defined(TWPS0) - TWSR = 0; -#endif - TWBR = (AC_FREQ / 100000UL - 16) / 2; - TWCR = _BV (TWEN) | _BV (TWIE); -} - -int8_t -twi_master_is_finished () -{ - if (twi_state == TWI_SUCCESS || twi_state == TWI_FAILURE) - { - twi_state = TWI_FREE; - return 1; - } - else - return 0; -} - -int8_t -twi_master_send (uint8_t addr, uint8_t *data, uint8_t len) -{ - if (twi_state == TWI_FREE) - { - TWI_DEBUG ('a'); - twi_state = TWI_BUSY; - twi_nb_retry = 0; - twi_dest_addr = addr & 0xfe; - twi_len = len; - buffer = data; - /* envoie du start */ - TWCR |= _BV(TWSTA); - TWCR |= _BV(TWINT); - return 0; - } - else - { - TWI_DEBUG ('x'); - return -1; - } -} - -int8_t -twi_master_read (uint8_t addr, uint8_t *data, uint8_t len) -{ - if (twi_state == TWI_FREE) - { - TWI_DEBUG ('a'); - twi_state = TWI_BUSY; - twi_nb_retry = 0; - twi_dest_addr = addr | 0x01; - twi_len = len; - buffer = data; - TWCR |= _BV(TWSTA) | _BV (TWINT); - return 0; - } - else - return -1; -} - -SIGNAL (SIG_2WIRE_SERIAL) -{ - TWI_DEBUG ('y'); - switch (TW_STATUS) - { - /* Master */ - case TW_START: - case TW_REP_START: - /* start transmis, on envoie l'adresse */ - TWI_DEBUG ('d'); - TWCR &= ~ (_BV (TWSTA) | _BV (TWSTO) | _BV (TWINT)); - TWDR = twi_dest_addr; - twi_idx = 0; - break; - case TW_MT_ARB_LOST: /* valable pour le receiver aussi */ - /* todo */ - TWI_DEBUG ('e'); - break; - /* Master Transmitter */ - case TW_MT_DATA_ACK: - case TW_MT_SLA_ACK: - /* slave ok - * On envoi des données si il en reste - */ - if (twi_idx < twi_len) - { - TWI_DEBUG ('f'); - TWDR = buffer[twi_idx ++]; - } - else - { - TWCR |= _BV (TWSTO); - TWI_DEBUG ('g'); - twi_state = TWI_SUCCESS; - } - break; - case TW_MT_SLA_NACK: - /* le slave ne repond plus - * on essaye NB_RETRY avant d'arreter - */ - if (twi_nb_retry < NB_RETRY) - { - TWI_DEBUG ('h'); - TWCR |= _BV (TWSTA); - twi_nb_retry ++; - } - else - { - TWI_DEBUG ('i'); - TWCR |= _BV (TWSTO); - twi_state = TWI_FAILURE; - } - break; - case TW_MT_DATA_NACK: - /* le slave ne veut plus de donnée */ - TWI_DEBUG ('j'); - TWCR |= _BV (TWSTO); - twi_state = TWI_SUCCESS; - break; - /* Master Receiver */ - case TW_MR_SLA_ACK: - TWI_DEBUG ('p'); - if (twi_len > 1) /* on recoit plusieurs octet */ - { - TWI_DEBUG ('k'); - TWCR |= _BV (TWEA); - } - break; - case TW_MR_SLA_NACK: - if (twi_nb_retry < NB_RETRY) - { - TWI_DEBUG ('l'); - TWCR |= _BV (TWEA); - } - else - { - TWI_DEBUG ('m'); - TWCR |= _BV (TWSTO); - twi_state = TWI_FAILURE; - } - break; - case TW_MR_DATA_ACK: - buffer[twi_idx ++] = TWDR; - TWI_DEBUG ('n'); - if (twi_idx == (twi_len - 1)) - TWCR &= ~ _BV (TWEA); - break; - case TW_MR_DATA_NACK: /* dernier byte */ - twi_state = TWI_SUCCESS; - TWI_DEBUG ('o'); - buffer[twi_idx ++] = TWDR; - TWCR |= _BV (TWSTO); - break; - } - TWCR |= _BV (TWINT); -} diff --git a/n/avr/modules/twi/master/twi_master.h b/n/avr/modules/twi/master/twi_master.h deleted file mode 100644 index 59bab61..0000000 --- a/n/avr/modules/twi/master/twi_master.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef twi_master_h -#define twi_master_h -/* twi_master.h */ -/* avr.twi.master - TWI master module. {{{ - * - * Copyright (C) 2005 Clément Demonchy - * - * Robot APB Team/Efrei 2005. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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. - * - * }}} */ - -void twi_master_init (void); -int8_t twi_master_is_finished (); -int8_t twi_master_send (uint8_t addr, uint8_t data[], uint8_t len); -int8_t twi_master_read (uint8_t addr, uint8_t data[], uint8_t len); - -#endif /* twi_master_h */ diff --git a/n/avr/modules/twi/slave/Makefile.module b/n/avr/modules/twi/slave/Makefile.module deleted file mode 100644 index 6c9a289..0000000 --- a/n/avr/modules/twi/slave/Makefile.module +++ /dev/null @@ -1 +0,0 @@ -twi_slave_SOURCES = twi_slave.c diff --git a/n/avr/modules/twi/slave/README b/n/avr/modules/twi/slave/README deleted file mode 100644 index 3f1c51b..0000000 --- a/n/avr/modules/twi/slave/README +++ /dev/null @@ -1,27 +0,0 @@ -avr.twi.slave - TWI slave module. - -TWI slave only module for AVR. See modules README for more details about AVR -modules. - -TWI is Atmel name for I2C. - - -Copyright (C) 2005 Clément Demonchy - -Robot APB Team/Efrei 2006. - Web: http://assos.efrei.fr/robot/ - Email: robot AT efrei DOT fr - -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. diff --git a/n/avr/modules/twi/slave/avrconfig.h b/n/avr/modules/twi/slave/avrconfig.h deleted file mode 100644 index ed23f47..0000000 --- a/n/avr/modules/twi/slave/avrconfig.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef avrconfig_h -#define avrconfig_h -/* avrconfig.h */ -/* avr.twi.slave - TWI slave module. {{{ - * - * Copyright (C) 2005 Nicolas Schodet - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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. - * - * }}} */ - -/* twi.slave - TWI slave module. */ -/** Reception buffer size. */ -#define AC_TWI_SLAVE_RCPT_BUF_SIZE 1 -/** Emission buffer size. */ -#define AC_TWI_SLAVE_SEND_BUF_SIZE 1 - -#endif /* avrconfig_h */ diff --git a/n/avr/modules/twi/slave/test/Makefile b/n/avr/modules/twi/slave/test/Makefile deleted file mode 100644 index f28b954..0000000 --- a/n/avr/modules/twi/slave/test/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -BASE = ../../../.. -AVR_PROGS = test_twi_slave -test_twi_slave_SOURCES = test_twi_slave.c -MODULES = uart twi/slave -CONFIGFILE = avrconfig.h -# atmega8, atmega8535, atmega128... -AVR_MCU = atmega8 -# -O2 : speed -# -Os : size -OPTIMIZE = -O2 - -# Test compilations. -TEST_MCU = atmega8535 atmega128 -TEST_CONFIGFILES = avrconfig.h - -include $(BASE)/make/Makefile.gen diff --git a/n/avr/modules/twi/slave/test/avrconfig.h b/n/avr/modules/twi/slave/test/avrconfig.h deleted file mode 100644 index bc1e909..0000000 --- a/n/avr/modules/twi/slave/test/avrconfig.h +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef avrconfig_h -#define avrconfig_h -/* avrconfig.h */ -/* avr.twi.slave - TWI slave module. {{{ - * - * Copyright (C) 2005 Nicolas Schodet - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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 0 -/** Baudrate: 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 76800, - * 115200, 230400, 250000, 500000, 1000000. */ -#define AC_UART0_BAUDRATE 115200 -/** Send mode: - * - POLLING: no interrupts. - * - RING: interrupts, ring buffer. */ -#define AC_UART0_SEND_MODE RING -/** Recv mode, same as send mode. */ -#define AC_UART0_RECV_MODE RING -/** 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 PTS -/** 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 - -/* twi.slave - TWI slave module. */ -/** Reception buffer size. */ -#define AC_TWI_SLAVE_RCPT_BUF_SIZE 1 -/** Emission buffer size. */ -#define AC_TWI_SLAVE_SEND_BUF_SIZE 1 - -#endif /* avrconfig_h */ diff --git a/n/avr/modules/twi/slave/test/test_twi_slave.c b/n/avr/modules/twi/slave/test/test_twi_slave.c deleted file mode 100644 index 4cdfd4b..0000000 --- a/n/avr/modules/twi/slave/test/test_twi_slave.c +++ /dev/null @@ -1,52 +0,0 @@ -/* test_twi_slave.c */ -/* avr.twi.slave - TWI slave module. {{{ - * - * Copyright (C) 2005 Clément Demonchy - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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 "modules/uart/uart.h" -#include "modules/twi/slave/twi_slave.h" -#include "io.h" - -int -main (void) -{ - uint8_t data[AC_TWI_SLAVE_RCPT_BUF_SIZE]; - uart0_init (); - sei (); - twi_init (0x02); - uart0_putc ('s'); - uart0_putc ('s'); - uart0_putc ('s'); - uart0_putc ('\n'); - data[0] = 0; - while (42) - { - if (twi_poll (data, AC_TWI_SLAVE_RCPT_BUF_SIZE)) - { - uart0_putc ('r'); - twi_update (data, AC_TWI_SLAVE_SEND_BUF_SIZE); - } - } - return 0; -} diff --git a/n/avr/modules/twi/slave/twi_slave.c b/n/avr/modules/twi/slave/twi_slave.c deleted file mode 100644 index 58e777e..0000000 --- a/n/avr/modules/twi/slave/twi_slave.c +++ /dev/null @@ -1,151 +0,0 @@ -/* twi_slave.c */ -/* avr.twi.slave - TWI slave module. {{{ - * - * Copyright (C) 2005 Clément Demonchy - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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 "twi_slave.h" - -#include "io.h" - -#include - -static volatile uint8_t twi_rcpt_tail; -static volatile uint8_t send_idx; -static volatile uint8_t data_ready; -static volatile uint8_t buf_rcpt[AC_TWI_SLAVE_RCPT_BUF_SIZE]; -static volatile uint8_t buf_send1[AC_TWI_SLAVE_SEND_BUF_SIZE]; -static volatile uint8_t buf_send2[AC_TWI_SLAVE_SEND_BUF_SIZE]; -static volatile uint8_t *buf_send_sys, *buf_send_user; -static volatile int8_t send_switch; -static volatile int8_t update; - -#if 0 -#define TWI_DEBUG(x) uart0_putc (x) -#else -#define TWI_DEBUG(x) -#endif - -void -twi_init (uint8_t addr) -{ - send_switch = 0; - update = 0; - buf_send_sys = buf_send1; - buf_send_user = buf_send2; - TWAR = addr; - TWSR = 0x00; - TWCR = _BV(TWEA) | _BV(TWEN) | _BV(TWIE); -} - - -SIGNAL (SIG_2WIRE_SERIAL) -{ - TWI_DEBUG (';'); - switch (TW_STATUS) - { - /* slave transmitter mode */ - /* START + SLA|W + ACK */ - case TW_ST_SLA_ACK: - case TW_ST_ARB_LOST_SLA_ACK: - TWI_DEBUG ('a'); - if (send_switch && !update) - { - volatile uint8_t *tmp = buf_send_sys; - buf_send_sys = buf_send_user; - buf_send_user = tmp; - send_switch = 0; - } - send_idx = 0; - /* no break */ - case TW_ST_DATA_ACK: - TWI_DEBUG ('b'); - TWDR = buf_send_sys[send_idx++]; - if (AC_TWI_SLAVE_SEND_BUF_SIZE == send_idx) - TWCR &= ~_BV(TWEA); - break; - case TW_ST_DATA_NACK: - case TW_ST_LAST_DATA: - TWI_DEBUG ('c'); - TWCR |= _BV (TWEA); - break; - /* slave receiver mode */ - /* START + SLA|W + ACK */ - case TW_SR_SLA_ACK: - case TW_SR_ARB_LOST_SLA_ACK: - case TW_SR_GCALL_ACK: - case TW_SR_ARB_LOST_GCALL_ACK: - TWI_DEBUG ('z'); - data_ready = 0; - twi_rcpt_tail = 0; - if (AC_TWI_SLAVE_RCPT_BUF_SIZE == 1) - TWCR &= ~_BV(TWEA); - break; - /* DATA + ACK */ - case TW_SR_DATA_ACK: - case TW_SR_GCALL_DATA_ACK: - TWI_DEBUG ('y'); - buf_rcpt[twi_rcpt_tail++] = TWDR; - if (AC_TWI_SLAVE_RCPT_BUF_SIZE - twi_rcpt_tail == 1) - TWCR &= ~_BV(TWEA); - break; - /* DATA + NACK */ - case TW_SR_DATA_NACK: - case TW_SR_GCALL_DATA_NACK: - TWI_DEBUG ('x'); - buf_rcpt[twi_rcpt_tail++] = TWDR; - /* no break */ - /* STOP */ - case TW_SR_STOP: - TWI_DEBUG ('w'); - data_ready = 1; - break; - } - TWCR |= _BV(TWINT); -} - -/** Recopie les données recues dans buf. */ -uint8_t -twi_poll (uint8_t buf[], uint8_t size) -{ - if (data_ready) - { - data_ready = 0; - while (size --) - buf[size] = buf_rcpt[size]; - TWCR |= _BV (TWEA); - return 1; - } - else - return 0; -} - -void -twi_update (uint8_t buf[], uint8_t size) -{ - update = 1; - send_switch = 1; - while (size --) - buf_send_user[size] = buf[size]; - update = 0; -} - diff --git a/n/avr/modules/twi/slave/twi_slave.h b/n/avr/modules/twi/slave/twi_slave.h deleted file mode 100644 index c7851e0..0000000 --- a/n/avr/modules/twi/slave/twi_slave.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef twi_slave_h -#define twi_slave_h -/* twi_slave.h */ -/* avr.twi.slave - TWI slave module. {{{ - * - * Copyright (C) 2005 Clément Demonchy - * - * Robot APB Team/Efrei 2006. - * Web: http://assos.efrei.fr/robot/ - * Email: robot AT efrei DOT fr - * - * 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. - * - * }}} */ - -void -twi_init (uint8_t addr); - -uint8_t -twi_poll (uint8_t buf[], uint8_t size); - -void -twi_update (uint8_t buf[], uint8_t size); - -#endif /* twi_slave_h */ diff --git a/n/avr/modules/twi/test/Makefile.master b/n/avr/modules/twi/test/Makefile.master new file mode 100644 index 0000000..fa4f22e --- /dev/null +++ b/n/avr/modules/twi/test/Makefile.master @@ -0,0 +1,25 @@ +BASE = ../../.. +AVR_PROGS = test_twi_master +test_twi_master_SOURCES = test_twi_master.c +DOC = +EXTRACTDOC = +MODULES = twi uart proto + + +CONFIGFILE = avrconfig_master.h +TEST_CONFIGFILES = avrconfig_master.h + + +# atmega8, atmega8535, atmega128... +AVR_MCU = atmega8535 +# -O2 : speed +# -Os : size +OPTIMIZE = -O2 + +DEFS = +LIBS = + +# Test compilations. +TEST_MCU = atmega8535 atmega128 + +include $(BASE)/make/Makefile.gen diff --git a/n/avr/modules/twi/test/Makefile.slave b/n/avr/modules/twi/test/Makefile.slave new file mode 100644 index 0000000..306ee1c --- /dev/null +++ b/n/avr/modules/twi/test/Makefile.slave @@ -0,0 +1,24 @@ +BASE = ../../.. +AVR_PROGS = test_twi_sl +test_twi_sl_SOURCES = test_twi_sl.c +DOC = +EXTRACTDOC = +MODULES = twi uart + + +CONFIGFILE = avrconfig_slave.h +TEST_CONFIGFILES = avrconfig_slave.h + +# atmega8, atmega8535, atmega128... +AVR_MCU = atmega128 +# -O2 : speed +# -Os : size +OPTIMIZE = -O2 + +DEFS = +LIBS = + +# Test compilations. +TEST_MCU = atmega8535 atmega128 + +include $(BASE)/make/Makefile.gen diff --git a/n/avr/modules/twi/test/avrconfig_master.h b/n/avr/modules/twi/test/avrconfig_master.h new file mode 100644 index 0000000..6496886 --- /dev/null +++ b/n/avr/modules/twi/test/avrconfig_master.h @@ -0,0 +1,92 @@ +#ifndef avrconfig_h +#define avrconfig_h +/* avrconfig.h */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2005 Demonchy Clément + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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. + * + * }}} */ + +#define TWI_SL_RCPT_SIZE 1 +#define TWI_SL_SEND_SIZE 1 + +#define TWI_MASTER_ENABLE 1 + +/* 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 + +/* 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 0 +/** Baudrate: 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 76800, + * 115200, 230400, 250000, 500000, 1000000. */ +#define AC_UART0_BAUDRATE 9600 +/** 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 STDIO + + +#endif /* avrconfig_h */ diff --git a/n/avr/modules/twi/test/avrconfig_slave.h b/n/avr/modules/twi/test/avrconfig_slave.h new file mode 100644 index 0000000..6fdfd9a --- /dev/null +++ b/n/avr/modules/twi/test/avrconfig_slave.h @@ -0,0 +1,92 @@ +#ifndef avrconfig_h +#define avrconfig_h +/* avrconfig.h */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2005 Demonchy Clément + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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. + * + * }}} */ + +#define TWI_SL_RCPT_SIZE 1 +#define TWI_SL_SEND_SIZE 1 + +#define TWI_SLAVE_ENABLE 1 + +/* 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 + +/* 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 9600 +/** 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 STDIO + + +#endif /* avrconfig_h */ diff --git a/n/avr/modules/twi/test/test_twi_master.c b/n/avr/modules/twi/test/test_twi_master.c new file mode 100644 index 0000000..348ac95 --- /dev/null +++ b/n/avr/modules/twi/test/test_twi_master.c @@ -0,0 +1,94 @@ +/* test_twi_master.c */ +/* avr.twi.master - TWI master module. {{{ + * + * Copyright (C) 2005 Clément Demonchy + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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 "modules/uart/uart.h" +#include "modules/proto/proto.h" +#include "modules/twi/twi.h" +#include "modules/utils/utils.h" +#include "io.h" + +void proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) +{ + uint8_t data[1] = {0x00}; + int8_t c; + switch (cmd) + { + case 's': + if (size == 2) + { + proto_send ('s', 0, 0); + twi_ms_send (args[0], &args[1], 1); + while (!twi_ms_is_finished ()) + ; + proto_send ('f', 0, 0); + } + else + proto_send ('e', 0, 0); + break; + case 'r': + if (size == 2) + { + uart0_putc ('r'); + c = twi_ms_read (args[0], data, 1); + if (c != 0) + proto_send ('e', 1 , 0); + else + { + while (!twi_ms_is_finished ()) + ; + proto_send ('f', 1, data); + } + } + else + proto_send ('e', 1, 0); + break; + case 'z': + utils_reset (); + break; + default: + proto_send ('e', 1, 0); + } +} + +int +main (void) +{ + uint8_t c; + sei (); + uart0_init (); + twi_init (0x04); + uart0_putc ('m'); + uart0_putc ('s'); + uart0_putc ('s'); + uart0_putc ('\r'); + while (42) + { + c = uart0_getc (); + proto_accept (c); + } + return 0; +} diff --git a/n/avr/modules/twi/test/test_twi_sl.c b/n/avr/modules/twi/test/test_twi_sl.c new file mode 100644 index 0000000..8672a6f --- /dev/null +++ b/n/avr/modules/twi/test/test_twi_sl.c @@ -0,0 +1,51 @@ +/* test_twi_slave.c */ +/* avr.twi.slave - TWI slave module. {{{ + * + * Copyright (C) 2005 Clément Demonchy + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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 "modules/twi/twi.h" +#include "modules/uart/uart.h" +#include "io.h" + +int +main (void) +{ + uint8_t data[TWI_SL_RCPT_SIZE]; + sei (); + uart0_init (); + uart0_putc ('s'); + uart0_putc ('s'); + uart0_putc ('s'); + twi_init (0x02); + data[0] = 0; + while (42) + { + if (twi_sl_poll (data, TWI_SL_RCPT_SIZE)) + { + twi_sl_update (data, TWI_SL_RCPT_SIZE); + } + } + return 0; +} diff --git a/n/avr/modules/twi/twi.avr.c b/n/avr/modules/twi/twi.avr.c new file mode 100644 index 0000000..dc2bbff --- /dev/null +++ b/n/avr/modules/twi/twi.avr.c @@ -0,0 +1,363 @@ +/* twi.avr.c */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2005 Demonchy Clément + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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 "twi.h" + +#include +#include +#include "modules/uart/uart.h" + +// TODO mettre l'etat partout +// quand on fait les demandes, et les liberations qui vont bien dans +// l'interruption + +enum +{ + TWI_SUCCESS, + TWI_BUSY, + TWI_FREE, + TWI_FAILURE +}; + +#ifdef TWI_SLAVE_ENABLE +/* données reçues du master */ +static volatile uint8_t rcpt_buf_sl[TWI_SL_RCPT_SIZE]; +static volatile uint8_t data_ready_sl; +/* données à envoyer au master */ +/* 2 buffers 1 pour envoyer vers l'user et l'autre vers l'i2c */ +static volatile uint8_t send_buf_sl1[TWI_SL_SEND_SIZE]; +static volatile uint8_t send_buf_sl2[TWI_SL_SEND_SIZE]; +static volatile uint8_t *send_sys_sl, *send_user_sl; +static volatile uint8_t update_sl; /* lock pour savoir si on peut switcher les buffers sans risque */ +static volatile uint8_t send_switch_sl; +#endif /* TWI_SLAVE_ENABLE */ +#ifdef TWI_MASTER_ENABLE +static volatile int8_t state_ms; +static volatile int8_t nb_retry_ms = 5; // XXX utile ? +static volatile uint8_t dest_addr_ms; +static volatile uint8_t len_buf_ms; +static volatile uint8_t *send_buf_ms; +#endif /* TWI_MASTER_ENABLE */ + +void +twi_init (uint8_t addr) +{ +#ifdef TWI_SLAVE_ENABLE + data_ready_sl = 0; + send_switch_sl = 0; + update_sl = 0; + send_sys_sl = send_buf_sl1; + send_user_sl = send_buf_sl2; + TWAR = addr; + TWSR = 0x00; + TWCR = _BV(TWEA); +#endif /* TWI_SLAVE_ENABLE */ +#ifdef TWI_MASTER_ENABLE + #if defined(TWPS0) + TWSR = 0; + #endif + TWBR = (AC_FREQ / 100000UL - 16) / 2; + state_ms = TWI_FREE; +#endif /* TWI_MASTER_ENABLE */ + /* Active la twi et les interruptions de la twi */ + TWCR |= _BV (TWEN) | _BV (TWIE); +} + +#ifdef TWI_SLAVE_ENABLE +uint8_t +twi_sl_poll (uint8_t *buffer, uint8_t size) +{ + // XXX state + if (data_ready_sl) + { + data_ready_sl = 0; + while (size --) + buffer[size] = rcpt_buf_sl[size]; + /* de nouveau dispo pour traiter de nouvelles requetes */ + TWCR |= _BV (TWEA); + return 1; + } + else + return 0; +} +#endif /* TWI_SLAVE_ENABLE */ + +#ifdef TWI_SLAVE_ENABLE +void +twi_sl_update (uint8_t *buffer, uint8_t size) +{ + // XXX state + update_sl = 1; + send_switch_sl = 1; /* demander un swap des buffers */ + while (size --) + send_user_sl[size] = buffer[size]; + update_sl = 0; +} +#endif /* TWI_SLAVE_ENABLE */ + +#ifdef TWI_MASTER_ENABLE +int8_t +twi_ms_is_finished () +{ + if (state_ms == TWI_SUCCESS || state_ms == TWI_FAILURE) + { + state_ms = TWI_FREE; + return 1; + } + else + return 0; +} +#endif /* TWI_MASTER_ENABLE */ + +#ifdef TWI_MASTER_ENABLE +int8_t +twi_ms_send (uint8_t addr, uint8_t *data, uint8_t len) +{ + uart0_putc ('a'); + if (state_ms != TWI_BUSY) + { + uart0_putc ('b'); + state_ms = TWI_BUSY; + nb_retry_ms = 0; + dest_addr_ms = addr & 0xfe; + len_buf_ms = len; + send_buf_ms = data; + /* envoie du start */ + TWCR |= _BV(TWSTA) | _BV(TWINT); + return 0; + } + else + { + uart0_putc ('c'); + return -1; + } +} +#endif /* TWI_MASTER_ENABLE */ + +#ifdef TWI_MASTER_ENABLE +int8_t +twi_ms_read (uint8_t addr, uint8_t *data, uint8_t len) +{ + + uart0_putc ('z'); + if (state_ms != TWI_BUSY) + { + uart0_putc ('y'); + state_ms = TWI_BUSY; + nb_retry_ms = 0; + dest_addr_ms = addr | 0x01; + len_buf_ms = len; + send_buf_ms = data; + TWCR |= _BV(TWSTA) | _BV (TWINT); + return 0; + } + else + { + uart0_putc ('x'); + return -1; + } +} +#endif /* TWI_MASTER_ENABLE */ + +SIGNAL (SIG_2WIRE_SERIAL) +{ +#ifdef TWI_SLAVE_ENABLE + static uint8_t send_idx_sl = 0; + static uint8_t rcpt_idx_sl = 0; +#endif /* TWI_SLAVE_ENABLE */ +#ifdef TWI_MASTER_ENABLE + static uint8_t idx_ms; +#define NB_RETRY 5 +#endif /* TWI_MASTER_ENABLE */ + switch (TW_STATUS) + { +#ifdef TWI_SLAVE_ENABLE + /***** slave transmitter mode *****/ + /* START + SLA|W + ACK + * on a recu un start pour une ecriture et on a acquité + * choisi le buffer d'envoie + * envoie le premier byte + */ + case TW_ST_SLA_ACK: + case TW_ST_ARB_LOST_SLA_ACK: + if (send_switch_sl && !update_sl) + { + volatile uint8_t *tmp = send_sys_sl; + send_sys_sl = send_user_sl; + send_user_sl = tmp; + send_switch_sl = 0; + } + send_idx_sl = 0; + /* NO BREAK */ + /* Recu un ack apres l'envoie d'un bit */ + case TW_ST_DATA_ACK: + uart0_putc ('p'); + TWDR = send_sys_sl[send_idx_sl++]; + if (send_idx_sl == TWI_SL_SEND_SIZE) + TWCR &= ~_BV(TWEA); + TWCR |= _BV(TWINT); + break; + case TW_ST_DATA_NACK: + case TW_ST_LAST_DATA: + uart0_putc ('q'); + TWCR |= _BV (TWEA); + TWCR |= _BV(TWINT); + break; + /***** slave receiver mode *****/ + /* START + SLA|W + ACK */ + case TW_SR_SLA_ACK: + case TW_SR_ARB_LOST_SLA_ACK: + case TW_SR_GCALL_ACK: + case TW_SR_ARB_LOST_GCALL_ACK: + uart0_putc ('u'); + data_ready_sl = 0; + rcpt_idx_sl = 0; + if (TWI_SL_RCPT_SIZE == 1) + TWCR &= ~_BV(TWEA); + TWCR |= _BV(TWINT); + break; + /* DATA + ACK */ + case TW_SR_DATA_ACK: + case TW_SR_GCALL_DATA_ACK: + uart0_putc ('s'); + rcpt_buf_sl[rcpt_idx_sl++] = TWDR; + if (TWI_SL_RCPT_SIZE - rcpt_idx_sl == 1) + TWCR &= ~_BV(TWEA); + TWCR |= _BV(TWINT); + break; + /* DATA + NACK */ + case TW_SR_DATA_NACK: + case TW_SR_GCALL_DATA_NACK: + uart0_putc ('o'); + rcpt_buf_sl[rcpt_idx_sl++] = TWDR; + /* NO BREAK */ + /* STOP */ + case TW_SR_STOP: + uart0_putc ('q'); + data_ready_sl = 1; + TWCR |= _BV(TWINT); + break; +#endif /* TWI_SLAVE_ENABLE */ +#ifdef TWI_MASTER_ENABLE + /* Master */ + case TW_START: + case TW_REP_START: + uart0_putc ('d'); + /* start transmis, on envoie l'adresse */ + TWCR &= ~ (_BV (TWSTA) | _BV (TWSTO) | _BV (TWINT)); + TWDR = dest_addr_ms; + idx_ms = 0; + TWCR |= _BV (TWINT); + break; + case TW_MT_ARB_LOST: /* valable pour le receiver aussi */ + /* todo */ + break; + /* Master Transmitter */ + case TW_MT_DATA_ACK: + case TW_MT_SLA_ACK: + uart0_putc ('e'); + /* start transmis, on envoie l'adresse */ + /* slave ok + * On envoi des données si il en reste + */ + if (idx_ms < len_buf_ms) + { + TWDR = send_buf_ms[idx_ms ++]; + } + else + { + TWCR |= _BV (TWSTO); + state_ms = TWI_SUCCESS; + } + TWCR |= _BV (TWINT); + break; + case TW_MT_SLA_NACK: + uart0_putc ('f'); + /* start transmis, on envoie l'adresse */ + /* le slave ne repond plus + * on essaye NB_RETRY avant d'arreter + */ + if (nb_retry_ms < NB_RETRY) + { + TWCR |= _BV (TWSTA); + nb_retry_ms ++; + } + else + { + TWCR |= _BV (TWSTO); + state_ms = TWI_FAILURE; + } + TWCR |= _BV (TWINT); + break; + case TW_MT_DATA_NACK: + uart0_putc ('g'); + /* start transmis, on envoie l'adresse */ + /* le slave ne veut plus de donnée */ + TWCR |= _BV (TWSTO); + state_ms = TWI_SUCCESS; + TWCR |= _BV (TWINT); + break; + /* Master Receiver */ + case TW_MR_SLA_ACK: + uart0_putc ('h'); + /* start transmis, on envoie l'adresse */ + if (len_buf_ms > 1) /* on recoit plusieurs octet */ + { + TWCR |= _BV (TWEA); + } + TWCR |= _BV (TWINT); + break; + case TW_MR_SLA_NACK: + /* start transmis, on envoie l'adresse */ + if (nb_retry_ms < NB_RETRY) + { + uart0_putc ('i'); + TWCR |= _BV (TWEA); + } + else + { + uart0_putc ('j'); + TWCR |= _BV (TWSTO); + state_ms = TWI_FAILURE; + } + TWCR |= _BV (TWINT); + break; + case TW_MR_DATA_ACK: + uart0_putc ('k'); + send_buf_ms[idx_ms ++] = TWDR; + if (idx_ms == (len_buf_ms - 1)) + TWCR &= ~ _BV (TWEA); + TWCR |= _BV (TWINT); + break; + case TW_MR_DATA_NACK: /* dernier byte */ + uart0_putc ('l'); + state_ms = TWI_SUCCESS; + send_buf_ms[idx_ms ++] = TWDR; + TWCR |= _BV (TWSTO); + TWCR |= _BV (TWINT); + break; +#endif/* TWI_MASTER_ENABLE */ + } +} diff --git a/n/avr/modules/twi/twi.c b/n/avr/modules/twi/twi.c new file mode 100644 index 0000000..e60bfa9 --- /dev/null +++ b/n/avr/modules/twi/twi.c @@ -0,0 +1,33 @@ +/* twi.c */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2005 Demonchy Clément + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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 "twi.h" + +#if defined (HOST) +# error "TO BE IMPLEMENTED" +#elif defined (SIMU) +# error "TO BE IMPLEMENTED" +#else +# include "twi.avr.c" +#endif diff --git a/n/avr/modules/twi/twi.h b/n/avr/modules/twi/twi.h new file mode 100644 index 0000000..f036417 --- /dev/null +++ b/n/avr/modules/twi/twi.h @@ -0,0 +1,55 @@ +#ifndef twi_h +#define twi_h +/* twi.h */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2005 Demonchy Clément + * + * Robot APB Team/Efrei 2006. + * Web: http://assos.efrei.fr/robot/ + * Email: robot AT efrei DOT fr + * + * 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 + +/** Initialise twi. */ +void +twi_init (uint8_t addr); + +#ifdef TWI_SLAVE_ENABLE +/** Récupère dans buffer les données recues en tant qu'esclave */ +uint8_t +twi_sl_poll (uint8_t *buffer, uint8_t size); +/** Met à jour le buffer de donnée à envoyer */ +void +twi_sl_update (uint8_t *buffer, uint8_t size); +#endif /* TWI_SLAVE_ENABLE */ + +#ifdef TWI_MASTER_ENABLE +/** Is the current transaction finished ? */ +int8_t +twi_ms_is_finished (void); +/** Send len bytes of data to address */ +int8_t +twi_ms_send (uint8_t address, uint8_t *data, uint8_t len); +/** Read len bytes at addresse en put them in data */ +int8_t +twi_ms_read (uint8_t address, uint8_t *data, uint8_t len); +#endif /* TWI_MASTER_ENABLE */ + +#endif /* twi_h */ -- cgit v1.2.3