diff options
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_internal.h | 66 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_lowputc.c | 3 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_sdhc.c | 79 | ||||
-rwxr-xr-x | nuttx/configs/kwikstik-k40/src/kwikstik-internal.h | 4 | ||||
-rwxr-xr-x | nuttx/configs/kwikstik-k40/src/up_nsh.c | 162 | ||||
-rw-r--r-- | nuttx/configs/twr-k60n512/src/twrk60-internal.h | 4 | ||||
-rw-r--r-- | nuttx/configs/twr-k60n512/src/up_nsh.c | 158 |
7 files changed, 396 insertions, 80 deletions
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_internal.h b/nuttx/arch/arm/src/kinetis/kinetis_internal.h index e9dfb29d7..c05032678 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_internal.h +++ b/nuttx/arch/arm/src/kinetis/kinetis_internal.h @@ -216,6 +216,11 @@ #define _PIN_INT_SHIFT (20) #define _PIN_INT_MASK (31 << _PIN_INT_SHIFT) +#define _PIN_INTDMA_MASK (3 << _PIN_INT_SHIFT) +#define _PIN_INTDMA_NONE (0 << _PIN_INT_SHIFT) +#define _PIN_DMA (1 << _PIN_INT_SHIFT) +#define _PIN_INTERRUPT (2 << _PIN_INT_SHIFT) + #define PIN_DMA_RISING (5 << _PIN_INT_SHIFT) /* 00101 DMA Request on rising edge */ #define PIN_DMA_FALLING (9 << _PIN_INT_SHIFT) /* 01001 DMA Request on falling edge */ #define PIN_DMA_BOTH (13 << _PIN_INT_SHIFT) /* 01101 DMA Request on either edge */ @@ -772,6 +777,67 @@ EXTERN void kinetis_dmadump(DMA_HANDLE handle, const struct kinetis_dmaregs_s *r #endif #endif +/**************************************************************************** + * Name: sdhc_initialize + * + * Description: + * Initialize SDIO for operation. + * + * Input Parameters: + * slotno - Not used. + * + * Returned Values: + * A reference to an SDIO interface structure. NULL is returned on failures. + * + ****************************************************************************/ + +#ifdef CONFIG_KINETIS_SDHC +struct sdio_dev_s; +EXTERN FAR struct sdio_dev_s *sdhc_initialize(int slotno); +#endif + +/**************************************************************************** + * Name: sdhc_mediachange + * + * Description: + * Called by board-specific logic -- posssible from an interrupt handler -- + * in order to signal to the driver that a card has been inserted or + * removed from the slot + * + * Input Parameters: + * dev - An instance of the SDIO driver device state structure. + * cardinslot - true is a card has been detected in the slot; false if a + * card has been removed from the slot. Only transitions + * (inserted->removed or removed->inserted should be reported) + * + * Returned Values: + * None + * + ****************************************************************************/ + +#ifdef CONFIG_KINETIS_SDHC +EXTERN void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); +#endif + +/**************************************************************************** + * Name: sdio_wrprotect + * + * Description: + * Called by board-specific logic to report if the card in the slot is + * mechanically write protected. + * + * Input Parameters: + * dev - An instance of the SDIO driver device state structure. + * wrprotect - true is a card is writeprotected. + * + * Returned Values: + * None + * + ****************************************************************************/ + +#ifdef CONFIG_KINETIS_SDHC +EXTERN void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); +#endif #undef EXTERN #if defined(__cplusplus) } diff --git a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c index a808e0917..afd5e7a20 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c @@ -432,7 +432,8 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, * RWFIFO[RXWATER] = 1: RDRF will be set when the number of queues bytes * (1 in this case) is greater than or equal to 1. * - /* Set the watermarks to one and disable the FIFOs */ + * Set the watermarks to one/zero and disable the FIFOs + */ putreg8(1, uart_base+KINETIS_UART_RWFIFO_OFFSET); putreg8(0, uart_base+KINETIS_UART_TWFIFO_OFFSET); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c b/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c index aab0282f6..d9da13cf2 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c @@ -172,8 +172,8 @@ # define SAMPLENDX_BEFORE_SETUP 0 # define SAMPLENDX_BEFORE_ENABLE 1 # define SAMPLENDX_AFTER_SETUP 2 -# define SAMPLENDX_END_TRANSFER 3 -# define SAMPLENDX_DMA_CALLBACK 4 +# define SAMPLENDX_DMA_CALLBACK 3 +# define SAMPLENDX_END_TRANSFER 4 # define DEBUG_NSAMPLES 5 # else # define SAMPLENDX_BEFORE_SETUP 0 @@ -680,13 +680,13 @@ static void kinetis_dumpsamples(struct kinetis_dev_s *priv) } #endif kinetis_dumpsample(priv, &g_sampleregs[SAMPLENDX_AFTER_SETUP], "After setup"); - kinetis_dumpsample(priv, &g_sampleregs[SAMPLENDX_END_TRANSFER], "End of transfer"); #if defined(CONFIG_DEBUG_DMA) && defined(CONFIG_SDIO_DMA) if (priv->dmamode) { kinetis_dumpsample(priv, &g_sampleregs[SAMPLENDX_DMA_CALLBACK], "DMA Callback"); } #endif + kinetis_dumpsample(priv, &g_sampleregs[SAMPLENDX_END_TRANSFER], "End of transfer"); } #endif @@ -1037,10 +1037,6 @@ static void kinetis_endtransfer(struct kinetis_dev_s *priv, sdio_eventset_t wkup #ifdef CONFIG_SDIO_DMA if (priv->dmamode) { - /* DMA debug instrumentation */ - - kinetis_sample(priv, SAMPLENDX_END_TRANSFER); - /* Make sure that the DMA is stopped (it will be stopped automatically * on normal transfers, but not necessarily when the transfer terminates * on an error condition). @@ -1054,6 +1050,10 @@ static void kinetis_endtransfer(struct kinetis_dev_s *priv, sdio_eventset_t wkup priv->remaining = 0; + /* Debug instrumentation */ + + kinetis_sample(priv, SAMPLENDX_END_TRANSFER); + /* Is a thread wait for these data transfer complete events? */ if ((priv->waitevents & wkupevent) != 0) @@ -1780,30 +1780,31 @@ static void kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t a switch (cmd & MMCSD_RESPONSE_MASK) { - case MMCSD_NO_RESPONSE: - regval |= SDHC_XFERTYP_RSPTYP_NONE; /* No response */ + case MMCSD_NO_RESPONSE: /* No response */ + regval |= SDHC_XFERTYP_RSPTYP_NONE; break; - case MMCSD_R1B_RESPONSE: - regval |= SDHC_XFERTYP_RSPTYP_LEN48BSY; /* Response length 48, check busy */ + case MMCSD_R1B_RESPONSE: /* Response length 48, check busy & cmdindex*/ + regval |= (SDHC_XFERTYP_RSPTYP_LEN48BSY | SDHC_XFERTYP_CICEN); + break; - case MMCSD_R1_RESPONSE: - case MMCSD_R3_RESPONSE: + case MMCSD_R1_RESPONSE: /* Response length 48, check cmdindex */ + case MMCSD_R6_RESPONSE: + regval |= (SDHC_XFERTYP_RSPTYP_LEN48 | SDHC_XFERTYP_CICEN); + break; + + case MMCSD_R3_RESPONSE: /* Response length 48 */ case MMCSD_R4_RESPONSE: case MMCSD_R5_RESPONSE: - case MMCSD_R6_RESPONSE: case MMCSD_R7_RESPONSE: - regval |= SDHC_XFERTYP_RSPTYP_LEN48; /* Response length 48 */ + regval |= SDHC_XFERTYP_RSPTYP_LEN48; break; - case MMCSD_R2_RESPONSE: - regval |= SDHC_XFERTYP_RSPTYP_LEN136; /* Response length 136 */ + case MMCSD_R2_RESPONSE: /* Response length 136 */ + regval |= SDHC_XFERTYP_RSPTYP_LEN136; break; } -# warning "Missing other settings?" - fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); - /* Enable DMA */ #ifdef CONFIG_SDIO_DMA @@ -1815,16 +1816,11 @@ static void kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t a } #endif - /* Other bits (revisit -- these probably should not alway be set). - * - * CICEN=1: The SDHC will check the index field in the response to see if - * it has the same value as the command index. If it is not, it - * is reported as a command index error. - * Also... what about CMDTYP? - */ + /* Other bits? What about CMDTYP? */ #warning "Revisit" - regval |= SDHC_XFERTYP_CICEN; + + fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); /* Set the SDHC Argument value */ @@ -2093,9 +2089,6 @@ static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { -#ifdef CONFIG_DEBUG - uint32_t respcmd; -#endif uint32_t regval; int ret = OK; @@ -2154,19 +2147,6 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32 fdbg("ERROR: CRC failure: %08x\n", regval); ret = -EIO; } -#ifdef CONFIG_DEBUG - else - { - /* Check response received is of desired command */ - - respcmd = getreg32(KINETIS_SDHC_RESPCMD); - if ((uint8_t)(respcmd & SDHC_RESPCMD_MASK) != (cmd & MMCSD_CMDIDX_MASK)) - { - fdbg("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd); - ret = -EINVAL; - } - } -#endif } /* Clear all pending message completion events and return the R1/R6 response */ @@ -2461,6 +2441,7 @@ static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev, priv->xfrflags = 0; #endif + kinetis_dumpsamples(priv); return wkupevent; } @@ -2789,7 +2770,7 @@ static void kinetis_callback(void *arg) ****************************************************************************/ /**************************************************************************** - * Name: sdio_initialize + * Name: sdhc_initialize * * Description: * Initialize SDIO for operation. @@ -2802,7 +2783,7 @@ static void kinetis_callback(void *arg) * ****************************************************************************/ -FAR struct sdio_dev_s *sdio_initialize(int slotno) +FAR struct sdio_dev_s *sdhc_initialize(int slotno) { uint32_t regval; @@ -2888,7 +2869,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) } /**************************************************************************** - * Name: sdio_mediachange + * Name: sdhc_mediachange * * Description: * Called by board-specific logic -- posssible from an interrupt handler -- @@ -2906,7 +2887,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) * ****************************************************************************/ -void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) +void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; uint8_t cdstatus; @@ -2951,7 +2932,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) * ****************************************************************************/ -void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) +void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; irqstate_t flags; diff --git a/nuttx/configs/kwikstik-k40/src/kwikstik-internal.h b/nuttx/configs/kwikstik-k40/src/kwikstik-internal.h index 6b98a6789..015f0bc86 100755 --- a/nuttx/configs/kwikstik-k40/src/kwikstik-internal.h +++ b/nuttx/configs/kwikstik-k40/src/kwikstik-internal.h @@ -1,6 +1,6 @@ /************************************************************************************ - * configs/kwikstik-k40/src/kwikstik_internal.h - * arch/arm/src/board/kwikstik_internal.n + * configs/kwikstik-k40/src/kwikstik-internal.h + * arch/arm/src/board/kwikstik-internal.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/configs/kwikstik-k40/src/up_nsh.c b/nuttx/configs/kwikstik-k40/src/up_nsh.c index eb16f71bf..b1ccdf60f 100755 --- a/nuttx/configs/kwikstik-k40/src/up_nsh.c +++ b/nuttx/configs/kwikstik-k40/src/up_nsh.c @@ -45,35 +45,26 @@ #include <debug.h> #include <errno.h> -#ifdef CONFIG_KINETIS_SPI1 -# include <nuttx/spi.h> -# include <nuttx/mtd.h> -#endif - -#ifdef CONFIG_KINETIS_SDIO +#ifdef CONFIG_KINETIS_SDHC # include <nuttx/sdio.h> # include <nuttx/mmcsd.h> #endif #include "kinetis_internal.h" +#include "kwikstik-internal.h" /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - /* Configuration ************************************************************/ -/* For now, don't build in any SPI1 support -- NSH is not using it */ - -#undef CONFIG_KINETIS_SPI1 - /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_KWIKSTIK_K40 # define CONFIG_NSH_HAVEUSBDEV 1 # define CONFIG_NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 -# error "Only one MMC/SD slot" +# error "Only one MMC/SD slot, slot 0" # undef CONFIG_NSH_MMCSDSLOTNO # endif # ifndef CONFIG_NSH_MMCSDSLOTNO @@ -92,11 +83,11 @@ # undef CONFIG_NSH_HAVEUSBDEV #endif -/* Can't support MMC/SD features if mountpoints are disabled or if SDIO support +/* Can't support MMC/SD features if mountpoints are disabled or if SDHC support * is not enabled. */ -#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDIO) +#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC) # undef CONFIG_NSH_HAVEMMCSD #endif @@ -104,6 +95,16 @@ # define CONFIG_NSH_MMCSDMINOR 0 #endif +/* We expect to receive GPIO interrupts for card insertion events */ + +#ifndef CONFIG_GPIO_IRQ +# error "CONFIG_GPIO_IRQ required for card detect interrupt" +#endif + +#ifndef CONFIG_KINETIS_PORTEINTS +# error "CONFIG_KINETIS_PORTEINTS required for card detect interrupt" +#endif + /* Debug ********************************************************************/ #ifdef CONFIG_CPP_HAVE_VARARGS @@ -121,6 +122,84 @@ #endif /**************************************************************************** + * Private Types + ****************************************************************************/ + +/* This structure encapsulates the global variable used in this file and + * reduces the probability of name collistions. + */ + +#ifdef CONFIG_NSH_HAVEMMCSD +struct kinetis_nsh_s +{ + FAR struct sdio_dev_s *sdhc; /* SDIO driver handle */ + bool inserted; /* True: card is inserted */ +}; +#endif + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +#ifdef CONFIG_NSH_HAVEMMCSD +static struct kinetis_nsh_s g_nsh; +#endif + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: kinetis_mediachange + ****************************************************************************/ + +#ifdef CONFIG_NSH_HAVEMMCSD +static void kinetis_mediachange(void) +{ + bool inserted; + + /* Get the current value of the card detect pin. This pin is pulled up on + * board. So low means that a card is present. + */ + + inserted = !kinetis_gpioread(GPIO_SD_CARDDETECT); + + /* Has the pin changed state? */ + + if (inserted != g_nsh.inserted) + { + /* Yes.. perform the appropriate action (this might need some debounce). */ + + g_nsh.inserted = inserted; + sdhc_mediachange(g_nsh.sdhc, inserted); + + /* If the card has been inserted, then check if it is write protected + * aw well. + */ + + if (inserted) + { + sdhc_wrprotect(g_nsh.sdhc, !kinetis_gpioread(GPIO_SD_WRPROTECT)); + } + } +} +#endif + +/**************************************************************************** + * Name: kinetis_cdinterrupt + ****************************************************************************/ + +#ifdef CONFIG_NSH_HAVEMMCSD +static int kinetis_cdinterrupt(int irq, FAR void *context) +{ + /* All of the work is done by kinetis_mediachange() */ + + kinetis_mediachange(); + return OK; +} +#endif + +/**************************************************************************** * Public Functions ****************************************************************************/ @@ -134,6 +213,59 @@ int nsh_archinitialize(void) { -# warning "Missing logic" +#ifdef CONFIG_NSH_HAVEMMCSD + int ret; + + /* Configure GPIO pins. + * + * First CD power. The initial state will provide SD power. + */ + + kinetis_pinconfig(GPIO_SD_CARDON); /* Applies power to the card */ + + /* Attached the card detect interrupt (but don't enable it yet) */ + + kinetis_pinconfig(GPIO_SD_CARDDETECT); + kinetis_pinirqattach(GPIO_SD_CARDDETECT, kinetis_cdinterrupt); + + /* Configure the write protect GPIO */ + + kinetis_pinconfig(GPIO_SD_WRPROTECT); + + /* Mount the SDHC-based MMC/SD block driver */ + /* First, get an instance of the SDHC interface */ + + message("nsh_archinitialize: Initializing SDHC slot %d\n", + CONFIG_NSH_MMCSDSLOTNO); + + g_nsh.sdhc = sdhc_initialize(CONFIG_NSH_MMCSDSLOTNO); + if (!g_nsh.sdhc) + { + message("nsh_archinitialize: Failed to initialize SDHC slot %d\n", + CONFIG_NSH_MMCSDSLOTNO); + return -ENODEV; + } + + /* Now bind the SDHC interface to the MMC/SD driver */ + + message("nsh_archinitialize: Bind SDHC to the MMC/SD driver, minor=%d\n", + CONFIG_NSH_MMCSDMINOR); + + ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_nsh.sdhc); + if (ret != OK) + { + message("nsh_archinitialize: Failed to bind SDHC to the MMC/SD driver: %d\n", ret); + return ret; + } + message("nsh_archinitialize: Successfully bound SDHC to the MMC/SD driver\n"); + + /* Handle the initial card state */ + + kinetis_mediachange(); + + /* Enable CD interrupts to handle subsequent media changes */ + + kinetis_pinirqenable(GPIO_SD_CARDDETECT); +#endif return OK; } diff --git a/nuttx/configs/twr-k60n512/src/twrk60-internal.h b/nuttx/configs/twr-k60n512/src/twrk60-internal.h index bbec8955a..eb4555b57 100644 --- a/nuttx/configs/twr-k60n512/src/twrk60-internal.h +++ b/nuttx/configs/twr-k60n512/src/twrk60-internal.h @@ -1,6 +1,6 @@ /************************************************************************************ * configs/twr-k60n512/src/twrk60-internal.h - * arch/arm/src/board/twrk60-internal.n + * arch/arm/src/board/twrk60-internal.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -110,7 +110,7 @@ */ #define GPIO_SD_CARDDETECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN28) -#define GPIO_SD_WRPROTECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN27) +#define GPIO_SD_WRPROTECT (GPIO_PULLUP | PIN_PORTE | PIN27) #define GPIO_SD_CARDON (GPIO_HIGHDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTE | PIN6) #define GPIO_SW1 (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTA | PIN19) diff --git a/nuttx/configs/twr-k60n512/src/up_nsh.c b/nuttx/configs/twr-k60n512/src/up_nsh.c index c70e222f6..1fc959cf9 100644 --- a/nuttx/configs/twr-k60n512/src/up_nsh.c +++ b/nuttx/configs/twr-k60n512/src/up_nsh.c @@ -45,22 +45,17 @@ #include <debug.h> #include <errno.h> -#ifdef CONFIG_KINETIS_SPI1 -# include <nuttx/spi.h> -# include <nuttx/mtd.h> -#endif - -#ifdef CONFIG_KINETIS_SDIO +#ifdef CONFIG_KINETIS_SDHC # include <nuttx/sdio.h> # include <nuttx/mmcsd.h> #endif #include "kinetis_internal.h" +#include "twrk60-internal.h" /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - /* Configuration ************************************************************/ /* PORT and SLOT number probably depend on the board configuration */ @@ -69,7 +64,7 @@ # define CONFIG_NSH_HAVEUSBDEV 1 # define CONFIG_NSH_HAVEMMCSD 1 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 -# error "Only one MMC/SD slot" +# error "Only one MMC/SD slot, slot 0" # undef CONFIG_NSH_MMCSDSLOTNO # endif # ifndef CONFIG_NSH_MMCSDSLOTNO @@ -88,11 +83,11 @@ # undef CONFIG_NSH_HAVEUSBDEV #endif -/* Can't support MMC/SD features if mountpoints are disabled or if SDIO support +/* Can't support MMC/SD features if mountpoints are disabled or if SDHC support * is not enabled. */ -#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDIO) +#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC) # undef CONFIG_NSH_HAVEMMCSD #endif @@ -100,6 +95,16 @@ # define CONFIG_NSH_MMCSDMINOR 0 #endif +/* We expect to receive GPIO interrupts for card insertion events */ + +#ifndef CONFIG_GPIO_IRQ +# error "CONFIG_GPIO_IRQ required for card detect interrupt" +#endif + +#ifndef CONFIG_KINETIS_PORTEINTS +# error "CONFIG_KINETIS_PORTEINTS required for card detect interrupt" +#endif + /* Debug ********************************************************************/ #ifdef CONFIG_CPP_HAVE_VARARGS @@ -117,6 +122,84 @@ #endif /**************************************************************************** + * Private Types + ****************************************************************************/ + +/* This structure encapsulates the global variable used in this file and + * reduces the probability of name collistions. + */ + +#ifdef CONFIG_NSH_HAVEMMCSD +struct kinetis_nsh_s +{ + FAR struct sdio_dev_s *sdhc; /* SDIO driver handle */ + bool inserted; /* True: card is inserted */ +}; +#endif + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +#ifdef CONFIG_NSH_HAVEMMCSD +static struct kinetis_nsh_s g_nsh; +#endif + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: kinetis_mediachange + ****************************************************************************/ + +#ifdef CONFIG_NSH_HAVEMMCSD +static void kinetis_mediachange(void) +{ + bool inserted; + + /* Get the current value of the card detect pin. This pin is pulled up on + * board. So low means that a card is present. + */ + + inserted = !kinetis_gpioread(GPIO_SD_CARDDETECT); + + /* Has the pin changed state? */ + + if (inserted != g_nsh.inserted) + { + /* Yes.. perform the appropriate action (this might need some debounce). */ + + g_nsh.inserted = inserted; + sdhc_mediachange(g_nsh.sdhc, inserted); + + /* If the card has been inserted, then check if it is write protected + * aw well. + */ + + if (inserted) + { + sdhc_wrprotect(g_nsh.sdhc, !kinetis_gpioread(GPIO_SD_WRPROTECT)); + } + } +} +#endif + +/**************************************************************************** + * Name: kinetis_cdinterrupt + ****************************************************************************/ + +#ifdef CONFIG_NSH_HAVEMMCSD +static int kinetis_cdinterrupt(int irq, FAR void *context) +{ + /* All of the work is done by kinetis_mediachange() */ + + kinetis_mediachange(); + return OK; +} +#endif + +/**************************************************************************** * Public Functions ****************************************************************************/ @@ -130,6 +213,59 @@ int nsh_archinitialize(void) { -# warning "Missing logic" +#ifdef CONFIG_NSH_HAVEMMCSD + int ret; + + /* Configure GPIO pins. + * + * First CD power. The initial state will provide SD power. + */ + + kinetis_pinconfig(GPIO_SD_CARDON); /* Applies power to the card */ + + /* Attached the card detect interrupt (but don't enable it yet) */ + + kinetis_pinconfig(GPIO_SD_CARDDETECT); + kinetis_pinirqattach(GPIO_SD_CARDDETECT, kinetis_cdinterrupt); + + /* Configure the write protect GPIO */ + + kinetis_pinconfig(GPIO_SD_WRPROTECT); + + /* Mount the SDHC-based MMC/SD block driver */ + /* First, get an instance of the SDHC interface */ + + message("nsh_archinitialize: Initializing SDHC slot %d\n", + CONFIG_NSH_MMCSDSLOTNO); + + g_nsh.sdhc = sdhc_initialize(CONFIG_NSH_MMCSDSLOTNO); + if (!g_nsh.sdhc) + { + message("nsh_archinitialize: Failed to initialize SDHC slot %d\n", + CONFIG_NSH_MMCSDSLOTNO); + return -ENODEV; + } + + /* Now bind the SDHC interface to the MMC/SD driver */ + + message("nsh_archinitialize: Bind SDHC to the MMC/SD driver, minor=%d\n", + CONFIG_NSH_MMCSDMINOR); + + ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_nsh.sdhc); + if (ret != OK) + { + message("nsh_archinitialize: Failed to bind SDHC to the MMC/SD driver: %d\n", ret); + return ret; + } + message("nsh_archinitialize: Successfully bound SDHC to the MMC/SD driver\n"); + + /* Handle the initial card state */ + + kinetis_mediachange(); + + /* Enable CD interrupts to handle subsequent media changes */ + + kinetis_pinirqenable(GPIO_SD_CARDDETECT); +#endif return OK; } |