This commit is contained in:
Sebastien Lorquet
2016-08-31 13:41:49 +02:00
parent 90568f9e8f
commit d4048f3eeb
4 changed files with 72 additions and 4 deletions
+1
View File
@@ -76,6 +76,7 @@ include usbhost$(DELIM)Make.defs
include usbmonitor$(DELIM)Make.defs
include video$(DELIM)Make.defs
include wireless$(DELIM)Make.defs
include contactless$(DELIM)Make.defs
ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
CSRCS += dev_null.c dev_zero.c
+2 -2
View File
@@ -37,11 +37,11 @@ ifeq ($(CONFIG_DRIVERS_CONTACTLESS),y)
# Include contactless drivers
ifeq ($(CONFIG_WL_MFRC522),y)
ifeq ($(CONFIG_CL_MFRC522),y)
CSRCS += mfrc522.c
endif
ifeq ($(CONFIG_WL_PN532),y)
ifeq ($(CONFIG_CL_PN532),y)
CSRCS += pn532.c
endif
+2 -2
View File
@@ -50,7 +50,7 @@
#include <unistd.h>
#include <nuttx/kmalloc.h>
#include <nuttx/contactless/contactless.h>
#include <nuttx/drivers/contactless.h>
#include "mfrc522.h"
@@ -168,7 +168,7 @@ static inline void mfrc522_configspi(FAR struct spi_dev_s *spi)
SPI_SETMODE(spi, SPIDEV_MODE0);
SPI_SETBITS(spi, 8);
(void)SPI_HWFEATURES(spi, 0);
(void)SPI_SETFREQUENCY(spi, CONFIG_CL_MFRC522_SPI_FREQ);
(void)SPI_SETFREQUENCY(spi, CONFIG_MFRC522_SPI_FREQ);
}
static inline void mfrc522_select(struct mfrc522_dev_s *dev)