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

Apps Issue #246:Replace romdisk_register() with boardctl(BOARDIOC_ROMDISK)

Browse Source 
files changed: examples/nxflat/nxflat_main.c
               examples/thttpd/thttpd_main.c

examples/thttpd: Fix error: unused variable 'desc'
This commit is contained in:
Tanushree Baindur 2021-05-13 23:37:30 -05:00 committed by Xiang Xiao
parent b7e9c43489
commit ab41d23d7c
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/nxflat/nxflat_main.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* examples/nxflat/nxflat_main.c * apps/examples/nxflat/nxflat_main.c
* *
* Copyright (C) 2009, 2011, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -41,6 +41,7 @@
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/boardctl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -153,12 +154,18 @@ int main(int argc, FAR char *argv[])
FAR char *args[1]; FAR char *args[1];
int ret; int ret;
int i; int i;
struct boardioc_romdisk_s desc;
/* Create a ROM disk for the ROMFS filesystem */ /* Create a ROM disk for the ROMFS filesystem */
message("Registering romdisk\n"); message("Registering romdisk\n");
ret = romdisk_register(0, (FAR uint8_t *)romfs_img,
NSECTORS(romfs_img_len), SECTORSIZE); desc.minor = 0; /* Minor device number of the ROM disk. */
desc.nsectors = NSECTORS(romfs_img_len); /* The number of sectors in the ROM disk */
desc.sectsize = SECTORSIZE; /* The size of one sector in bytes */
desc.image = (FAR uint8_t *)romfs_img; /* File system image */
ret = boardctl(BOARDIOC_ROMDISK, (uintptr_t)&desc);
if (ret < 0) if (ret < 0)
{ {
errmsg("ERROR: romdisk_register failed: %d\n", ret); errmsg("ERROR: romdisk_register failed: %d\n", ret);
@ -173,7 +180,7 @@ int main(int argc, FAR char *argv[])
ret = mount(ROMFSDEV, MOUNTPT, "romfs", MS_RDONLY, NULL); ret = mount(ROMFSDEV, MOUNTPT, "romfs", MS_RDONLY, NULL);
if (ret < 0) if (ret < 0)
{ {
errmsg("ERROR: mount(%s,%s,romfs) failed: %s\n", errmsg("ERROR: mount(%s,%s,romfs) failed: %d\n",
ROMFSDEV, MOUNTPT, errno); ROMFSDEV, MOUNTPT, errno);
} }

20
examples/thttpd/thttpd_main.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* examples/thttpd/thttpd_main.c * apps/examples/thttpd/thttpd_main.c
* *
* Copyright (C) 2009-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -59,6 +59,10 @@
#include <nuttx/drivers/ramdisk.h> #include <nuttx/drivers/ramdisk.h>
#ifdef CONFIG_THTTPD_NXFLAT
# include <sys/boardctl.h>
#endif
#ifdef CONFIG_THTTPD_BINFS #ifdef CONFIG_THTTPD_BINFS
# include <nuttx/fs/unionfs.h> # include <nuttx/fs/unionfs.h>
#endif #endif
@ -204,6 +208,9 @@ int main(int argc, FAR char *argv[])
#endif #endif
char *thttpd_argv = "thttpd"; char *thttpd_argv = "thttpd";
int ret; int ret;
#ifdef CONFIG_THTTPD_NXFLAT
struct boardioc_romdisk_s desc;
#endif
/* Configure SLIP */ /* Configure SLIP */
@ -252,12 +259,18 @@ int main(int argc, FAR char *argv[])
netlib_ifup("eth0"); netlib_ifup("eth0");
#ifdef CONFIG_THTTPD_NXFLAT
/* Create a ROM disk for the ROMFS filesystem */ /* Create a ROM disk for the ROMFS filesystem */
printf("Registering romdisk\n"); printf("Registering romdisk\n");
ret = romdisk_register(0, (uint8_t *)romfs_img, NSECTORS(romfs_img_len), desc.minor = 0; /* Minor device number of the ROM disk. */
SECTORSIZE); desc.nsectors = NSECTORS(romfs_img_len); /* The number of sectors in the ROM disk */
desc.sectsize = SECTORSIZE; /* The size of one sector in bytes */
desc.image = (FAR uint8_t *)romfs_img; /* File system image */
ret = boardctl(BOARDIOC_ROMDISK, (uintptr_t)&desc);
if (ret < 0) if (ret < 0)
{ {
printf("ERROR: romdisk_register failed: %d\n", ret); printf("ERROR: romdisk_register failed: %d\n", ret);
@ -275,6 +288,7 @@ int main(int argc, FAR char *argv[])
printf("ERROR: mount(%s,%s,romfs) failed: %d\n", printf("ERROR: mount(%s,%s,romfs) failed: %d\n",
ROMFSDEV, ROMFS_MOUNTPT, errno); ROMFSDEV, ROMFS_MOUNTPT, errno);
} }
#endif
#ifdef CONFIG_THTTPD_BINFS #ifdef CONFIG_THTTPD_BINFS
/* Mount the BINFS file system */ /* Mount the BINFS file system */