Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-10 11:29:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98 from JelmerT/hotfix-z1-i2cmaster

Browse Source 
Bugfix z1 i2cmaster
This commit is contained in:
Nicolas Tsiftes 2013-02-17 09:21:18 -08:00
commit ebacb91e57
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/z1/dev/i2cmaster.c
View File

@ -226,16 +226,13 @@ ISR(USCIAB1TX, i2c_tx_interrupt)
// RX Part // RX Part
#if I2C_RX_WITH_INTERRUPT #if I2C_RX_WITH_INTERRUPT
else if (UC1IFG & UCB1RXIFG){ // RX int. condition else if (UC1IFG & UCB1RXIFG){ // RX int. condition
if (rx_byte_ctr == 0){ rx_buf_ptr[rx_byte_tot - rx_byte_ctr] = UCB1RXBUF;
rx_byte_ctr--;
if (rx_byte_ctr == 1){ //stop condition should be set before receiving last byte
// Only for 1-byte transmissions, STOP is handled in receive_n_int // Only for 1-byte transmissions, STOP is handled in receive_n_int
if (rx_byte_tot != 1) if (rx_byte_tot != 1)
UCB1CTL1 |= UCTXSTP; // I2C stop condition UCB1CTL1 |= UCTXSTP; // I2C stop condition
UC1IFG &= ~UCB1RXIFG; // Clear USCI_B1 RX int flag. XXX Just in case, check if necessary
UC1IFG &= ~UCB1RXIFG; // Clear USCI_B1 RX int flag. XXX Just in case, check if necessary
}
else {
rx_buf_ptr[rx_byte_tot - rx_byte_ctr] = UCB1RXBUF;
rx_byte_ctr--;
} }
} }
#endif #endif