andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make AVR I2C config naming more standard 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5901 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
utzig 2013-06-27 15:19:20 +00:00
parent 1076c100ce
commit b874475dd7
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/AVR-AT90CANx-GCC/mcuconf.h
View File

@ -48,7 +48,7 @@
/*
* I2C driver system settings.
*/
#define USE_AVR_I2C FALSE
#define AVR_I2C_USE_I2C1 FALSE
/*
* SPI driver system settings.

2
demos/AVR-ATmega128-GCC/mcuconf.h
View File

@ -48,7 +48,7 @@
/*
* I2C driver system settings.
*/
#define USE_AVR_I2C FALSE
#define AVR_I2C_USE_I2C1 FALSE
/*
* SPI driver system settings.

2
demos/AVR-Arduino-GCC/mcuconf.h
View File

@ -48,7 +48,7 @@
/*
* I2C driver system settings.
*/
#define USE_AVR_I2C FALSE
#define AVR_I2C_USE_I2C1 FALSE
/*
* SPI driver system settings.

2
demos/AVR-ArduinoMega-GCC/mcuconf.h
View File

@ -48,7 +48,7 @@
/*
* I2C driver system settings.
*/
#define USE_AVR_I2C FALSE
#define AVR_I2C_USE_I2C1 FALSE
/*
* SPI driver system settings.

12
os/hal/platforms/AVR/i2c_lld.c
View File

@ -36,8 +36,8 @@
/*===========================================================================*/
/** @brief I2C driver identifier.*/
#if USE_AVR_I2C || defined(__DOXYGEN__)
I2CDriver I2CD;
#if AVR_I2C_USE_I2C1 || defined(__DOXYGEN__)
I2CDriver I2CD1;
#endif
/*===========================================================================*/
@ -71,7 +71,7 @@ I2CDriver I2CD;
/* Driver interrupt handlers. */
/*===========================================================================*/
#if USE_AVR_I2C || defined(__DOXYGEN__)
#if AVR_I2C_USE_I2C1 || defined(__DOXYGEN__)
/**
* @brief I2C event interrupt handler.
*
@ -80,7 +80,7 @@ I2CDriver I2CD;
CH_IRQ_HANDLER(TWI_vect) {
CH_IRQ_PROLOGUE();
I2CDriver *i2cp = &I2CD;
I2CDriver *i2cp = &I2CD1;
switch (TWSR & 0xF8) {
case TWI_START:
@ -148,7 +148,7 @@ CH_IRQ_HANDLER(TWI_vect) {
CH_IRQ_EPILOGUE();
}
#endif /* USE_AVR_I2C */
#endif /* AVR_I2C_USE_I2C1 */
/*===========================================================================*/
/* Driver exported functions. */
@ -160,7 +160,7 @@ CH_IRQ_HANDLER(TWI_vect) {
* @notapi
*/
void i2c_lld_init(void) {
i2cObjectInit(&I2CD);
i2cObjectInit(&I2CD1);
}
/**

8
os/hal/platforms/AVR/i2c_lld.h
View File

@ -71,8 +71,8 @@
* @details If set to @p TRUE the support for I2C is included.
* @note The default is @p FALSE.
*/
#if !defined(USE_AVR_I2C) || defined(__DOXYGEN__)
#define USE_AVR_I2C FALSE
#if !defined(AVR_I2C_USE_I2C1) || defined(__DOXYGEN__)
#define AVR_I2C_USE_I2C1 FALSE
#endif
/** @} */
@ -195,8 +195,8 @@ typedef struct I2CDriver I2CDriver;
/*===========================================================================*/
#if !defined(__DOXYGEN__)
#if USE_AVR_I2C
extern I2CDriver I2CD;
#if AVR_I2C_USE_I2C1
extern I2CDriver I2CD1;
#endif
#endif /* !defined(__DOXYGEN__) */