LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: dfu: correct size for USB_REQ_DFU_GETSTATE result 

return the correct size for DFU_GETSTATE result (1 byte in DFU 1.1 spec)
to avoid issue in USB protocol and the variable "value" is propagated
to req->lenght as all the in the other request with answer
- DFU_GETSTATUS
- DFU_DNLOAD
- DFU_UPLOAD
Then the buffer is correctly treated in USB driver

NB: it was the only request witch directly change "req->actual"

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
This commit is contained in:
Patrick Delaunay 2016-12-16 18:41:31 +01:00 committed by Marek Vasut
parent 8987012fe5
commit f11bb25245
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/gadget/f_dfu.c
View File

@ -212,12 +212,12 @@ static void handle_getstatus(struct usb_request *req)
dstat->iString = 0; dstat->iString = 0;
} }
static void handle_getstate(struct usb_request *req) static int handle_getstate(struct usb_request *req)
{ {
struct f_dfu *f_dfu = req->context; struct f_dfu *f_dfu = req->context;
((u8 *)req->buf)[0] = f_dfu->dfu_state; ((u8 *)req->buf)[0] = f_dfu->dfu_state;
req->actual = sizeof(u8); return sizeof(u8);
} }
static inline void to_dfu_mode(struct f_dfu *f_dfu) static inline void to_dfu_mode(struct f_dfu *f_dfu)
@ -272,7 +272,7 @@ static int state_app_idle(struct f_dfu *f_dfu,
value = RET_STAT_LEN; value = RET_STAT_LEN;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
case USB_REQ_DFU_DETACH: case USB_REQ_DFU_DETACH:
f_dfu->dfu_state = DFU_STATE_appDETACH; f_dfu->dfu_state = DFU_STATE_appDETACH;
@ -300,7 +300,7 @@ static int state_app_detach(struct f_dfu *f_dfu,
value = RET_STAT_LEN; value = RET_STAT_LEN;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
default: default:
f_dfu->dfu_state = DFU_STATE_appIDLE; f_dfu->dfu_state = DFU_STATE_appIDLE;
@ -345,7 +345,7 @@ static int state_dfu_idle(struct f_dfu *f_dfu,
value = RET_STAT_LEN; value = RET_STAT_LEN;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
case USB_REQ_DFU_DETACH: case USB_REQ_DFU_DETACH:
/* /*
@ -385,7 +385,7 @@ static int state_dfu_dnload_sync(struct f_dfu *f_dfu,
value = RET_STAT_LEN; value = RET_STAT_LEN;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
default: default:
f_dfu->dfu_state = DFU_STATE_dfuERROR; f_dfu->dfu_state = DFU_STATE_dfuERROR;
@ -441,7 +441,7 @@ static int state_dfu_dnload_idle(struct f_dfu *f_dfu,
value = RET_STAT_LEN; value = RET_STAT_LEN;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
default: default:
f_dfu->dfu_state = DFU_STATE_dfuERROR; f_dfu->dfu_state = DFU_STATE_dfuERROR;
@ -469,7 +469,7 @@ static int state_dfu_manifest_sync(struct f_dfu *f_dfu,
req->complete = dnload_request_flush; req->complete = dnload_request_flush;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
default: default:
f_dfu->dfu_state = DFU_STATE_dfuERROR; f_dfu->dfu_state = DFU_STATE_dfuERROR;
@ -497,7 +497,7 @@ static int state_dfu_manifest(struct f_dfu *f_dfu,
puts("DOWNLOAD ... OK\nCtrl+C to exit ...\n"); puts("DOWNLOAD ... OK\nCtrl+C to exit ...\n");
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
default: default:
f_dfu->dfu_state = DFU_STATE_dfuERROR; f_dfu->dfu_state = DFU_STATE_dfuERROR;
@ -534,7 +534,7 @@ static int state_dfu_upload_idle(struct f_dfu *f_dfu,
value = RET_STAT_LEN; value = RET_STAT_LEN;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
default: default:
f_dfu->dfu_state = DFU_STATE_dfuERROR; f_dfu->dfu_state = DFU_STATE_dfuERROR;
@ -558,7 +558,7 @@ static int state_dfu_error(struct f_dfu *f_dfu,
value = RET_STAT_LEN; value = RET_STAT_LEN;
break; break;
case USB_REQ_DFU_GETSTATE: case USB_REQ_DFU_GETSTATE:
handle_getstate(req); value = handle_getstate(req);
break; break;
case USB_REQ_DFU_CLRSTATUS: case USB_REQ_DFU_CLRSTATUS:
f_dfu->dfu_state = DFU_STATE_dfuIDLE; f_dfu->dfu_state = DFU_STATE_dfuIDLE;