From a05359e4ddee36e23f0632703facc1b4ddb6a591 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 30 Jul 2024 10:56:10 -0400 Subject: [PATCH] USB: Change some ASSERT to ASSERT_ALWAYS. Otherwise we get Werrors when trying to build with KDEBUG_LEVEL < 2. We might as well check these statuses always and panic even on release builds. --- src/add-ons/kernel/busses/usb/ehci.cpp | 6 +++--- src/add-ons/kernel/busses/usb/ohci.cpp | 8 ++++---- src/add-ons/kernel/busses/usb/uhci.cpp | 4 ++-- src/add-ons/kernel/busses/usb/xhci.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/add-ons/kernel/busses/usb/ehci.cpp b/src/add-ons/kernel/busses/usb/ehci.cpp index b9185e91cd..7f3c3c10df 100644 --- a/src/add-ons/kernel/busses/usb/ehci.cpp +++ b/src/add-ons/kernel/busses/usb/ehci.cpp @@ -2807,7 +2807,7 @@ EHCI::WriteDescriptorChain(ehci_qtd *topDescriptor, generic_io_vec *vector, status_t status = generic_memcpy( (generic_addr_t)current->buffer_log + bufferOffset, false, vector[vectorIndex].base + vectorOffset, physical, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; @@ -2867,7 +2867,7 @@ EHCI::ReadDescriptorChain(ehci_qtd *topDescriptor, generic_io_vec *vector, status_t status = generic_memcpy( vector[vectorIndex].base + vectorOffset, physical, (generic_addr_t)current->buffer_log + bufferOffset, false, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; @@ -2982,7 +2982,7 @@ EHCI::ReadIsochronousDescriptorChain(isochronous_transfer_data *transfer) status_t status = generic_memcpy( vector[vectorIndex].base + vectorOffset, physical, (generic_addr_t)transfer->buffer_log + bufferOffset, false, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); offset += length; vectorOffset += length; diff --git a/src/add-ons/kernel/busses/usb/ohci.cpp b/src/add-ons/kernel/busses/usb/ohci.cpp index e7b679c351..26a1b7f302 100644 --- a/src/add-ons/kernel/busses/usb/ohci.cpp +++ b/src/add-ons/kernel/busses/usb/ohci.cpp @@ -2297,7 +2297,7 @@ OHCI::_WriteDescriptorChain(ohci_general_td *topDescriptor, generic_io_vec *vect status_t status = generic_memcpy( (generic_addr_t)current->buffer_logical + bufferOffset, false, vector[vectorIndex].base + vectorOffset, physical, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; @@ -2354,7 +2354,7 @@ OHCI::_WriteIsochronousDescriptorChain(ohci_isochronous_td *topDescriptor, status_t status = generic_memcpy( (generic_addr_t)current->buffer_logical + bufferOffset, false, vector[vectorIndex].base + vectorOffset, physical, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; @@ -2418,7 +2418,7 @@ OHCI::_ReadDescriptorChain(ohci_general_td *topDescriptor, generic_io_vec *vecto status_t status = generic_memcpy( vector[vectorIndex].base + vectorOffset, physical, (generic_addr_t)current->buffer_logical + bufferOffset, false, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; @@ -2472,7 +2472,7 @@ OHCI::_ReadIsochronousDescriptorChain(ohci_isochronous_td *topDescriptor, status_t status = generic_memcpy( vector[vectorIndex].base + vectorOffset, physical, (generic_addr_t)current->buffer_logical + bufferOffset, false, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; diff --git a/src/add-ons/kernel/busses/usb/uhci.cpp b/src/add-ons/kernel/busses/usb/uhci.cpp index 8256c8b8a5..8ffaf0b0f5 100644 --- a/src/add-ons/kernel/busses/usb/uhci.cpp +++ b/src/add-ons/kernel/busses/usb/uhci.cpp @@ -2296,7 +2296,7 @@ UHCI::WriteDescriptorChain(uhci_td *topDescriptor, generic_io_vec *vector, status_t status = generic_memcpy( (generic_addr_t)current->buffer_log + bufferOffset, false, vector[vectorIndex].base + vectorOffset, physical, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; @@ -2357,7 +2357,7 @@ UHCI::ReadDescriptorChain(uhci_td *topDescriptor, generic_io_vec *vector, status_t status = generic_memcpy( vector[vectorIndex].base + vectorOffset, physical, (generic_addr_t)current->buffer_log + bufferOffset, false, length); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); actualLength += length; vectorOffset += length; diff --git a/src/add-ons/kernel/busses/usb/xhci.cpp b/src/add-ons/kernel/busses/usb/xhci.cpp index 3aef714ece..8efc6bdada 100644 --- a/src/add-ons/kernel/busses/usb/xhci.cpp +++ b/src/add-ons/kernel/busses/usb/xhci.cpp @@ -1465,7 +1465,7 @@ XHCI::WriteDescriptor(xhci_td *descriptor, generic_io_vec *vector, size_t vector (generic_addr_t)descriptor->buffers[bufIdx] + bufUsed, false, vector[vecIdx].base + (vector[vecIdx].length - length), physical, toCopy); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); written += toCopy; bufUsed += toCopy; @@ -1496,7 +1496,7 @@ XHCI::ReadDescriptor(xhci_td *descriptor, generic_io_vec *vector, size_t vectorC status_t status = generic_memcpy( vector[vecIdx].base + (vector[vecIdx].length - length), physical, (generic_addr_t)descriptor->buffers[bufIdx] + bufUsed, false, toCopy); - ASSERT(status == B_OK); + ASSERT_ALWAYS(status == B_OK); read += toCopy; bufUsed += toCopy;