deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed reference to obsolete header. Fixed HALTing when the SCSI handler fails.

Browse source
This commit is contained in:
ksb 2009-07-11 17:34:19 +00:00
parent 53da57ba60
commit e3fae627f5
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/arm/common/usb/msc/msc-descriptors.c
View file

@ -1,5 +1,5 @@
#include "descriptors.h" #include "descriptors.h"
#include "usbmassbulk.h" #include "usb-msc-bulk.h"
#include <usb-arch.h> #include <usb-arch.h>
const struct usb_st_device_descriptor device_descriptor = const struct usb_st_device_descriptor device_descriptor =

22
cpu/arm/common/usb/msc/usb-msc-bulk.c
View file

@ -304,7 +304,27 @@ PROCESS_THREAD(usb_mass_bulk_request_process, ev , data)
state.status = MASS_BULK_CSW_STATUS_FAILED; state.status = MASS_BULK_CSW_STATUS_FAILED;
} }
if (ret != USB_MSC_HANDLER_DELAYED if (ret != USB_MSC_HANDLER_DELAYED
&& buf_submitted == buf_free) goto send_csw_state; && buf_submitted == buf_free) {
if (cbw_buffer.dCBWDataTransferLength > 0) {
/* HALT the apropriate endpoint */
if (cbw_buffer.bmCBWFlags & MASS_BULK_CBW_FLAG_IN) {
submit_halt(BULK_IN);
} else {
submit_halt(BULK_OUT);
}
/* Wait for HALT */
while(1) {
PROCESS_WAIT_EVENT();
if (ev == reset_event) goto reset_state;
if (ev == PROCESS_EVENT_POLL) {
USBBuffer *buffer =
get_next_buffer(BULK_IN, USB_BUFFER_ID_HALT);
if (buffer && (buffer->flags & USB_BUFFER_HALT)) break;
}
}
}
goto send_csw_state;
}
if (cbw_buffer.bmCBWFlags & MASS_BULK_CBW_FLAG_IN) { if (cbw_buffer.bmCBWFlags & MASS_BULK_CBW_FLAG_IN) {
goto send_data_state; goto send_data_state;
} else { } else {