sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

exmaples: some nxstyle fixes for module/sotest/thttpd

Browse Source 
Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
This commit is contained in:
liuhaitao 2020-05-15 11:03:12 +08:00 committed by Xiang Xiao
parent 0c60624276
commit 79e544f032
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/module/module_main.c
View File

@ -122,7 +122,7 @@
* Private data * Private data
****************************************************************************/ ****************************************************************************/
static const char g_write_string[] = "Hi there, installed driver\n"; static const char g_write_string[] = "Hi there installed driver\n";
/**************************************************************************** /****************************************************************************
* Symbols from Auto-Generated Code * Symbols from Auto-Generated Code
@ -196,7 +196,9 @@ int main(int argc, FAR char *argv[])
NSECTORS(romfs_img_len), SECTORSIZE); NSECTORS(romfs_img_len), SECTORSIZE);
if (ret < 0) if (ret < 0)
{ {
/* This will happen naturally if we registered the ROM disk previously. */ /* This will happen naturally if we registered the ROM disk
* previously.
*/
if (ret != -EEXIST) if (ret != -EEXIST)
{ {

8
examples/sotest/sotest_main.c
View File

@ -145,7 +145,9 @@ int main(int argc, FAR char *argv[])
NSECTORS(romfs_img_len), SECTORSIZE); NSECTORS(romfs_img_len), SECTORSIZE);
if (ret < 0) if (ret < 0)
{ {
/* This will happen naturally if we registered the ROM disk previously. */ /* This will happen naturally if we registered the ROM disk
* previously.
*/
if (ret != -EEXIST) if (ret != -EEXIST)
{ {
@ -257,7 +259,9 @@ int main(int argc, FAR char *argv[])
testfunc(msg); testfunc(msg);
#if CONFIG_MODLIB_MAXDEPEND > 0 #if CONFIG_MODLIB_MAXDEPEND > 0
/* This should fail because the second shared library depends on the first. */ /* This should fail because the second shared library depends on
* the first.
*/
ret = dlclose(handle1); ret = dlclose(handle1);
if (ret == 0) if (ret == 0)

25
examples/thttpd/thttpd_main.c
View File

@ -110,13 +110,13 @@
/* Ethernet specific configuration */ /* Ethernet specific configuration */
#ifdef CONFIG_NET_ETHERNET #ifdef CONFIG_NET_ETHERNET
/* Use the standard Ethernet device name */ /* Use the standard Ethernet device name */
# define NET_DEVNAME "eth0" # define NET_DEVNAME "eth0"
#else #else
/* No Ethernet -> No MAC address operations */ /* No Ethernet -> No MAC address operations */
# undef CONFIG_EXAMPLES_THTTPD_NOMAC # undef CONFIG_EXAMPLES_THTTPD_NOMAC
#endif #endif
@ -125,7 +125,7 @@
#ifdef CONFIG_NET_SLIP #ifdef CONFIG_NET_SLIP
/* TTY device to use */ /* TTY device to use */
# ifndef CONFIG_NET_SLIPTTY # ifndef CONFIG_NET_SLIPTTY
# define CONFIG_NET_SLIPTTY "/dev/ttyS1" # define CONFIG_NET_SLIPTTY "/dev/ttyS1"
@ -216,7 +216,7 @@ int main(int argc, FAR char *argv[])
} }
#endif #endif
/* Many embedded network interfaces must have a software assigned MAC */ /* Many embedded network interfaces must have a software assigned MAC */
#ifdef CONFIG_EXAMPLES_THTTPD_NOMAC #ifdef CONFIG_EXAMPLES_THTTPD_NOMAC
printf("Assigning MAC\n"); printf("Assigning MAC\n");
@ -256,7 +256,8 @@ int main(int argc, FAR char *argv[])
printf("Registering romdisk\n"); printf("Registering romdisk\n");
ret = romdisk_register(0, (uint8_t*)romfs_img, NSECTORS(romfs_img_len), SECTORSIZE); ret = romdisk_register(0, (uint8_t *)romfs_img, NSECTORS(romfs_img_len),
SECTORSIZE);
if (ret < 0) if (ret < 0)
{ {
printf("ERROR: romdisk_register failed: %d\n", ret); printf("ERROR: romdisk_register failed: %d\n", ret);
@ -283,22 +284,26 @@ int main(int argc, FAR char *argv[])
ret = mount(NULL, BINFS_MOUNTPT, "binfs", MS_RDONLY, NULL); ret = mount(NULL, BINFS_MOUNTPT, "binfs", MS_RDONLY, NULL);
if (ret < 0) if (ret < 0)
{ {
printf("ERROR: mount(NULL,%s,binfs) failed: %d\n", BINFS_MOUNTPT, errno); printf("ERROR: mount(NULL,%s,binfs) failed: %d\n",
BINFS_MOUNTPT, errno);
} }
/* Now create and mount the union file system */ /* Now create and mount the union file system */
printf("Creating UNIONFS filesystem at %s\n", UNIONFS_MOUNTPT); printf("Creating UNIONFS filesystem at %s\n", UNIONFS_MOUNTPT);
ret = unionfs_mount(ROMFS_MOUNTPT, ROMFS_PREFIX, BINFS_MOUNTPT, BINFS_PREFIX, ret = unionfs_mount(ROMFS_MOUNTPT, ROMFS_PREFIX, BINFS_MOUNTPT,
UNIONFS_MOUNTPT); BINFS_PREFIX, UNIONFS_MOUNTPT);
if (ret < 0) if (ret < 0)
{ {
printf("ERROR: Failed to create the union file system at %s: %d\n", UNIONFS_MOUNTPT, ret); printf("ERROR: Failed to create the union file system at %s: %d\n",
UNIONFS_MOUNTPT, ret);
} }
#endif #endif
/* Start THTTPD. At present, symbol table info is passed via global variables */ /* Start THTTPD. At present, symbol table info is passed via
* global variables.
*/
#ifdef CONFIG_THTTPD_NXFLAT #ifdef CONFIG_THTTPD_NXFLAT
g_thttpdsymtab = g_thttpd_exports; g_thttpdsymtab = g_thttpd_exports;