greg
/
dmrconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify windows dfu routines.

This commit is contained in:
Serge 2018-09-08 00:32:47 -07:00
parent b0af2a7d28
commit 480c612650
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dfu-windows.c
View File

@ -88,18 +88,17 @@ static status_t status;
static int dev_request(int request, int value, int index) static int dev_request(int request, int value, int index)
{ {
int rqlen = sizeof(CNTRPIPE_RQ); CNTRPIPE_RQ rq;
PCNTRPIPE_RQ rq = alloca(rqlen);
DWORD nbytes = 0; DWORD nbytes = 0;
rq->Function = URB_FUNCTION_CLASS_INTERFACE; rq.Function = URB_FUNCTION_CLASS_INTERFACE;
rq->Direction = VENDOR_DIRECTION_OUT; rq.Direction = VENDOR_DIRECTION_OUT;
rq->Request = request; rq.Request = request;
rq->Value = value; rq.Value = value;
rq->Index = index; rq.Index = index;
rq->Length = 0; rq.Length = 0;
if (!DeviceIoControl(dev, PU_VENDOR_REQUEST, rq, rqlen, if (!DeviceIoControl(dev, PU_VENDOR_REQUEST, &rq, sizeof(rq),
NULL, 0, &nbytes, NULL)) { NULL, 0, &nbytes, NULL)) {
return -1; return -1;
} }
@ -130,18 +129,17 @@ static int dev_write(int request, int value, int length, PBYTE data)
static int dev_read(int request, int value, int length, PBYTE buffer) static int dev_read(int request, int value, int length, PBYTE buffer)
{ {
int rqlen = sizeof(CNTRPIPE_RQ); CNTRPIPE_RQ rq;
PCNTRPIPE_RQ rq = alloca(rqlen);
DWORD nbytes = 0; DWORD nbytes = 0;
rq->Function = URB_FUNCTION_CLASS_INTERFACE; rq.Function = URB_FUNCTION_CLASS_INTERFACE;
rq->Direction = VENDOR_DIRECTION_IN; rq.Direction = VENDOR_DIRECTION_IN;
rq->Request = request; rq.Request = request;
rq->Value = value; rq.Value = value;
rq->Index = 0; rq.Index = 0;
rq->Length = length; rq.Length = length;
if (!DeviceIoControl(dev, PU_VENDOR_REQUEST, rq, rqlen, if (!DeviceIoControl(dev, PU_VENDOR_REQUEST, &rq, sizeof(rq),
buffer, length, &nbytes, NULL)) { buffer, length, &nbytes, NULL)) {
return -1; return -1;
} }