TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-07-17 14:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant values in I2C struct.

Browse Source
This commit is contained in:
Jared Boone 2016-04-26 16:17:53 -07:00
parent 93ecf9ef82
commit 01fc6b9bc9
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/chibios-portapack/os/hal/platforms/LPC43xx/i2c_lld.c
View File

@ -187,15 +187,15 @@ static void i2c_lld_abort_operation(I2CDriver *i2cp) {
} }
static bool_t i2c_lld_tx_not_done(I2CDriver *i2cp) { static bool_t i2c_lld_tx_not_done(I2CDriver *i2cp) {
return i2cp->txidx < i2cp->txbytes; return i2cp->txbytes > 0;
} }
static bool_t i2c_lld_rx_not_done(I2CDriver *i2cp) { static bool_t i2c_lld_rx_not_done(I2CDriver *i2cp) {
return i2cp->rxbuf && i2cp->rxbytes; return i2cp->rxbytes > 0;
} }
static bool_t i2c_lld_rx_last_byte(I2CDriver *i2cp) { static bool_t i2c_lld_rx_last_byte(I2CDriver *i2cp) {
return i2cp->rxidx == (i2cp->rxbytes - 1); return i2cp->rxbytes == 1;
} }
/** /**
@ -249,7 +249,8 @@ static void i2c_lld_serve_event_interrupt(I2CDriver *i2cp) {
case I2C_MASTER_TX_DATA_ACK: /* 0x28 */ case I2C_MASTER_TX_DATA_ACK: /* 0x28 */
if (i2c_lld_tx_not_done(i2cp)) { if (i2c_lld_tx_not_done(i2cp)) {
//i2c_periph_transmit_byte(dp, i2cp->txbuf[i2cp->txidx++]); //i2c_periph_transmit_byte(dp, i2cp->txbuf[i2cp->txidx++]);
dp->DAT = i2cp->txbuf[i2cp->txidx++]; dp->DAT = *i2cp->txbuf++;
i2cp->txbytes--;
dp->CONCLR = I2C_CONCLR_SIC; dp->CONCLR = I2C_CONCLR_SIC;
} else { } else {
if (i2c_lld_rx_not_done(i2cp)) { if (i2c_lld_rx_not_done(i2cp)) {
@ -266,7 +267,8 @@ static void i2c_lld_serve_event_interrupt(I2CDriver *i2cp) {
break; break;
case I2C_MASTER_RX_DATA_ACK: /* 0x50 */ case I2C_MASTER_RX_DATA_ACK: /* 0x50 */
i2cp->rxbuf[i2cp->rxidx++] = i2c_periph_read_byte(dp); *i2cp->rxbuf++ = i2c_periph_read_byte(dp);
i2cp->rxbytes--;
/* fall through */ /* fall through */
case I2C_MASTER_RX_ADDR_ACK: /* 0x40 */ case I2C_MASTER_RX_ADDR_ACK: /* 0x40 */
if (i2c_lld_rx_last_byte(i2cp)) { if (i2c_lld_rx_last_byte(i2cp)) {
@ -277,7 +279,8 @@ static void i2c_lld_serve_event_interrupt(I2CDriver *i2cp) {
break; break;
case I2C_MASTER_RX_DATA_NACK: /* 0x58 */ case I2C_MASTER_RX_DATA_NACK: /* 0x58 */
i2cp->rxbuf[i2cp->rxidx] = i2c_periph_read_byte(dp); *i2cp->rxbuf++ = i2c_periph_read_byte(dp);
i2cp->rxbytes--;
i2c_periph_stop(dp); i2c_periph_stop(dp);
wakeup_isr(i2cp, RDY_OK); wakeup_isr(i2cp, RDY_OK);
/* fall through */ /* fall through */
@ -474,10 +477,8 @@ static msg_t i2c_lld_master_start(I2CDriver *i2cp, uint_fast8_t addr_r,
i2cp->addr_r = addr_r; i2cp->addr_r = addr_r;
i2cp->txbuf = txbuf; i2cp->txbuf = txbuf;
i2cp->txbytes = txbytes; i2cp->txbytes = txbytes;
i2cp->txidx = 0;
i2cp->rxbuf = rxbuf; i2cp->rxbuf = rxbuf;
i2cp->rxbytes = rxbytes; i2cp->rxbytes = rxbytes;
i2cp->rxidx = 0;
/* Atomic check on the timer in order to make sure that a timeout didn't /* Atomic check on the timer in order to make sure that a timeout didn't
happen outside the critical zone.*/ happen outside the critical zone.*/

8
firmware/chibios-portapack/os/hal/platforms/LPC43xx/i2c_lld.h
View File

@ -169,10 +169,6 @@ struct I2CDriver {
* @brief Number of bytes of data to send. * @brief Number of bytes of data to send.
*/ */
size_t txbytes; size_t txbytes;
/**
* @brief Current index in buffer when sending data.
*/
size_t txidx;
/** /**
* @brief Pointer to the buffer to put received data. * @brief Pointer to the buffer to put received data.
*/ */
@ -181,10 +177,6 @@ struct I2CDriver {
* @brief Number of bytes of data to receive. * @brief Number of bytes of data to receive.
*/ */
size_t rxbytes; size_t rxbytes;
/**
* @brief Current index in buffer when receiving data.
*/
size_t rxidx;
/** /**
* @brief Pointer to the I2Cx registers block. * @brief Pointer to the I2Cx registers block.
*/ */