nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 12:08:36 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

SAMA5: A few early, easy bug fixes. The rest will all be difficult

Browse source
This commit is contained in:
Gregory Nutt 2013-08-06 11:29:53 -06:00
parent fa011d9aca
commit ce9eb71495
3 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
arch/arm/src/sama5/sam_hsmci.c
View file

@ -494,38 +494,37 @@ static void sam_callback(void *arg);
* Private Data
****************************************************************************/
struct sam_dev_s g_sdiodev =
/* Callbacks */
static const struct sdio_dev_s g_callbacks =
{
.dev =
{
.reset = sam_reset,
.status = sam_status,
.widebus = sam_widebus,
.clock = sam_clock,
.attach = sam_attach,
.sendcmd = sam_sendcmd,
.blocksetup = sam_blocksetup,
.recvsetup = sam_dmarecvsetup,
.sendsetup = sam_dmasendsetup,
.cancel = sam_cancel,
.waitresponse = sam_waitresponse,
.recvR1 = sam_recvshort,
.recvR2 = sam_recvlong,
.recvR3 = sam_recvshort,
.recvR4 = sam_recvnotimpl,
.recvR5 = sam_recvnotimpl,
.recvR6 = sam_recvshort,
.recvR7 = sam_recvshort,
.waitenable = sam_waitenable,
.eventwait = sam_eventwait,
.callbackenable = sam_callbackenable,
.registercallback = sam_registercallback,
.reset = sam_reset,
.status = sam_status,
.widebus = sam_widebus,
.clock = sam_clock,
.attach = sam_attach,
.sendcmd = sam_sendcmd,
.blocksetup = sam_blocksetup,
.recvsetup = sam_dmarecvsetup,
.sendsetup = sam_dmasendsetup,
.cancel = sam_cancel,
.waitresponse = sam_waitresponse,
.recvR1 = sam_recvshort,
.recvR2 = sam_recvlong,
.recvR3 = sam_recvshort,
.recvR4 = sam_recvnotimpl,
.recvR5 = sam_recvnotimpl,
.recvR6 = sam_recvshort,
.recvR7 = sam_recvshort,
.waitenable = sam_waitenable,
.eventwait = sam_eventwait,
.callbackenable = sam_callbackenable,
.registercallback = sam_registercallback,
#ifdef CONFIG_SDIO_DMA
.dmasupported = sam_dmasupported,
.dmarecvsetup = sam_dmarecvsetup,
.dmasendsetup = sam_dmasendsetup,
.dmasupported = sam_dmasupported,
.dmarecvsetup = sam_dmarecvsetup,
.dmasendsetup = sam_dmasendsetup,
#endif
},
};
/* Pre-allocate memory for each HSMCI device */
@ -2809,12 +2808,19 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
return NULL;
}
fvdbg("priv: %p base: %08x hsmci: %d dmac: %d pid: %d\n",
priv, priv->base, priv->hsmci, dmac, pid);
/* Initialize the HSMCI slot structure */
sem_init(&priv->waitsem, 0, 0);
priv->waitwdog = wd_create();
DEBUGASSERT(priv->waitwdog);
/* Initialize the callbacks */
memcpy(&priv->dev, &g_callbacks, sizeof(struct sdio_dev_s ));
/* Allocate a DMA channel */
priv->dma = sam_dmachannel(dmac, DMA_FLAGS(pid));
@ -2825,7 +2831,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
*/
sam_reset(&priv->dev);
return &g_sdiodev.dev;
return &priv->dev;
}
/****************************************************************************

20
configs/sama5d3x-ek/src/sam_hsmci.c
View file

@ -136,10 +136,10 @@
struct sam_hsmci_info_s
{
pio_pinset_t pincfg;
uint8_t irq;
xcpt_t handler;
struct sdio_dev_s **hsmci;
pio_pinset_t pincfg; /* Card detect PIO pin configuratin */
uint8_t irq; /* Interrupt number (same as pid) */
xcpt_t handler; /* Interrupt handler */
struct sdio_dev_s **hsmci; /* R/W device handle */
};
/****************************************************************************
@ -264,9 +264,9 @@ int sam_hsmci_initialize(int slotno, int minor)
/* Get the HSMI description */
info = sam_hsmci_info(slotno);
if (info)
if (!info)
{
fdbg("No info for slotno &d\n", slotno);
fdbg("No info for slotno %d\n", slotno);
return -EINVAL;
}
@ -325,16 +325,16 @@ bool sam_cardinserted(int slotno)
/* Get the HSMI description */
info = sam_hsmci_info(slotno);
if (info)
if (!info)
{
fdbg("No info for slotno &d\n", slotno);
fdbg("No info for slotno %d\n", slotno);
return false;
}
/* Get the state of the PIO pin */
inserted = sam_pioread(PIO_MCI0_CD);
fvdbg("Slot 0 inserted: %s\n", slotno, inserted ? "NO" : "YES");
inserted = sam_pioread(info->pincfg);
fvdbg("Slot %d inserted: %s\n", slotno, inserted ? "NO" : "YES");
return !inserted;
#else /* HAVE_MMCSD */

1
drivers/mmcsd/mmcsd_sdio.c
View file

@ -2982,6 +2982,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
mmcsd_givesem(priv);
return -EBUSY;
}
fvdbg("Attached MMC/SD interrupts\n");
/* Register a callback so that we get informed if media is inserted or