From 1fda0523da7c5728d2afdb099ed99079015d4da9 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 6 Oct 2016 07:44:00 -0600 Subject: [PATCH] CONFIG_CL_MFR522, not CONFIG_WL_MFR522 --- configs/stm32f103-minimum/src/Makefile | 2 +- configs/stm32f103-minimum/src/stm32_bringup.c | 2 +- configs/stm32f103-minimum/src/stm32_spi.c | 4 ++-- configs/stm32f103-minimum/src/stm32f103_minimum.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/stm32f103-minimum/src/Makefile b/configs/stm32f103-minimum/src/Makefile index 5876a6df68..c502b43a47 100644 --- a/configs/stm32f103-minimum/src/Makefile +++ b/configs/stm32f103-minimum/src/Makefile @@ -53,7 +53,7 @@ ifeq ($(CONFIG_AUDIO_TONE),y) CSRCS += stm32_tone.c endif -ifeq ($(CONFIG_WL_MFRC522),y) +ifeq ($(CONFIG_CL_MRFC522),y) CSRCS += stm32_mfrc522.c endif diff --git a/configs/stm32f103-minimum/src/stm32_bringup.c b/configs/stm32f103-minimum/src/stm32_bringup.c index ec7d33db3f..016e7149bd 100644 --- a/configs/stm32f103-minimum/src/stm32_bringup.c +++ b/configs/stm32f103-minimum/src/stm32_bringup.c @@ -112,7 +112,7 @@ int stm32_bringup(void) } #endif -#ifdef CONFIG_WL_MFRC522 +#ifdef CONFIG_CL_MRFC522 ret = stm32_mfrc522initialize("/dev/rfid0"); if (ret < 0) { diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c index 2095e3e2af..10aabe207c 100644 --- a/configs/stm32f103-minimum/src/stm32_spi.c +++ b/configs/stm32f103-minimum/src/stm32_spi.c @@ -74,7 +74,7 @@ void stm32_spidev_initialize(void) * architecture. */ -#ifdef CONFIG_WL_MFRC522 +#ifdef CONFIG_CL_MRFC522 (void)stm32_configgpio(GPIO_CS_MFRC522); /* MFRC522 chip select */ #endif @@ -112,7 +112,7 @@ void stm32_spidev_initialize(void) void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { -#if defined(CONFIG_WL_MFRC522) +#if defined(CONFIG_CL_MRFC522) if (devid == SPIDEV_WIRELESS) { stm32_gpiowrite(GPIO_CS_MFRC522, !selected); diff --git a/configs/stm32f103-minimum/src/stm32f103_minimum.h b/configs/stm32f103-minimum/src/stm32f103_minimum.h index f3c083ac6b..68c57ba3a1 100644 --- a/configs/stm32f103-minimum/src/stm32f103_minimum.h +++ b/configs/stm32f103-minimum/src/stm32f103_minimum.h @@ -139,7 +139,7 @@ void stm32_usbinitialize(void); * ************************************************************************************/ -#ifdef CONFIG_WL_MFRC522 +#ifdef CONFIG_CL_MRFC522 int stm32_mfrc522initialize(FAR const char *devpath); #endif