summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a2072b9)
raw | patch | inline | side by side (parent: a2072b9)
| author | Hao Zhang <hzhang@ti.com> | |
| Wed, 27 May 2020 01:16:47 +0000 (21:16 -0400) | ||
| committer | Sivaraj R <sivaraj@ti.com> | |
| Wed, 27 May 2020 07:59:54 +0000 (02:59 -0500) |
Signed-off-by: Hao Zhang <hzhang@ti.com>
| packages/ti/drv/i2c/src/v1/I2C_v1.c | patch | blob | history | |
| packages/ti/drv/i2c/test/eeprom_read/src/main_test.c | patch | blob | history |
index 4f5b41df1299c1e56d12c359c08e5bd35ef65fde..41f3707f908771edb24e584bbeb0865c0f862c61 100644 (file)
@@ -82,15 +82,14 @@ static int32_t I2C_v1_setBusFrequency(I2C_Handle handle, uint32_t busFrequency);
static int32_t I2C_v1_recoverBus(I2C_Handle handle, uint32_t i2cDelay);
static int32_t I2C_v1_resetCtrl(I2C_Handle handle);
static int32_t I2C_v1_ctrlInit(I2C_Handle handle);
-static uint32_t I2C_v1_waitForPin(I2C_Handle handle,
- uint32_t flag,
- uint32_t timeout,
- uint8_t *timeOutStatus);
+static uint32_t I2C_v1_waitForPin(I2C_Handle handle,
+ uint32_t flag,
+ uint32_t *pTimeout);
#define I2C_DELAY_MED ((uint32_t) 10000U)
#define I2C_DELAY_BIG ((uint32_t) 30000U)
#define I2C_DELAY_SMALL ((uint32_t) 5000U)
-
+#define I2C_DELAY_USEC ((uint32_t) 250U)
/* I2C function table for I2C AM57x implementation */
const I2C_FxnTable I2C_v1_FxnTable = {
return (retHandle);
}
+static bool I2C_checkTimeout(uint32_t *pUsecCnt)
+{
+ bool timeout = (bool)false;
+
+ *pUsecCnt = *pUsecCnt + 1U;
+ if (*pUsecCnt == 1000U)
+ {
+ *pUsecCnt = 0U;
+ timeout = (bool)true;
+ }
+
+ return (timeout);
+}
+
/*
* ======== I2C_primeTransfer_v1 =======
*/
I2C_v1_Object *object = NULL;
I2C_HwAttrs const *hwAttrs = NULL;
int16_t status = I2C_STS_SUCCESS;
- uint8_t timeoutStatus = 0;
uint32_t errStat=0,fatalError=0;
uint32_t regVal;
uint32_t xsa;
uint32_t timeout = transaction->timeout;
-
+ uint32_t uSecTimeout = 0U;
+
/* Get the pointer to the object and hwAttrs */
object = (I2C_v1_Object*)handle->object;
hwAttrs = (I2C_HwAttrs const *)handle->hwAttrs;
/* wait for bus busy */
while ((I2CMasterBusBusy(hwAttrs->baseAddr) == 0) && (timeout != 0))
{
- I2C_v1_udelay(I2C_DELAY_SMALL);
- timeout--;
+ I2C_v1_udelay(I2C_DELAY_USEC);
+ if (I2C_checkTimeout(&uSecTimeout))
+ {
+ timeout--;
+ }
}
while ((object->writeCountIdx != 0U) && (timeout != 0))
I2C_INT_STOP_CONDITION ) == 0U)) && \
(timeout != 0))
{
- I2C_v1_udelay(I2C_DELAY_SMALL);
- timeout--;
+ I2C_v1_udelay(I2C_DELAY_USEC);
+ if (I2C_checkTimeout(&uSecTimeout))
+ {
+ timeout--;
+ }
}
errStat = I2CMasterIntRawStatusEx(hwAttrs->baseAddr, I2C_INT_ARBITRATION_LOST | \
if ((fatalError == 0U) && (timeout != 0U))
{
- /* wait for register access ready */
- (void)I2C_v1_waitForPin(handle,
- I2C_INT_ADRR_READY_ACESS,
- transaction->timeout,
- &timeoutStatus);
+ /* wait for register access ready */
+ timeout = I2C_v1_waitForPin(handle,
+ I2C_INT_ADRR_READY_ACESS,
+ &timeout);
}
if ((errStat & I2C_INT_ARBITRATION_LOST) == I2C_INT_ARBITRATION_LOST)
{
status = I2C_STS_ERR_ACCESS_ERROR;
}
- else if ((timeoutStatus == (uint8_t)1U) || (timeout == 0U))
+ else if (timeout == 0U)
{
status = I2C_STS_ERR_TIMEOUT;
}
if ((fatalError == 0U) && (timeout != 0U))
{
/* wait for stop to happen */
- (void)I2C_v1_waitForPin(handle,
- I2C_INT_STOP_CONDITION,
- transaction->timeout,
- &timeoutStatus);
+ timeout = I2C_v1_waitForPin(handle,
+ I2C_INT_STOP_CONDITION,
+ &timeout);
/* wait for register access ready */
- (void)I2C_v1_waitForPin(handle,
- I2C_INT_ADRR_READY_ACESS,
- transaction->timeout,
- &timeoutStatus);
+ timeout = I2C_v1_waitForPin(handle,
+ I2C_INT_ADRR_READY_ACESS,
+ &timeout);
- if ((timeoutStatus == (uint8_t)1U) || (timeout == 0U))
+ if (timeout == 0U)
{
status = I2C_STS_ERR_TIMEOUT;
}
/* wait for bus not busy */
while ((I2CMasterBusBusy(hwAttrs->baseAddr)==0) && (timeout != 0U))
{
- I2C_v1_udelay(I2C_DELAY_SMALL);
- timeout--;
+ I2C_v1_udelay(I2C_DELAY_USEC);
+ if (I2C_checkTimeout(&uSecTimeout))
+ {
+ timeout--;
+ }
}
while ((object->readCountIdx != 0U) && (timeout != 0U))
I2C_INT_ACCESS_ERROR ) == 0U)) && \
(timeout != 0U))
{
- I2C_v1_udelay(I2C_DELAY_SMALL);
- timeout--;
+ I2C_v1_udelay(I2C_DELAY_USEC);
+ if (I2C_checkTimeout(&uSecTimeout))
+ {
+ timeout--;
+ }
}
errStat = I2CMasterIntRawStatusEx(hwAttrs->baseAddr, I2C_INT_ARBITRATION_LOST | \
if ((fatalError == 0U) && (timeout != 0U))
{
/* wait for register access ready */
- (void)I2C_v1_waitForPin(handle,
- I2C_INT_ADRR_READY_ACESS,
- transaction->timeout,
- &timeoutStatus);
+ timeout = I2C_v1_waitForPin(handle,
+ I2C_INT_ADRR_READY_ACESS,
+ &timeout);
}
if ((errStat & I2C_INT_ARBITRATION_LOST) == I2C_INT_ARBITRATION_LOST)
{
status = I2C_STS_ERR_ACCESS_ERROR;
}
- else if (timeoutStatus == (uint8_t)1U)
+ else if (timeout == 0U)
{
status = I2C_STS_ERR_TIMEOUT;
}
if ((fatalError == 0U) && (timeout != 0U))
{
/* wait for stop to happen */
- (void)I2C_v1_waitForPin(handle,
- I2C_INT_STOP_CONDITION,
- transaction->timeout,
- &timeoutStatus);
+ timeout = I2C_v1_waitForPin(handle,
+ I2C_INT_STOP_CONDITION,
+ &timeout);
/* wait for register access ready */
- (void)I2C_v1_waitForPin(handle,
- I2C_INT_ADRR_READY_ACESS,
- transaction->timeout,
- &timeoutStatus);
+ timeout = I2C_v1_waitForPin(handle,
+ I2C_INT_ADRR_READY_ACESS,
+ &timeout);
- if ((timeoutStatus == (uint8_t)1U) || (timeout == 0U))
+ if (timeout == 0U)
{
status = I2C_STS_ERR_TIMEOUT;
}
/*
* ======== I2C_v1_waitForPin ========
*/
-static uint32_t I2C_v1_waitForPin(I2C_Handle handle,
- uint32_t flag,
- uint32_t timeout,
- uint8_t *timeOutStatus)
+static uint32_t I2C_v1_waitForPin(I2C_Handle handle,
+ uint32_t flag,
+ uint32_t *pTimeout)
{
- uint32_t status = 0;
- I2C_HwAttrs const *hwAttrs = NULL;
- volatile uint32_t pinTimeout = timeout;
-
- *timeOutStatus = 0;
+ uint32_t status;
+ I2C_HwAttrs const *hwAttrs = NULL;
+ uint32_t timeout = *pTimeout;
+ uint32_t uSecTimeout = 0U;
/* Get the pointer to hwAttrs */
hwAttrs = (I2C_HwAttrs const *)handle->hwAttrs;
- /* For backware compatibility. Perform timeout check if value is greater
- * than 0 only.
- */
- if(pinTimeout > 0U)
+ if(timeout > 0U)
{
status = I2CMasterIntRawStatus(hwAttrs->baseAddr);
while ((uint32_t) 0U == (status & flag))
{
- if ((uint32_t) 0U != pinTimeout)
+ if ((uint32_t) 0U != timeout)
{
+ I2C_v1_udelay(I2C_DELAY_USEC);
+ if (I2C_checkTimeout(&uSecTimeout))
+ {
+ timeout--;
+ }
status = I2CMasterIntRawStatus(hwAttrs->baseAddr);
- pinTimeout = pinTimeout - 1U;
}
else
{
}
}
- if (0U != timeout)
- {
- if (pinTimeout == 0U)
- {
- *timeOutStatus = (uint8_t)1U;
- I2CMasterIntClearEx(hwAttrs->baseAddr, I2C_INT_ALL);
- }
- }
- }
- else
- {
- while(I2CMasterIntRawStatusEx(hwAttrs->baseAddr, flag) == 0U)
+ if (timeout == 0U)
{
+ I2CMasterIntClearEx(hwAttrs->baseAddr, I2C_INT_ALL);
}
}
- return status;
+ return (timeout);
}
diff --git a/packages/ti/drv/i2c/test/eeprom_read/src/main_test.c b/packages/ti/drv/i2c/test/eeprom_read/src/main_test.c
index 70f5df968a9de2135d59f5a60e9b94456c133008..67215d4af45119641fbaee4f6ec978f1852c89e5 100644 (file)
#if defined (SOC_AM335X) || defined (SOC_AM437x) || defined (SOC_AM571x) || defined (SOC_AM572x) || defined (SOC_AM574x) || defined (SOC_AM65XX) || defined (SOC_J721E) || defined (SOC_J7200)
{I2C_Probe_BusFrequency_test, I2C_TEST_ID_PROBE_BUS_FREQ, false, true, false, SemaphoreP_WAIT_FOREVER, "\r\n I2C probe bus freq test in interrupt mode"},
{I2C_timeout_test, I2C_TEST_ID_TIMEOUT_INT, false, true, false, 1, "\r\n I2C timeout test in interrupt mode"},
- {I2C_timeout_test, I2C_TEST_ID_TIMEOUT_POLLING, false, false, false, 1, "\r\n I2C timeout test in polling mode"},
#endif
{NULL, },
};