sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 23:21:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'usb_memory_order_retry' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-25 14:21:08 -07:00
parent 698ee9cfdb 8bd640875f
commit 6eb05eaabe
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
esphome/components/usb_uart/usb_uart.cpp
View File

@@ -169,6 +169,11 @@ bool USBUartChannel::read_array(uint8_t *data, size_t len) {
this->parent_->start_input(this); this->parent_->start_input(this);
return status; return status;
} }
void USBUartComponent::reset_input_state_(USBUartChannel *channel) {
channel->input_retry_count_.store(0);
channel->input_started_.store(false);
}
void USBUartComponent::defer_input_retry_(USBUartChannel *channel) { void USBUartComponent::defer_input_retry_(USBUartChannel *channel) {
static constexpr uint8_t MAX_INPUT_RETRIES = 10; static constexpr uint8_t MAX_INPUT_RETRIES = 10;
@@ -176,7 +181,7 @@ void USBUartComponent::defer_input_retry_(USBUartChannel *channel) {
uint8_t retry_count = channel->input_retry_count_.fetch_add(1); uint8_t retry_count = channel->input_retry_count_.fetch_add(1);
if (retry_count >= MAX_INPUT_RETRIES) { if (retry_count >= MAX_INPUT_RETRIES) {
ESP_LOGE(TAG, "Input retry limit reached for channel %d, stopping retries", channel->index_); ESP_LOGE(TAG, "Input retry limit reached for channel %d, stopping retries", channel->index_);
channel->input_started_.store(false); this->reset_input_state_(channel);
return; return;
} }
@@ -257,8 +262,8 @@ void USBUartComponent::start_input(USBUartChannel *channel) {
if (!status.success) { if (!status.success) {
ESP_LOGE(TAG, "Control transfer failed, status=%s", esp_err_to_name(status.error_code)); ESP_LOGE(TAG, "Control transfer failed, status=%s", esp_err_to_name(status.error_code));
// Transfer failed, slot already released // Transfer failed, slot already released
// Mark input as not started so normal operations can restart later // Reset state so normal operations can restart later
channel->input_started_.store(false); this->reset_input_state_(channel);
return; return;
} }
@@ -268,8 +273,8 @@ void USBUartComponent::start_input(USBUartChannel *channel) {
if (chunk == nullptr) { if (chunk == nullptr) {
// No chunks available - queue is full, data dropped, slot already released // No chunks available - queue is full, data dropped, slot already released
this->usb_data_queue_.increment_dropped_count(); this->usb_data_queue_.increment_dropped_count();
// Mark input as not started so normal operations can restart later // Reset state so normal operations can restart later
channel->input_started_.store(false); this->reset_input_state_(channel);
return; return;
} }
@@ -295,9 +300,9 @@ void USBUartComponent::start_input(USBUartChannel *channel) {
// No slots available - defer retry to main loop // No slots available - defer retry to main loop
this->defer_input_retry_(channel); this->defer_input_retry_(channel);
} else if (result != usb_host::TRANSFER_OK) { } else if (result != usb_host::TRANSFER_OK) {
// Other error (submit failed) - don't retry, just clear flag // Other error (submit failed) - don't retry, just reset state
// Error already logged by transfer_in() // Error already logged by transfer_in()
channel->input_started_.store(false); this->reset_input_state_(channel);
} }
} }
@@ -404,8 +409,7 @@ void USBUartTypeCdcAcm::enable_channels() {
for (auto *channel : this->channels_) { for (auto *channel : this->channels_) {
if (!channel->initialised_.load()) if (!channel->initialised_.load())
continue; continue;
channel->input_retry_count_.store(0); this->reset_input_state_(channel);
channel->input_started_.store(false);
channel->output_started_.store(false); channel->output_started_.store(false);
this->start_input(channel); this->start_input(channel);
} }

1
esphome/components/usb_uart/usb_uart.h
View File

@@ -142,6 +142,7 @@ class USBUartComponent : public usb_host::USBClient {
protected: protected:
void defer_input_retry_(USBUartChannel *channel); void defer_input_retry_(USBUartChannel *channel);
void reset_input_state_(USBUartChannel *channel);
std::vector<USBUartChannel *> channels_{}; std::vector<USBUartChannel *> channels_{};
}; };