From db09cf20e709a1aafd1d91a5de99e4dcda7927a4 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Mon, 29 Nov 2010 23:07:51 +0100 Subject: digital/avr/modules/twi: implement software master, closes #141 --- digital/avr/modules/twi/Makefile.module | 2 +- digital/avr/modules/twi/test/soft/Makefile | 14 ++ digital/avr/modules/twi/test/soft/avrconfig.h | 107 ++++++++++++ digital/avr/modules/twi/twi_soft.avr.c | 240 ++++++++++++++++++++++++++ 4 files changed, 362 insertions(+), 1 deletion(-) create mode 100644 digital/avr/modules/twi/test/soft/Makefile create mode 100644 digital/avr/modules/twi/test/soft/avrconfig.h create mode 100644 digital/avr/modules/twi/twi_soft.avr.c diff --git a/digital/avr/modules/twi/Makefile.module b/digital/avr/modules/twi/Makefile.module index 3508cf4f..136203a9 100644 --- a/digital/avr/modules/twi/Makefile.module +++ b/digital/avr/modules/twi/Makefile.module @@ -1 +1 @@ -twi_SOURCES = twi.c twi_hard.avr.c twi.host.c +twi_SOURCES = twi.c twi_hard.avr.c twi_soft.avr.c twi.host.c diff --git a/digital/avr/modules/twi/test/soft/Makefile b/digital/avr/modules/twi/test/soft/Makefile new file mode 100644 index 00000000..68b9da2c --- /dev/null +++ b/digital/avr/modules/twi/test/soft/Makefile @@ -0,0 +1,14 @@ +BASE = ../../../.. +AVR_PROGS = test_twi_soft +test_twi_soft_SOURCES = test_twi.c +MODULES = twi uart proto math/random utils +CONFIGFILE = avrconfig.h +# atmega8, atmega8535, atmega128... +AVR_MCU = atmega128 +# -O2 : speed +# -Os : size +OPTIMIZE = -Os + +vpath %.c .. + +include $(BASE)/make/Makefile.gen diff --git a/digital/avr/modules/twi/test/soft/avrconfig.h b/digital/avr/modules/twi/test/soft/avrconfig.h new file mode 100644 index 00000000..4a802a6d --- /dev/null +++ b/digital/avr/modules/twi/test/soft/avrconfig.h @@ -0,0 +1,107 @@ +#ifndef avrconfig_h +#define avrconfig_h +/* avrconfig.h */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2010 Nicolas Schodet + * + * 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. + * + * }}} */ + +/* utils */ +/** 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 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 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 32 +/** 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 + +/* twi - TWI module. */ +/** Driver to implement TWI: HARD, SOFT, or USI. */ +#define AC_TWI_DRIVER SOFT +/** Do not use interrupts. */ +#define AC_TWI_NO_INTERRUPT 0 +/** TWI frequency, should really be 100 kHz. */ +#define AC_TWI_FREQ 100000 +/** Enable slave part. */ +#define AC_TWI_SLAVE_ENABLE 0 +/** Enable master part. */ +#define AC_TWI_MASTER_ENABLE 1 +/** Master transfer completion callback, optionally defined by the user, called + * at end of master transfer. */ +#undef AC_TWI_MASTER_DONE +/** Use internal pull up. */ +#define AC_TWI_PULL_UP 0 +/** SDA line IO for SOFT driver. */ +#define AC_TWI_SOFT_SDA_IO D, 1 +/** SCL line IO for SOFT driver. */ +#define AC_TWI_SOFT_SCL_IO D, 0 + +#endif /* avrconfig_h */ diff --git a/digital/avr/modules/twi/twi_soft.avr.c b/digital/avr/modules/twi/twi_soft.avr.c new file mode 100644 index 00000000..b673d5be --- /dev/null +++ b/digital/avr/modules/twi/twi_soft.avr.c @@ -0,0 +1,240 @@ +/* twi_soft.avr.c - Software master implementation. */ +/* avr.twi - TWI AVR module. {{{ + * + * Copyright (C) 2010 Nicolas Schodet + * + * 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 "twi.h" + +#if TWI_DRIVER == TWI_DRIVER_SOFT + +# include "modules/utils/utils.h" +# include "io.h" + +# if AC_TWI_SLAVE_ENABLE +# error "twi: slave mode not supported by software driver" +# endif +# if AC_TWI_NO_INTERRUPT +# warning "twi: no interrupt anyway" +# endif + +/* Define IO shortcuts. */ +# define SDA_IO AC_TWI_SOFT_SDA_IO +# define SCL_IO AC_TWI_SOFT_SCL_IO + +# if AC_TWI_PULL_UP +# define SDA_0 do { IO_CLR (SDA_IO); IO_OUTPUT (SDA_IO); } while (0) +# define SDA_1 do { IO_INPUT (SDA_IO); IO_SET (SDA_IO); } while (0) +# define SCL_0 do { IO_CLR (SCL_IO); IO_OUTPUT (SCL_IO); } while (0) +# define SCL_1 do { IO_INPUT (SCL_IO); IO_SET (SCL_IO); } while (0) +# else +# define SDA_0 do { IO_OUTPUT (SDA_IO); } while (0) +# define SDA_1 do { IO_INPUT (SDA_IO); } while (0) +# define SCL_0 do { IO_OUTPUT (SCL_IO); } while (0) +# define SCL_1 do { IO_INPUT (SCL_IO); } while (0) +# endif + +# if AC_TWI_MASTER_ENABLE + +/** Current master status. */ +uint8_t twi_master_current_status; + +# endif + +void +twi_init (uint8_t addr) +{ +#if AC_TWI_PULL_UP + SDA_1; + SCL_1; +#else + IO_CLR (SDA_IO); + SDA_1; + IO_CLR (SCL_IO); + SCL_1; +#endif +} + +void +twi_uninit (void) +{ + /* Keep pull-up. */ +} + +# if AC_TWI_MASTER_ENABLE + +/** Wait a half bit period. */ +static void +twi_delay (void) +{ + utils_delay (0.5 / AC_TWI_FREQ); +} + +/** Wait until SCL is high to enable clock stretching. */ +static inline void +twi_wait_scl (void) +{ + while (!IO_GET (SCL_IO)) + ; +} + +/** Send start condition. */ +static void +twi_master_send_start (void) +{ + SDA_0; + twi_delay (); + SCL_0; + twi_delay (); +} + +/** Send stop condition. */ +static void +twi_master_send_stop (void) +{ + SDA_0; + twi_delay (); + SCL_1; + twi_wait_scl (); + twi_delay (); + SDA_1; + twi_delay (); +} + +/** Send one bit. */ +static void +twi_master_send_bit (uint8_t bit) +{ + if (bit) + SDA_1; + else + SDA_0; + twi_delay (); + SCL_1; + twi_wait_scl (); + twi_delay (); + SCL_0; +} + +/** Receive one bit. */ +static uint8_t +twi_master_recv_bit (void) +{ + SDA_1; + twi_delay (); + SCL_1; + twi_wait_scl (); + uint8_t bit = IO_GET (SDA_IO) ? 1 : 0; + twi_delay (); + SCL_0; + return bit; +} + +/** Send one byte, return the received nack bit. */ +static uint8_t +twi_master_send_byte (uint8_t b) +{ + uint8_t i; + for (i = 8; i; i--) + { + twi_master_send_bit (b & 0x80); + b <<= 1; + } + return twi_master_recv_bit (); +} + +/** Receive one byte, send the nack bit. */ +static uint8_t +twi_master_recv_byte (uint8_t nack) +{ + uint8_t i, b; + b = 0; + for (i = 8; i; i--) + { + b <<= 1; + b |= twi_master_recv_bit (); + } + twi_master_send_bit (nack); + return b; +} + +void +twi_master_send (uint8_t addr, const uint8_t *buffer, uint8_t size) +{ + uint8_t nack, sent = 0; + /* Start. */ + twi_master_send_start (); + /* Send SLA+W. */ + nack = twi_master_send_byte (addr | 0); + /* Send data. */ + for (; !nack && sent < size; sent++) + nack = twi_master_send_byte (buffer[sent]); + /* Stop. */ + twi_master_send_stop (); + /* Update status, there is no background task. */ + twi_master_current_status = sent; + /* If defined, call master done callback. */ +#ifdef AC_TWI_MASTER_DONE + AC_TWI_MASTER_DONE (); +#endif +} + +void +twi_master_recv (uint8_t addr, uint8_t *buffer, uint8_t size) +{ + uint8_t nack, recv = 0; + /* Start. */ + twi_master_send_start (); + /* Send SLA+R. */ + nack = twi_master_send_byte (addr | 1); + if (!nack) + { + /* Receive data, send nack in last byte. */ + for (; recv < size; recv++) + buffer[recv] = twi_master_recv_byte (recv == size - 1 ? 1 : 0); + } + /* Stop. */ + twi_master_send_stop (); + /* Update status, there is no background task. */ + twi_master_current_status = recv; + /* If defined, call master done callback. */ +#ifdef AC_TWI_MASTER_DONE + AC_TWI_MASTER_DONE (); +#endif +} + +uint8_t +twi_master_status (void) +{ + return twi_master_current_status; +} + +uint8_t +twi_master_wait (void) +{ + /* No background task, nothing to wait. */ + return twi_master_current_status; +} + +# endif /* AC_TWI_MASTER_ENABLE */ + +#endif /* TWI_DRIVER == TWI_DRIVER_SOFT */ -- cgit v1.2.3