dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Mirtoo: Switch to SPI mode 1 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4872 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-06-26 18:58:52 +00:00
parent 4ba6eec999
commit b96e5cf7f7
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nuttx/configs/mirtoo/README.txt
View File

@ -865,3 +865,17 @@ Where <subdir> is one of the following:
CONFIG_NSH_DISABLE_SH=y
CONFIG_NSH_DISABLE_TEST=y
CONFIG_NSH_DISABLE_WGET=y
NOTES: (1) It takes many seconds to boot the sytem using the NXFFS
file system because the entire FLASH must be verified on power up.
(2) FAT does not have this delay and this configuration can be
modified to use the (larger) FAT file system as described below:
fat:
There is no FAT configuration, but the nxffx configuration can be used
to support the FAT FS if the following changes are made to the NuttX
configuration file:
CONFIG_FS_NXFFS=n
CONFIG_FS_FAT=y
CONFIG_NSH_DISABLE_MKFATFS=n

4
nuttx/configs/mirtoo/nsh/defconfig
View File

@ -169,8 +169,8 @@ CONFIG_PIC32MX_IOPORTC=y
# Mirtoo Board Settings
#
CONFIG_MTD_SST25=n
#CONFIG_SST25_SPIMODE
#CONFIG_SST25_SPIFREQUENCY
CONFIG_SST25_SPIMODE=1
CONFIG_SST25_SPIFREQUENCY=20000000
CONFIG_SST25_SECTOR512=n
#

6
nuttx/configs/mirtoo/nxffs/defconfig
View File

@ -169,9 +169,9 @@ CONFIG_PIC32MX_IOPORTC=y
# Mirtoo Board Settings
#
CONFIG_MTD_SST25=y
#CONFIG_SST25_SPIMODE
#CONFIG_SST25_SPIFREQUENCY
CONFIG_SST25_SECTOR512=y
CONFIG_SST25_SPIMODE=1
CONFIG_SST25_SPIFREQUENCY=20000000
CONFIG_SST25_SECTOR512=n
#
# PIC32MX Configuration Settings

8
nuttx/drivers/mtd/sst25.c
View File

@ -60,7 +60,7 @@
* Pre-processor Definitions
************************************************************************************/
/* Configuration ********************************************************************/
/* Per the data sheet, MP25P10 parts can be driven with either SPI mode 0 (CPOL=0 and
/* Per the data sheet, the SST25 parts can be driven with either SPI mode 0 (CPOL=0 and
* CPHA=0) or mode 3 (CPOL=1 and CPHA=1). But I have heard that other devices can
* operated in mode 0 or 1. So you may need to specify CONFIG_SST25_SPIMODE to
* select the best mode for your device. If CONFIG_SST25_SPIMODE is not defined,
@ -397,8 +397,6 @@ static void sst25_waitwritecomplete(struct sst25_dev_s *priv)
}
while ((status & SST25_SR_BUSY) != 0);
#endif
fvdbg("Complete\n");
}
/************************************************************************************
@ -946,11 +944,13 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
#ifdef CONFIG_SST25_SECTOR512
geo->blocksize = (1 << SST25_SECTOR_SHIFT);
geo->erasesize = (1 << SST25_SECTOR_SHIFT);
geo->neraseblocks = priv->nsectors << (priv->sectorshift - );
#else
geo->blocksize = (1 << priv->sectorshift);
#endif
geo->erasesize = (1 << priv->sectorshift);
geo->neraseblocks = priv->nsectors;
#endif
ret = OK;
fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",