Add hooks for SD media change callbacks

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4267 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-01-06 01:58:03 +00:00
parent 7de5004f47
commit ad270ba835
4 changed files with 397 additions and 205 deletions
@@ -655,6 +655,7 @@ EXTERN void ssp_flush(FAR struct spi_dev_s *dev);
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SPI_CALLBACK
#ifdef CONFIG_LPC17_SPI #ifdef CONFIG_LPC17_SPI
EXTERN int lpc17_spiregister(FAR struct spi_dev_s *dev, EXTERN int lpc17_spiregister(FAR struct spi_dev_s *dev,
spi_mediachange_t callback, void *arg); spi_mediachange_t callback, void *arg);
@@ -669,6 +670,7 @@ EXTERN int lpc17_ssp0register(FAR struct spi_dev_s *dev,
EXTERN int lpc17_ssp1register(FAR struct spi_dev_s *dev, EXTERN int lpc17_ssp1register(FAR struct spi_dev_s *dev,
spi_mediachange_t callback, void *arg); spi_mediachange_t callback, void *arg);
#endif #endif
#endif
/**************************************************************************** /****************************************************************************
* Name: lpc17_dmainitialize * Name: lpc17_dmainitialize
+8 -1
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/lpc17xx/lpc17_spi.c * arch/arm/src/lpc17xx/lpc17_spi.c
* *
* Copyright (C) 2010 Gregory Nutt. All rights reserved. * Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -104,6 +104,8 @@
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
/* This structure descibes the state of the SSP driver */
struct lpc17_spidev_s struct lpc17_spidev_s
{ {
struct spi_dev_s spidev; /* Externally visible part of the SPI interface */ struct spi_dev_s spidev; /* Externally visible part of the SPI interface */
@@ -153,7 +155,11 @@ static const struct spi_ops_s g_spiops =
.send = spi_send, .send = spi_send,
.sndblock = spi_sndblock, .sndblock = spi_sndblock,
.recvblock = spi_recvblock, .recvblock = spi_recvblock,
#ifdef CONFIG_SPI_CALLBACK
.registercallback = lpc17_spiregister, /* Provided externally */
#else
.registercallback = 0, /* Not implemented */ .registercallback = 0, /* Not implemented */
#endif
}; };
static struct lpc17_spidev_s g_spidev = static struct lpc17_spidev_s g_spidev =
@@ -597,5 +603,6 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
#endif #endif
return &priv->spidev; return &priv->spidev;
} }
#endif /* CONFIG_LPC17_SPI */ #endif /* CONFIG_LPC17_SPI */
+7 -5
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/lpc17xx/lpc17_ssp.c * arch/arm/src/lpc17xx/lpc17_ssp.c
* *
* Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -108,6 +108,8 @@
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
/* This structure descibes the state of the SSP driver */
struct lpc17_sspdev_s struct lpc17_sspdev_s
{ {
struct spi_dev_s spidev; /* Externally visible part of the SPI interface */ struct spi_dev_s spidev; /* Externally visible part of the SPI interface */
@@ -235,7 +237,7 @@ static struct lpc17_sspdev_s g_ssp1dev =
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: ssp_getreg * Name: ssp_getreg
* *
* Description: * Description:
@@ -248,14 +250,14 @@ static struct lpc17_sspdev_s g_ssp1dev =
* Returned Value: * Returned Value:
* The contents of the 32-bit register * The contents of the 32-bit register
* *
************************************************************************************/ ****************************************************************************/
static inline uint32_t ssp_getreg(FAR struct lpc17_sspdev_s *priv, uint8_t offset) static inline uint32_t ssp_getreg(FAR struct lpc17_sspdev_s *priv, uint8_t offset)
{ {
return getreg32(priv->sspbase + (uint32_t)offset); return getreg32(priv->sspbase + (uint32_t)offset);
} }
/************************************************************************************ /****************************************************************************
* Name: ssp_putreg * Name: ssp_putreg
* *
* Description: * Description:
@@ -269,7 +271,7 @@ static inline uint32_t ssp_getreg(FAR struct lpc17_sspdev_s *priv, uint8_t offse
* Returned Value: * Returned Value:
* None * None
* *
************************************************************************************/ ***************************************************************************/
static inline void ssp_putreg(FAR struct lpc17_sspdev_s *priv, uint8_t offset, uint32_t value) static inline void ssp_putreg(FAR struct lpc17_sspdev_s *priv, uint8_t offset, uint32_t value)
{ {
File diff suppressed because it is too large Load Diff