merge simtrace2-discovery.[ch] to libusb_util.[ch]

Change-Id: I4defbec70986a90c1f0cfb7587393265b73c0163

host/include/osmocom/simtrace2/libusb_util.h

@@ -68,3 +68,6 @@ int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids,
 
 libusb_device_handle *usb_open_claim_interface(libusb_context *ctx,
 					       const struct usb_interface_match *ifm);
+
+int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num,
+		     uint8_t *out, uint8_t *in, uint8_t *irq);

host/lib/libusb_util.c

@@ -295,3 +295,44 @@ libusb_device_handle *usb_open_claim_interface(libusb_context *ctx,
 
 	return usb_devh;
 }
+
+/*! \brief obtain the endpoint addresses for a given USB interface */
+int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num,
+		     uint8_t *out, uint8_t *in, uint8_t *irq)
+{
+	libusb_device *dev = libusb_get_device(devh);
+	struct libusb_config_descriptor *cdesc;
+	const struct libusb_interface_descriptor *idesc;
+	const struct libusb_interface *iface;
+	int rc, l;
+
+	rc = libusb_get_active_config_descriptor(dev, &cdesc);
+	if (rc < 0)
+		return rc;
+
+	iface = &cdesc->interface[if_num];
+	/* FIXME: we assume there's no altsetting */
+	idesc = &iface->altsetting[0];
+
+	for (l = 0; l < idesc->bNumEndpoints; l++) {
+		const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l];
+		switch (edesc->bmAttributes & 3) {
+		case LIBUSB_TRANSFER_TYPE_BULK:
+			if (edesc->bEndpointAddress & 0x80) {
+				if (in)
+					*in = edesc->bEndpointAddress;
+			} else {
+				if (out)
+					*out = edesc->bEndpointAddress;
+			}
+			break;
+		case LIBUSB_TRANSFER_TYPE_INTERRUPT:
+			if (irq)
+				*irq = edesc->bEndpointAddress;
+			break;
+		default:
+			break;
+		}
+	}
+	return 0;
+}

host/src/Makefile.am

@@ -5,14 +5,12 @@ AM_LDFLAGS=$(COVERAGE_LDFLAGS)
 LDADD= $(top_builddir)/lib/libosmo-simtrace2.la \
        $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBUSB_LIBS)
 
-noinst_HEADERS = simtrace2-discovery.h
-
 bin_PROGRAMS = simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff
 
-simtrace2_remsim_SOURCES = simtrace2-remsim.c simtrace2-discovery.c
+simtrace2_remsim_SOURCES = simtrace2-remsim.c
 
-simtrace2_remsim_usb2udp_SOURCES = usb2udp.c simtrace2-discovery.c
+simtrace2_remsim_usb2udp_SOURCES = usb2udp.c
 
 simtrace2_list_SOURCES = simtrace2_usb.c
 
-simtrace2_sniff_SOURCES = simtrace2-sniff.c simtrace2-discovery.c
+simtrace2_sniff_SOURCES = simtrace2-sniff.c

host/src/simtrace2-discovery.c

@@ -1,94 +0,0 @@
-/* simtrace2-discovery - host PC library to scan for matching USB
- * devices
- *
- * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#include <stdint.h>
-
-#include <libusb.h>
-
-/*! \brief obtain the endpoint addresses for a given USB interface */
-int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num,
-		     uint8_t *out, uint8_t *in, uint8_t *irq)
-{
-	libusb_device *dev = libusb_get_device(devh);
-	struct libusb_config_descriptor *cdesc;
-	const struct libusb_interface_descriptor *idesc;
-	const struct libusb_interface *iface;
-	int rc, l;
-
-	rc = libusb_get_active_config_descriptor(dev, &cdesc);
-	if (rc < 0)
-		return rc;
-
-	iface = &cdesc->interface[if_num];
-	/* FIXME: we assume there's no altsetting */
-	idesc = &iface->altsetting[0];
-
-	for (l = 0; l < idesc->bNumEndpoints; l++) {
-		const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l];
-		switch (edesc->bmAttributes & 3) {
-		case LIBUSB_TRANSFER_TYPE_BULK:
-			if (edesc->bEndpointAddress & 0x80) {
-				if (in)
-					*in = edesc->bEndpointAddress;
-			} else {
-				if (out)
-					*out = edesc->bEndpointAddress;
-			}
-			break;
-		case LIBUSB_TRANSFER_TYPE_INTERRUPT:
-			if (irq)
-				*irq = edesc->bEndpointAddress;
-			break;
-		default:
-			break;
-		}
-	}
-	return 0;
-}
-
-#if 0
-	struct libusb_device_descriptor ddesc;
-	int rc, i, j, k;
-
-	rc = libusb_get_device_descriptor(devh, &ddesc);
-	if (rc < 0)
-		return;
-
-	for (i = 0; i < ddesc.bNumConfigurations; i++) {
-		struct libusb_config_descriptor *cdesc;
-		rc = libusb_get_config_descriptor(devh, i, &cdesc);
-		if (rc < 0)
-			return;
-
-		for (j = 0; j < cdesc->bNumInterfaces; j++) {
-			const struct libusb_interface *iface = cdesc->interface[j];
-			for (k = 0; k < iface->num_altsetting; k++) {
-				const struct libusb_interface_descriptor *idesc = iface->altsetting[k];
-				/* make sure this is the interface we're looking for */
-				if (idesc->bInterfaceClass != 0xFF ||
-				    idesc->bInterfaceSubClass != if_class ||
-				    idsec->bInterfaceProtocol != if_proto)
-					continue;
-				/* FIXME */
-			}
-		}
-
-		libusb_free_config_descriptor(cdesc);
-	}
-#endif

host/src/simtrace2-discovery.h

@@ -1,26 +0,0 @@
-/* simtrace2-discovery - host PC library to scan for matching USB
- * devices
- * 
- * (C) 2016 by Harald Welte <hwelte@hmw-consulting.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#pragma once
-
-#include <stdint.h>
-#include <libusb.h>
-
-int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num,
-		     uint8_t *out, uint8_t *in, uint8_t *irq);

host/src/simtrace2-remsim.c

@@ -44,8 +44,6 @@
 #include <osmocom/simtrace2/apdu_dispatch.h>
 #include <osmocom/simtrace2/gsmtap.h>
 
-#include "simtrace2-discovery.h"
-
 #include <osmocom/core/utils.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/core/msgb.h>

host/src/simtrace2-sniff.c

@@ -40,7 +40,6 @@
 #include <osmocom/simtrace2/libusb_util.h>
 #include <osmocom/simtrace2/simtrace_usb.h>
 #include <osmocom/simtrace2/simtrace_prot.h>
-#include "simtrace2-discovery.h"
 
 #include <osmocom/simtrace2/gsmtap.h>
 

host/src/usb2udp.c

@@ -37,7 +37,7 @@
 
 #include <osmocom/simtrace2/simtrace_usb.h>
 #include <osmocom/simtrace2/simtrace_prot.h>
-#include "simtrace2-discovery.h"
+#include <osmocom/simtrace2/libusb_util.h>
 
 #include <osmocom/core/utils.h>
 #include <osmocom/core/socket.h>