Skip to content

increase timeout for slow I2C slaves that make use of extensive clock stretching #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 7, 2014
Merged

increase timeout for slow I2C slaves that make use of extensive clock stretching #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04fa77f
increase timeout for slow slaves that use clock extensive stretching
mazgch May 6, 2014
850bb11
undo typo
mazgch May 6, 2014
e61b2f1
make sure we remove any function from a physical pin so that we can a…
mazgch May 7, 2014
ab2b426
Merge branch 'master' of https://github.com/mbedmicro/mbed
mazgch May 7, 2014
94ac072
fix multibyte reads (was polling wrong status value)
mazgch May 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/i2c_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int i2c_stop(i2c_t *obj) {
}

static int timeout_status_poll(i2c_t *obj, uint32_t mask) {
uint32_t i, timeout = 1000;
uint32_t i, timeout = 100000;

for (i = 0; i < timeout; i++) {
if (obj->i2c->S & mask)
Expand Down
2 changes: 1 addition & 1 deletion libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/i2c_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int i2c_stop(i2c_t *obj) {
}

static int timeout_status_poll(i2c_t *obj, uint32_t mask) {
uint32_t i, timeout = 1000;
uint32_t i, timeout = 100000;

for (i = 0; i < timeout; i++) {
if (obj->i2c->S & mask)
Expand Down
2 changes: 1 addition & 1 deletion libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ int i2c_stop(i2c_t *obj) {
}

static int timeout_status_poll(i2c_t *obj, uint32_t mask) {
uint32_t i, timeout = 1000;
uint32_t i, timeout = 100000;

for (i = 0; i < timeout; i++) {
if (HW_I2C_S_RD(obj->instance) & mask)
Expand Down
2 changes: 1 addition & 1 deletion libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
LPC_I2C0->MSTCTL = (1 << 0);
data[count] = (LPC_I2C0->MSTDAT & 0xFF);
status = ((LPC_I2C0->STAT >> 1) & (0x07));
if (status != 0x00) {
if (status != 0x01) {
i2c_stop(obj);
return count;
}
Expand Down
72 changes: 31 additions & 41 deletions libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ static const SWM_Map SWM_UART_RX[] = {
static const SWM_Map SWM_UART_RTS[] = {
{0, 16},
{1, 24},
{3, 0},
{3, 0}, // not available
};

static const SWM_Map SWM_UART_CTS[] = {
{0, 24},
{2, 0},
{3, 8}
{3, 8} // not available
};

// bit flags for used UARTs
Expand Down Expand Up @@ -82,9 +82,29 @@ static uart_irq_handler irq_handler;
int stdio_uart_inited = 0;
serial_t stdio_uart;

static void switch_pin(const SWM_Map *swm, PinName pn)
{
uint32_t regVal;
if (pn != NC)
{
// check if we have any function mapped to this pin already and remove it
for (int n = 0; n < sizeof(LPC_SWM->PINASSIGN)/sizeof(*LPC_SWM->PINASSIGN); n ++) {
regVal = LPC_SWM->PINASSIGN[n];
for (int j = 0; j <= 24; j += 8) {
if (((regVal >> j) & 0xFF) == pn)
regVal |= (0xFF << j);
}
LPC_SWM->PINASSIGN[n] = regVal;
}
}
// now map it
regVal = LPC_SWM->PINASSIGN[swm->n] & ~(0xFF << swm->offset);
LPC_SWM->PINASSIGN[swm->n] = regVal | (pn << swm->offset);
}

void serial_init(serial_t *obj, PinName tx, PinName rx) {
int is_stdio_uart = 0;

int uart_n = get_available_uart();
if (uart_n == -1) {
error("No available UART");
Expand All @@ -93,16 +113,8 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) {
obj->uart = (LPC_USART0_Type *)(LPC_USART0_BASE + (0x4000 * uart_n));
uart_used |= (1 << uart_n);

const SWM_Map *swm;
uint32_t regVal;

swm = &SWM_UART_TX[uart_n];
regVal = LPC_SWM->PINASSIGN[swm->n] & ~(0xFF << swm->offset);
LPC_SWM->PINASSIGN[swm->n] = regVal | (tx << swm->offset);

swm = &SWM_UART_RX[uart_n];
regVal = LPC_SWM->PINASSIGN[swm->n] & ~(0xFF << swm->offset);
LPC_SWM->PINASSIGN[swm->n] = regVal | (rx << swm->offset);
switch_pin(&SWM_UART_TX[uart_n], tx);
switch_pin(&SWM_UART_RX[uart_n], rx);

/* uart clock divided by 6 */
LPC_SYSCON->UARTCLKDIV =6;
Expand Down Expand Up @@ -296,33 +308,11 @@ void serial_break_clear(serial_t *obj) {
}

void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, PinName txflow) {
const SWM_Map *swm_rts, *swm_cts;
uint32_t regVal_rts, regVal_cts;

swm_rts = &SWM_UART_RTS[obj->index];
swm_cts = &SWM_UART_CTS[obj->index];
regVal_rts = LPC_SWM->PINASSIGN[swm_rts->n] & ~(0xFF << swm_rts->offset);
regVal_cts = LPC_SWM->PINASSIGN[swm_cts->n] & ~(0xFF << swm_cts->offset);

if (FlowControlNone == type) {
LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (0xFF << swm_rts->offset);
LPC_SWM->PINASSIGN[swm_cts->n] = regVal_cts | (0xFF << swm_cts->offset);
obj->uart->CFG &= ~CTSEN;
return;
}
if ((FlowControlRTS == type || FlowControlRTSCTS == type) && (rxflow != NC)) {
LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (rxflow << swm_rts->offset);
if (FlowControlRTS == type) {
LPC_SWM->PINASSIGN[swm_cts->n] = regVal_cts | (0xFF << swm_cts->offset);
obj->uart->CFG &= ~CTSEN;
}
}
if ((FlowControlCTS == type || FlowControlRTSCTS == type) && (txflow != NC)) {
LPC_SWM->PINASSIGN[swm_cts->n] = regVal_cts | (txflow << swm_cts->offset);
obj->uart->CFG |= CTSEN;
if (FlowControlCTS == type) {
LPC_SWM->PINASSIGN[swm_rts->n] = regVal_rts | (0xFF << swm_rts->offset);
}
}
if ((FlowControlNone == type || FlowControlRTS == type)) txflow = NC;
if ((FlowControlNone == type || FlowControlCTS == type)) rxflow = NC;
switch_pin(&SWM_UART_RTS[obj->index], rxflow);
switch_pin(&SWM_UART_CTS[obj->index], txflow);
if (txflow == NC) obj->uart->CFG &= ~CTSEN;
else obj->uart->CFG |= CTSEN;
}