|
[-]
[+]
|
Changed |
_service:tar_git:nfcd-binder-plugin.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:nfcd-binder-plugin.spec
^
|
|
|
|
|
Changed |
_service
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:nfcd-binder-plugin-1.1.3.tar.bz2/Makefile
^
|
| @@ -56,12 +56,10 @@
DEBUG_FLAGS = -g
RELEASE_FLAGS =
-DISABLE_HEXDUMP ?= 0
-ifneq ($(DISABLE_HEXDUMP),0)
-DEFINES += -DDISABLE_HEXDUMP
+ifndef KEEP_SYMBOLS
+KEEP_SYMBOLS = 0
endif
-KEEP_SYMBOLS ?= 0
ifneq ($(KEEP_SYMBOLS),0)
RELEASE_FLAGS += -g
endif
@@ -138,15 +136,14 @@
# Install
#
-PLUGIN_DIR ?= usr/lib/nfcd/plugins
-ABS_PLUGIN_DIR := $(shell echo /$(PLUGIN_DIR) | sed -r 's|/+|/|g')
-
+INSTALL_PERM = 755
INSTALL = install
INSTALL_DIRS = $(INSTALL) -d
-INSTALL_PLUGIN_DIR = $(DESTDIR)$(ABS_PLUGIN_DIR)
+INSTALL_FILES = $(INSTALL) -m $(INSTALL_PERM)
+INSTALL_LIB_DIR = $(DESTDIR)/usr/lib/nfcd/plugins
-install: $(INSTALL_PLUGIN_DIR)
- $(INSTALL) -m 755 $(RELEASE_LIB) $(INSTALL_PLUGIN_DIR)
+install: $(INSTALL_LIB_DIR)
+ $(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR)
-$(INSTALL_PLUGIN_DIR):
+$(INSTALL_LIB_DIR):
$(INSTALL_DIRS) $@
|
|
[-]
[+]
|
Changed |
_service:tar_git:nfcd-binder-plugin-1.1.3.tar.bz2/src/binder_nfc_adapter.c
^
|
| @@ -132,8 +132,19 @@
#define DIR_IN '>'
#define DIR_OUT '<'
+#define DUMP(f,args...) gutil_log(&binder_hexdump_log, \
+ GLOG_LEVEL_VERBOSE, f, ##args)
+
+static
+gboolean
+binder_nfc_adapter_close(
+ BinderNfcAdapter* self);
+
+static
+void
+binder_nfc_adapter_state_check(
+ BinderNfcAdapter* self);
-#ifndef DISABLE_HEXDUMP
static
void
binder_hexdump(
@@ -171,24 +182,6 @@
}
}
- #define BINDER_DUMP(dir, data, len) binder_dump_data(dir, data, len)
- #define DUMP(f,args...) gutil_log(&binder_hexdump_log, \
- GLOG_LEVEL_VERBOSE, f, ##args)
-#else
- #define BINDER_DUMP(dir, data, len)
- #define DUMP(f,args...)
-#endif /* !DISABLE_HEXDUMP */
-
-static
-gboolean
-binder_nfc_adapter_close(
- BinderNfcAdapter* self);
-
-static
-void
-binder_nfc_adapter_state_check(
- BinderNfcAdapter* self);
-
/*==========================================================================*
* INfcClientCallback
*==========================================================================*/
@@ -250,7 +243,7 @@
NciHalClient* hal_client = self->hal_client;
DUMP("%c data, %u byte(s)", DIR_IN, (guint)len);
- BINDER_DUMP(DIR_IN, data, len);
+ binder_dump_data(DIR_IN, data, len);
if (hal_client) {
hal_client->fn->read(hal_client, data, len);
}
@@ -335,7 +328,7 @@
GBinderWriter writer;
gulong id;
- BINDER_DUMP(DIR_OUT, data, len);
+ binder_dump_data(DIR_OUT, data, len);
gbinder_local_request_init_writer(req, &writer);
gbinder_writer_append_hidl_vec(&writer, data, len, 1);
id = gbinder_client_transact(self->client, BINDER_NFC_REQ_WRITE,
|
|
[-]
[+]
|
Changed |
_service:tar_git:nfcd-binder-plugin-1.1.3.tar.bz2/src/binder_nfc_plugin.c
^
|
| @@ -130,18 +130,15 @@
void* plugin)
{
BinderNfcPlugin* self = BINDER_NFC_PLUGIN(plugin);
+ char** ptr;
self->list_call_id = 0;
- if (services) {
- char** ptr;
+ for (ptr = services; *ptr; ptr++) {
+ if (g_str_has_prefix(*ptr, BINDER_NFC)) {
+ const char* sep = strchr(*ptr, '/');
- for (ptr = services; *ptr; ptr++) {
- if (g_str_has_prefix(*ptr, BINDER_NFC)) {
- const char* sep = strchr(*ptr, '/');
-
- if (sep) {
- binder_nfc_plugin_add_adapter(self, sep + 1);
- }
+ if (sep) {
+ binder_nfc_plugin_add_adapter(self, sep + 1);
}
}
}
|
