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

[AVR] I2C driver updated for chibios3/nil + fixes 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7235 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
utzig 2014-09-02 18:26:24 +00:00
parent 56b6f21257
commit 13cbdd5f4a
2 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
os/hal/ports/AVR/i2c_lld.c
View File

@ -47,25 +47,6 @@ I2CDriver I2CD1;
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
/**
* @brief Wakes up the waiting thread.
*
* @param[in] i2cp pointer to the @p I2CDriver object
* @param[in] msg wakeup message
*
* @notapi
*/
#define wakeup_isr(i2cp, msg) { \
osalSysLockFromISR(); \
if ((i2cp)->thread != NULL) { \
thread_t *tp = (i2cp)->thread; \
(i2cp)->thread = NULL; \
tp->p_u.rdymsg = (msg); \
chSchReadyI(tp); \
} \
osalSysUnlockFromISR(); \
}
/*===========================================================================*/ /*===========================================================================*/
/* Driver interrupt handlers. */ /* Driver interrupt handlers. */
/*===========================================================================*/ /*===========================================================================*/
@ -100,7 +81,7 @@ OSAL_IRQ_HANDLER(TWI_vect) {
TWCR = ((1 << TWSTA) | (1 << TWINT) | (1 << TWEN) | (1 << TWIE)); TWCR = ((1 << TWSTA) | (1 << TWINT) | (1 << TWEN) | (1 << TWIE));
} else { } else {
TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN)); TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN));
wakeup_isr(i2cp, MSG_OK); _i2c_wakeup_isr(i2cp);
} }
} }
break; break;
@ -122,27 +103,27 @@ OSAL_IRQ_HANDLER(TWI_vect) {
case TWI_MASTER_RX_DATA_NACK: case TWI_MASTER_RX_DATA_NACK:
i2cp->rxbuf[i2cp->rxidx] = TWDR; i2cp->rxbuf[i2cp->rxidx] = TWDR;
TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN)); TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN));
wakeup_isr(i2cp, MSG_OK); _i2c_wakeup_isr(i2cp);
case TWI_MASTER_TX_ADDR_NACK: case TWI_MASTER_TX_ADDR_NACK:
case TWI_MASTER_TX_DATA_NACK: case TWI_MASTER_TX_DATA_NACK:
case TWI_MASTER_RX_ADDR_NACK: case TWI_MASTER_RX_ADDR_NACK:
i2cp->errors |= I2CD_ACK_FAILURE; i2cp->errors |= I2C_ACK_FAILURE;
break; break;
case TWI_ARBITRATION_LOST: case TWI_ARBITRATION_LOST:
i2cp->errors |= I2CD_ARBITRATION_LOST; i2cp->errors |= I2C_ARBITRATION_LOST;
break; break;
case TWI_BUS_ERROR: case TWI_BUS_ERROR:
i2cp->errors |= I2CD_BUS_ERROR; i2cp->errors |= I2C_BUS_ERROR;
break; break;
default: default:
/* FIXME: only gets here if there are other MASTERs in the bus */ /* FIXME: only gets here if there are other MASTERs in the bus */
TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN)); TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN));
wakeup_isr(i2cp, MSG_RESET); _i2c_wakeup_error_isr(i2cp);
} }
if (i2cp->errors != I2CD_NO_ERROR) { if (i2cp->errors != I2C_NO_ERROR) {
TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN)); TWCR = ((1 << TWSTO) | (1 << TWINT) | (1 << TWEN));
wakeup_isr(i2cp, MSG_RESET); _i2c_wakeup_error_isr(i2cp);
} }
OSAL_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
@ -160,6 +141,7 @@ OSAL_IRQ_HANDLER(TWI_vect) {
*/ */
void i2c_lld_init(void) { void i2c_lld_init(void) {
i2cObjectInit(&I2CD1); i2cObjectInit(&I2CD1);
I2CD1.thread = NULL;
} }
/** /**
@ -170,14 +152,18 @@ void i2c_lld_init(void) {
* @notapi * @notapi
*/ */
void i2c_lld_start(I2CDriver *i2cp) { void i2c_lld_start(I2CDriver *i2cp) {
uint32_t clock_speed = 100000;
/* TODO: Test TWI without external pull-ups (use internal) */ /* TODO: Test TWI without external pull-ups (use internal) */
/* Configure prescaler to 1 */ /* Configure prescaler to 1 */
TWSR &= 0xF8; TWSR &= 0xF8;
if (i2cp->config != NULL)
clock_speed = i2cp->config->clock_speed;
/* Configure baudrate */ /* Configure baudrate */
TWBR = ((F_CPU / i2cp->config->clock_speed) - 16) / 2; TWBR = ((F_CPU / clock_speed) - 16) / 2;
} }
/** /**
@ -219,6 +205,7 @@ void i2c_lld_stop(I2CDriver *i2cp) {
msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr, msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr,
uint8_t *rxbuf, size_t rxbytes, uint8_t *rxbuf, size_t rxbytes,
systime_t timeout) { systime_t timeout) {
i2cp->errors = I2C_NO_ERROR;
i2cp->addr = addr; i2cp->addr = addr;
i2cp->txbuf = NULL; i2cp->txbuf = NULL;
i2cp->txbytes = 0; i2cp->txbytes = 0;
@ -230,12 +217,7 @@ msg_t i2c_lld_master_receive_timeout(I2CDriver *i2cp, i2caddr_t addr,
/* Send START */ /* Send START */
TWCR = ((1 << TWSTA) | (1 << TWINT) | (1 << TWEN) | (1 << TWIE)); TWCR = ((1 << TWSTA) | (1 << TWINT) | (1 << TWEN) | (1 << TWIE));
osalSysLock(); return osalThreadSuspendTimeoutS(&i2cp->thread, TIME_INFINITE);
i2cp->thread = chThdGetSelfX();
chSchGoSleepS(THD_STATE_SUSPENDED);
chSysUnlock();
return chThdGetSelfX()->p_u.rdymsg;
} }
/** /**
@ -265,6 +247,7 @@ msg_t i2c_lld_master_transmit_timeout(I2CDriver *i2cp, i2caddr_t addr,
const uint8_t *txbuf, size_t txbytes, const uint8_t *txbuf, size_t txbytes,
uint8_t *rxbuf, size_t rxbytes, uint8_t *rxbuf, size_t rxbytes,
systime_t timeout) { systime_t timeout) {
i2cp->errors = I2C_NO_ERROR;
i2cp->addr = addr; i2cp->addr = addr;
i2cp->txbuf = txbuf; i2cp->txbuf = txbuf;
i2cp->txbytes = txbytes; i2cp->txbytes = txbytes;
@ -275,12 +258,7 @@ msg_t i2c_lld_master_transmit_timeout(I2CDriver *i2cp, i2caddr_t addr,
TWCR = ((1 << TWSTA) | (1 << TWINT) | (1 << TWEN) | (1 << TWIE)); TWCR = ((1 << TWSTA) | (1 << TWINT) | (1 << TWEN) | (1 << TWIE));
chSysLock(); return osalThreadSuspendTimeoutS(&i2cp->thread, TIME_INFINITE);
i2cp->thread = chThdGetSelfX();
chSchGoSleepS(THD_STATE_SUSPENDED);
chSysUnlock();
return chThdGetSelfX()->p_u.rdymsg;
} }
#endif /* HAL_USE_I2C */ #endif /* HAL_USE_I2C */

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

@ -125,14 +125,10 @@ struct I2CDriver {
*/ */
i2cflags_t errors; i2cflags_t errors;
#if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__) #if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
#if CH_USE_MUTEXES || defined(__DOXYGEN__)
/** /**
* @brief Mutex protecting the bus. * @brief Mutex protecting the bus.
*/ */
Mutex mutex; mutex_t mutex;
#elif CH_USE_SEMAPHORES
Semaphore semaphore;
#endif
#endif /* I2C_USE_MUTUAL_EXCLUSION */ #endif /* I2C_USE_MUTUAL_EXCLUSION */
#if defined(I2C_DRIVER_EXT_FIELDS) #if defined(I2C_DRIVER_EXT_FIELDS)
I2C_DRIVER_EXT_FIELDS I2C_DRIVER_EXT_FIELDS
@ -141,7 +137,7 @@ struct I2CDriver {
/** /**
* @brief Thread waiting for I/O completion. * @brief Thread waiting for I/O completion.
*/ */
Thread *thread; thread_reference_t thread;
/** /**
* @brief Address of slave device. * @brief Address of slave device.
*/ */