Merge pull request #116 from Ysurac/develop

sync

build.sh

@@ -243,6 +243,10 @@ if [ "$OMR_KERNEL" != "5.4" ] && [ "$OMR_TARGET" != "x86_64" ] && [ "$OMR_TARGET
 	echo "# CONFIG_PACKAGE_kmod-r8168 is not set" >> "$OMR_TARGET/source/.config"
 fi
 
+if [ "$OMR_TARGET" = "rutx" -a "$OMR_KERNEL" = "5.4" ]; then
+	echo "CONFIG_PACKAGE_kmod-r2ec=y" >> "$OMR_TARGET/source/.config"
+fi
+
 if [ "$OMR_TARGET" = "bpi-r1" -a "$OMR_OPENWRT" = "master" ]; then
 	# We disable mc in master, because it leads to unknown compilation errors on bpi-r1 target
 	# No time to check this, now, cause i am focused on make this target work
@@ -432,9 +436,9 @@ if [ -f target/linux/mediatek/patches-5.4/0999-hnat.patch ]; then
 	rm -f target/linux/mediatek/patches-5.4/0999-hnat.patch
 fi
 
-if [ -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch ]; then
-	rm -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch
-fi
+#if [ -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch ]; then
+#	rm -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch
+#fi
 
 if [ -f package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch ]; then
 	rm -f package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch

root/include/target.mk

@@ -0,0 +1,352 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
+
+ifneq ($(__target_inc),1)
+__target_inc=1
+
+# default device type
+DEVICE_TYPE?=router
+
+# Default packages - the really basic set
+DEFAULT_PACKAGES:=\
+	base-files \
+	ca-bundle \
+	dropbear \
+	fstools \
+	libc \
+	libgcc \
+	libustream-wolfssl \
+	logd \
+	mtd \
+	netifd \
+	opkg \
+	uci \
+	uclient-fetch \
+	urandom-seed \
+	urngd
+
+ifneq ($(CONFIG_SELINUX),)
+DEFAULT_PACKAGES+=busybox-selinux procd-selinux
+else
+DEFAULT_PACKAGES+=busybox procd
+endif
+
+# include ujail on systems with enough storage
+ifeq ($(CONFIG_SMALL_FLASH),)
+DEFAULT_PACKAGES+=procd-ujail
+endif
+
+# include seccomp ld-preload hooks if kernel supports it
+ifneq ($(CONFIG_SECCOMP),)
+DEFAULT_PACKAGES+=procd-seccomp
+endif
+
+# For the basic set
+DEFAULT_PACKAGES.basic:=
+# For nas targets
+DEFAULT_PACKAGES.nas:=\
+	block-mount \
+	fdisk \
+	lsblk \
+	mdadm
+# For router targets
+DEFAULT_PACKAGES.router:=\
+	dnsmasq \
+	firewall \
+	ip6tables \
+	iptables \
+	kmod-nft-offload \
+	odhcp6c \
+	odhcpd-ipv6only \
+	ppp \
+	ppp-mod-pppoe
+
+ifneq ($(DUMP),)
+  all: dumpinfo
+endif
+
+target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+ifeq ($(DUMP),)
+  PLATFORM_DIR:=$(TOPDIR)/target/linux/$(BOARD)
+  SUBTARGET:=$(strip $(foreach subdir,$(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)),$(if $(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(subdir))),$(subdir))))
+else
+  PLATFORM_DIR:=${CURDIR}
+  ifeq ($(SUBTARGETS),)
+    SUBTARGETS:=$(strip $(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)))
+  endif
+endif
+
+TARGETID:=$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))
+PLATFORM_SUBDIR:=$(PLATFORM_DIR)$(if $(SUBTARGET),/$(SUBTARGET))
+
+ifneq ($(TARGET_BUILD),1)
+  ifndef DUMP
+    include $(PLATFORM_DIR)/Makefile
+    ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+      include $(PLATFORM_SUBDIR)/target.mk
+    endif
+  endif
+else
+  ifneq ($(SUBTARGET),)
+    -include ./$(SUBTARGET)/target.mk
+  endif
+endif
+
+# Add device specific packages (here below to allow device type set from subtarget)
+DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
+
+filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
+extra_packages = $(if $(filter wpad wpad-% nas,$(1)),iwinfo)
+
+define ProfileDefault
+  NAME:=
+  PRIORITY:=
+  PACKAGES:=
+endef
+
+ifndef Profile
+define Profile
+  $(eval $(call ProfileDefault))
+  $(eval $(call Profile/$(1)))
+  dumpinfo : $(call shexport,Profile/$(1)/Description)
+  PACKAGES := $(filter-out -%,$(PACKAGES))
+  DUMPINFO += \
+	echo "Target-Profile: $(1)"; \
+	$(if $(PRIORITY), echo "Target-Profile-Priority: $(PRIORITY)"; ) \
+	echo "Target-Profile-Name: $(NAME)"; \
+	echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \
+	echo "Target-Profile-Description:"; \
+	echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \
+	echo "@@"; \
+	echo;
+endef
+endif
+
+ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+  define IncludeProfiles
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
+    -include $(sort $(wildcard $(PLATFORM_SUBDIR)/profiles/*.mk))
+  endef
+else
+  define IncludeProfiles
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
+  endef
+endif
+
+PROFILE?=$(call qstrip,$(CONFIG_TARGET_PROFILE))
+
+ifeq ($(TARGET_BUILD),1)
+  ifneq ($(DUMP),)
+    $(eval $(call IncludeProfiles))
+  endif
+endif
+
+ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
+  include $(INCLUDE_DIR)/kernel-version.mk
+endif
+
+GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
+GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
+
+__config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
+__config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
+find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))
+
+GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR))
+LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR))
+ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+  LINUX_SUBTARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_SUBDIR))
+endif
+
+# config file list used for compiling
+LINUX_KCONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(TOPDIR)/env/kernel-config)
+
+# default config list for reconfiguring
+# defaults to subtarget if subtarget exists and target does not
+# defaults to target otherwise
+USE_SUBTARGET_CONFIG = $(if $(wildcard $(LINUX_TARGET_CONFIG)),,$(if $(LINUX_SUBTARGET_CONFIG),1))
+
+LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG)))
+LINUX_RECONFIG_TARGET = $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG),$(LINUX_TARGET_CONFIG))
+
+# select the config file to be changed by kernel_menuconfig/kernel_oldconfig
+ifeq ($(CONFIG_TARGET),platform)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_TARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),subtarget)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_SUBTARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),subtarget_platform)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(LINUX_TARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_TARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),env)
+  LINUX_RECONFIG_LIST = $(LINUX_KCONFIG_LIST)
+  LINUX_RECONFIG_TARGET = $(TOPDIR)/env/kernel-config
+endif
+
+__linux_confcmd = $(2) $(patsubst %,+,$(wordlist 2,9999,$(1))) $(1)
+
+LINUX_CONF_CMD = $(SCRIPT_DIR)/kconfig.pl $(call __linux_confcmd,$(LINUX_KCONFIG_LIST))
+LINUX_RECONF_CMD = $(SCRIPT_DIR)/kconfig.pl $(call __linux_confcmd,$(LINUX_RECONFIG_LIST))
+LINUX_RECONF_DIFF = $(SCRIPT_DIR)/kconfig.pl - '>' $(call __linux_confcmd,$(filter-out $(LINUX_RECONFIG_TARGET),$(LINUX_RECONFIG_LIST))) $(1) $(GENERIC_PLATFORM_DIR)/config-filter
+
+ifeq ($(DUMP),1)
+  BuildTarget=$(BuildTargets/DumpCurrent)
+
+  CPU_CFLAGS = -Os -pipe
+  ifneq ($(findstring mips,$(ARCH)),)
+    ifneq ($(findstring mips64,$(ARCH)),)
+      CPU_TYPE ?= mips64
+    else
+      CPU_TYPE ?= mips32
+    endif
+    CPU_CFLAGS += -mno-branch-likely
+    CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
+    CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
+    CPU_CFLAGS_mips64r2 = -mips64r2 -mtune=mips64r2 -mabi=64
+    CPU_CFLAGS_4kec = -mips32r2 -mtune=4kec
+    CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc
+    CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
+    CPU_CFLAGS_octeonplus = -march=octeon+ -mabi=64
+  endif
+  ifeq ($(ARCH),i386)
+    CPU_TYPE ?= pentium-mmx
+    CPU_CFLAGS_pentium-mmx = -march=pentium-mmx
+    CPU_CFLAGS_pentium4 = -march=pentium4
+  endif
+  ifneq ($(findstring arm,$(ARCH)),)
+    CPU_TYPE ?= xscale
+  endif
+  ifeq ($(ARCH),powerpc)
+    CPU_CFLAGS_603e:=-mcpu=603e
+    CPU_CFLAGS_8540:=-mcpu=8540
+    CPU_CFLAGS_405:=-mcpu=405
+    CPU_CFLAGS_440:=-mcpu=440
+    CPU_CFLAGS_464fp:=-mcpu=464fp
+  endif
+  ifeq ($(ARCH),powerpc64)
+    CPU_TYPE ?= powerpc64
+    CPU_CFLAGS_e5500:=-mcpu=e5500
+    CPU_CFLAGS_powerpc64:=-mcpu=powerpc64
+  endif
+  ifeq ($(ARCH),sparc)
+    CPU_TYPE = sparc
+    CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc
+  endif
+  ifeq ($(ARCH),aarch64)
+    CPU_TYPE ?= generic
+    CPU_CFLAGS_generic = -mcpu=generic
+    CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53
+  endif
+  ifeq ($(ARCH),arc)
+    CPU_TYPE ?= arc700
+    CPU_CFLAGS += -matomic
+    CPU_CFLAGS_arc700 = -mcpu=arc700
+    CPU_CFLAGS_archs = -mcpu=archs
+  endif
+  ifneq ($(CPU_TYPE),)
+    ifndef CPU_CFLAGS_$(CPU_TYPE)
+      $(warning CPU_TYPE "$(CPU_TYPE)" doesn't correspond to a known type)
+    endif
+  endif
+  DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))
+
+  ifneq ($(BOARD),)
+    TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(call target_conf,$(TARGETID))
+    $(TMP_CONFIG): $(LINUX_KCONFIG_LIST)
+		$(LINUX_CONF_CMD) > $@ || rm -f $@
+    -include $(TMP_CONFIG)
+    .SILENT: $(TMP_CONFIG)
+    .PRECIOUS: $(TMP_CONFIG)
+
+    ifdef KERNEL_TESTING_PATCHVER
+      ifneq ($(KERNEL_TESTING_PATCHVER),$(KERNEL_PATCHVER))
+        FEATURES += testing-kernel
+      endif
+    endif
+    ifneq ($(CONFIG_OF),)
+      FEATURES += dt
+    endif
+    ifneq ($(CONFIG_GENERIC_GPIO)$(CONFIG_GPIOLIB),)
+      FEATURES += gpio
+    endif
+    ifneq ($(CONFIG_PCI),)
+      FEATURES += pci
+    endif
+    ifneq ($(CONFIG_PCIEPORTBUS),)
+      FEATURES += pcie
+    endif
+    ifneq ($(CONFIG_USB)$(CONFIG_USB_SUPPORT),)
+      ifneq ($(CONFIG_USB_ARCH_HAS_HCD)$(CONFIG_USB_EHCI_HCD),)
+        FEATURES += usb
+      endif
+    endif
+    ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
+      FEATURES += pcmcia
+    endif
+    ifneq ($(CONFIG_VGA_CONSOLE)$(CONFIG_FB),)
+      FEATURES += display
+    endif
+    ifneq ($(CONFIG_RTC_CLASS),)
+      FEATURES += rtc
+    endif
+    ifneq ($(CONFIG_VIRTIO),)
+      FEATURES += virtio
+    endif
+    ifneq ($(CONFIG_CPU_MIPS32_R2),)
+      FEATURES += mips16
+    endif
+    FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))
+
+    # remove duplicates
+    FEATURES:=$(sort $(FEATURES))
+  endif
+endif
+
+CUR_SUBTARGET:=$(SUBTARGET)
+ifeq ($(SUBTARGETS),)
+  CUR_SUBTARGET := default
+endif
+
+define BuildTargets/DumpCurrent
+  .PHONY: dumpinfo
+  dumpinfo : export DESCRIPTION=$$(Target/Description)
+  dumpinfo:
+	@echo 'Target: $(TARGETID)'; \
+	 echo 'Target-Board: $(BOARD)'; \
+	 echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),$(if $(SUBTARGET),))'; \
+	 echo 'Target-Arch: $(ARCH)'; \
+	 echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(ARCH)$(if $(CPU_TYPE),_$(CPU_TYPE))$(if $(CPU_SUBTYPE),_$(CPU_SUBTYPE)))'; \
+	 echo 'Target-Features: $(FEATURES)'; \
+	 echo 'Target-Depends: $(DEPENDS)'; \
+	 echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \
+	 echo 'CPU-Type: $(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))'; \
+	 echo 'Linux-Version: $(LINUX_VERSION)'; \
+	$(if $(LINUX_TESTING_VERSION),echo 'Linux-Testing-Version: $(LINUX_TESTING_VERSION)';) \
+	 echo 'Linux-Release: $(LINUX_RELEASE)'; \
+	 echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
+	$(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; )) \
+	 echo 'Target-Description:'; \
+	 echo "$$$$DESCRIPTION"; \
+	 echo '@@'; \
+	 echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \
+	 $(DUMPINFO)
+	$(if $(CUR_SUBTARGET),$(SUBMAKE) -r --no-print-directory -C image -s DUMP=1 SUBTARGET=$(CUR_SUBTARGET))
+	$(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s DUMP=1 SUBTARGET=$(SUBTARGET); ))
+endef
+
+include $(INCLUDE_DIR)/kernel.mk
+ifeq ($(TARGET_BUILD),1)
+  include $(INCLUDE_DIR)/kernel-build.mk
+  BuildTarget?=$(BuildKernel)
+endif
+
+endif #__target_inc

root/package/modems/Makefile

@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2019 Teltonika
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/download.mk
+
+PKG_NAME:=modems
+PKG_VERSION:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/modems
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=3G/4G modem list
+endef
+
+define Build/Compile
+endef
+
+define Package/modems/install
+	$(INSTALL_DIR) $(1)/lib/network/wwan/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/data/* $(1)/lib/network/wwan/
+	#in order to keep the Lede GIT repo free of filenames with colons,
+	#we name the files xxxx-yyyy
+	# and rename here after copying to the build directory
+	shopt -s nullglob ; \
+	for filevar in $(1)/lib/network/wwan/*-* ; \
+	do \
+		FILENAME=$$$$(basename $$$$filevar) ; \
+		NEWNAME=$$$${FILENAME//-/:} ; \
+		mv "$(1)/lib/network/wwan/$$$$FILENAME" "$(1)/lib/network/wwan/$$$$NEWNAME" ; \
+	done
+endef
+
+$(eval $(call BuildPackage,modems))

root/package/modems/src/README.md

@@ -0,0 +1,2 @@
+# modems
+

root/package/modems/src/data/0421-03a7

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia C5-00 Mobile phone",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-060d

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-10",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-060e

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-10",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-0612

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-15/CS-18",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-0619

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-12",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-061e

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-11",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-0623

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-17",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-0629

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-18",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-062d

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-19",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-062f

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-19",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/0421-0638

@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia 21M-02",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/05c6-0016

@@ -0,0 +1,6 @@
+{
+	"desc": "iBall 3.5G Connect",
+	"control": 2,
+	"data": 2
+}	"generic": 1
+}

root/package/modems/src/data/05c6-0023

@@ -0,0 +1,5 @@
+{
+	"desc": "Leoxsys LN-72V",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/05c6-00a0

@@ -0,0 +1,6 @@
+{
+	"desc": "Axesstel MV241",
+	"control": 2,
+	"data": 0
+}	"generic": 1
+}

root/package/modems/src/data/05c6-6000

@@ -0,0 +1,5 @@
+{
+	"desc": "Siemens SG75",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/05c6-9000

@@ -0,0 +1,5 @@
+{
+	"desc": "Generic Qualcomm",
+	"control": 1,
+	"data": 2
+}}

root/package/modems/src/data/05c6-9215

@@ -0,0 +1,8 @@
+{
+	"desc": "Quectel EC20",
+	"type": "gobinet",
+	"control": 2,
+	"boudrate": 115200,
+	"stop_bits": 8,
+	"gps": 1
+}

root/package/modems/src/data/07d1-3e01

@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-152",
+	"control": 1,
+	"data": 0
+}}

root/package/modems/src/data/07d1-3e02

@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156",
+	"control": 1,
+	"data": 0
+}}

root/package/modems/src/data/07d1-7e11

@@ -0,0 +1,6 @@
+{
+	"desc": "D-Link DWM-156",
+	"control": 1,
+	"data": 2
+}	"generic": 1
+}

root/package/modems/src/data/0af0-4005

@@ -0,0 +1,4 @@
+{
+	"desc": "Option GIO711",
+	"type": "qmi"
+}

root/package/modems/src/data/0af0-6901

@@ -0,0 +1,5 @@
+{
+	"desc": "Option GI0201",
+	"control": 1,
+	"data": 0
+}}

root/package/modems/src/data/0af0-7201

@@ -0,0 +1,5 @@
+{
+	"desc": "Option GTM380",
+	"control": 1,
+	"data": 0
+}}

root/package/modems/src/data/0af0-8120

@@ -0,0 +1,4 @@
+{
+	"desc": "Option GTM681W",
+	"type": "qmi"
+}

root/package/modems/src/data/0af0-9200

@@ -0,0 +1,5 @@
+{
+	"desc": "Option GTM671WFS",
+	"control": 2,
+	"data": 2
+}}

root/package/modems/src/data/0b3c-c000

@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 100",
+	"type": "qmi"
+}

root/package/modems/src/data/0b3c-c001

@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 120",
+	"type": "qmi"
+}

root/package/modems/src/data/0b3c-c002

@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 140",
+	"type": "qmi"
+}

root/package/modems/src/data/0b3c-c003

@@ -0,0 +1,5 @@
+{
+	"desc": "Olivetti Olicard 145",
+	"control": 0,
+	"data": 4
+}}

root/package/modems/src/data/0b3c-c004

@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 155",
+	"type": "qmi"
+}

root/package/modems/src/data/0b3c-c005

@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 200",
+	"type": "qmi"
+}

root/package/modems/src/data/0b3c-c00a

@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 160",
+	"type": "qmi"
+}

root/package/modems/src/data/0b3c-c00b

@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 500",
+	"type": "qmi"
+}

root/package/modems/src/data/0bdb-1900

@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3507g",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}

root/package/modems/src/data/0bdb-1902

@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3507g",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}

root/package/modems/src/data/0bdb-190a

@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3307",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}

root/package/modems/src/data/0bdb-190d

@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F5521gw",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}

root/package/modems/src/data/0bdb-1910

@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F5521gw",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}

root/package/modems/src/data/0c88-17da

@@ -0,0 +1,5 @@
+{
+	"desc": "Kyocera KPC650",
+	"control": 0,
+	"data": 0
+}}

root/package/modems/src/data/0c88-180a

@@ -0,0 +1,5 @@
+{
+	"desc": "Kyocera KPC680",
+	"control": 0,
+	"data": 0
+}}

root/package/modems/src/data/0f3d-68a2

@@ -0,0 +1,4 @@
+{
+	"desc": "Sierra MC7700",
+	"type": "qmi"
+}

root/package/modems/src/data/0f3d-68aa

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra Wireless AC313U/320U/330U Direct IP",
+	"control": 3,
+	"data": 3
+}}

root/package/modems/src/data/1004-6124

@@ -0,0 +1,6 @@
+{
+	"desc": "LG L-05A",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}

root/package/modems/src/data/1004-6141

@@ -0,0 +1,6 @@
+{
+	"desc": "LG LUU-2100TI",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}

root/package/modems/src/data/1004-6157

@@ -0,0 +1,6 @@
+{
+	"desc": "LG LUU-2110TI",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}

root/package/modems/src/data/1004-618f

@@ -0,0 +1,5 @@
+{
+	"desc": "LG L-02C",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/106c-3711

@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-150",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/106c-3714

@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-175",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/106c-3715

@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-175AL",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/106c-3716

@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-190",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/106c-3717

@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-185C/UM185E",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}

root/package/modems/src/data/106c-3718

@@ -0,0 +1,4 @@
+{
+	"desc": "PANTECH UML-290 4G Modem",
+	"type": "qmi"
+}

root/package/modems/src/data/106c-3721

@@ -0,0 +1,4 @@
+{
+	"desc": "PANTECH P4200 4G Modem",
+	"type": "qmi"
+}

root/package/modems/src/data/1199-0017

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra EM5625",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0018

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5720",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0019

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC595U",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0020

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5725",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0021

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC597E",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0022

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra EM5725",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0023

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC597",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0024

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5727 CDMA",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0025

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC598",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0026

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra T11",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0027

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC402",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0028

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5728",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0112

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra CDMA 1xEVDO PC Card, AC580",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0120

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC595U",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0218

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5720",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0220

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5725",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0224

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5727",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-0301

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC250U",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-6802

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6803

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8765",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6804

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6805

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8765",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6808

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6809

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6813

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6815

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6816

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6820

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875",
+	"control": 0,
+	"data": 2
+}}

root/package/modems/src/data/1199-6821

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875U",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/1199-6822

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875E",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-6833

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-6834

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8780",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-6835

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-6838

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8780",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-6839

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-683a

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8785",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-683b

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8785 Composite",
+	"control": 3,
+	"data": 4
+}}

root/package/modems/src/data/1199-6850

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/1199-6851

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC 881",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/1199-6852

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880E",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/1199-6853

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC881E",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/1199-6855

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880U",
+	"control": 2,
+	"data": 0
+}}

root/package/modems/src/data/1199-6856

@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra ATT USB Connect 881",
+	"control": 2,
+	"data": 0
+}}