summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-27 12:39:21 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-27 12:39:21 +0000
commit3a851e6c51a7d18a8f2b30bf4d0f0b9954116aa6 (patch)
tree3355bb261085cfa9f90c5db6130f2fb9e0dc0476
parent5ee86601a172384191c3ea92d72785711c7cc201 (diff)
downloadnuttx-3a851e6c51a7d18a8f2b30bf4d0f0b9954116aa6.tar.gz
nuttx-3a851e6c51a7d18a8f2b30bf4d0f0b9954116aa6.tar.bz2
nuttx-3a851e6c51a7d18a8f2b30bf4d0f0b9954116aa6.zip
Patches for LPC17xx SSP driver from Chris Taglia; patch for RAM test from Rommel Marcelo
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5792 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--apps/system/ramtest/ramtest.c10
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/system/ramtest/ramtest.c b/apps/system/ramtest/ramtest.c
index 120b1732c..378a9a333 100644
--- a/apps/system/ramtest/ramtest.c
+++ b/apps/system/ramtest/ramtest.c
@@ -85,11 +85,11 @@ static void show_usage(FAR const char *progname, int exitcode)
{
printf("\nUsage: %s [-w|h|b] <hex-address> <decimal-size>\n", progname);
printf("\nWhere:\n");
- printf(" <hex-address> starting address of the test.");
- printf(" <decimal-size> number of memory locations.");
- printf(" -w Sets the width of a memory location to 32-bits.");
- printf(" -h Sets the width of a memory location to 16-bits (default).");
- printf(" -b Sets the width of a memory location to 8-bits.");
+ printf(" <hex-address> starting address of the test.\n");
+ printf(" <decimal-size> number of memory locations.\n");
+ printf(" -w Sets the width of a memory location to 32-bits.\n");
+ printf(" -h Sets the width of a memory location to 16-bits (default).\n");
+ printf(" -b Sets the width of a memory location to 8-bits.\n");
exit(exitcode);
}
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
index 151efbd89..331319cc7 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -495,7 +495,7 @@ static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits)
regval = ssp_getreg(priv, LPC17_SSP_CR0_OFFSET);
regval &= ~SSP_CR0_DSS_MASK;
regval |= ((nbits - 1) << SSP_CR0_DSS_SHIFT);
- regval = ssp_getreg(priv, LPC17_SSP_CR0_OFFSET);
+ ssp_putreg(priv, LPC17_SSP_CR0_OFFSET, regval);
/* Save the selection so the subsequence re-configurations will be faster */