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

usb_serial: Set option driver to use the last found port.

Browse Source 
* Add a warning when >1 port is found (as we only use the
  last found serial port)
* Verified working, remove if 0.
This commit is contained in:
Alexander von Gluck IV
2012-07-22 13:48:57 -05:00
parent 8899214980
commit 7e67ec90a4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/ports/usb_serial/Option.cpp
+13 -3
View File
@@ -24,6 +24,7 @@ OptionDevice::AddDevice(const usb_configuration_info *config)
{ {
TRACE_FUNCALLS("> OptionDevice::AddDevice(%08x, %08x)\n", this, config); TRACE_FUNCALLS("> OptionDevice::AddDevice(%08x, %08x)\n", this, config);
int portsFound = 0;
if (config->interface_count > 0) { if (config->interface_count > 0) {
for (size_t index = 0; index < config->interface_count; index++) { for (size_t index = 0; index < config->interface_count; index++) {
usb_interface_info *interface = config->interface[index].active; usb_interface_info *interface = config->interface[index].active;
@@ -61,17 +62,26 @@ OptionDevice::AddDevice(const usb_configuration_info *config)
if (txEndpointID < 0 || rxEndpointID < 0 || irEndpointID < 0) if (txEndpointID < 0 || rxEndpointID < 0 || irEndpointID < 0)
continue; continue;
TRACE("> OptionDevice::%s: found at interface %d\n", __func__, TRACE("> OptionDevice::%s: found port at interface %d\n", __func__,
index); index);
portsFound++;
usb_endpoint_info *irEndpoint = &interface->endpoint[irEndpointID]; usb_endpoint_info *irEndpoint = &interface->endpoint[irEndpointID];
usb_endpoint_info *txEndpoint = &interface->endpoint[txEndpointID]; usb_endpoint_info *txEndpoint = &interface->endpoint[txEndpointID];
usb_endpoint_info *rxEndpoint = &interface->endpoint[rxEndpointID]; usb_endpoint_info *rxEndpoint = &interface->endpoint[rxEndpointID];
SetControlPipe(irEndpoint->handle); SetControlPipe(irEndpoint->handle);
SetReadPipe(rxEndpoint->handle); SetReadPipe(rxEndpoint->handle);
SetWritePipe(txEndpoint->handle); SetWritePipe(txEndpoint->handle);
}
// We accept the first found serial interface // TODO: We need to handle multiple ports
// TODO: We should set each matching interface up (can be > 1) // We use the last found serial port for now
if (portsFound > 0) {
if (portsFound > 1) {
TRACE_ALWAYS("> OptionDevice::%s: Warning: Found more than one "
"serial port on this device (%d). Only the last one is "
"is used.\n", __func__, portsFound);
}
return B_OK; return B_OK;
} }
} }
src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
-4
View File
@@ -760,9 +760,6 @@ SerialDevice::MakeDevice(usb_device device, uint16 vendorID,
} }
} }
#if 0
// Not yet working
// Option Serial Device // Option Serial Device
for (uint32 i = 0; i < sizeof(kOptionDevices) for (uint32 i = 0; i < sizeof(kOptionDevices)
/ sizeof(kOptionDevices[0]); i++) { / sizeof(kOptionDevices[0]); i++) {
@@ -772,7 +769,6 @@ SerialDevice::MakeDevice(usb_device device, uint16 vendorID,
kOptionDevices[i].deviceName); kOptionDevices[i].deviceName);
} }
} }
#endif
// Otherwise, return standard ACM device // Otherwise, return standard ACM device
return new(std::nothrow) ACMDevice(device, vendorID, productID, return new(std::nothrow) ACMDevice(device, vendorID, productID,