[-]
[+]
|
Changed |
_service:tar_git:libnciplugin.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:libnciplugin.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/libnciplugin.git</param>
<param name="branch">master</param>
- <param name="revision">1.1.0</param>
+ <param name="revision">1.1.1</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:libnciplugin-1.1.1.tar.bz2/LICENSE
^
|
@@ -1,6 +1,6 @@
Copyright (C) 2019-2021 Jolla Ltd.
Copyright (C) 2019-2021 Slava Monich <slava.monich@jolla.com>
-Copyright (C) 2020 Open Mobile Platform LLC.
+Copyright (C) 2020-2021 Open Mobile Platform LLC.
You may use this file under the terms of the BSD license as follows:
|
[-]
[+]
|
Changed |
_service:tar_git:libnciplugin-1.1.1.tar.bz2/Makefile
^
|
@@ -33,7 +33,7 @@
VERSION_MAJOR = 1
VERSION_MINOR = 1
-VERSION_RELEASE = 0
+VERSION_RELEASE = 1
# Version for pkg-config
PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
|
[-]
[+]
|
Changed |
_service:tar_git:libnciplugin-1.1.1.tar.bz2/debian/changelog
^
|
@@ -1,3 +1,10 @@
+libnciplugin (1.1.1) unstable; urgency=low
+
+ * Fixed ISO-DEP timeout regression
+ * Support presence checks for locked targets
+
+ -- Slava Monich <slava.monich@jolla.com> Thu, 17 Jun 2021 14:44:11 +0300
+
libnciplugin (1.1.0) unstable; urgency=low
* Implemented NfcInitiator for NFC-DEP
|
[-]
[+]
|
Changed |
_service:tar_git:libnciplugin-1.1.1.tar.bz2/debian/control
^
|
@@ -2,13 +2,13 @@
Section: libs
Priority: optional
Maintainer: Slava Monich <slava.monich@jolla.com>
-Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil-dev, libncicore-dev (>= 1.1.11)
+Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil-dev (>= 1.0.31), libncicore-dev (>= 1.1.13)
Standards-Version: 3.8.4
Package: libnciplugin
Section: libs
Architecture: any
-Depends: libncicore (>= 1.1.11), ${shlibs:Depends}, ${misc:Depends}
+Depends: libncicore (>= 1.1.13), libglibutil (>= 1.0.31), ${shlibs:Depends}, ${misc:Depends}
Description: Support library for NCI-based nfcd plugins
Package: libnciplugin-dev
|
[-]
[+]
|
Changed |
_service:tar_git:libnciplugin-1.1.1.tar.bz2/src/nci_adapter.c
^
|
@@ -366,8 +366,11 @@
{
NciAdapter* self = THIS(user_data);
NciAdapterPriv* priv = self->priv;
+ NfcTargetSequence* seq = self->target->sequence;
+ gboolean do_presence_check = !seq || (nfc_target_sequence_flags(seq)
+ & NFC_SEQUENCE_FLAG_ALLOW_PRESENCE_CHECK);
- if (!priv->presence_check_id && !self->target->sequence) {
+ if (!priv->presence_check_id && do_presence_check) {
priv->presence_check_id = nci_target_presence_check(self->target,
nci_adapter_presence_check_done, self);
if (!priv->presence_check_id) {
|
[-]
[+]
|
Changed |
_service:tar_git:libnciplugin-1.1.1.tar.bz2/src/nci_target.c
^
|
@@ -253,10 +253,11 @@
NciTarget* self,
NciTargetPresenceCheck* check)
{
+ NfcTarget* target = &self->target;
static const guint8 cmd_data[] = { T2T_CMD_READ, 0x00 };
- return nfc_target_transmit(&self->target, cmd_data, sizeof(cmd_data),
- NULL, nci_target_presence_check_complete,
+ return nfc_target_transmit(target, cmd_data, sizeof(cmd_data),
+ target->sequence, nci_target_presence_check_complete,
nci_target_presence_check_free1, check);
}
@@ -266,8 +267,10 @@
NciTarget* self,
NciTargetPresenceCheck* check)
{
- return nfc_target_transmit(&self->target, NULL, 0,
- NULL, nci_target_presence_check_complete,
+ NfcTarget* target = &self->target;
+
+ return nfc_target_transmit(target, NULL, 0,
+ target->sequence, nci_target_presence_check_complete,
nci_target_presence_check_free1, check);
}
@@ -414,6 +417,7 @@
}
break;
case NCI_RF_INTERFACE_ISO_DEP:
+ tx_timeout = 0; /* Rely on CORE_INTERFACE_ERROR_NTF */
transmit_finish = nci_target_transmit_finish_iso_dep;
break;
case NCI_RF_INTERFACE_NFC_DEP:
|