i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_ecm: Use the current configuration instead of a fixed one.

Browse Source 
This allows usb_ecm to work in case it is part of a device using
different configurations for different types of interfaces and ECM is
not the first configuration.
This commit is contained in:
Michael Lotz
2016-03-12 13:15:49 +01:00
parent b62bb24fe4
commit 91ea4fb48a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/usb_ecm/ECMDevice.cpp
+5 -5
View File
@@ -103,18 +103,18 @@ ECMDevice::Open()
// reset the device by switching the data interface to the disabled first // reset the device by switching the data interface to the disabled first
// interface and then enable it by setting the second actual data interface // interface and then enable it by setting the second actual data interface
const usb_configuration_info *config const usb_configuration_info *config
= gUSBModule->get_nth_configuration(fDevice, 0); = gUSBModule->get_configuration(fDevice);
gUSBModule->set_alt_interface(fDevice, gUSBModule->set_alt_interface(fDevice,
&config->interface[fDataInterfaceIndex].alt[0]); &config->interface[fDataInterfaceIndex].alt[0]);
// update to the changed config // update to the changed config
config = gUSBModule->get_nth_configuration(fDevice, 0); config = gUSBModule->get_configuration(fDevice);
gUSBModule->set_alt_interface(fDevice, gUSBModule->set_alt_interface(fDevice,
&config->interface[fDataInterfaceIndex].alt[1]); &config->interface[fDataInterfaceIndex].alt[1]);
// update again // update again
config = gUSBModule->get_nth_configuration(fDevice, 0); config = gUSBModule->get_configuration(fDevice);
usb_interface_info *interface = config->interface[fDataInterfaceIndex].active; usb_interface_info *interface = config->interface[fDataInterfaceIndex].active;
if (interface->endpoint_count < 2) { if (interface->endpoint_count < 2) {
TRACE_ALWAYS("setting the data alternate interface failed\n"); TRACE_ALWAYS("setting the data alternate interface failed\n");
@@ -156,7 +156,7 @@ ECMDevice::Close()
// put the device into non-connected mode again by switching the data // put the device into non-connected mode again by switching the data
// interface to the disabled alternate // interface to the disabled alternate
const usb_configuration_info *config const usb_configuration_info *config
= gUSBModule->get_nth_configuration(fDevice, 0); = gUSBModule->get_configuration(fDevice);
gUSBModule->set_alt_interface(fDevice, gUSBModule->set_alt_interface(fDevice,
&config->interface[fDataInterfaceIndex].alt[0]); &config->interface[fDataInterfaceIndex].alt[0]);
@@ -368,7 +368,7 @@ status_t
ECMDevice::_SetupDevice() ECMDevice::_SetupDevice()
{ {
const usb_configuration_info *config const usb_configuration_info *config
= gUSBModule->get_nth_configuration(fDevice, 0); = gUSBModule->get_configuration(fDevice);
if (config == NULL) { if (config == NULL) {
TRACE_ALWAYS("failed to get device configuration\n"); TRACE_ALWAYS("failed to get device configuration\n");