From 6263ed441f45d636d9a66f94e0bc30eaca13459f Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Thu, 6 Mar 2008 23:32:31 +0100 Subject: * digital/avr/modules/twi: - avrconfig cleanup. --- digital/asserv/src/asserv/avrconfig.h | 15 +++++++++++---- digital/asserv/src/asserv/twi_proto.c | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'digital/asserv/src') diff --git a/digital/asserv/src/asserv/avrconfig.h b/digital/asserv/src/asserv/avrconfig.h index f8ced464..984eeef2 100644 --- a/digital/asserv/src/asserv/avrconfig.h +++ b/digital/asserv/src/asserv/avrconfig.h @@ -87,10 +87,17 @@ /** Use external counters. */ #define AC_ASSERV_COUNTER_EXTERNAL 1 /** TWI address. */ -#define AV_ASSERV_TWI_ADDRESS 4 +#define AC_ASSERV_TWI_ADDRESS 4 + +/* twi - TWI module. */ +/** Activate master part. */ +#define AC_TWI_MASTER_ENABLE 0 +/** Activate slave part. */ +#define AC_TWI_SLAVE_ENABLE 1 +/** Slave recv buffer size. */ +#define AC_TWI_SL_RECV_BUFFER_SIZE 16 +/** Slave send buffer size. */ +#define AC_TWI_SL_SEND_BUFFER_SIZE 16 -#define TWI_SLAVE_ENABLE 1 -#define TWI_SL_RCPT_SIZE 16 -#define TWI_SL_SEND_SIZE 16 #endif /* avrconfig_h */ diff --git a/digital/asserv/src/asserv/twi_proto.c b/digital/asserv/src/asserv/twi_proto.c index aa5c9fad..a87db2cf 100644 --- a/digital/asserv/src/asserv/twi_proto.c +++ b/digital/asserv/src/asserv/twi_proto.c @@ -39,7 +39,7 @@ struct twi_proto_t twi_proto; void twi_proto_init (void) { - twi_init (AV_ASSERV_TWI_ADDRESS); + twi_init (AC_ASSERV_TWI_ADDRESS); twi_proto_update (); } @@ -47,7 +47,7 @@ twi_proto_init (void) void twi_proto_update (void) { - u8 buf[TWI_SL_RCPT_SIZE]; + u8 buf[AC_TWI_SL_RECV_BUFFER_SIZE]; /* Handle incoming command. */ while (twi_sl_poll (buf, sizeof (buf))) twi_proto_callback (buf, sizeof (buf)); -- cgit v1.2.3