PeterCxy/OpenEUICC
14
20
Fork 16
Code Issues 10 Pull requests Projects Releases 7 Wiki Activity Actions

fix usb driver

Browse source
This commit is contained in:
septs 2025-02-26 14:00:05 +08:00
parent 377e101057
commit 59d6a8f8ea
Signed by: septs
SSH key fingerprint: SHA256:ElK0p6DNkbsqYUdJ3I9QHDVf21SQD0c2r+hd7s/r5Co
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.idea/deploymentTargetSelector.xml generated
View file

@ -4,6 +4,14 @@
<selectionStates>
<SelectionState runConfigName="app-unpriv">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2025-02-26T05:33:18.646829Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=44161JEKB15351" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />

4
app-common/src/main/java/im/angry/openeuicc/core/DefaultEuiccChannelFactory.kt
View file

@ -8,7 +8,7 @@ import android.se.omapi.SEService
import android.util.Log
import im.angry.openeuicc.common.R
import im.angry.openeuicc.core.usb.UsbApduInterface
import im.angry.openeuicc.core.usb.getIoEndpoints
import im.angry.openeuicc.core.usb.getBulkEndpoints
import im.angry.openeuicc.util.*
import java.lang.IllegalArgumentException
@ -61,7 +61,7 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
}
override fun tryOpenUsbEuiccChannel(usbDevice: UsbDevice, usbInterface: UsbInterface): EuiccChannel? {
val (bulkIn, bulkOut) = usbInterface.getIoEndpoints()
val (bulkIn, bulkOut) = usbInterface.getBulkEndpoints()
if (bulkIn == null || bulkOut == null) return null
val conn = usbManager.openDevice(usbDevice) ?: return null
if (!conn.claimInterface(usbInterface, true)) return null

8
app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidUtils.kt
View file

@ -14,14 +14,14 @@ val UsbDevice.interfaces: Iterable<UsbInterface>
val UsbInterface.endpoints: Iterable<UsbEndpoint>
get() = (0 until endpointCount).map(::getEndpoint)
fun UsbInterface.getIoEndpoints(): Pair<UsbEndpoint?, UsbEndpoint?> {
fun UsbInterface.getBulkEndpoints(): Pair<UsbEndpoint?, UsbEndpoint?> {
val endpoints = endpoints
.filter { it.type == UsbConstants.USB_ENDPOINT_XFER_BULK }
return Pair(
endpoints.first { it.direction == UsbConstants.USB_DIR_IN },
endpoints.first { it.direction == UsbConstants.USB_DIR_OUT },
endpoints.find { it.direction == UsbConstants.USB_DIR_IN },
endpoints.find { it.direction == UsbConstants.USB_DIR_OUT },
)
}
fun UsbDevice.getSmartCardInterface() =
interfaces.first { it.interfaceClass == UsbConstants.USB_CLASS_CSCID }
interfaces.find { it.interfaceClass == UsbConstants.USB_CLASS_CSCID }