sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SD on Sure board should work in SPI mode2 as well

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4800 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-06-03 17:49:11 +00:00
parent 7b5b9fe825
commit 41557f74d5
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configs/sure-pic32mx/nsh/defconfig
View File

@ -357,6 +357,7 @@ CONFIG_DEBUG_SCHED=n
CONFIG_DEBUG_USB=n CONFIG_DEBUG_USB=n
CONFIG_DEBUG_FS=n CONFIG_DEBUG_FS=n
CONFIG_DEBUG_SPI=n CONFIG_DEBUG_SPI=n
CONFIG_SPI_REGDEBUG=n
CONFIG_HAVE_CXX=n CONFIG_HAVE_CXX=n
CONFIG_HAVE_CXXINITIALIZE=n CONFIG_HAVE_CXXINITIALIZE=n
@ -380,7 +381,7 @@ CONFIG_FDCLONE_DISABLE=n
CONFIG_FDCLONE_STDIO=n CONFIG_FDCLONE_STDIO=n
CONFIG_SDCLONE_DISABLE=y CONFIG_SDCLONE_DISABLE=y
CONFIG_SCHED_WORKQUEUE=n CONFIG_SCHED_WORKQUEUE=n
CONFIG_SCHED_WORKPRIORITY=50 CONFIG_SCHED_WORKPRIORITY=192
CONFIG_SCHED_WORKPERIOD=(50*1000) CONFIG_SCHED_WORKPERIOD=(50*1000)
CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SCHED_WORKSTACKSIZE=1024
CONFIG_SIG_SIGWORK=4 CONFIG_SIG_SIGWORK=4

19
configs/sure-pic32mx/src/up_nsh.c
View File

@ -69,7 +69,7 @@
# define CONFIG_NSH_MMCSDSPIPORTNO 2 # define CONFIG_NSH_MMCSDSPIPORTNO 2
# endif # endif
# if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0 # if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
# error "The Sure PIC32MX MMC/SD is only one slot (0)" # error "The Sure PIC32MX MMC/SD has only one slot (0)"
# undef CONFIG_NSH_MMCSDSLOTNO # undef CONFIG_NSH_MMCSDSLOTNO
# define CONFIG_NSH_MMCSDSLOTNO 0 # define CONFIG_NSH_MMCSDSLOTNO 0
# endif # endif
@ -200,13 +200,13 @@ static int nsh_waiter(int argc, char *argv[])
#ifdef CONFIG_NSH_HAVEMMCSD #ifdef CONFIG_NSH_HAVEMMCSD
static int nsh_sdinitialize(void) static int nsh_sdinitialize(void)
{ {
FAR struct spi_dev_s *ssp; FAR struct spi_dev_s *spi;
int ret; int ret;
/* Get the SPI port */ /* Get the SPI port */
ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO); spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (!ssp) if (!spi)
{ {
message("nsh_archinitialize: Failed to initialize SPI port %d\n", message("nsh_archinitialize: Failed to initialize SPI port %d\n",
CONFIG_NSH_MMCSDSPIPORTNO); CONFIG_NSH_MMCSDSPIPORTNO);
@ -217,10 +217,19 @@ static int nsh_sdinitialize(void)
message("Successfully initialized SPI port %d\n", message("Successfully initialized SPI port %d\n",
CONFIG_NSH_MMCSDSPIPORTNO); CONFIG_NSH_MMCSDSPIPORTNO);
/* The SPI should be in 8-bit (default) and mode2: CKP=1, CKE=0.
* The MMC/SD driver will control the SPI frequency. WARNING:
* this is not the right way to do this... this should be done
* the MMC/SD driver: Other device on SPI1 may need other mode
* settings.
*/
SPI_SETMODE(spi, SPIDEV_MODE2);
/* Bind the SPI port to the slot */ /* Bind the SPI port to the slot */
ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR,
CONFIG_NSH_MMCSDSLOTNO, ssp); CONFIG_NSH_MMCSDSLOTNO, spi);
if (ret < 0) if (ret < 0)
{ {
message("nsh_sdinitialize: " message("nsh_sdinitialize: "