ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Address @ithinuel's comments

pull/7822/head
Donatien Garnier 2018-08-28 17:00:35 +01:00
parent 681811e403
commit bfe4c748ce
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
features/nfc/controllers/PN512Driver.h
View File

@ -30,7 +30,6 @@
namespace mbed { namespace mbed {
namespace nfc { namespace nfc {
struct PN512TransportDriver;
class PN512Driver : public NFCControllerDriver, private PN512TransportDriver::Delegate { class PN512Driver : public NFCControllerDriver, private PN512TransportDriver::Delegate {
public: public:
PN512Driver(PN512TransportDriver *transport_driver); PN512Driver(PN512TransportDriver *transport_driver);

3
features/nfc/nfc/NFCController.h
View File

@ -149,10 +149,11 @@ public:
nfc_err_t cancel_discovery(); nfc_err_t cancel_discovery();
private: private:
// These two classes need to be friends to access the following transceiver() method
friend class NFCRemoteEndpoint; friend class NFCRemoteEndpoint;
friend class NFCRemoteInitiator;
friend class Type4RemoteInitiator; friend class Type4RemoteInitiator;
nfc_transceiver_t *transceiver() const; nfc_transceiver_t *transceiver() const;
void polling_callback(nfc_err_t ret); void polling_callback(nfc_err_t ret);
// NFC Stack scheduler // NFC Stack scheduler

26
features/nfc/nfc/NFCDefinitions.h
View File

@ -18,6 +18,8 @@
#define MBED_NFC_DEFINITIONS_H #define MBED_NFC_DEFINITIONS_H
#include <stdint.h> #include <stdint.h>
#include <stdbool.h>
#include "stack/nfc_errors.h" #include "stack/nfc_errors.h"
#include "acore/ac_buffer.h" #include "acore/ac_buffer.h"
@ -25,19 +27,19 @@
namespace mbed { namespace mbed {
namespace nfc { namespace nfc {
struct nfc_rf_protocols_bitmask_t { struct nfc_rf_protocols_bitmask_t {
uint8_t initiator_t1t : 1; bool initiator_t1t : 1;
uint8_t initiator_t2t : 1; bool initiator_t2t : 1;
uint8_t initiator_t3t : 1; bool initiator_t3t : 1;
uint8_t initiator_iso_dep : 1; bool initiator_iso_dep : 1;
uint8_t initiator_nfc_dep : 1; bool initiator_nfc_dep : 1;
uint8_t initiator_t5t : 1; bool initiator_t5t : 1;
uint8_t target_t1t : 1; bool target_t1t : 1;
uint8_t target_t2t : 1; bool target_t2t : 1;
uint8_t target_t3t : 1; bool target_t3t : 1;
uint8_t target_iso_dep : 1; bool target_iso_dep : 1;
uint8_t target_nfc_dep : 1; bool target_nfc_dep : 1;
uint8_t target_t5t : 1; bool target_t5t : 1;
}; };
enum nfc_tag_type_t { enum nfc_tag_type_t {