1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- ecos-2.0/packages/io/usb/slave/v2_0/host/usbhost.c 2002-09-21 22:06:59.000000000 +0000
+++ ecos-2.0/packages/io/usb/slave/v2_0/host/usbhost.c 2004-01-27 18:22:57.000000000 +0000
@@ -308,22 +308,22 @@
int this_len = length - 1;
int ioctl_result;
- transfer.requesttype = USB_TYPE_CLASS | USB_RECIP_DEVICE;
+ transfer.bRequestType = USB_TYPE_CLASS | USB_RECIP_DEVICE;
if (this_len > 4) {
this_len = 4;
}
switch (this_len) {
- case 1: transfer.request = USBTEST_CONTROL_DATA1; break;
- case 2: transfer.request = USBTEST_CONTROL_DATA2; break;
- case 3: transfer.request = USBTEST_CONTROL_DATA3; break;
- case 4: transfer.request = USBTEST_CONTROL_DATA4; break;
+ case 1: transfer.bRequest = USBTEST_CONTROL_DATA1; break;
+ case 2: transfer.bRequest = USBTEST_CONTROL_DATA2; break;
+ case 3: transfer.bRequest = USBTEST_CONTROL_DATA3; break;
+ case 4: transfer.bRequest = USBTEST_CONTROL_DATA4; break;
default:
fprintf(stderr, "usbhost: internal error, confusion about transfer length.\n");
exit(EXIT_FAILURE);
}
- transfer.value = (buf[i] << 8) | buf[i+1]; // Possible read beyond end of buffer,
- transfer.index = (buf[i+2] << 8) | buf[i+3]; // but not worth worrying about.
- transfer.length = 0;
+ transfer.wValue = (buf[i] << 8) | buf[i+1]; // Possible read beyond end of buffer,
+ transfer.wIndex = (buf[i+2] << 8) | buf[i+3]; // but not worth worrying about.
+ transfer.wLength = 0;
transfer.timeout = 10 * 1000; // ten seconds, the target should always accept data faster than this.
transfer.data = NULL;
@@ -339,11 +339,11 @@
length = 0;
}
#endif
- transfer.requesttype = request_type;
- transfer.request = request;
- transfer.value = value;
- transfer.index = index;
- transfer.length = length;
+ transfer.bRequestType = request_type;
+ transfer.bRequest = request;
+ transfer.wValue = value;
+ transfer.wIndex = index;
+ transfer.wLength = length;
transfer.timeout = 10000;
transfer.data = data;
|
