usb: device: cleanup CDC ACM UART rx_ready, tx_ready and is_pending
Align the irq_tx_ready and irq_rx_ready implementations and use them
from irq_rx_pending.
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
diff --git a/subsys/usb/device/class/cdc_acm.c b/subsys/usb/device/class/cdc_acm.c
index 2616f98..97711a0 100644
--- a/subsys/usb/device/class/cdc_acm.c
+++ b/subsys/usb/device/class/cdc_acm.c
@@ -666,7 +666,7 @@
{
struct cdc_acm_dev_data_t * const dev_data = dev->data;
- if (dev_data->rx_ready) {
+ if (dev_data->rx_ready && dev_data->rx_irq_ena) {
return 1;
}
@@ -682,15 +682,11 @@
*/
static int cdc_acm_irq_is_pending(const struct device *dev)
{
- struct cdc_acm_dev_data_t * const dev_data = dev->data;
-
- if (dev_data->tx_ready && dev_data->tx_irq_ena) {
+ if (cdc_acm_irq_rx_ready(dev) || cdc_acm_irq_tx_ready(dev)) {
return 1;
- } else if (dev_data->rx_ready && dev_data->rx_irq_ena) {
- return 1;
- } else {
- return 0;
}
+
+ return 0;
}
/**
