SAM3U SPI driver update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4017 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
fa313aa47f
commit
fc02cfd242
@ -146,9 +146,9 @@ examples/helloxx
|
|||||||
|
|
||||||
CONFIG_EXAMPLES_HELLOXX_BUILTIN -- Build the helloxx example as a
|
CONFIG_EXAMPLES_HELLOXX_BUILTIN -- Build the helloxx example as a
|
||||||
"built-in" that can be executed from the NSH command line.
|
"built-in" that can be executed from the NSH command line.
|
||||||
CONFIG_EXAMPLE_HELLOXX_NOSTATICCONST - Set if system does not support
|
CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST - Set if system does not support
|
||||||
static constructors.
|
static constructors.
|
||||||
CONFIG_EXAMPLE_HELLOXX_NOSTACKCONST - Set if the system does not
|
CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST - Set if the system does not
|
||||||
support construction of objects on the stack.
|
support construction of objects on the stack.
|
||||||
|
|
||||||
Also needed:
|
Also needed:
|
||||||
|
@ -78,7 +78,7 @@ class CHelloWorld
|
|||||||
// Private Data
|
// Private Data
|
||||||
//***************************************************************************
|
//***************************************************************************
|
||||||
|
|
||||||
#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTATICCONST
|
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST
|
||||||
static CHelloWorld g_HelloWorld;
|
static CHelloWorld g_HelloWorld;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ static CHelloWorld g_HelloWorld;
|
|||||||
* Name: user_start/nxhello_main
|
* Name: user_start/nxhello_main
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN
|
#ifdef CONFIG_EXAMPLES_HELLOXX_BUILTIN
|
||||||
extern "C" int helloxx_main(int argc, char *argv[]);
|
extern "C" int helloxx_main(int argc, char *argv[]);
|
||||||
# define MAIN_NAME helloxx_main
|
# define MAIN_NAME helloxx_main
|
||||||
# define MAIN_STRING "helloxx_main: "
|
# define MAIN_STRING "helloxx_main: "
|
||||||
@ -105,7 +105,7 @@ extern "C" int helloxx_main(int argc, char *argv[]);
|
|||||||
|
|
||||||
int MAIN_NAME(int argc, char *argv[])
|
int MAIN_NAME(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTACKCONST
|
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST
|
||||||
CHelloWorld HelloWorld;
|
CHelloWorld HelloWorld;
|
||||||
#endif
|
#endif
|
||||||
CHelloWorld *pHelloWorld = new CHelloWorld;
|
CHelloWorld *pHelloWorld = new CHelloWorld;
|
||||||
@ -113,12 +113,12 @@ int MAIN_NAME(int argc, char *argv[])
|
|||||||
printf(MAIN_STRING "Saying hello from the dynamically constructed instance\n");
|
printf(MAIN_STRING "Saying hello from the dynamically constructed instance\n");
|
||||||
pHelloWorld->HelloWorld();
|
pHelloWorld->HelloWorld();
|
||||||
|
|
||||||
#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTACKCONST
|
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST
|
||||||
printf(MAIN_STRING "Saying hello from the statically constructed instance\n");
|
printf(MAIN_STRING "Saying hello from the instance constructed of the stack\n");
|
||||||
HelloWorld.HelloWorld();
|
HelloWorld.HelloWorld();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTATICCONST
|
#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST
|
||||||
printf(MAIN_STRING "Saying hello from the statically constructed instance\n");
|
printf(MAIN_STRING "Saying hello from the statically constructed instance\n");
|
||||||
g_HelloWorld.HelloWorld();
|
g_HelloWorld.HelloWorld();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user