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

Fix error codes

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18927 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Niels Sascha Reedijk
2006-09-25 16:46:28 +00:00
parent c69902c5fc
commit 43a747b5d0
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/ohci_rh.cpp
+12 -12
View File
@@ -142,7 +142,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
usb_request_data *request = t->RequestData(); usb_request_data *request = t->RequestData();
TRACE(("OHCIRootHub::ProcessTransfer(): request: %d\n", request->Request)); TRACE(("OHCIRootHub::ProcessTransfer(): request: %d\n", request->Request));
uint32 status = B_USB_STATUS_DEVICE_TIMEOUT; uint32 status = B_TIMED_OUT;
size_t actualLength = 0; size_t actualLength = 0;
switch (request->Request) { switch (request->Request) {
case USB_REQUEST_GET_STATUS: { case USB_REQUEST_GET_STATUS: {
@@ -155,7 +155,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
// everything as 0 means all is ok. // everything as 0 means all is ok.
// TODO (?) actually check for the value // TODO (?) actually check for the value
memset(t->Data(), 0, actualLength); memset(t->Data(), 0, actualLength);
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
} }
@@ -163,7 +163,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
if (ohci->GetPortStatus(request->Index, &portStatus) >= B_OK) { if (ohci->GetPortStatus(request->Index, &portStatus) >= B_OK) {
actualLength = MIN(sizeof(usb_port_status), t->DataLength()); actualLength = MIN(sizeof(usb_port_status), t->DataLength());
memcpy(t->Data(), (void *)&portStatus, actualLength); memcpy(t->Data(), (void *)&portStatus, actualLength);
status = B_USB_STATUS_SUCCESS; status = B_OK;
} }
break; break;
@@ -171,12 +171,12 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
case USB_REQUEST_SET_ADDRESS: case USB_REQUEST_SET_ADDRESS:
if (request->Value >= 128) { if (request->Value >= 128) {
status = B_USB_STATUS_DEVICE_TIMEOUT; status = B_TIMED_OUT;
break; break;
} }
TRACE(("OHCIRootHub::ProcessTransfer(): set address: %d\n", request->Value)); TRACE(("OHCIRootHub::ProcessTransfer(): set address: %d\n", request->Value));
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
case USB_REQUEST_GET_DESCRIPTOR: case USB_REQUEST_GET_DESCRIPTOR:
@@ -188,7 +188,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
t->DataLength()); t->DataLength());
memcpy(t->Data(), (void *)&sOHCIRootHubDevice, memcpy(t->Data(), (void *)&sOHCIRootHubDevice,
actualLength); actualLength);
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
} }
@@ -200,7 +200,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
t->DataLength()); t->DataLength());
memcpy(t->Data(), (void *)&(sOHCIRootHubConfig), memcpy(t->Data(), (void *)&(sOHCIRootHubConfig),
actualLength); actualLength);
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
} }
@@ -213,7 +213,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
t->DataLength()); t->DataLength());
memcpy(t->Data(), (void *)&sOHCIRootHubStrings[index], memcpy(t->Data(), (void *)&sOHCIRootHubStrings[index],
actualLength); actualLength);
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
} }
@@ -225,14 +225,14 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
t->DataLength()); t->DataLength());
memcpy(t->Data(), (void *)&sOHCIRootHubConfig.hub, memcpy(t->Data(), (void *)&sOHCIRootHubConfig.hub,
actualLength); actualLength);
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
} }
} }
break; break;
case USB_REQUEST_SET_CONFIGURATION: case USB_REQUEST_SET_CONFIGURATION:
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
case USB_REQUEST_CLEAR_FEATURE: { case USB_REQUEST_CLEAR_FEATURE: {
@@ -244,7 +244,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
TRACE(("OHCIRootHub::ProcessTransfer(): clear feature: %d\n", request->Value)); TRACE(("OHCIRootHub::ProcessTransfer(): clear feature: %d\n", request->Value));
if (ohci->ClearPortFeature(request->Index, request->Value) >= B_OK) if (ohci->ClearPortFeature(request->Index, request->Value) >= B_OK)
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
} }
@@ -257,7 +257,7 @@ OHCIRootHub::ProcessTransfer(Transfer *t, OHCI *ohci)
TRACE(("OHCIRootHub::ProcessTransfer(): set feature: %d\n", request->Value)); TRACE(("OHCIRootHub::ProcessTransfer(): set feature: %d\n", request->Value));
if (ohci->SetPortFeature(request->Index, request->Value) >= B_OK) if (ohci->SetPortFeature(request->Index, request->Value) >= B_OK)
status = B_USB_STATUS_SUCCESS; status = B_OK;
break; break;
} }
} }