Skip to content

Update Wire per @chrisckc debugging #1011

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 1 commit into from
Nov 28, 2022
Merged

Update Wire per @chrisckc debugging #1011

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 25 additions & 23 deletions libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,38 +140,50 @@ void TwoWire::begin(uint8_t addr) {
_running = true;
}

// See: https://github.com/earlephilhower/arduino-pico/issues/979#issuecomment-1328237128
#pragma GCC push_options
#pragma GCC optimize ("O0")
void TwoWire::onIRQ() {
// Make a local copy of the IRQ status up front. If it changes while we're
// running the IRQ callback will fire again after returning. Avoids potential
// race conditions
volatile uint32_t irqstat = _i2c->hw->intr_stat;
uint32_t irqstat = _i2c->hw->intr_stat;
if (irqstat == 0) {
return;
}

// First, pull off any data available
if (irqstat & (1 << 2)) {
// RX_FULL
if (_slaveStartDet && (_buffLen < (int)sizeof(_buff))) {
if (_buffLen < (int)sizeof(_buff)) {
_buff[_buffLen++] = _i2c->hw->data_cmd & 0xff;
} else {
_i2c->hw->data_cmd;
}
}
// RESTART_DET
if (irqstat & (1 << 12)) {
if (_onReceiveCallback && _buffLen) {
_onReceiveCallback(_buffLen);
// RD_REQ
if (irqstat & (1 << 5)) {
if (_onRequestCallback) {
_onRequestCallback();
}
_buffLen = 0;
_buffOff = 0;
_slaveStartDet = false;
_i2c->hw->clr_restart_det;
_i2c->hw->clr_rd_req;
}
// TX_ABRT
if (irqstat & (1 << 6)) {
_i2c->hw->clr_tx_abrt;
}
// START_DET
if (irqstat & (1 << 10)) {
_buffLen = 0;
_buffOff = 0;
_slaveStartDet = true;
_i2c->hw->clr_start_det;
}
// RESTART_DET
if (irqstat & (1 << 12)) {
if (_onReceiveCallback && _buffLen) {
_onReceiveCallback(_buffLen);
}
_i2c->hw->clr_restart_det;
}
// STOP_DET
if (irqstat & (1 << 9)) {
if (_onReceiveCallback && _buffLen) {
Expand All @@ -182,18 +194,8 @@ void TwoWire::onIRQ() {
_slaveStartDet = false;
_i2c->hw->clr_stop_det;
}
// TX_ABRT
if (irqstat & (1 << 6)) {
_i2c->hw->clr_tx_abrt;
}
// RD_REQ
if (irqstat & (1 << 5)) {
if (_onRequestCallback) {
_onRequestCallback();
}
_i2c->hw->clr_rd_req;
}
}
#pragma GCC pop_options

void TwoWire::end() {
if (!_running) {
Expand Down