Update to the STM32 ADC and CAN drivers

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4215 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-12-22 21:55:54 +00:00
parent 61be0bba52
commit 9c0f5e8bf7

View File

@ -98,7 +98,7 @@ int MAIN_NAME(int argc, char *argv[])
size_t readsize; size_t readsize;
ssize_t nbytes; ssize_t nbytes;
#if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_EXAMPLES_ADC_NSAMPLES) #if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_EXAMPLES_ADC_NSAMPLES)
long nsamples; long nloops;
#endif #endif
int fd; int fd;
int errval = 0; int errval = 0;
@ -110,14 +110,14 @@ int MAIN_NAME(int argc, char *argv[])
*/ */
#if defined(CONFIG_NSH_BUILTIN_APPS) #if defined(CONFIG_NSH_BUILTIN_APPS)
nsamples = 1; nloops = 1;
if (argc > 1) if (argc > 1)
{ {
nsamples = strtol(argv[1], NULL, 10); nloops = strtol(argv[1], NULL, 10);
} }
message(MAIN_STRING "nsamples: %d\n", nsamples); message(MAIN_STRING "nloops: %d\n", nloops);
#elif defined(CONFIG_EXAMPLES_ADC_NSAMPLES) #elif defined(CONFIG_EXAMPLES_ADC_NSAMPLES)
message(MAIN_STRING "nsamples: %d\n", CONFIG_EXAMPLES_ADC_NSAMPLES); message(MAIN_STRING "nloops: %d\n", CONFIG_EXAMPLES_ADC_NSAMPLES);
#endif #endif
/* Initialization of the ADC hardware is performed by logic external to /* Initialization of the ADC hardware is performed by logic external to
@ -150,9 +150,9 @@ int MAIN_NAME(int argc, char *argv[])
*/ */
#if defined(CONFIG_NSH_BUILTIN_APPS) #if defined(CONFIG_NSH_BUILTIN_APPS)
for (; nsamples > 0; nsamples--) for (; nloops > 0; nloops--)
#elif defined(CONFIG_EXAMPLES_ADC_NSAMPLES) #elif defined(CONFIG_EXAMPLES_ADC_NSAMPLES)
for (nsamples = 0; nsamples < CONFIG_EXAMPLES_ADC_NSAMPLES; nsamples++) for (nloops = 0; nloops < CONFIG_EXAMPLES_ADC_NSAMPLES; nloops++)
#else #else
for (;;) for (;;)
#endif #endif
@ -167,7 +167,6 @@ int MAIN_NAME(int argc, char *argv[])
readsize = CONFIG_EXAMPLES_ADC_GROUPSIZE * sizeof(struct adc_msg_s); readsize = CONFIG_EXAMPLES_ADC_GROUPSIZE * sizeof(struct adc_msg_s);
nbytes = read(fd, sample, readsize); nbytes = read(fd, sample, readsize);
message("Bytes read: %d\n", nbytes);
/* Handle unexpected return values */ /* Handle unexpected return values */
@ -201,7 +200,7 @@ int MAIN_NAME(int argc, char *argv[])
} }
else else
{ {
message("Sample: "); message("Sample:\n");
for (i = 0; i < nsamples ; i++) for (i = 0; i < nsamples ; i++)
{ {
message("%d: channel: %d value: %d\n", message("%d: channel: %d value: %d\n",