From 864d80aaeb14c304e437762fc8465db006fb02c2 Mon Sep 17 00:00:00 2001
From: Ryan Press <ryan@presslab.us>
Date: Mon, 31 Mar 2025 06:59:54 -0700
Subject: [PATCH] lpac: Add support for MBIM backend

Signed-off-by: Ryan Press <ryan@presslab.us>
---
 utils/lpac/Config.in      | 5 +++++
 utils/lpac/Makefile       | 4 +++-
 utils/lpac/files/lpac.sh  | 5 +++++
 utils/lpac/files/lpac.uci | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/utils/lpac/Config.in b/utils/lpac/Config.in
index d8377907c9..59669de2c1 100644
--- a/utils/lpac/Config.in
+++ b/utils/lpac/Config.in
@@ -19,4 +19,9 @@ config LPAC_WITH_UQMI
 	help
 	  Compile LPAC with APDU uqmi Backend support.
 
+config LPAC_WITH_MBIM
+	bool "Include APDU MBIM Backend support"
+	default y
+	help
+	  Compile LPAC with APDU MBIM Backend support.
 endmenu
diff --git a/utils/lpac/Makefile b/utils/lpac/Makefile
index 6afc124edf..c045bac5cd 100644
--- a/utils/lpac/Makefile
+++ b/utils/lpac/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lpac
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/estkme-group/lpac/tar.gz/refs/tags/v$(PKG_VERSION)?
@@ -25,6 +25,7 @@ define Package/lpac
   DEPENDS:= \
     +LPAC_WITH_PCSC:libpcsclite \
     +LPAC_WITH_PCSC:pcscd \
+    +LPAC_WITH_MBIM:libmbim \
     +libcurl
   URL:=https://github.com/estkme-group/lpac
 endef
@@ -50,6 +51,7 @@ CMAKE_OPTIONS += \
   -DLPAC_WITH_APDU_PCSC=$(if $(CONFIG_LPAC_WITH_PCSC),ON,OFF) \
   -DLPAC_WITH_APDU_AT=$(if $(CONFIG_LPAC_WITH_AT),ON,OFF) \
   -DLPAC_WITH_APDU_UQMI=$(if $(CONFIG_LPAC_WITH_UQMI),ON,OFF) \
+  -DLPAC_WITH_APDU_MBIM=$(if $(CONFIG_LPAC_WITH_MBIM),ON,OFF) \
   -DLPAC_WITH_APDU_QMI_QRTR=OFF
 
 define Package/lpac/install
diff --git a/utils/lpac/files/lpac.sh b/utils/lpac/files/lpac.sh
index 1fde307fd7..f8df4fdbf7 100644
--- a/utils/lpac/files/lpac.sh
+++ b/utils/lpac/files/lpac.sh
@@ -30,6 +30,11 @@ elif [ "$APDU_BACKEND" = "uqmi" ]; then
     UQMI_DEBUG="$(uci_get lpac uqmi debug 0)"
     export LPAC_QMI_DEV="$UQMI_DEV"
     export LPAC_QMI_DEBUG="$UQMI_DEBUG"
+elif [ "$APDU_BACKEND" = "mbim" ]; then
+    MBIM_DEVICE="$(uci_get lpac mbim device /dev/cdc-wdm0)"
+    MBIM_PROXY="$(uci_get lpac mbim proxy 1)"
+    export MBIM_DEVICE="$MBIM_DEVICE"
+    export MBIM_USE_PROXY="$MBIM_PROXY"
 fi
 
 export LPAC_CUSTOM_ISD_R_AID="$CUSTOM_ISD_R_AID"
diff --git a/utils/lpac/files/lpac.uci b/utils/lpac/files/lpac.uci
index 040a80edbb..9f397392d0 100644
--- a/utils/lpac/files/lpac.uci
+++ b/utils/lpac/files/lpac.uci
@@ -12,3 +12,7 @@ config at at
 config uqmi uqmi
 	option		device		'/dev/cdc-wdm0'
 	option		debug		'0'
+
+config mbim mbim
+	option		device		'/dev/cdc-wdm0'
+	option		proxy		'1'