From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 25 Oct 2015 11:37:32 +0000 (+0100)
Subject: Better multi-card support; index them by number instead of just type.
X-Git-Tag: 0.4~48
X-Git-Url: https://git.sesse.net/?p=bmusb;a=commitdiff_plain;h=fbfef809541ca1910ff09a817f04a4a3baff64e3

Better multi-card support; index them by number instead of just type.
---

diff --git a/bmusb.cpp b/bmusb.cpp
index 6157a3b..b3739ca 100644
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -659,6 +659,80 @@ void BMUSBCapture::usb_thread_func()
 	}
 }
 
+struct USBCardDevice {
+	uint16_t product;
+	uint8_t bus, port;
+	libusb_device *device;
+};
+
+libusb_device_handle *open_card(int card_index)
+{	
+	libusb_device **devices;
+	ssize_t num_devices = libusb_get_device_list(nullptr, &devices);
+	if (num_devices == -1) {
+		fprintf(stderr, "Error finding USB devices\n");
+		exit(1);
+	}
+	vector<USBCardDevice> found_cards;
+	for (ssize_t i = 0; i < num_devices; ++i) {
+		libusb_device_descriptor desc;
+                if (libusb_get_device_descriptor(devices[i], &desc) < 0) {
+			fprintf(stderr, "Error getting device descriptor for device %d\n", int(i));
+			exit(1);
+		}
+
+		uint8_t bus = libusb_get_bus_number(devices[i]);
+		uint8_t port = libusb_get_port_number(devices[i]);
+
+		if (!(desc.idVendor == 0x1edb && desc.idProduct == 0xbd3b) &&
+		    !(desc.idVendor == 0x1edb && desc.idProduct == 0xbd4f)) {
+			libusb_unref_device(devices[i]);
+			continue;
+		}
+
+		found_cards.push_back({ desc.idProduct, bus, port, devices[i] });
+	}
+	libusb_free_device_list(devices, 0);
+
+	// Sort the devices to get a consistent ordering.
+	sort(found_cards.begin(), found_cards.end(), [](const USBCardDevice &a, const USBCardDevice &b) {
+		if (a.product != b.product)
+			return a.product < b.product;
+		if (a.bus != b.bus)
+			return a.bus < b.bus;
+		return a.port < b.port;
+	});
+
+	for (size_t i = 0; i < found_cards.size(); ++i) {
+		fprintf(stderr, "Card %d: Bus %03u Device %03u ", int(i), found_cards[i].bus, found_cards[i].port);
+		if (found_cards[i].product == 0xbd3b) {
+			fprintf(stderr, "Intensity Shuttle\n");
+		} else if (found_cards[i].product == 0xbd4f) {
+			fprintf(stderr, "UltraStudio SDI\n");
+		} else {
+			assert(false);
+		}
+	}
+
+	if (size_t(card_index) >= found_cards.size()) {
+		fprintf(stderr, "Could not open card %d (only %d found)\n", card_index, int(found_cards.size()));
+		exit(1);
+	}
+
+	libusb_device_handle *devh;
+	int rc = libusb_open(found_cards[card_index].device, &devh);
+	if (rc < 0) {
+		fprintf(stderr, "Error opening card %d: %s\n", card_index, libusb_error_name(rc));
+		exit(1);
+	}
+
+	for (size_t i = 0; i < found_cards.size(); ++i) {
+		libusb_unref_device(found_cards[i].device);
+	}
+
+	return devh;
+}
+
 void BMUSBCapture::configure_card()
 {
 	if (video_frame_allocator == nullptr) {
@@ -679,9 +753,7 @@ void BMUSBCapture::configure_card()
 		exit(1);
 	}
 
-	//struct libusb_device_handle *devh = libusb_open_device_with_vid_pid(nullptr, 0x1edb, 0xbd3b);
-	//struct libusb_device_handle *devh = libusb_open_device_with_vid_pid(nullptr, 0x1edb, 0xbd4f);
-	struct libusb_device_handle *devh = libusb_open_device_with_vid_pid(nullptr, vid, pid);
+	libusb_device_handle *devh = open_card(card_index);
 	if (!devh) {
 		fprintf(stderr, "Error finding USB device\n");
 		exit(1);
diff --git a/bmusb.h b/bmusb.h
index b2725ab..e203326 100644
--- a/bmusb.h
+++ b/bmusb.h
@@ -64,8 +64,8 @@ typedef std::function<void(uint16_t timecode,
 // The actual capturing class, representing capture from a single card.
 class BMUSBCapture {
  public:
-	BMUSBCapture(int vid = 0x1edb, int pid = 0xbd3b)
-		: vid(vid), pid(pid)
+	BMUSBCapture(int card_index)
+		: card_index(card_index)
 	{
 	}
 
@@ -150,7 +150,7 @@ class BMUSBCapture {
 	static constexpr int NUM_BMUSB_REGISTERS = 60;
 	uint8_t register_file[NUM_BMUSB_REGISTERS];
 
-	int vid, pid;
+	int card_index;
 	std::vector<libusb_transfer *> iso_xfrs;
 };