diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-13 02:39:50 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-13 02:39:50 +0000 |
commit | da731966b0ad8969cf1a8a33eb3651bd76287157 (patch) | |
tree | 7060f7e17ec969951b026c5b0c4f3bf7c49c2222 /nuttx/arch/arm/src/sam3u/sam3u_hsmci.c | |
parent | f4171be9f47a670f45cca05b9542a11ad4b5c16c (diff) | |
download | px4-nuttx-da731966b0ad8969cf1a8a33eb3651bd76287157.tar.gz px4-nuttx-da731966b0ad8969cf1a8a33eb3651bd76287157.tar.bz2 px4-nuttx-da731966b0ad8969cf1a8a33eb3651bd76287157.zip |
Debug instrumentation
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2591 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/sam3u/sam3u_hsmci.c')
-rwxr-xr-x | nuttx/arch/arm/src/sam3u/sam3u_hsmci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c index 17604ae03..d41546058 100755 --- a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c +++ b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c @@ -289,12 +289,10 @@ struct sam3u_dev_s #if defined(CONFIG_HSMCI_XFRDEBUG) || defined(CONFIG_HSMCI_CMDDEBUG) struct sam3u_hsmciregs_s { - uint32_t cr; /* Control Register */ uint32_t mr; /* Mode Register */ uint32_t dtor; /* Data Timeout Register */ uint32_t sdcr; /* SD/SDIO Card Register */ uint32_t argr; /* Argument Register */ - uint32_t cmdr; /* Command Register */ uint32_t blkr; /* Block Register */ uint32_t cstor; /* Completion Signal Timeout Register */ uint32_t rsp0; /* Response Register 0 */ @@ -635,7 +633,7 @@ static void sam3u_disablexfrints(struct sam3u_dev_s *priv) * Name: sam3u_disable * * Description: - * Enable/disable the HSMCI + * Disable the HSMCI * ****************************************************************************/ @@ -688,12 +686,10 @@ static inline void sam3u_enable(void) #if defined(CONFIG_HSMCI_XFRDEBUG) || defined(CONFIG_HSMCI_CMDDEBUG) static void sam3u_hsmcisample(struct sam3u_hsmciregs_s *regs) { - regs->cr = getreg32(SAM3U_HSMCI_CR); regs->mr = getreg32(SAM3U_HSMCI_MR); regs->dtor = getreg32(SAM3U_HSMCI_DTOR); regs->sdcr = getreg32(SAM3U_HSMCI_SDCR); regs->argr = getreg32(SAM3U_HSMCI_ARGR); - regs->cmdr = getreg32(SAM3U_HSMCI_CMDR); regs->blkr = getreg32(SAM3U_HSMCI_BLKR); regs->cstor = getreg32(SAM3U_HSMCI_CSTOR); regs->rsp0 = getreg32(SAM3U_HSMCI_RSPR0); @@ -721,12 +717,10 @@ static void sam3u_hsmcisample(struct sam3u_hsmciregs_s *regs) static void sam3u_hsmcidump(struct sam3u_hsmciregs_s *regs, const char *msg) { fdbg("HSMCI Registers: %s\n", msg); - fdbg(" CR[%08x]: %08x\n", SAM3U_HSMCI_CR, regs->cr); fdbg(" MR[%08x]: %08x\n", SAM3U_HSMCI_MR, regs->mr); fdbg(" DTOR[%08x]: %08x\n", SAM3U_HSMCI_DTOR, regs->dtor); fdbg(" SDCR[%08x]: %08x\n", SAM3U_HSMCI_SDCR, regs->sdcr); fdbg(" ARGR[%08x]: %08x\n", SAM3U_HSMCI_ARGR, regs->argr); - fdbg(" CMDR[%08x]: %08x\n", SAM3U_HSMCI_CMDR, regs->cmdr); fdbg(" BLKR[%08x]: %08x\n", SAM3U_HSMCI_BLKR, regs->blkr); fdbg(" CSTOR[%08x]: %08x\n", SAM3U_HSMCI_CSTOR, regs->cstor); fdbg(" RSPR0[%08x]: %08x\n", SAM3U_HSMCI_RSPR0, regs->rsp0); @@ -1226,6 +1220,7 @@ static void sam3u_reset(FAR struct sdio_dev_s *dev) flags = irqsave(); putreg32((1 << SAM3U_PID_HSMCI), SAM3U_PMC_PCER); + fdbg("PCSR: %08x\n", getreg32(SAM3U_PMC_PCSR)); /* Reset the MCI */ @@ -1251,7 +1246,7 @@ static void sam3u_reset(FAR struct sdio_dev_s *dev) putreg32(HSMCI_SDCR_SDCSEL_SLOTA | HSMCI_SDCR_SDCBUS_4BIT, SAM3U_HSMCI_SDCR); - /* Enable the MCI and the Power Saving */ + /* Enable the MCI controller */ putreg32(HSMCI_CR_MCIEN, SAM3U_HSMCI_CR); @@ -2408,6 +2403,11 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) sam3u_configgpio(GPIO_MCI_CK); /* SD clock */ sam3u_configgpio(GPIO_MCI_DA); /* Command/Response */ +#ifdef CONFIG_DEBUG_FS + sam3u_dumpgpio(GPIO_PORT_PIOA, "Pins: 3-8"); + sam3u_dumpgpio(GPIO_PORT_PIOB, "Pins: 28-31"); +#endif + /* Reset the card and assure that it is in the initial, unconfigured * state. */ |