i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: Change some ASSERT to ASSERT_ALWAYS.

Browse Source 
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.
This commit is contained in:
Augustin Cavalier
2024-07-30 10:56:10 -04:00
parent 2a2f213fde
commit a05359e4dd
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/ehci.cpp
+3 -3
View File
@@ -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;
src/add-ons/kernel/busses/usb/ohci.cpp
+4 -4
View File
@@ -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;
src/add-ons/kernel/busses/usb/uhci.cpp
+2 -2
View File
@@ -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;
src/add-ons/kernel/busses/usb/xhci.cpp
+2 -2
View File
@@ -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;