usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8
Change-Id: I332a6802dbd49b4018b9318b8621d26ed94c955d Signed-off-by: Arve Hjønnevåg <arve@android.com>
This commit is contained in:
parent
f0fd81de04
commit
0592b02412
4 changed files with 5 additions and 5 deletions
|
@ -1121,7 +1121,7 @@ static int acc_bind_config(struct usb_configuration *c)
|
|||
dev->cdev = c->cdev;
|
||||
dev->function.name = "accessory";
|
||||
dev->function.strings = acc_strings,
|
||||
dev->function.descriptors = fs_acc_descs;
|
||||
dev->function.fs_descriptors = fs_acc_descs;
|
||||
dev->function.hs_descriptors = hs_acc_descs;
|
||||
dev->function.bind = acc_function_bind;
|
||||
dev->function.unbind = acc_function_unbind;
|
||||
|
|
|
@ -566,7 +566,7 @@ static int adb_bind_config(struct usb_configuration *c)
|
|||
|
||||
dev->cdev = c->cdev;
|
||||
dev->function.name = "adb";
|
||||
dev->function.descriptors = fs_adb_descs;
|
||||
dev->function.fs_descriptors = fs_adb_descs;
|
||||
dev->function.hs_descriptors = hs_adb_descs;
|
||||
dev->function.bind = adb_function_bind;
|
||||
dev->function.unbind = adb_function_unbind;
|
||||
|
|
|
@ -599,7 +599,7 @@ audio_bind(struct usb_configuration *c, struct usb_function *f)
|
|||
hs_as_in_ep_desc.bEndpointAddress =
|
||||
fs_as_in_ep_desc.bEndpointAddress;
|
||||
|
||||
f->descriptors = fs_audio_desc;
|
||||
f->fs_descriptors = fs_audio_desc;
|
||||
f->hs_descriptors = hs_audio_desc;
|
||||
|
||||
for (i = 0, status = 0; i < IN_EP_REQ_COUNT && status == 0; i++) {
|
||||
|
|
|
@ -1212,10 +1212,10 @@ static int mtp_bind_config(struct usb_configuration *c, bool ptp_config)
|
|||
dev->function.name = "mtp";
|
||||
dev->function.strings = mtp_strings;
|
||||
if (ptp_config) {
|
||||
dev->function.descriptors = fs_ptp_descs;
|
||||
dev->function.fs_descriptors = fs_ptp_descs;
|
||||
dev->function.hs_descriptors = hs_ptp_descs;
|
||||
} else {
|
||||
dev->function.descriptors = fs_mtp_descs;
|
||||
dev->function.fs_descriptors = fs_mtp_descs;
|
||||
dev->function.hs_descriptors = hs_mtp_descs;
|
||||
}
|
||||
dev->function.bind = mtp_function_bind;
|
||||
|
|
Loading…
Add table
Reference in a new issue