some additional fixes
Fork of PN532 by
Diff: PN532_SPI.h
- Revision:
- 1:b8cab5222fd0
- Parent:
- 0:9c6b9280c0e1
- Child:
- 3:4189a10038e6
diff -r 9c6b9280c0e1 -r b8cab5222fd0 PN532_SPI.h --- a/PN532_SPI.h Tue Oct 08 08:33:22 2013 +0000 +++ b/PN532_SPI.h Thu Oct 17 06:37:26 2013 +0000 @@ -5,27 +5,35 @@ #include "mbed.h" #include "PN532Interface.h" -class PN532_SPI : public PN532Interface { +class PN532_SPI : public PN532Interface +{ public: PN532_SPI(SPI &spi, PinName ss); - PN532_SPI(SPI *spi, PinName ss); - + PN532_SPI(SPI *spi, PinName ss); + virtual void begin(); virtual void wakeup(); virtual int8_t writeCommand(const uint8_t buf[], uint8_t len); virtual int16_t readResponse(uint8_t buf[], uint8_t len, uint16_t timeout); - + private: - SPI* _spi; + SPI *_spi; DigitalOut _ss; uint8_t command; - + bool isReady(); void writeFrame(const uint8_t buf[], uint8_t len); int8_t readAckFrame(); - - inline void write(uint8_t data) { REVERSE_BITS_ORDER(data); _spi->write(data); } - inline uint8_t read() { uint8_t data = _spi->write(0); REVERSE_BITS_ORDER(data); return data; } + + inline void write(uint8_t data) { + REVERSE_BITS_ORDER(data); + _spi->write(data); + } + inline uint8_t read() { + uint8_t data = _spi->write(0); + REVERSE_BITS_ORDER(data); + return data; + } }; #endif