Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Make AT32 I2C accesses fully interrupt driven (#13171)

Browse source 
Make I2C accesses fully interrupt driven
This commit is contained in:
Steve Evans 2023-11-17 22:45:04 +00:00 • committed by GitHub
parent 84a04db8b9
commit ab1559cf20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 251 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

462
lib/main/AT32F43x/middlewares/i2c_application_library/i2c_application.c
View file

@ -23,6 +23,7 @@
*/ */
#include "i2c_application.h" #include "i2c_application.h"
#include "drivers/pinio.h"
/** @addtogroup AT32F435_437_middlewares_i2c_application_library /** @addtogroup AT32F435_437_middlewares_i2c_application_library
* @{ * @{
@ -91,12 +92,6 @@
((uint32_t)(DMA_CHANNEL) == ((uint32_t)DMA2_CHANNEL6))? DMA2_DTERR6_FLAG : \ ((uint32_t)(DMA_CHANNEL) == ((uint32_t)DMA2_CHANNEL6))? DMA2_DTERR6_FLAG : \
DMA2_DTERR7_FLAG) DMA2_DTERR7_FLAG)
/**
* @brief i2c transmission status
*/
#define I2C_START 0
#define I2C_END 1
/** /**
* @brief initializes peripherals used by the i2c. * @brief initializes peripherals used by the i2c.
* @param none * @param none
@ -158,26 +153,6 @@ void i2c_reset_ctrl2_register(i2c_handle_type* hi2c)
hi2c->i2cx->ctrl2_bit.dir = 0; hi2c->i2cx->ctrl2_bit.dir = 0;
} }
/**
* @brief wait for the transfer to end.
* @param hi2c: the handle points to the operation information.
* @param timeout: maximum waiting time.
* @retval i2c status.
*/
i2c_status_type i2c_wait_end(i2c_handle_type* hi2c, uint32_t timeout)
{
while(hi2c->status != I2C_END)
{
/* check timeout */
if((timeout--) == 0)
{
hi2c->error_code = I2C_ERR_TIMEOUT;
}
}
return hi2c->error_code;
}
/** /**
* @brief wait for the flag to be set or reset, only BUSYF flag * @brief wait for the flag to be set or reset, only BUSYF flag
* is waiting to be reset, and other flags are waiting to be set * is waiting to be reset, and other flags are waiting to be set
@ -272,6 +247,14 @@ i2c_status_type i2c_wait_flag(i2c_handle_type* hi2c, uint32_t flag, uint32_t eve
return hi2c->error_code; return hi2c->error_code;
} }
// Initialise the data buffer
static void i2c_set_buffer(i2c_handle_type* hi2c, i2cStep_t step, uint8_t *buf, uint16_t len)
{
hi2c->step = step;
hi2c->pbuff[step] = buf;
hi2c->pcount[step] = len;
}
/** /**
* @brief dma transfer cofiguration. * @brief dma transfer cofiguration.
* @param hi2c: the handle points to the operation information. * @param hi2c: the handle points to the operation information.
@ -315,7 +298,14 @@ void i2c_dma_config(i2c_handle_type* hi2c, dma_channel_type* dma_channel, uint8_
*/ */
void i2c_start_transfer(i2c_handle_type* hi2c, uint16_t address, i2c_start_mode_type start) void i2c_start_transfer(i2c_handle_type* hi2c, uint16_t address, i2c_start_mode_type start)
{ {
if (hi2c->pcount > MAX_TRANSFER_CNT) uint16_t totalLen = hi2c->pcount[hi2c->step];
// Writes are done in a continuous block
if ((hi2c->step == I2C_STEP_REG) && (hi2c->mode == I2C_INT_MA_TX)) {
totalLen = hi2c->pcount[I2C_STEP_REG] + hi2c->pcount[I2C_STEP_DATA];
}
if (totalLen > MAX_TRANSFER_CNT)
{ {
hi2c->psize = MAX_TRANSFER_CNT; hi2c->psize = MAX_TRANSFER_CNT;
@ -323,9 +313,18 @@ void i2c_start_transfer(i2c_handle_type* hi2c, uint16_t address, i2c_start_mode_
} }
else else
{ {
hi2c->psize = hi2c->pcount; hi2c->psize = totalLen;
i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_AUTO_STOP_MODE, start); if ((hi2c->step == I2C_STEP_DATA) && (hi2c->mode == I2C_INT_MA_TX)) {
// Don't send a stop as a restart will be necessary to advance to I2C_STEP_DATA
i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_RELOAD_MODE, start);
} else {
if ((hi2c->mode == I2C_INT_MA_RX) || (hi2c->mode == I2C_INT_MA_TX)) {
i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_SOFT_STOP_MODE, start);
} else {
i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_AUTO_STOP_MODE, start);
}
}
} }
} }
@ -342,21 +341,21 @@ void i2c_start_transfer(i2c_handle_type* hi2c, uint16_t address, i2c_start_mode_
*/ */
void i2c_start_transfer_dma(i2c_handle_type* hi2c, dma_channel_type* dma_channelx, uint16_t address, i2c_start_mode_type start) void i2c_start_transfer_dma(i2c_handle_type* hi2c, dma_channel_type* dma_channelx, uint16_t address, i2c_start_mode_type start)
{ {
if (hi2c->pcount > MAX_TRANSFER_CNT) if (hi2c->pcount[hi2c->step] > MAX_TRANSFER_CNT)
{ {
hi2c->psize = MAX_TRANSFER_CNT; hi2c->psize = MAX_TRANSFER_CNT;
/* config dma */ /* config dma */
i2c_dma_config(hi2c, dma_channelx, hi2c->pbuff, hi2c->psize); i2c_dma_config(hi2c, dma_channelx, hi2c->pbuff[hi2c->step], hi2c->psize);
i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_RELOAD_MODE, start); i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_RELOAD_MODE, start);
} }
else else
{ {
hi2c->psize = hi2c->pcount; hi2c->psize = hi2c->pcount[hi2c->step];
/* config dma */ /* config dma */
i2c_dma_config(hi2c, dma_channelx, hi2c->pbuff, hi2c->psize); i2c_dma_config(hi2c, dma_channelx, hi2c->pbuff[hi2c->step], hi2c->psize);
i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_AUTO_STOP_MODE, start); i2c_transmit_set(hi2c->i2cx, address, hi2c->psize, I2C_AUTO_STOP_MODE, start);
} }
@ -374,8 +373,8 @@ void i2c_start_transfer_dma(i2c_handle_type* hi2c, dma_channel_type* dma_channel
i2c_status_type i2c_master_transmit(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_master_transmit(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -389,7 +388,7 @@ i2c_status_type i2c_master_transmit(i2c_handle_type* hi2c, uint16_t address, uin
/* start transfer */ /* start transfer */
i2c_start_transfer(hi2c, address, I2C_GEN_START_WRITE); i2c_start_transfer(hi2c, address, I2C_GEN_START_WRITE);
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the tdis flag to be set */ /* wait for the tdis flag to be set */
if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -399,11 +398,11 @@ i2c_status_type i2c_master_transmit(i2c_handle_type* hi2c, uint16_t address, uin
} }
/* send data */ /* send data */
i2c_data_send(hi2c->i2cx, *hi2c->pbuff++); i2c_data_send(hi2c->i2cx, *hi2c->pbuff[hi2c->step]++);
hi2c->psize--; hi2c->psize--;
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
if ((hi2c->psize == 0) && (hi2c->pcount != 0)) if ((hi2c->psize == 0) && (hi2c->pcount[hi2c->step] != 0))
{ {
/* wait for the tcrld flag to be set */ /* wait for the tcrld flag to be set */
if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -444,8 +443,8 @@ i2c_status_type i2c_master_transmit(i2c_handle_type* hi2c, uint16_t address, uin
i2c_status_type i2c_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -469,7 +468,7 @@ i2c_status_type i2c_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_
/* clear addr flag */ /* clear addr flag */
i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG); i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG);
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the rdbf flag to be set */ /* wait for the rdbf flag to be set */
if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_STOP, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_STOP, timeout) != I2C_OK)
@ -481,8 +480,8 @@ i2c_status_type i2c_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_
if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) == SET) if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) == SET)
{ {
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
} }
hi2c->error_code = I2C_ERR_STEP_4; hi2c->error_code = I2C_ERR_STEP_4;
@ -490,8 +489,8 @@ i2c_status_type i2c_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_
} }
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
} }
/* wait for the stop flag to be set */ /* wait for the stop flag to be set */
@ -532,8 +531,8 @@ i2c_status_type i2c_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_
i2c_status_type i2c_master_receive(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_master_receive(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -547,7 +546,7 @@ i2c_status_type i2c_master_receive(i2c_handle_type* hi2c, uint16_t address, uint
/* start transfer */ /* start transfer */
i2c_start_transfer(hi2c, address, I2C_GEN_START_READ); i2c_start_transfer(hi2c, address, I2C_GEN_START_READ);
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the rdbf flag to be set */ /* wait for the rdbf flag to be set */
if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -557,11 +556,11 @@ i2c_status_type i2c_master_receive(i2c_handle_type* hi2c, uint16_t address, uint
} }
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
if ((hi2c->psize == 0) && (hi2c->pcount != 0)) if ((hi2c->psize == 0) && (hi2c->pcount[hi2c->step] != 0))
{ {
/* wait for the tcrld flag to be set */ /* wait for the tcrld flag to be set */
if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK) if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK)
@ -602,8 +601,8 @@ i2c_status_type i2c_master_receive(i2c_handle_type* hi2c, uint16_t address, uint
i2c_status_type i2c_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -646,7 +645,7 @@ i2c_status_type i2c_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata, uint16
i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG); i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG);
} }
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the tdis flag to be set */ /* wait for the tdis flag to be set */
if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -659,8 +658,8 @@ i2c_status_type i2c_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata, uint16
} }
/* send data */ /* send data */
i2c_data_send(hi2c->i2cx, *hi2c->pbuff++); i2c_data_send(hi2c->i2cx, *hi2c->pbuff[hi2c->step]++);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
} }
/* wait for the ackfail flag to be set */ /* wait for the ackfail flag to be set */
@ -715,10 +714,10 @@ i2c_status_type i2c_master_transmit_int(i2c_handle_type* hi2c, uint16_t address,
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_INT_MA_TX; hi2c->mode = I2C_INT_MA_TX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -750,10 +749,10 @@ i2c_status_type i2c_slave_receive_int(i2c_handle_type* hi2c, uint8_t* pdata, uin
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_INT_SLA_RX; hi2c->mode = I2C_INT_SLA_RX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -785,10 +784,10 @@ i2c_status_type i2c_master_receive_int(i2c_handle_type* hi2c, uint16_t address,
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_INT_MA_RX; hi2c->mode = I2C_INT_MA_RX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -819,10 +818,10 @@ i2c_status_type i2c_slave_transmit_int(i2c_handle_type* hi2c, uint8_t* pdata, ui
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_INT_SLA_TX; hi2c->mode = I2C_INT_SLA_TX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -856,10 +855,10 @@ i2c_status_type i2c_master_transmit_dma(i2c_handle_type* hi2c, uint16_t address,
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_DMA_MA_TX; hi2c->mode = I2C_DMA_MA_TX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -896,10 +895,10 @@ i2c_status_type i2c_slave_receive_dma(i2c_handle_type* hi2c, uint8_t* pdata, uin
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_DMA_SLA_RX; hi2c->mode = I2C_DMA_SLA_RX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -912,7 +911,7 @@ i2c_status_type i2c_slave_receive_dma(i2c_handle_type* hi2c, uint8_t* pdata, uin
i2c_dma_enable(hi2c->i2cx, I2C_DMA_REQUEST_RX, FALSE); i2c_dma_enable(hi2c->i2cx, I2C_DMA_REQUEST_RX, FALSE);
/* config dma */ /* config dma */
i2c_dma_config(hi2c, hi2c->dma_rx_channel, hi2c->pbuff, size); i2c_dma_config(hi2c, hi2c->dma_rx_channel, hi2c->pbuff[hi2c->step], size);
/* enable acknowledge */ /* enable acknowledge */
i2c_ack_enable(hi2c->i2cx, TRUE); i2c_ack_enable(hi2c->i2cx, TRUE);
@ -940,10 +939,10 @@ i2c_status_type i2c_master_receive_dma(i2c_handle_type* hi2c, uint16_t address,
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_DMA_MA_RX; hi2c->mode = I2C_DMA_MA_RX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -980,10 +979,10 @@ i2c_status_type i2c_slave_transmit_dma(i2c_handle_type* hi2c, uint8_t* pdata, ui
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_DMA_SLA_TX; hi2c->mode = I2C_DMA_SLA_TX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -996,7 +995,7 @@ i2c_status_type i2c_slave_transmit_dma(i2c_handle_type* hi2c, uint8_t* pdata, ui
i2c_dma_enable(hi2c->i2cx, I2C_DMA_REQUEST_TX, FALSE); i2c_dma_enable(hi2c->i2cx, I2C_DMA_REQUEST_TX, FALSE);
/* config dma */ /* config dma */
i2c_dma_config(hi2c, hi2c->dma_tx_channel, hi2c->pbuff, size); i2c_dma_config(hi2c, hi2c->dma_tx_channel, hi2c->pbuff[hi2c->step], size);
/* enable acknowledge */ /* enable acknowledge */
i2c_ack_enable(hi2c->i2cx, TRUE); i2c_ack_enable(hi2c->i2cx, TRUE);
@ -1069,8 +1068,10 @@ i2c_status_type i2c_memory_address_send(i2c_handle_type* hi2c, i2c_mem_address_w
i2c_status_type i2c_memory_write(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_memory_write(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; hi2c->mode = I2C_MA_TX;
hi2c->pcount = size + mem_address_width;
// Initialise the data buffer
i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1099,9 +1100,9 @@ i2c_status_type i2c_memory_write(i2c_handle_type* hi2c, i2c_mem_address_width_ty
} }
hi2c->psize -= mem_address_width; hi2c->psize -= mem_address_width;
hi2c->pcount -= mem_address_width; hi2c->pcount[hi2c->step] -= mem_address_width;
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the tdis flag to be set */ /* wait for the tdis flag to be set */
if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -1111,11 +1112,11 @@ i2c_status_type i2c_memory_write(i2c_handle_type* hi2c, i2c_mem_address_width_ty
} }
/* send data */ /* send data */
i2c_data_send(hi2c->i2cx, *hi2c->pbuff++); i2c_data_send(hi2c->i2cx, *hi2c->pbuff[hi2c->step]++);
hi2c->psize--; hi2c->psize--;
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
if ((hi2c->psize == 0) && (hi2c->pcount != 0)) if ((hi2c->psize == 0) && (hi2c->pcount[hi2c->step] != 0))
{ {
/* wait for the tcrld flag to be set */ /* wait for the tcrld flag to be set */
if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -1162,8 +1163,10 @@ i2c_status_type i2c_memory_write(i2c_handle_type* hi2c, i2c_mem_address_width_ty
i2c_status_type i2c_memory_read(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_memory_read(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; hi2c->mode = I2C_MA_RX;
hi2c->pcount = size;
// Initialise the data buffer
i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1201,7 +1204,7 @@ i2c_status_type i2c_memory_read(i2c_handle_type* hi2c, i2c_mem_address_width_typ
/* start transfer */ /* start transfer */
i2c_start_transfer(hi2c, address, I2C_GEN_START_READ); i2c_start_transfer(hi2c, address, I2C_GEN_START_READ);
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the rdbf flag to be set */ /* wait for the rdbf flag to be set */
if (i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if (i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -1210,11 +1213,11 @@ i2c_status_type i2c_memory_read(i2c_handle_type* hi2c, i2c_mem_address_width_typ
} }
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
if ((hi2c->psize == 0) && (hi2c->pcount != 0)) if ((hi2c->psize == 0) && (hi2c->pcount[hi2c->step] != 0))
{ {
/* wait for the tcrld flag to be set */ /* wait for the tcrld flag to be set */
if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK) if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK)
@ -1260,42 +1263,40 @@ i2c_status_type i2c_memory_read(i2c_handle_type* hi2c, i2c_mem_address_width_typ
*/ */
i2c_status_type i2c_memory_write_int(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_memory_write_int(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ if (mem_address_width == I2C_MEM_ADDR_WIDIH_8) {
hi2c->mode = I2C_INT_MA_TX; // Note that this works for little endian without adjusting the address
hi2c->status = I2C_START; hi2c->pcount[I2C_STEP_REG] = 1;
// address is on the stack and we need a copy on the heap for the interrupt processing to use
hi2c->reg = mem_address;
} else {
hi2c->pcount[I2C_STEP_REG] = 2;
// I2C address is big endian, so swap the address bytes
hi2c->reg = ((mem_address >> 8) & 0xff) | ((mem_address & 0xff) << 8);
}
hi2c->pbuff = pdata; hi2c->step = I2C_STEP_REG;
hi2c->pcount = size + mem_address_width; hi2c->pbuff[I2C_STEP_REG] = (uint8_t *)&hi2c->reg;
hi2c->pbuff[I2C_STEP_DATA] = pdata;
hi2c->pcount[I2C_STEP_DATA] = size;
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
/* wait for the busy flag to be reset */ /* wait for the busy flag to be reset */
if (i2c_wait_flag(hi2c, I2C_BUSYF_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_BUSYF_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK)
{ {
hi2c->error_code = I2C_ERR_STEP_1; hi2c->error_code = I2C_ERR_STEP_1;
return hi2c->error_code; return hi2c->error_code;
} }
hi2c->state = I2C_START;
/* initialization parameters */
hi2c->mode = I2C_INT_MA_TX;
/* start transfer */ /* start transfer */
i2c_start_transfer(hi2c, address, I2C_GEN_START_WRITE); i2c_start_transfer(hi2c, address, I2C_GEN_START_WRITE);
/* wait for the tdis flag to be set */
if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
{
hi2c->error_code = I2C_ERR_STEP_2;
return hi2c->error_code;
}
/* send memory address */
if(i2c_memory_address_send(hi2c, mem_address_width, mem_address, timeout) != I2C_OK)
{
hi2c->error_code = I2C_ERR_STEP_3;
return hi2c->error_code;
}
hi2c->psize--;
hi2c->pcount--;
/* enable interrupt */ /* enable interrupt */
i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_TD_INT, TRUE); i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_TD_INT, TRUE);
@ -1318,12 +1319,22 @@ i2c_status_type i2c_memory_write_int(i2c_handle_type* hi2c, i2c_mem_address_widt
*/ */
i2c_status_type i2c_memory_read_int(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_memory_read_int(i2c_handle_type* hi2c, i2c_mem_address_width_type mem_address_width, uint16_t address, uint16_t mem_address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ if (mem_address_width == I2C_MEM_ADDR_WIDIH_8) {
hi2c->mode = I2C_INT_MA_RX; // Note that this works for little endian without adjusting the address
hi2c->status = I2C_START; hi2c->pcount[I2C_STEP_REG] = 1;
// address is on the stack and we need a copy on the heap for the interrupt processing to use
hi2c->reg = mem_address;
} else {
hi2c->pcount[I2C_STEP_REG] = 2;
// I2C address is big endian, so swap the address bytes
hi2c->reg = ((mem_address >> 8) & 0xff) | ((mem_address & 0xff) << 8);
}
hi2c->pbuff = pdata; hi2c->step = I2C_STEP_REG;
hi2c->pcount = size; hi2c->pbuff[I2C_STEP_REG] = (uint8_t *)&hi2c->reg;
hi2c->pbuff[I2C_STEP_DATA] = pdata;
hi2c->pcount[I2C_STEP_DATA] = size;
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1334,35 +1345,16 @@ i2c_status_type i2c_memory_read_int(i2c_handle_type* hi2c, i2c_mem_address_width
return hi2c->error_code; return hi2c->error_code;
} }
/* start transfer */ hi2c->state = I2C_START;
i2c_transmit_set(hi2c->i2cx, address, mem_address_width, I2C_SOFT_STOP_MODE, I2C_GEN_START_WRITE);
/* wait for the tdis flag to be set */ /* initialization parameters */
if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) hi2c->mode = I2C_INT_MA_RX;
{
hi2c->error_code = I2C_ERR_STEP_2;
return hi2c->error_code;
}
/* send memory address */ /* start transfer, initially a write with the register number */
if(i2c_memory_address_send(hi2c, mem_address_width, mem_address, timeout) != I2C_OK) i2c_start_transfer(hi2c, address, I2C_GEN_START_WRITE);
{
hi2c->error_code = I2C_ERR_STEP_3;
return hi2c->error_code;
}
/* wait for the tdc flag to be set */
if (i2c_wait_flag(hi2c, I2C_TDC_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK)
{
hi2c->error_code = I2C_ERR_STEP_4;
return hi2c->error_code;
}
/* start transfer */
i2c_start_transfer(hi2c, address, I2C_GEN_START_READ);
/* enable i2c interrupt */ /* enable i2c interrupt */
i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_RD_INT, TRUE); i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_TD_INT | I2C_RD_INT, TRUE);
return hi2c->error_code; return hi2c->error_code;
} }
@ -1385,10 +1377,10 @@ i2c_status_type i2c_memory_write_dma(i2c_handle_type* hi2c, i2c_mem_address_widt
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_DMA_MA_TX; hi2c->mode = I2C_DMA_MA_TX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1456,10 +1448,10 @@ i2c_status_type i2c_memory_read_dma(i2c_handle_type* hi2c, i2c_mem_address_width
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->mode = I2C_DMA_MA_RX; hi2c->mode = I2C_DMA_MA_RX;
hi2c->status = I2C_START; hi2c->state = I2C_START;
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1521,8 +1513,8 @@ i2c_status_type i2c_memory_read_dma(i2c_handle_type* hi2c, i2c_mem_address_width
i2c_status_type i2c_smbus_master_transmit(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_smbus_master_transmit(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1542,9 +1534,9 @@ i2c_status_type i2c_smbus_master_transmit(i2c_handle_type* hi2c, uint16_t addres
/* start transfer */ /* start transfer */
i2c_start_transfer(hi2c, address, I2C_GEN_START_WRITE); i2c_start_transfer(hi2c, address, I2C_GEN_START_WRITE);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the tdis flag to be set */ /* wait for the tdis flag to be set */
if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -1554,11 +1546,11 @@ i2c_status_type i2c_smbus_master_transmit(i2c_handle_type* hi2c, uint16_t addres
} }
/* send data */ /* send data */
i2c_data_send(hi2c->i2cx, *hi2c->pbuff++); i2c_data_send(hi2c->i2cx, *hi2c->pbuff[hi2c->step]++);
hi2c->psize--; hi2c->psize--;
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
if ((hi2c->psize == 0) && (hi2c->pcount != 0)) if ((hi2c->psize == 0) && (hi2c->pcount[hi2c->step] != 0))
{ {
/* wait for the tcrld flag to be set */ /* wait for the tcrld flag to be set */
if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -1599,8 +1591,8 @@ i2c_status_type i2c_smbus_master_transmit(i2c_handle_type* hi2c, uint16_t addres
i2c_status_type i2c_smbus_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_smbus_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1624,12 +1616,12 @@ i2c_status_type i2c_smbus_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, u
i2c_pec_transmit_enable(hi2c->i2cx, TRUE); i2c_pec_transmit_enable(hi2c->i2cx, TRUE);
/* configure the number of bytes to be transmitted */ /* configure the number of bytes to be transmitted */
i2c_cnt_set(hi2c->i2cx, hi2c->pcount); i2c_cnt_set(hi2c->i2cx, hi2c->pcount[hi2c->step]);
/* clear addr flag */ /* clear addr flag */
i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG); i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG);
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the rdbf flag to be set */ /* wait for the rdbf flag to be set */
if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_STOP, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_STOP, timeout) != I2C_OK)
@ -1641,8 +1633,8 @@ i2c_status_type i2c_smbus_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, u
if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) == SET) if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) == SET)
{ {
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
} }
hi2c->error_code = I2C_ERR_STEP_3; hi2c->error_code = I2C_ERR_STEP_3;
@ -1650,8 +1642,8 @@ i2c_status_type i2c_smbus_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, u
} }
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
} }
/* wait for the stop flag to be set */ /* wait for the stop flag to be set */
@ -1695,8 +1687,8 @@ i2c_status_type i2c_smbus_slave_receive(i2c_handle_type* hi2c, uint8_t* pdata, u
i2c_status_type i2c_smbus_master_receive(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_smbus_master_receive(i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1716,7 +1708,7 @@ i2c_status_type i2c_smbus_master_receive(i2c_handle_type* hi2c, uint16_t address
/* start transfer */ /* start transfer */
i2c_start_transfer(hi2c, address, I2C_GEN_START_READ); i2c_start_transfer(hi2c, address, I2C_GEN_START_READ);
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the rdbf flag to be set */ /* wait for the rdbf flag to be set */
if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_RDBF_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -1726,11 +1718,11 @@ i2c_status_type i2c_smbus_master_receive(i2c_handle_type* hi2c, uint16_t address
} }
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
if ((hi2c->psize == 0) && (hi2c->pcount != 0)) if ((hi2c->psize == 0) && (hi2c->pcount[hi2c->step] != 0))
{ {
/* wait for the tcrld flag to be set */ /* wait for the tcrld flag to be set */
if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK) if (i2c_wait_flag(hi2c, I2C_TCRLD_FLAG, I2C_EVENT_CHECK_NONE, timeout) != I2C_OK)
@ -1771,8 +1763,8 @@ i2c_status_type i2c_smbus_master_receive(i2c_handle_type* hi2c, uint16_t address
i2c_status_type i2c_smbus_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout) i2c_status_type i2c_smbus_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata, uint16_t size, uint32_t timeout)
{ {
/* initialization parameters */ /* initialization parameters */
hi2c->pbuff = pdata; // Initialise the data buffer
hi2c->pcount = size; i2c_set_buffer(hi2c, I2C_STEP_DATA, pdata, size);
hi2c->error_code = I2C_OK; hi2c->error_code = I2C_OK;
@ -1801,7 +1793,7 @@ i2c_status_type i2c_smbus_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata,
i2c_pec_transmit_enable(hi2c->i2cx, TRUE); i2c_pec_transmit_enable(hi2c->i2cx, TRUE);
/* configure the number of bytes to be transmitted */ /* configure the number of bytes to be transmitted */
i2c_cnt_set(hi2c->i2cx, hi2c->pcount); i2c_cnt_set(hi2c->i2cx, hi2c->pcount[hi2c->step]);
} }
/* clear addr flag */ /* clear addr flag */
@ -1824,15 +1816,15 @@ i2c_status_type i2c_smbus_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata,
i2c_pec_transmit_enable(hi2c->i2cx, TRUE); i2c_pec_transmit_enable(hi2c->i2cx, TRUE);
/* configure the number of bytes to be transmitted */ /* configure the number of bytes to be transmitted */
i2c_cnt_set(hi2c->i2cx, hi2c->pcount); i2c_cnt_set(hi2c->i2cx, hi2c->pcount[hi2c->step]);
/* clear addr flag */ /* clear addr flag */
i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG); i2c_flag_clear(hi2c->i2cx, I2C_ADDRF_FLAG);
} }
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
while (hi2c->pcount > 0) while (hi2c->pcount[hi2c->step] > 0)
{ {
/* wait for the tdis flag to be set */ /* wait for the tdis flag to be set */
if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK) if(i2c_wait_flag(hi2c, I2C_TDIS_FLAG, I2C_EVENT_CHECK_ACKFAIL, timeout) != I2C_OK)
@ -1845,8 +1837,8 @@ i2c_status_type i2c_smbus_slave_transmit(i2c_handle_type* hi2c, uint8_t* pdata,
} }
/* send data */ /* send data */
i2c_data_send(hi2c->i2cx, *hi2c->pbuff++); i2c_data_send(hi2c->i2cx, *hi2c->pbuff[hi2c->step]++);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
} }
/* wait for the ackfail flag to be set */ /* wait for the ackfail flag to be set */
@ -1909,53 +1901,59 @@ i2c_status_type i2c_master_irq_handler_int(i2c_handle_type* hi2c)
/* refresh tx register */ /* refresh tx register */
i2c_refresh_txdt_register(hi2c); i2c_refresh_txdt_register(hi2c);
if(hi2c->pcount != 0) if(hi2c->pcount[hi2c->step] != 0)
{ {
hi2c->error_code = I2C_ERR_ACKFAIL; hi2c->error_code = I2C_ERR_ACKFAIL;
return hi2c->error_code;
} }
} }
else if (i2c_flag_get(hi2c->i2cx, I2C_TDIS_FLAG) != RESET) else if (i2c_flag_get(hi2c->i2cx, I2C_TDIS_FLAG) != RESET)
{ {
/* send data */ /* send data */
i2c_data_send(hi2c->i2cx, *hi2c->pbuff++); i2c_data_send(hi2c->i2cx, *hi2c->pbuff[hi2c->step]++);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
if ((hi2c->pcount[hi2c->step] == 0) && (hi2c->step == I2C_STEP_REG) && (hi2c->mode == I2C_INT_MA_TX)) {
// Advance to next step
hi2c->step = I2C_STEP_DATA;
}
} }
else if (i2c_flag_get(hi2c->i2cx, I2C_TCRLD_FLAG) != RESET) else if (i2c_flag_get(hi2c->i2cx, I2C_TCRLD_FLAG) != RESET)
{ {
if ((hi2c->psize == 0) && (hi2c->pcount != 0)) if ((hi2c->psize == 0) && (hi2c->pcount[hi2c->step] != 0))
{ {
/* continue transfer */ i2c_start_transfer(hi2c, i2c_transfer_addr_get(hi2c->i2cx), I2C_WITHOUT_START);
i2c_start_transfer(hi2c, i2c_transfer_addr_get(hi2c->i2cx), I2C_WITHOUT_START); } else {
} hi2c->error_code = I2C_ERR_TCRLD;
else
{
hi2c->error_code = I2C_ERR_TCRLD;
return hi2c->error_code;
} }
} }
else if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET) else if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET)
{ {
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
} }
else if (i2c_flag_get(hi2c->i2cx, I2C_TDC_FLAG) != RESET) else if (i2c_flag_get(hi2c->i2cx, I2C_TDC_FLAG) != RESET)
{ {
if (hi2c->pcount == 0) if (hi2c->pcount[hi2c->step] == 0)
{ {
if (hi2c->i2cx->ctrl2_bit.astopen == 0) if ((hi2c->step == I2C_STEP_REG) && (hi2c->mode == I2C_INT_MA_RX)) {
{ // Advance to next step
/* generate stop condtion */ hi2c->step = I2C_STEP_DATA;
i2c_stop_generate(hi2c->i2cx);
} /* restart transfer as a read */
i2c_start_transfer(hi2c, i2c_transfer_addr_get(hi2c->i2cx), I2C_GEN_START_READ);
} else {
if (hi2c->i2cx->ctrl2_bit.astopen == 0)
{
/* generate stop condtion */
i2c_stop_generate(hi2c->i2cx);
}
}
} }
else else
{ {
hi2c->error_code = I2C_ERR_TDC; hi2c->error_code = I2C_ERR_TDC;
return hi2c->error_code;
} }
} }
else if (i2c_flag_get(hi2c->i2cx, I2C_STOPF_FLAG) != RESET) else if (i2c_flag_get(hi2c->i2cx, I2C_STOPF_FLAG) != RESET)
@ -1979,9 +1977,7 @@ i2c_status_type i2c_master_irq_handler_int(i2c_handle_type* hi2c)
i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_TD_INT | I2C_RD_INT, FALSE); i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_TD_INT | I2C_RD_INT, FALSE);
/* transfer complete */ /* transfer complete */
hi2c->status = I2C_END; hi2c->state = I2C_END;
hi2c->error_code = I2C_OK;
return hi2c->error_code;
} }
return hi2c->error_code; return hi2c->error_code;
@ -1997,7 +1993,7 @@ i2c_status_type i2c_slave_irq_handler_int(i2c_handle_type* hi2c)
if (i2c_flag_get(hi2c->i2cx, I2C_ACKFAIL_FLAG) != RESET) if (i2c_flag_get(hi2c->i2cx, I2C_ACKFAIL_FLAG) != RESET)
{ {
/* transfer complete */ /* transfer complete */
if (hi2c->pcount == 0) if (hi2c->pcount[hi2c->step] == 0)
{ {
i2c_refresh_txdt_register(hi2c); i2c_refresh_txdt_register(hi2c);
@ -2018,21 +2014,21 @@ i2c_status_type i2c_slave_irq_handler_int(i2c_handle_type* hi2c)
} }
else if (i2c_flag_get(hi2c->i2cx, I2C_TDIS_FLAG) != RESET) else if (i2c_flag_get(hi2c->i2cx, I2C_TDIS_FLAG) != RESET)
{ {
if (hi2c->pcount > 0) if (hi2c->pcount[hi2c->step] > 0)
{ {
/* send data */ /* send data */
hi2c->i2cx->txdt = (*(hi2c->pbuff++)); hi2c->i2cx->txdt = (*(hi2c->pbuff[hi2c->step]++));
hi2c->psize--; hi2c->psize--;
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
} }
} }
else if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET) else if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET)
{ {
if (hi2c->pcount > 0) if (hi2c->pcount[hi2c->step] > 0)
{ {
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
} }
} }
@ -2054,17 +2050,17 @@ i2c_status_type i2c_slave_irq_handler_int(i2c_handle_type* hi2c)
if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET) if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET)
{ {
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
if ((hi2c->psize > 0)) if ((hi2c->psize > 0))
{ {
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
} }
} }
/* transfer complete */ /* transfer complete */
hi2c->status = I2C_END; hi2c->state = I2C_END;
} }
return hi2c->error_code; return hi2c->error_code;
@ -2088,7 +2084,7 @@ i2c_status_type i2c_master_irq_handler_dma(i2c_handle_type* hi2c)
/* refresh tx dt register */ /* refresh tx dt register */
i2c_refresh_txdt_register(hi2c); i2c_refresh_txdt_register(hi2c);
if(hi2c->pcount != 0) if(hi2c->pcount[hi2c->step] != 0)
{ {
hi2c->error_code = I2C_ERR_ACKFAIL; hi2c->error_code = I2C_ERR_ACKFAIL;
return hi2c->error_code; return hi2c->error_code;
@ -2099,7 +2095,7 @@ i2c_status_type i2c_master_irq_handler_dma(i2c_handle_type* hi2c)
/* disable tdc interrupt */ /* disable tdc interrupt */
i2c_interrupt_enable(hi2c->i2cx, I2C_TDC_INT, FALSE); i2c_interrupt_enable(hi2c->i2cx, I2C_TDC_INT, FALSE);
if (hi2c->pcount != 0) if (hi2c->pcount[hi2c->step] != 0)
{ {
/* continue transfer */ /* continue transfer */
i2c_start_transfer(hi2c, i2c_transfer_addr_get(hi2c->i2cx), I2C_WITHOUT_START); i2c_start_transfer(hi2c, i2c_transfer_addr_get(hi2c->i2cx), I2C_WITHOUT_START);
@ -2141,7 +2137,7 @@ i2c_status_type i2c_master_irq_handler_dma(i2c_handle_type* hi2c)
i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_TD_INT | I2C_RD_INT, FALSE); i2c_interrupt_enable(hi2c->i2cx, I2C_ERR_INT | I2C_TDC_INT | I2C_STOP_INT | I2C_ACKFIAL_INT | I2C_TD_INT | I2C_RD_INT, FALSE);
/* transfer complete */ /* transfer complete */
hi2c->status = I2C_END; hi2c->state = I2C_END;
} }
return hi2c->error_code; return hi2c->error_code;
@ -2182,17 +2178,17 @@ i2c_status_type i2c_slave_irq_handler_dma(i2c_handle_type* hi2c)
if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET) if (i2c_flag_get(hi2c->i2cx, I2C_RDBF_FLAG) != RESET)
{ {
/* read data */ /* read data */
(*hi2c->pbuff++) = i2c_data_receive(hi2c->i2cx); (*hi2c->pbuff[hi2c->step]++) = i2c_data_receive(hi2c->i2cx);
if ((hi2c->psize > 0)) if ((hi2c->psize > 0))
{ {
hi2c->pcount--; hi2c->pcount[hi2c->step]--;
hi2c->psize--; hi2c->psize--;
} }
} }
/* transfer complete */ /* transfer complete */
hi2c->status = I2C_END; hi2c->state = I2C_END;
} }
return hi2c->error_code; return hi2c->error_code;
@ -2226,10 +2222,10 @@ void i2c_dma_tx_rx_irq_handler(i2c_handle_type* hi2c, dma_channel_type* dma_chan
case I2C_DMA_MA_RX: case I2C_DMA_MA_RX:
{ {
/* update the number of transfers */ /* update the number of transfers */
hi2c->pcount -= hi2c->psize; hi2c->pcount[hi2c->step] -= hi2c->psize;
/* transfer complete */ /* transfer complete */
if (hi2c->pcount == 0) if (hi2c->pcount[hi2c->step] == 0)
{ {
/* enable stop interrupt */ /* enable stop interrupt */
i2c_interrupt_enable(hi2c->i2cx, I2C_STOP_INT, TRUE); i2c_interrupt_enable(hi2c->i2cx, I2C_STOP_INT, TRUE);
@ -2238,20 +2234,20 @@ void i2c_dma_tx_rx_irq_handler(i2c_handle_type* hi2c, dma_channel_type* dma_chan
else else
{ {
/* update the buffer pointer of transfers */ /* update the buffer pointer of transfers */
hi2c->pbuff += hi2c->psize; hi2c->pbuff[hi2c->step] += hi2c->psize;
/* set the number to be transferred */ /* set the number to be transferred */
if (hi2c->pcount > MAX_TRANSFER_CNT) if (hi2c->pcount[hi2c->step] > MAX_TRANSFER_CNT)
{ {
hi2c->psize = MAX_TRANSFER_CNT; hi2c->psize = MAX_TRANSFER_CNT;
} }
else else
{ {
hi2c->psize = hi2c->pcount; hi2c->psize = hi2c->pcount[hi2c->step];
} }
/* config dma channel, continue to transfer data */ /* config dma channel, continue to transfer data */
i2c_dma_config(hi2c, dma_channel, hi2c->pbuff, hi2c->psize); i2c_dma_config(hi2c, dma_channel, hi2c->pbuff[hi2c->step], hi2c->psize);
/* enable tdc interrupt */ /* enable tdc interrupt */
i2c_interrupt_enable(hi2c->i2cx, I2C_TDC_INT, TRUE); i2c_interrupt_enable(hi2c->i2cx, I2C_TDC_INT, TRUE);

27
lib/main/AT32F43x/middlewares/i2c_application_library/i2c_application.h
View file

@ -70,7 +70,9 @@ typedef enum
typedef enum typedef enum
{ {
I2C_INT_MA_TX = 0, I2C_MA_TX = 0,
I2C_MA_RX,
I2C_INT_MA_TX,
I2C_INT_MA_RX, I2C_INT_MA_RX,
I2C_INT_SLA_TX, I2C_INT_SLA_TX,
I2C_INT_SLA_RX, I2C_INT_SLA_RX,
@ -120,14 +122,30 @@ typedef enum
* @{ * @{
*/ */
/**
* @brief i2c transmission status
*/
typedef enum {
I2C_START,
I2C_END
} i2cState_t;
typedef enum {
I2C_STEP_REG, // Preliminary transfer to write register address prior to a read
I2C_STEP_DATA,
I2C_STEP_COUNT
} i2cStep_t;
typedef struct typedef struct
{ {
i2c_type *i2cx; /*!< i2c registers base address */ i2c_type *i2cx; /*!< i2c registers base address */
uint8_t *pbuff; /*!< pointer to i2c transfer buffer */ uint16_t reg;
uint8_t *pbuff[I2C_STEP_COUNT]; /*!< pointer to i2c transfer buffer */
__IO uint16_t psize; /*!< i2c transfer size */ __IO uint16_t psize; /*!< i2c transfer size */
__IO uint16_t pcount; /*!< i2c transfer counter */ __IO uint16_t pcount[I2C_STEP_COUNT]; /*!< i2c transfer counter */
__IO uint32_t mode; /*!< i2c communication mode */ __IO uint32_t mode; /*!< i2c communication mode */
__IO uint32_t status; /*!< i2c communication status */ __IO i2cStep_t step; /*!< 0 based phased count */
__IO i2cState_t state; /*!< i2c communication state */
__IO i2c_status_type error_code; /*!< i2c error code */ __IO i2c_status_type error_code; /*!< i2c error code */
dma_channel_type *dma_tx_channel; /*!< dma transmit channel */ dma_channel_type *dma_tx_channel; /*!< dma transmit channel */
dma_channel_type *dma_rx_channel; /*!< dma receive channel */ dma_channel_type *dma_rx_channel; /*!< dma receive channel */
@ -145,7 +163,6 @@ typedef struct
void i2c_config (i2c_handle_type* hi2c); void i2c_config (i2c_handle_type* hi2c);
void i2c_lowlevel_init (i2c_handle_type* hi2c); void i2c_lowlevel_init (i2c_handle_type* hi2c);
void i2c_reset_ctrl2_register (i2c_handle_type* hi2c); void i2c_reset_ctrl2_register (i2c_handle_type* hi2c);
i2c_status_type i2c_wait_end (i2c_handle_type* hi2c, uint32_t timeout);
i2c_status_type i2c_wait_flag (i2c_handle_type* hi2c, uint32_t flag, uint32_t event_check, uint32_t timeout); i2c_status_type i2c_wait_flag (i2c_handle_type* hi2c, uint32_t flag, uint32_t event_check, uint32_t timeout);
i2c_status_type i2c_master_transmit (i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout); i2c_status_type i2c_master_transmit (i2c_handle_type* hi2c, uint16_t address, uint8_t* pdata, uint16_t size, uint32_t timeout);