Skip to content

Commit fa5a554

Browse files
robert-hhrobert-hh
committed
nxp_driver: Update the fsl_lpi2c.* files.
Updated for MIMXRT1011, -1015, -1021, -1052, -1062, -1064 and .-1176 Tested with MIMXRT1011, -1021, -1052, -1062 and -1176 Lacking boards for testing MIMXRT1015 and -1064. But at least the build is fine.
1 parent a180582 commit fa5a554

File tree

7 files changed

+126
-42
lines changed

7 files changed

+126
-42
lines changed

‎sdk/devices/MIMXRT1011/drivers/fsl_lpi2c.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,33 @@ static status_t LPI2C_RunTransferStateMachine(LPI2C_Type *base, lpi2c_master_han
10651065

10661066
/* Check for errors. */
10671067
status = LPI2C_MasterGetStatusFlags(base);
1068+
1069+
/* Get fifo counts. */
1070+
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1071+
1072+
/* Get pointer to private data. */
1073+
xfer = &handle->transfer;
1074+
10681075
/* For the last byte, nack flag is expected.
10691076
Do not check and clear kLPI2C_MasterNackDetectFlag for the last byte,
10701077
in case FIFO is emptied when stop command has not been sent. */
10711078
if (handle->remainingBytes == 0U)
10721079
{
1073-
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1080+
/* When data size is not zero which means it is not only one byte of address is sent, and */
1081+
/* when the txfifo is empty, or have one byte which is the stop command, then the nack status can be ignored. */
1082+
if ((xfer->dataSize != 0U) &&
1083+
((txCount == 0U) || ((txCount == 1U) && (handle->state == (uint8_t)kWaitForCompletionState) &&
1084+
((xfer->flags & (uint32_t)kLPI2C_TransferNoStopFlag) == 0U))))
1085+
{
1086+
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1087+
}
10741088
}
1089+
10751090
result = LPI2C_MasterCheckAndClearError(base, status);
1091+
10761092
if (kStatus_Success == result)
10771093
{
1078-
/* Get pointer to private data. */
1079-
xfer = &handle->transfer;
1080-
1081-
/* Get fifo counts and compute room in tx fifo. */
1082-
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1094+
/* Compute room in tx fifo */
10831095
txCount = txFifoSize - txCount;
10841096

10851097
while (!state_complete)

‎sdk/devices/MIMXRT1015/drivers/fsl_lpi2c.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,33 @@ static status_t LPI2C_RunTransferStateMachine(LPI2C_Type *base, lpi2c_master_han
10651065

10661066
/* Check for errors. */
10671067
status = LPI2C_MasterGetStatusFlags(base);
1068+
1069+
/* Get fifo counts. */
1070+
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1071+
1072+
/* Get pointer to private data. */
1073+
xfer = &handle->transfer;
1074+
10681075
/* For the last byte, nack flag is expected.
10691076
Do not check and clear kLPI2C_MasterNackDetectFlag for the last byte,
10701077
in case FIFO is emptied when stop command has not been sent. */
10711078
if (handle->remainingBytes == 0U)
10721079
{
1073-
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1080+
/* When data size is not zero which means it is not only one byte of address is sent, and */
1081+
/* when the txfifo is empty, or have one byte which is the stop command, then the nack status can be ignored. */
1082+
if ((xfer->dataSize != 0U) &&
1083+
((txCount == 0U) || ((txCount == 1U) && (handle->state == (uint8_t)kWaitForCompletionState) &&
1084+
((xfer->flags & (uint32_t)kLPI2C_TransferNoStopFlag) == 0U))))
1085+
{
1086+
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1087+
}
10741088
}
1089+
10751090
result = LPI2C_MasterCheckAndClearError(base, status);
1091+
10761092
if (kStatus_Success == result)
10771093
{
1078-
/* Get pointer to private data. */
1079-
xfer = &handle->transfer;
1080-
1081-
/* Get fifo counts and compute room in tx fifo. */
1082-
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1094+
/* Compute room in tx fifo */
10831095
txCount = txFifoSize - txCount;
10841096

10851097
while (!state_complete)

‎sdk/devices/MIMXRT1021/drivers/fsl_lpi2c.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,33 @@ static status_t LPI2C_RunTransferStateMachine(LPI2C_Type *base, lpi2c_master_han
10651065

10661066
/* Check for errors. */
10671067
status = LPI2C_MasterGetStatusFlags(base);
1068+
1069+
/* Get fifo counts. */
1070+
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1071+
1072+
/* Get pointer to private data. */
1073+
xfer = &handle->transfer;
1074+
10681075
/* For the last byte, nack flag is expected.
10691076
Do not check and clear kLPI2C_MasterNackDetectFlag for the last byte,
10701077
in case FIFO is emptied when stop command has not been sent. */
10711078
if (handle->remainingBytes == 0U)
10721079
{
1073-
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1080+
/* When data size is not zero which means it is not only one byte of address is sent, and */
1081+
/* when the txfifo is empty, or have one byte which is the stop command, then the nack status can be ignored. */
1082+
if ((xfer->dataSize != 0U) &&
1083+
((txCount == 0U) || ((txCount == 1U) && (handle->state == (uint8_t)kWaitForCompletionState) &&
1084+
((xfer->flags & (uint32_t)kLPI2C_TransferNoStopFlag) == 0U))))
1085+
{
1086+
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1087+
}
10741088
}
1089+
10751090
result = LPI2C_MasterCheckAndClearError(base, status);
1091+
10761092
if (kStatus_Success == result)
10771093
{
1078-
/* Get pointer to private data. */
1079-
xfer = &handle->transfer;
1080-
1081-
/* Get fifo counts and compute room in tx fifo. */
1082-
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1094+
/* Compute room in tx fifo */
10831095
txCount = txFifoSize - txCount;
10841096

10851097
while (!state_complete)

‎sdk/devices/MIMXRT1052/drivers/fsl_lpi2c.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,33 @@ static status_t LPI2C_RunTransferStateMachine(LPI2C_Type *base, lpi2c_master_han
10651065

10661066
/* Check for errors. */
10671067
status = LPI2C_MasterGetStatusFlags(base);
1068+
1069+
/* Get fifo counts. */
1070+
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1071+
1072+
/* Get pointer to private data. */
1073+
xfer = &handle->transfer;
1074+
10681075
/* For the last byte, nack flag is expected.
10691076
Do not check and clear kLPI2C_MasterNackDetectFlag for the last byte,
10701077
in case FIFO is emptied when stop command has not been sent. */
10711078
if (handle->remainingBytes == 0U)
10721079
{
1073-
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1080+
/* When data size is not zero which means it is not only one byte of address is sent, and */
1081+
/* when the txfifo is empty, or have one byte which is the stop command, then the nack status can be ignored. */
1082+
if ((xfer->dataSize != 0U) &&
1083+
((txCount == 0U) || ((txCount == 1U) && (handle->state == (uint8_t)kWaitForCompletionState) &&
1084+
((xfer->flags & (uint32_t)kLPI2C_TransferNoStopFlag) == 0U))))
1085+
{
1086+
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1087+
}
10741088
}
1089+
10751090
result = LPI2C_MasterCheckAndClearError(base, status);
1091+
10761092
if (kStatus_Success == result)
10771093
{
1078-
/* Get pointer to private data. */
1079-
xfer = &handle->transfer;
1080-
1081-
/* Get fifo counts and compute room in tx fifo. */
1082-
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1094+
/* Compute room in tx fifo */
10831095
txCount = txFifoSize - txCount;
10841096

10851097
while (!state_complete)

‎sdk/devices/MIMXRT1062/drivers/fsl_lpi2c.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,33 @@ static status_t LPI2C_RunTransferStateMachine(LPI2C_Type *base, lpi2c_master_han
10651065

10661066
/* Check for errors. */
10671067
status = LPI2C_MasterGetStatusFlags(base);
1068+
1069+
/* Get fifo counts. */
1070+
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1071+
1072+
/* Get pointer to private data. */
1073+
xfer = &handle->transfer;
1074+
10681075
/* For the last byte, nack flag is expected.
10691076
Do not check and clear kLPI2C_MasterNackDetectFlag for the last byte,
10701077
in case FIFO is emptied when stop command has not been sent. */
10711078
if (handle->remainingBytes == 0U)
10721079
{
1073-
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1080+
/* When data size is not zero which means it is not only one byte of address is sent, and */
1081+
/* when the txfifo is empty, or have one byte which is the stop command, then the nack status can be ignored. */
1082+
if ((xfer->dataSize != 0U) &&
1083+
((txCount == 0U) || ((txCount == 1U) && (handle->state == (uint8_t)kWaitForCompletionState) &&
1084+
((xfer->flags & (uint32_t)kLPI2C_TransferNoStopFlag) == 0U))))
1085+
{
1086+
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1087+
}
10741088
}
1089+
10751090
result = LPI2C_MasterCheckAndClearError(base, status);
1091+
10761092
if (kStatus_Success == result)
10771093
{
1078-
/* Get pointer to private data. */
1079-
xfer = &handle->transfer;
1080-
1081-
/* Get fifo counts and compute room in tx fifo. */
1082-
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1094+
/* Compute room in tx fifo */
10831095
txCount = txFifoSize - txCount;
10841096

10851097
while (!state_complete)

‎sdk/devices/MIMXRT1064/drivers/fsl_lpi2c.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,33 @@ static status_t LPI2C_RunTransferStateMachine(LPI2C_Type *base, lpi2c_master_han
10651065

10661066
/* Check for errors. */
10671067
status = LPI2C_MasterGetStatusFlags(base);
1068+
1069+
/* Get fifo counts. */
1070+
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1071+
1072+
/* Get pointer to private data. */
1073+
xfer = &handle->transfer;
1074+
10681075
/* For the last byte, nack flag is expected.
10691076
Do not check and clear kLPI2C_MasterNackDetectFlag for the last byte,
10701077
in case FIFO is emptied when stop command has not been sent. */
10711078
if (handle->remainingBytes == 0U)
10721079
{
1073-
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1080+
/* When data size is not zero which means it is not only one byte of address is sent, and */
1081+
/* when the txfifo is empty, or have one byte which is the stop command, then the nack status can be ignored. */
1082+
if ((xfer->dataSize != 0U) &&
1083+
((txCount == 0U) || ((txCount == 1U) && (handle->state == (uint8_t)kWaitForCompletionState) &&
1084+
((xfer->flags & (uint32_t)kLPI2C_TransferNoStopFlag) == 0U))))
1085+
{
1086+
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1087+
}
10741088
}
1089+
10751090
result = LPI2C_MasterCheckAndClearError(base, status);
1091+
10761092
if (kStatus_Success == result)
10771093
{
1078-
/* Get pointer to private data. */
1079-
xfer = &handle->transfer;
1080-
1081-
/* Get fifo counts and compute room in tx fifo. */
1082-
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1094+
/* Compute room in tx fifo */
10831095
txCount = txFifoSize - txCount;
10841096

10851097
while (!state_complete)

‎sdk/devices/MIMXRT1176/drivers/fsl_lpi2c.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,21 +1065,33 @@ static status_t LPI2C_RunTransferStateMachine(LPI2C_Type *base, lpi2c_master_han
10651065

10661066
/* Check for errors. */
10671067
status = LPI2C_MasterGetStatusFlags(base);
1068+
1069+
/* Get fifo counts. */
1070+
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1071+
1072+
/* Get pointer to private data. */
1073+
xfer = &handle->transfer;
1074+
10681075
/* For the last byte, nack flag is expected.
10691076
Do not check and clear kLPI2C_MasterNackDetectFlag for the last byte,
10701077
in case FIFO is emptied when stop command has not been sent. */
10711078
if (handle->remainingBytes == 0U)
10721079
{
1073-
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1080+
/* When data size is not zero which means it is not only one byte of address is sent, and */
1081+
/* when the txfifo is empty, or have one byte which is the stop command, then the nack status can be ignored. */
1082+
if ((xfer->dataSize != 0U) &&
1083+
((txCount == 0U) || ((txCount == 1U) && (handle->state == (uint8_t)kWaitForCompletionState) &&
1084+
((xfer->flags & (uint32_t)kLPI2C_TransferNoStopFlag) == 0U))))
1085+
{
1086+
status &= ~(uint32_t)kLPI2C_MasterNackDetectFlag;
1087+
}
10741088
}
1089+
10751090
result = LPI2C_MasterCheckAndClearError(base, status);
1091+
10761092
if (kStatus_Success == result)
10771093
{
1078-
/* Get pointer to private data. */
1079-
xfer = &handle->transfer;
1080-
1081-
/* Get fifo counts and compute room in tx fifo. */
1082-
LPI2C_MasterGetFifoCounts(base, &rxCount, &txCount);
1094+
/* Compute room in tx fifo */
10831095
txCount = txFifoSize - txCount;
10841096

10851097
while (!state_complete)

0 commit comments

Comments
 (0)