diff options
| author | Harald Welte <laforge@osmocom.org> | 2019-12-24 09:37:56 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2019-12-26 08:07:59 +0100 |
| commit | ce4b5c25e8fca000723b586a1dee24b7299c360e (patch) | |
| tree | 1366ff3a3041c8be2b78f02b1c0ec6111a35918d | |
| parent | 7f7de1ec1dbe853ef26fa221ee609c782d68c315 (diff) | |
library: Add osmo_st2_compatible_dev_idsp[]
This is a list of known-compatible USB VID/PID pairs.
Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc
| -rw-r--r-- | host/include/Makefile.am | 4 | ||||
| -rw-r--r-- | host/include/osmocom/simtrace2/usb_util.h | 5 | ||||
| -rw-r--r-- | host/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | host/lib/usb_util.c | 36 |
4 files changed, 47 insertions, 2 deletions
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 @@ nobase_include_HEADERS = \ 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_LIBADD = $(COMMONLIBS) 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@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 } +}; |