From 7add46bab5b580c4ef20d0fc67a11d5a1e6dc491 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 22 Dec 2017 07:19:13 -0600 Subject: [PATCH] lpc54 SDMMC. Some trivial naming improvements. --- arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h | 2 +- arch/arm/src/lpc54xx/lpc54_sdmmc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h b/arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h index 4307ceb09a..12c8356854 100644 --- a/arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h +++ b/arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h @@ -216,7 +216,7 @@ #define SDMMC_INT_SBE (1 << 13) /* Bit 13: Start-bit error */ #define SDMMC_INT_ACD (1 << 14) /* Bit 14: Auto command done */ #define SDMMC_INT_EBE (1 << 15) /* Bit 15: End-bit error (read)/Write no CRC */ -#define SDMMC_INT_SDMMC (1 << 16) /* Bit 16: Mask SD/MMC interrupt */ +#define SDMMC_INT_SDMMC (1 << 16) /* Bit 16: SD/MMC interrupt */ /* Bits 17-31: Reserved */ #define SDMMC_INT_ALL (0x1ffff) diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c index b5575e28b9..6e929b5924 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c @@ -290,7 +290,7 @@ static void lpc54_endtransfer(struct lpc54_dev_s *priv, sdio_eventset_t wkupeven /* Interrupt Handling *******************************************************/ -static int lpc54_interrupt(int irq, void *context, FAR void *arg); +static int lpc54_sdmmc_interrupt(int irq, void *context, FAR void *arg); /* SD Card Interface Methods ************************************************/ @@ -904,7 +904,7 @@ static void lpc54_endtransfer(struct lpc54_dev_s *priv, sdio_eventset_t wkupeven } /**************************************************************************** - * Name: lpc54_interrupt + * Name: lpc54_sdmmc_interrupt * * Description: * SD card interrupt handler @@ -917,7 +917,7 @@ static void lpc54_endtransfer(struct lpc54_dev_s *priv, sdio_eventset_t wkupeven * ****************************************************************************/ -static int lpc54_interrupt(int irq, void *context, FAR void *arg) +static int lpc54_sdmmc_interrupt(int irq, void *context, FAR void *arg) { struct lpc54_dev_s *priv = &g_scard_dev; uint32_t enabled; @@ -1507,7 +1507,7 @@ static int lpc54_attach(FAR struct sdio_dev_s *dev) /* Attach the SD card interrupt handler */ - ret = irq_attach(LPC54_IRQ_SDMMC, lpc54_interrupt, NULL); + ret = irq_attach(LPC54_IRQ_SDMMC, lpc54_sdmmc_interrupt, NULL); if (ret == OK) { /* Disable all interrupts at the SD card controller and clear static