diff options
| author | Martijn Coenen <maco@google.com> | 2015-11-25 16:22:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-25 16:22:33 +0000 |
| commit | ca3f49d6e019def467d61fe1996574f4c08f5573 (patch) | |
| tree | 0bb7283844a09a70773c9d283869384d664f249e | |
| parent | 5a920b2da9c8a53a6c79567f767af61b8463555e (diff) | |
| parent | dc0e6b62493b650bed4a26f55a61f50bebf7121c (diff) | |
| download | libnfc-nci-ca3f49d6e019def467d61fe1996574f4c08f5573.tar.gz | |
Merge "Fix rf discover notification type." am: 7d7160dda3
am: dc0e6b6249
* commit 'dc0e6b62493b650bed4a26f55a61f50bebf7121c':
Fix rf discover notification type.
| -rw-r--r-- | src/nfc/include/nfc_api.h | 10 | ||||
| -rw-r--r-- | src/nfc/nfc/nfc_ncif.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/nfc/include/nfc_api.h b/src/nfc/include/nfc_api.h index 4070c5c..70734e4 100644 --- a/src/nfc/include/nfc_api.h +++ b/src/nfc/include/nfc_api.h @@ -592,11 +592,11 @@ typedef struct /* the data type associated with NFC_RESULT_DEVT */ typedef struct { - tNFC_STATUS status; /* The event status - place holder. */ - UINT8 rf_disc_id; /* RF Discovery ID */ - UINT8 protocol; /* supported protocol */ - tNFC_RF_TECH_PARAMS rf_tech_param; /* RF technology parameters */ - BOOLEAN more; /* 0: last notification */ + tNFC_STATUS status; /* The event status - place holder. */ + UINT8 rf_disc_id; /* RF Discovery ID */ + UINT8 protocol; /* supported protocol */ + tNFC_RF_TECH_PARAMS rf_tech_param; /* RF technology parameters */ + UINT8 more; /* 0: last, 1: last (limit), 2: more */ } tNFC_RESULT_DEVT; /* the data type associated with NFC_SELECT_DEVT */ diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c index 1b0fb15..99ad256 100644 --- a/src/nfc/nfc/nfc_ncif.c +++ b/src/nfc/nfc/nfc_ncif.c @@ -741,8 +741,7 @@ void nfc_ncif_proc_discover_ntf (UINT8 *p, UINT16 plen) evt_data.result.rf_tech_param.mode = *p++; p = nfc_ncif_decode_rf_params (&evt_data.result.rf_tech_param, p); - evt_data.result.more = (*p == NCI_DISCOVER_NTF_MORE) ? TRUE : FALSE; - p++; + evt_data.result.more = *p++; (*nfc_cb.p_discv_cback) (NFC_RESULT_DEVT, &evt_data); } } |