diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-13 13:46:27 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-13 13:46:27 -0600 |
| commit | e1f201d538bb516259b6b7971abc085766f9643d (patch) | |
| tree | e8c36a819cfa4ade72b1e8f5a6446fbffc5b0945 | |
| parent | 5568d3695bc6a8c2732f52ebc4d6cf394c11f5e7 (diff) | |
| download | px4-nuttx-e1f201d538bb516259b6b7971abc085766f9643d.tar.gz px4-nuttx-e1f201d538bb516259b6b7971abc085766f9643d.tar.bz2 px4-nuttx-e1f201d538bb516259b6b7971abc085766f9643d.zip | |
Minor updates from initial debugging.
| -rw-r--r-- | nuttx/arch/arm/src/samv7/sam_hsmci.c | 5 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/samv7/sam_xdmac.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/samv7/sam_hsmci.c b/nuttx/arch/arm/src/samv7/sam_hsmci.c index 169563cb3..35422d425 100644 --- a/nuttx/arch/arm/src/samv7/sam_hsmci.c +++ b/nuttx/arch/arm/src/samv7/sam_hsmci.c @@ -1113,7 +1113,7 @@ static inline void sam_cmdsample2(struct sam_dev_s *priv, int index, * Name: sam_cmddump * * Description: - * Dump all comand/response register data + * Dump all command/response register data * ****************************************************************************/ @@ -2620,9 +2620,10 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, /* Since interrupts not been enabled to this point, any relevant events * are pending and should not yet have occurred. + * REVISIT: Not true. DMA interrupts are enabled. */ - DEBUGASSERT(priv->waitevents != 0 && priv->wkupevent == 0); + // DEBUGASSERT(priv->waitevents != 0 && priv->wkupevent == 0); /* Now enable event-related interrupts. If the events are pending, they * may happen immediately here before entering the loop. diff --git a/nuttx/arch/arm/src/samv7/sam_xdmac.c b/nuttx/arch/arm/src/samv7/sam_xdmac.c index d10650dfd..17125f4d9 100644 --- a/nuttx/arch/arm/src/samv7/sam_xdmac.c +++ b/nuttx/arch/arm/src/samv7/sam_xdmac.c @@ -2102,7 +2102,6 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs, const char *msg) { struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle; - struct sam_xdmac_s *xdmac = sam_controller(xdmach); dmadbg("%s\n", msg); dmadbg(" DMA Global Registers:\n"); |