Mov apps/examples/composite to apps/system/composite; convert configs/stm3210e-eval/composite to use kconfig-frontend tools -- untested

This commit is contained in:
Gregory Nutt
2013-09-25 18:50:14 -06:00
parent fa027d30e0
commit b3ecd158ac
131 changed files with 949 additions and 679 deletions
+4
View File
@@ -5633,3 +5633,7 @@
apps/examples/usbmsc to apps/system/usbmsc (2013-9-25). apps/examples/usbmsc to apps/system/usbmsc (2013-9-25).
* configs: Changes to many defconfig files resulting from moving * configs: Changes to many defconfig files resulting from moving
apps/examples/cdcacm to apps/system/cdcacm (2013-9-25). apps/examples/cdcacm to apps/system/cdcacm (2013-9-25).
* configs: Changes to many defconfig files resulting from moving
apps/examples/composite to apps/system/composite (2013-9-25).
* configs/stm3210e-eval/composite: Converted to use the kconfig-
frontends tool (2013-9-25).
+1 -1
View File
@@ -482,7 +482,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -470,7 +470,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -513,7 +513,7 @@ CONFIG_HAVE_CXX=y
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -471,7 +471,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -403,7 +403,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -342,7 +342,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -350,7 +350,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -568,7 +568,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# USB composite Class Driver Example # USB composite Class Driver Example
# #
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# #
# DHCP Server Example # DHCP Server Example
+4 -4
View File
@@ -52,8 +52,8 @@
/* Configuration ************************************************************/ /* Configuration ************************************************************/
/* Device minor number */ /* Device minor number */
#ifndef CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1 #ifndef CONFIG_SYSTEM_COMPOSITE_DEVMINOR1
# define CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1 0 # define CONFIG_SYSTEM_COMPOSITE_DEVMINOR1 0
#endif #endif
/* Debug ********************************************************************/ /* Debug ********************************************************************/
@@ -90,7 +90,7 @@
int composite_archinitialize(void) int composite_archinitialize(void)
{ {
/* If examples/composite is built as an NSH command, then SD slot should /* If system/composite is built as an NSH command, then SD slot should
* already have been initized in nsh_archinitialize() (see up_nsh.c). In * already have been initized in nsh_archinitialize() (see up_nsh.c). In
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
* *
@@ -99,7 +99,7 @@ int composite_archinitialize(void)
*/ */
#ifndef CONFIG_NSH_BUILTIN_APPS #ifndef CONFIG_NSH_BUILTIN_APPS
return sd_mount(CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1); return sd_mount(CONFIG_SYSTEM_COMPOSITE_DEVMINOR1);
#else #else
return OK; return OK;
#endif /* CONFIG_NSH_BUILTIN_APPS */ #endif /* CONFIG_NSH_BUILTIN_APPS */
+1 -1
View File
@@ -441,7 +441,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_CC3000BASIC is not set # CONFIG_EXAMPLES_CC3000BASIC is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -423,7 +423,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -501,7 +501,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME5="Button 5"
CONFIG_EXAMPLES_BUTTONS_NAME6="Button 6" CONFIG_EXAMPLES_BUTTONS_NAME6="Button 6"
CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7" CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -511,7 +511,7 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -673,7 +673,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME5="Button 5"
CONFIG_EXAMPLES_BUTTONS_NAME6="Button 6" CONFIG_EXAMPLES_BUTTONS_NAME6="Button 6"
CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7" CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -490,7 +490,7 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -544,7 +544,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME6="Button 6"
CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7" CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -437,7 +437,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -447,7 +447,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -447,7 +447,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -454,7 +454,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -386,7 +386,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -492,7 +492,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -415,7 +415,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -406,7 +406,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -580,7 +580,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_CC3000BASIC is not set # CONFIG_EXAMPLES_CC3000BASIC is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -601,7 +601,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_CC3000BASIC is not set # CONFIG_EXAMPLES_CC3000BASIC is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -334,7 +334,7 @@ composite:
---------- ----------
A simple test of the USB Composite Device (see A simple test of the USB Composite Device (see
apps/examples/README.txt and apps/examples/composite) apps/examples/README.txt and apps/system/composite)
Default toolchain: CodeSourcery for Windows Default toolchain: CodeSourcery for Windows
Output format: ELF and Intel HEX Output format: ELF and Intel HEX
+1 -1
View File
@@ -35,5 +35,5 @@
# Path to example in apps/examples containing the user_start entry point # Path to example in apps/examples containing the user_start entry point
CONFIGURED_APPS += examples/composite CONFIGURED_APPS += system/composite
+14 -14
View File
@@ -331,7 +331,7 @@ CONFIG_COMPOSITE_PRODUCTID=0x2022
CONFIG_COMPOSITE_VENDORSTR="NuttX" CONFIG_COMPOSITE_VENDORSTR="NuttX"
CONFIG_COMPOSITE_PRODUCTSTR="Composite Device" CONFIG_COMPOSITE_PRODUCTSTR="Composite Device"
CONFIG_COMPOSITE_SERIALSTR="12345" CONFIG_COMPOSITE_SERIALSTR="12345"
CONFIG_COMPOSITE_CONFIGSTR="examples/composite" CONFIG_COMPOSITE_CONFIGSTR="system/composite"
CONFIG_COMPOSITE_VERSIONNO=0x0101 CONFIG_COMPOSITE_VERSIONNO=0x0101
# #
@@ -395,20 +395,20 @@ CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=y
CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
# #
# Settings for examples/composite # Settings for system/composite
# #
CONFIG_EXAMPLES_COMPOSITE_DEBUGMM=n CONFIG_SYSTEM_COMPOSITE_DEBUGMM=n
CONFIG_EXAMPLES_COMPOSITE_NLUNS=1 CONFIG_SYSTEM_COMPOSITE_NLUNS=1
CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1=0 CONFIG_SYSTEM_COMPOSITE_DEVMINOR1=0
CONFIG_EXAMPLES_COMPOSITE_DEVPATH1="/dev/mmcsd0" CONFIG_SYSTEM_COMPOSITE_DEVPATH1="/dev/mmcsd0"
CONFIG_EXAMPLES_COMPOSITE_TTYUSB=0 CONFIG_SYSTEM_COMPOSITE_TTYUSB=0
CONFIG_EXAMPLES_COMPOSITE_SERDEV="/dev/ttyUSB0" CONFIG_SYSTEM_COMPOSITE_SERDEV="/dev/ttyUSB0"
CONFIG_EXAMPLES_COMPOSITE_BUFSIZE=256 CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
CONFIG_EXAMPLES_COMPOSITE_TRACEINIT=n CONFIG_SYSTEM_COMPOSITE_TRACEINIT=n
CONFIG_EXAMPLES_COMPOSITE_TRACECLASS=n CONFIG_SYSTEM_COMPOSITE_TRACECLASS=n
CONFIG_EXAMPLES_COMPOSITE_TRACETRANSFERS=n CONFIG_SYSTEM_COMPOSITE_TRACETRANSFERS=n
CONFIG_EXAMPLES_COMPOSITE_TRACECONTROLLER=n CONFIG_SYSTEM_COMPOSITE_TRACECONTROLLER=n
CONFIG_EXAMPLES_COMPOSITE_TRACEINTERRUPTS=n CONFIG_SYSTEM_COMPOSITE_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
+1 -1
View File
@@ -404,7 +404,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+4 -4
View File
@@ -55,8 +55,8 @@
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifndef CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1 #ifndef CONFIG_SYSTEM_COMPOSITE_DEVMINOR1
# define CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1 0 # define CONFIG_SYSTEM_COMPOSITE_DEVMINOR1 0
#endif #endif
/* PORT and SLOT number probably depend on the board configuration */ /* PORT and SLOT number probably depend on the board configuration */
@@ -105,7 +105,7 @@
int composite_archinitialize(void) int composite_archinitialize(void)
{ {
/* If examples/composite is built as an NSH command, then SD slot should /* If system/composite is built as an NSH command, then SD slot should
* already have been initized in nsh_archinitialize() (see up_nsh.c). In * already have been initized in nsh_archinitialize() (see up_nsh.c). In
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
* *
@@ -138,7 +138,7 @@ int composite_archinitialize(void)
message("composite_archinitialize: Binding SPI port %d to MMC/SD slot %d\n", message("composite_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO); LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO);
ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi); ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_COMPOSITE_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi);
if (ret < 0) if (ret < 0)
{ {
message("composite_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n", message("composite_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+1 -1
View File
@@ -728,7 +728,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -644,7 +644,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -573,7 +573,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -567,7 +567,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -566,7 +566,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -566,7 +566,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -621,7 +621,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
+1 -1
View File
@@ -485,7 +485,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -437,7 +437,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -442,7 +442,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -519,7 +519,7 @@ CONFIG_LIB_KBDCODEC=y
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -497,7 +497,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_CDCACM is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -537,7 +537,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
@@ -484,7 +484,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -552,7 +552,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -647,7 +647,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -524,7 +524,7 @@ CONFIG_SCHED_WORKSTACKSIZE=2048
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set
+1 -1
View File
@@ -480,7 +480,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CAN is not set
# CONFIG_EXAMPLES_COMPOSITE is not set # CONFIG_SYSTEM_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPC is not set

Some files were not shown because too many files have changed in this diff Show More