From 6595d6836d794749fbbf6d9f4deb70d4e1d1c7df Mon Sep 17 00:00:00 2001
From: "Ithamar R. Adema" <ithamar.adema@team-embedded.nl>
Date: Sun, 22 Feb 2009 10:39:31 +0000
Subject: [PATCH] * Make usb device detection in usb_webcam identical to the
 way the usb bus_manager handles it. * Fix some minor printf()-style warnings
 in the debug build of usb_webcam.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29279 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../media-add-ons/usb_webcam/CamDevice.cpp    | 55 ++++++++++++++-----
 .../media-add-ons/usb_webcam/CamRoster.cpp    |  2 +-
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
index d29502cc6d..df4325df5b 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
@@ -491,7 +491,7 @@ CamDevice::DataPumpThread()
 			len = fBulkIn->BulkTransfer(fBuffer, fBufferLen);
 #endif
 			
-			PRINT((CH ": got %d bytes" CT, len));
+			PRINT((CH ": got %ld bytes" CT, len));
 #ifdef DEBUG_WRITE_DUMP
 			write(fDumpFD, fBuffer, len);
 #endif
@@ -618,23 +618,48 @@ CamDeviceAddon::Sniff(BUSBDevice *device)
 		return ENODEV;
 	if (!device)
 		return EINVAL;
-	for (uint32 i = 0; fSupportedDevices[i].vendor; i++)
+
+	bool supported = false;
+	for (uint32 i = 0; !supported && fSupportedDevices[i].vendor; i++)
 	{
-/*		PRINT((CH "{%u,%u,%u,0x%x,0x%x} <> {%u,%u,%u,0x%x,0x%x}" CT,
-			device.Class(), device.Subclass(), device.Protocol(), device.VendorID(), device.ProductID(),
-			fSupportedDevices[i].desc.dev_class, fSupportedDevices[i].desc.dev_subclass, fSupportedDevices[i].desc.dev_protocol, fSupportedDevices[i].desc.vendor, fSupportedDevices[i].desc.product));*/
-/*		if (device.Class() != fSupportedDevices[i].desc.dev_class)
+		if ((fSupportedDevices[i].desc.vendor != 0
+			&& device->VendorID() != fSupportedDevices[i].desc.vendor)
+			|| (fSupportedDevices[i].desc.product != 0
+			&& device->ProductID() != fSupportedDevices[i].desc.product))
 			continue;
-		if (device.Subclass() != fSupportedDevices[i].desc.dev_subclass)
-			continue;
-		if (device.Protocol() != fSupportedDevices[i].desc.dev_protocol)
-			continue;*/
-		if (device->VendorID() != fSupportedDevices[i].desc.vendor)
-			continue;
-		if (device->ProductID() != fSupportedDevices[i].desc.product)
-			continue;
-		return i;
+
+		if ((fSupportedDevices[i].desc.dev_class == 0
+			|| device->Class() == fSupportedDevices[i].desc.dev_class)
+			&& (fSupportedDevices[i].desc.dev_subclass == 0
+			|| device->Subclass() == fSupportedDevices[i].desc.dev_subclass)
+			&& (fSupportedDevices[i].desc.dev_protocol == 0
+			|| device->Protocol() == fSupportedDevices[i].desc.dev_protocol)) {
+			supported = true;
+		}
+
+		// we have to check all interfaces for matching class/subclass/protocol
+		for (uint32 j = 0; !supported && j < device->CountConfigurations(); j++) {
+			const BUSBConfiguration* cfg = device->ConfigurationAt(j);
+			for (uint32 k = 0; !supported && k < cfg->CountInterfaces(); k++) {
+				const BUSBInterface* intf = cfg->InterfaceAt(k);
+				for (uint32 l = 0; !supported && l < intf->CountAlternates(); l++) {
+					const BUSBInterface* alt = intf->AlternateAt(l);
+					if ((fSupportedDevices[i].desc.dev_class == 0
+						|| alt->Class() == fSupportedDevices[i].desc.dev_class)
+						&& (fSupportedDevices[i].desc.dev_subclass == 0
+						|| alt->Subclass() == fSupportedDevices[i].desc.dev_subclass)
+						&& (fSupportedDevices[i].desc.dev_protocol == 0
+						|| alt->Protocol() == fSupportedDevices[i].desc.dev_protocol)) {
+						supported = true;
+					}
+				}
+			}
+		}
+
+		if (supported)
+			return i;
 	}
+
 	return ENODEV;
 }
 
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
index 3e7e4eb039..eeef15becf 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
+++ b/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
@@ -88,7 +88,7 @@ CamRoster::CountCameras()
 {
 	int32 count;
 	fLocker.Lock();
-	PRINT((CH "(): %d cameras" CT, fCameras.CountItems()));
+	PRINT((CH "(): %ld cameras" CT, fCameras.CountItems()));
 	count = fCameras.CountItems();
 	fLocker.Unlock();
 	return count;