mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-29 12:03:03 +00:00
Code Issues Releases Activity

MFp4 //depot/projects/usb@160708

Browse Source 
Need to check Read/Write allowed before writing any data for non-control
transfers.

Submitted by:	Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2009-04-22 17:08:13 +00:00
parent 672c9965ef
commit c1911c1b7c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=191401
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/usb/controller/atmegadci.c
View File

@ -103,7 +103,6 @@ static const struct usb2_hw_ep_profile
.max_in_frame_size = 64,
.max_out_frame_size = 64,
.is_simplex = 1,
.support_multi_buffer = 1,
.support_bulk = 1,
.support_interrupt = 1,
.support_isochronous = 1,
@ -451,11 +450,13 @@ atmegadci_data_tx(struct atmegadci_td *td)
td->error = 1;
return (0); /* complete */
}
if (!(temp & (ATMEGA_UEINTX_FIFOCON |
ATMEGA_UEINTX_TXINI))) {
/* cannot write any data */
temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X);
if (temp & 3) {
/* cannot write any data - a bank is busy */
goto not_complete;
}
count = td->max_packet_size;
if (td->remainder < count) {
/* we have a short packet */
@ -529,9 +530,9 @@ atmegadci_data_tx_sync(struct atmegadci_td *td)
* The control endpoint has only got one bank, so if that bank
* is free the packet has been transferred!
*/
if (!(temp & (ATMEGA_UEINTX_FIFOCON |
ATMEGA_UEINTX_TXINI))) {
/* cannot write any data */
temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X);
if (temp & 3) {
/* cannot write any data - a bank is busy */
goto not_complete;
}
if (sc->sc_dv_addr != 0xFF) {
@ -1166,7 +1167,7 @@ atmegadci_clear_stall_sub(struct atmegadci_softc *sc, uint8_t ep_no,
ATMEGA_WRITE_1(sc, ATMEGA_UECFG0X, temp);
ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X,
ATMEGA_UECFG1X_ALLOC |
ATMEGA_UECFG1X_EPBK1 |
ATMEGA_UECFG1X_EPBK0 | /* one bank */
ATMEGA_UECFG1X_EPSIZE(3));
temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X);