Change in simtrace2[master]: library: Add osmo_st2_compatible_dev_idsp[]

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16680 )


Change subject: library: Add osmo_st2_compatible_dev_idsp[]
......................................................................

library: Add osmo_st2_compatible_dev_idsp[]

This is a list of known-compatible USB VID/PID pairs.

Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc
---
M host/include/Makefile.am
A host/include/osmocom/simtrace2/usb_util.h
M host/lib/Makefile.am
A host/lib/usb_util.c
4 files changed, 47 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/80/16680/1

diff --git a/host/include/Makefile.am b/host/include/Makefile.am
index b7b453a..60134f3 100644
--- a/host/include/Makefile.am
+++ b/host/include/Makefile.am
@@ -3,4 +3,6 @@
 		osmocom/simtrace2/simtrace2_api.h \
 		osmocom/simtrace2/simtrace_usb.h \
 		osmocom/simtrace2/simtrace_prot.h \
-		osmocom/simtrace2/gsmtap.h
+		osmocom/simtrace2/usb_util.h \
+		osmocom/simtrace2/gsmtap.h \
+		$(NULL)
diff --git a/host/include/osmocom/simtrace2/usb_util.h b/host/include/osmocom/simtrace2/usb_util.h
new file mode 100644
index 0000000..3bb2486
--- /dev/null
+++ b/host/include/osmocom/simtrace2/usb_util.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <osmocom/usb/libusb.h>
+
+extern const struct dev_id osmo_st2_compatible_dev_ids[];
diff --git a/host/lib/Makefile.am b/host/lib/Makefile.am
index 438ad9d..3f7ec8e 100644
--- a/host/lib/Makefile.am
+++ b/host/lib/Makefile.am
@@ -15,4 +15,6 @@
 libosmo_simtrace2_la_SOURCES = \
 	apdu_dispatch.c \
 	gsmtap.c \
-	simtrace2_api.c
+	simtrace2_api.c \
+	usb_util.c \
+	$(NULL)
diff --git a/host/lib/usb_util.c b/host/lib/usb_util.c
new file mode 100644
index 0000000..7599991
--- /dev/null
+++ b/host/lib/usb_util.c
@@ -0,0 +1,36 @@
+/* usb_util - USB related utilities for SIMtrace 2 USB devices
+ *
+ * (C) 2016-2019 by Harald Welte <hwelte at 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 <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <getopt.h>
+
+#include <osmocom/core/utils.h>
+
+#include <osmocom/usb/libusb.h>
+#include <osmocom/simtrace2/simtrace_usb.h>
+
+/*! list of USB idVendor/idProduct tuples of devices using simtrace2 firmware */
+const struct dev_id osmo_st2_compatible_dev_ids[] = {
+	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 },
+	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_QMOD_SAM3 },
+	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_SIMTRACE2 },
+	{ 0, 0 }
+};

-- 
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16680
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc
Gerrit-Change-Number: 16680
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191226/978bf540/attachment.htm>