mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 16:50:55 +08:00
Replace all occurrences of vdbg with vinfo
This commit is contained in:
+13
-13
@@ -138,7 +138,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
{
|
||||
int index;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* BINFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -173,7 +173,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
|
||||
static int binfs_close(FAR struct file *filep)
|
||||
{
|
||||
fvdbg("Closing\n");
|
||||
finfo("Closing\n");
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ static ssize_t binfs_read(FAR struct file *filep, char *buffer, size_t buflen)
|
||||
{
|
||||
/* Reading is not supported. Just return end-of-file */
|
||||
|
||||
fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
{
|
||||
int ret;
|
||||
|
||||
fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
finfo("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
|
||||
/* Only one IOCTL command is supported */
|
||||
|
||||
@@ -237,7 +237,7 @@ static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
|
||||
static int binfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
{
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Copy the index from the old to the new file structure */
|
||||
|
||||
@@ -256,7 +256,7 @@ static int binfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
static int binfs_opendir(struct inode *mountpt, const char *relpath,
|
||||
struct fs_dirent_s *dir)
|
||||
{
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
|
||||
/* The requested directory must be the volume-relative "root" directory */
|
||||
|
||||
@@ -294,14 +294,14 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
* special error -ENOENT
|
||||
*/
|
||||
|
||||
fvdbg("Entry %d: End of directory\n", index);
|
||||
finfo("Entry %d: End of directory\n", index);
|
||||
ret = -ENOENT;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Save the filename and file type */
|
||||
|
||||
fvdbg("Entry %d: \"%s\"\n", index, name);
|
||||
finfo("Entry %d: \"%s\"\n", index, name);
|
||||
dir->fd_dir.d_type = DTYPE_FILE;
|
||||
strncpy(dir->fd_dir.d_name, name, NAME_MAX+1);
|
||||
|
||||
@@ -331,7 +331,7 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
|
||||
static int binfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
{
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
dir->u.binfs.fb_index = 0;
|
||||
return OK;
|
||||
@@ -351,7 +351,7 @@ static int binfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
static int binfs_bind(FAR struct inode *blkdriver, const void *data,
|
||||
void **handle)
|
||||
{
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -366,7 +366,7 @@ static int binfs_bind(FAR struct inode *blkdriver, const void *data,
|
||||
static int binfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
|
||||
unsigned int flags)
|
||||
{
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -379,7 +379,7 @@ static int binfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
|
||||
|
||||
static int binfs_statfs(struct inode *mountpt, struct statfs *buf)
|
||||
{
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Fill in the statfs info */
|
||||
|
||||
@@ -402,7 +402,7 @@ static int binfs_statfs(struct inode *mountpt, struct statfs *buf)
|
||||
|
||||
static int binfs_stat(struct inode *mountpt, const char *relpath, struct stat *buf)
|
||||
{
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* The requested directory must be the volume-relative "root" directory */
|
||||
|
||||
|
||||
@@ -464,7 +464,7 @@ mkfatfs_tryfat12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
|
||||
maxnclusters = FAT_MAXCLUST12;
|
||||
}
|
||||
|
||||
fvdbg("nfatsects=%u nclusters=%u (max=%u)\n",
|
||||
finfo("nfatsects=%u nclusters=%u (max=%u)\n",
|
||||
config->fc_nfatsects, config->fc_nclusters, maxnclusters);
|
||||
|
||||
/* Check if this number of clusters would overflow the maximum for
|
||||
@@ -535,7 +535,7 @@ mkfatfs_tryfat16(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
|
||||
maxnclusters = FAT_MAXCLUST16;
|
||||
}
|
||||
|
||||
fvdbg("nfatsects=%u nclusters=%u (min=%u max=%u)\n",
|
||||
finfo("nfatsects=%u nclusters=%u (min=%u max=%u)\n",
|
||||
config->fc_nfatsects, config->fc_nclusters, FAT_MINCLUST16,
|
||||
maxnclusters);
|
||||
|
||||
@@ -612,7 +612,7 @@ mkfatfs_tryfat32(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
|
||||
maxnclusters = FAT_MAXCLUST32;
|
||||
}
|
||||
|
||||
fvdbg("nfatsects=%u nclusters=%u (max=%u)\n",
|
||||
finfo("nfatsects=%u nclusters=%u (max=%u)\n",
|
||||
config->fc_nfatsects, config->fc_nclusters, maxnclusters);
|
||||
|
||||
/* Check if this number of clusters would overflow the maximum for
|
||||
@@ -654,7 +654,7 @@ mkfatfs_selectfat(int fattype, FAR struct fat_format_s *fmt,
|
||||
{
|
||||
/* Return the appropriate information about the selected file system. */
|
||||
|
||||
fvdbg("Selected FAT%d\n", fattype);
|
||||
finfo("Selected FAT%d\n", fattype);
|
||||
|
||||
var->fv_fattype = fattype;
|
||||
var->fv_nclusters = config->fc_nclusters;
|
||||
@@ -745,7 +745,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
|
||||
|
||||
do
|
||||
{
|
||||
fvdbg("Configuring with %d sectors/cluster...\n",
|
||||
finfo("Configuring with %d sectors/cluster...\n",
|
||||
1 << fmt->ff_clustshift);
|
||||
|
||||
/* Check if FAT12 has not been excluded */
|
||||
|
||||
+1
-1
@@ -1397,7 +1397,7 @@ static int fat_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct fat_file_s *newff;
|
||||
int ret;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
|
||||
@@ -573,11 +573,11 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
|
||||
*/
|
||||
|
||||
uint8_t part = PART_GETTYPE(i, fs->fs_buffer);
|
||||
fvdbg("Partition %d, offset %d, type %d\n", i, PART_ENTRY(i), part);
|
||||
finfo("Partition %d, offset %d, type %d\n", i, PART_ENTRY(i), part);
|
||||
|
||||
if (part == 0)
|
||||
{
|
||||
fvdbg("No partition %d\n", i);
|
||||
finfo("No partition %d\n", i);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -606,13 +606,13 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
|
||||
{
|
||||
/* Break out of the loop if a valid boot record is found */
|
||||
|
||||
fvdbg("MBR found in partition %d\n", i);
|
||||
finfo("MBR found in partition %d\n", i);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Re-read sector 0 so that we can check the next partition */
|
||||
|
||||
fvdbg("Partition %d is not an MBR\n", i);
|
||||
finfo("Partition %d is not an MBR\n", i);
|
||||
ret = fat_hwread(fs, fs->fs_buffer, 0, 1);
|
||||
if (ret < 0)
|
||||
{
|
||||
@@ -1875,7 +1875,7 @@ int fat_currentsector(struct fat_mountpt_s *fs, struct fat_file_s *ff,
|
||||
|
||||
ff->ff_sectorsincluster = fs->fs_fatsecperclus - sectoroffset;
|
||||
|
||||
fvdbg("position=%d currentsector=%d sectorsincluster=%d\n",
|
||||
finfo("position=%d currentsector=%d sectorsincluster=%d\n",
|
||||
position, ff->ff_currentsector, ff->ff_sectorsincluster);
|
||||
|
||||
return OK;
|
||||
|
||||
@@ -191,7 +191,7 @@ static void automount_mount(FAR struct automounter_state_s *priv)
|
||||
FAR const struct automount_lower_s *lower = priv->lower;
|
||||
int ret;
|
||||
|
||||
fvdbg("Mounting %s\n", lower->mountpoint);
|
||||
finfo("Mounting %s\n", lower->mountpoint);
|
||||
|
||||
/* Check if the something is already mounted at the mountpoint. */
|
||||
|
||||
@@ -268,7 +268,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
|
||||
FAR const struct automount_lower_s *lower = priv->lower;
|
||||
int ret;
|
||||
|
||||
fvdbg("Unmounting %s\n", lower->mountpoint);
|
||||
finfo("Unmounting %s\n", lower->mountpoint);
|
||||
|
||||
/* Check if the something is already mounted at the mountpoint. */
|
||||
|
||||
@@ -295,7 +295,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
|
||||
|
||||
if (errcode == EBUSY)
|
||||
{
|
||||
fvdbg("WARNING: Volume is busy, try again later\n");
|
||||
finfo("WARNING: Volume is busy, try again later\n");
|
||||
|
||||
/* Start a timer to retry the umount2 after a delay */
|
||||
|
||||
@@ -315,7 +315,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
|
||||
|
||||
else
|
||||
{
|
||||
fvdbg("ERROR: umount2 failed: %d\n", errcode);
|
||||
finfo("ERROR: umount2 failed: %d\n", errcode);
|
||||
return -errcode;
|
||||
}
|
||||
}
|
||||
@@ -363,7 +363,7 @@ static void automount_timeout(int argc, uint32_t arg1, ...)
|
||||
(FAR struct automounter_state_s *)((uintptr_t)arg1);
|
||||
int ret;
|
||||
|
||||
fllvdbg("Timeout!\n");
|
||||
fllinfo("Timeout!\n");
|
||||
DEBUGASSERT(argc == 1 && priv);
|
||||
|
||||
/* Check the state of things. This timeout at the interrupt level and
|
||||
@@ -372,7 +372,7 @@ static void automount_timeout(int argc, uint32_t arg1, ...)
|
||||
* there should be no pending work.
|
||||
*/
|
||||
|
||||
fllvdbg("inserted=%d\n", priv->inserted);
|
||||
fllinfo("inserted=%d\n", priv->inserted);
|
||||
DEBUGASSERT(!priv->inserted && work_available(&priv->work));
|
||||
|
||||
/* Queue work to occur immediately. */
|
||||
@@ -463,7 +463,7 @@ static int automount_interrupt(FAR const struct automount_lower_s *lower,
|
||||
|
||||
DEBUGASSERT(lower && priv && priv->lower == lower);
|
||||
|
||||
fllvdbg("inserted=%d\n", inserted);
|
||||
fllinfo("inserted=%d\n", inserted);
|
||||
|
||||
/* Cancel any pending work. We could get called multiple times if, for
|
||||
* example there is bounce in the detection mechanism. Work is performed
|
||||
@@ -532,7 +532,7 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower)
|
||||
FAR struct automounter_state_s *priv;
|
||||
int ret;
|
||||
|
||||
fvdbg("lower=%p\n", lower);
|
||||
finfo("lower=%p\n", lower);
|
||||
DEBUGASSERT(lower);
|
||||
|
||||
/* Allocate an auto-mounter state structure */
|
||||
|
||||
+1
-1
@@ -241,7 +241,7 @@ tryagain:
|
||||
return error;
|
||||
}
|
||||
|
||||
fvdbg("NFS_SUCCESS\n");
|
||||
finfo("NFS_SUCCESS\n");
|
||||
return OK;
|
||||
}
|
||||
|
||||
|
||||
+17
-17
@@ -390,7 +390,7 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp, struct nfsnode *np)
|
||||
int reqlen;
|
||||
int error;
|
||||
|
||||
fvdbg("Truncating file\n");
|
||||
finfo("Truncating file\n");
|
||||
|
||||
/* Create the SETATTR RPC call arguments */
|
||||
|
||||
@@ -771,7 +771,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
|
||||
FAR uint32_t *ptr;
|
||||
int error = 0;
|
||||
|
||||
fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -802,7 +802,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
|
||||
if (buflen > tmp)
|
||||
{
|
||||
buflen = tmp;
|
||||
fvdbg("Read size truncated to %d\n", buflen);
|
||||
finfo("Read size truncated to %d\n", buflen);
|
||||
}
|
||||
|
||||
/* Now loop until we fill the user buffer (or hit the end of the file) */
|
||||
@@ -852,7 +852,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
|
||||
|
||||
/* Perform the read */
|
||||
|
||||
fvdbg("Reading %d bytes\n", readsize);
|
||||
finfo("Reading %d bytes\n", readsize);
|
||||
nfs_statistics(NFSPROC_READ);
|
||||
error = nfs_request(nmp, NFSPROC_READ,
|
||||
(FAR void *)&nmp->nm_msgbuffer.read, reqlen,
|
||||
@@ -914,7 +914,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
|
||||
}
|
||||
}
|
||||
|
||||
fvdbg("Read %d bytes\n", bytesread);
|
||||
finfo("Read %d bytes\n", bytesread);
|
||||
nfs_semgive(nmp);
|
||||
return bytesread;
|
||||
|
||||
@@ -947,7 +947,7 @@ static ssize_t nfs_write(FAR struct file *filep, const char *buffer,
|
||||
int committed = NFSV3WRITE_FILESYNC;
|
||||
int error;
|
||||
|
||||
fvdbg("Write %d bytes to offset %d\n", buflen, filep->f_pos);
|
||||
finfo("Write %d bytes to offset %d\n", buflen, filep->f_pos);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1127,7 +1127,7 @@ static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct nfsnode *np;
|
||||
int error;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1193,7 +1193,7 @@ static int nfs_opendir(struct inode *mountpt, const char *relpath,
|
||||
uint32_t objtype;
|
||||
int error;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1273,7 +1273,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
int reqlen;
|
||||
int error = 0;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1378,7 +1378,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
tmp = *ptr++;
|
||||
if (tmp != 0)
|
||||
{
|
||||
fvdbg("End of directory\n");
|
||||
finfo("End of directory\n");
|
||||
error = ENOENT;
|
||||
}
|
||||
|
||||
@@ -1388,7 +1388,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
|
||||
else
|
||||
{
|
||||
fvdbg("No data but not end of directory???\n");
|
||||
finfo("No data but not end of directory???\n");
|
||||
error = EAGAIN;
|
||||
}
|
||||
|
||||
@@ -1437,7 +1437,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
|
||||
memcpy(dir->fd_dir.d_name, name, length);
|
||||
dir->fd_dir.d_name[length] = '\0';
|
||||
fvdbg("name: \"%s\"\n", dir->fd_dir.d_name);
|
||||
finfo("name: \"%s\"\n", dir->fd_dir.d_name);
|
||||
|
||||
/* Get the file attributes associated with this name and return
|
||||
* the file type.
|
||||
@@ -1481,7 +1481,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
dir->fd_dir.d_type = DTYPE_CHR;
|
||||
break;
|
||||
}
|
||||
fvdbg("type: %d->%d\n", (int)tmp, dir->fd_dir.d_type);
|
||||
finfo("type: %d->%d\n", (int)tmp, dir->fd_dir.d_type);
|
||||
|
||||
errout_with_semaphore:
|
||||
nfs_semgive(nmp);
|
||||
@@ -1502,7 +1502,7 @@ errout_with_semaphore:
|
||||
|
||||
static int nfs_rewinddir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir)
|
||||
{
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1780,7 +1780,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
|
||||
return ENOMEM;
|
||||
}
|
||||
|
||||
fvdbg("Connecting\n");
|
||||
finfo("Connecting\n");
|
||||
|
||||
/* Translate nfsmnt flags -> rpcclnt flags */
|
||||
|
||||
@@ -1826,7 +1826,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
|
||||
*handle = (FAR void *)nmp;
|
||||
nfs_semgive(nmp);
|
||||
|
||||
fvdbg("Successfully mounted\n");
|
||||
finfo("Successfully mounted\n");
|
||||
return OK;
|
||||
|
||||
bad:
|
||||
@@ -1872,7 +1872,7 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
|
||||
FAR struct nfsmount *nmp = (FAR struct nfsmount *)handle;
|
||||
int error;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
DEBUGASSERT(nmp);
|
||||
|
||||
/* Get exclusive access to the mount structure */
|
||||
|
||||
+5
-5
@@ -349,7 +349,7 @@ void rpcclnt_init(void)
|
||||
rpc_auth_unix = txdr_unsigned(RPCAUTH_UNIX);
|
||||
rpc_auth_null = txdr_unsigned(RPCAUTH_NULL);
|
||||
|
||||
fvdbg("RPC initialized\n");
|
||||
finfo("RPC initialized\n");
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -385,7 +385,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
|
||||
uint16_t tport;
|
||||
int errval;
|
||||
|
||||
fvdbg("Connecting\n");
|
||||
finfo("Connecting\n");
|
||||
|
||||
/* Create the socket */
|
||||
|
||||
@@ -731,7 +731,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
|
||||
error = rpcclnt_send(rpc, procnum, prog, request, reqlen);
|
||||
if (error != OK)
|
||||
{
|
||||
fvdbg("ERROR rpcclnt_send failed: %d\n", error);
|
||||
finfo("ERROR rpcclnt_send failed: %d\n", error);
|
||||
}
|
||||
|
||||
/* Wait for the reply from our send */
|
||||
@@ -741,7 +741,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
|
||||
error = rpcclnt_reply(rpc, procnum, prog, response, resplen);
|
||||
if (error != OK)
|
||||
{
|
||||
fvdbg("ERROR rpcclnt_reply failed: %d\n", error);
|
||||
finfo("ERROR rpcclnt_reply failed: %d\n", error);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -785,7 +785,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
|
||||
tmp = fxdr_unsigned(uint32_t, replymsg->status);
|
||||
if (tmp == RPC_SUCCESS)
|
||||
{
|
||||
fvdbg("RPC_SUCCESS\n");
|
||||
finfo("RPC_SUCCESS\n");
|
||||
}
|
||||
else if (tmp == RPC_PROGMISMATCH)
|
||||
{
|
||||
|
||||
@@ -225,7 +225,7 @@ int nxffs_getc(FAR struct nxffs_volume_s *volume, uint16_t reserve)
|
||||
off_t nextblock = volume->ioblock + 1;
|
||||
if (nextblock >= volume->nblocks)
|
||||
{
|
||||
fvdbg("End of FLASH encountered\n");
|
||||
finfo("End of FLASH encountered\n");
|
||||
return -ENOSPC;
|
||||
}
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ int nxffs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
struct nxffs_volume_s *volume;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -146,7 +146,7 @@ int nxffs_readdir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir)
|
||||
{
|
||||
/* Return the filename and file type */
|
||||
|
||||
fvdbg("Offset %d: \"%s\"\n", entry.hoffset, entry.name);
|
||||
finfo("Offset %d: \"%s\"\n", entry.hoffset, entry.name);
|
||||
dir->fd_dir.d_type = DTYPE_FILE;
|
||||
strncpy(dir->fd_dir.d_name, entry.name, NAME_MAX+1);
|
||||
|
||||
@@ -175,7 +175,7 @@ int nxffs_rewinddir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir)
|
||||
FAR struct nxffs_volume_s *volume;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
|
||||
@@ -383,7 +383,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
|
||||
* the location of the free FLASH region.
|
||||
*/
|
||||
|
||||
fvdbg("No inodes found\n");
|
||||
finfo("No inodes found\n");
|
||||
noinodes = true;
|
||||
}
|
||||
else
|
||||
@@ -391,7 +391,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
|
||||
/* Save the offset to the first inode */
|
||||
|
||||
volume->inoffset = entry.hoffset;
|
||||
fvdbg("First inode at offset %d\n", volume->inoffset);
|
||||
finfo("First inode at offset %d\n", volume->inoffset);
|
||||
|
||||
/* Discard this entry and set the next offset. */
|
||||
|
||||
@@ -411,7 +411,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
|
||||
nxffs_freeentry(&entry);
|
||||
}
|
||||
|
||||
fvdbg("Last inode before offset %d\n", offset);
|
||||
finfo("Last inode before offset %d\n", offset);
|
||||
}
|
||||
|
||||
/* No inodes were found after this offset. Now search for a block of
|
||||
@@ -435,11 +435,11 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
|
||||
/* Yes.. the FLASH is full. Force the offsets to the end of FLASH */
|
||||
|
||||
volume->froffset = volume->nblocks * volume->geo.blocksize;
|
||||
fvdbg("Assume no free FLASH, froffset: %d\n", volume->froffset);
|
||||
finfo("Assume no free FLASH, froffset: %d\n", volume->froffset);
|
||||
if (noinodes)
|
||||
{
|
||||
volume->inoffset = volume->froffset;
|
||||
fvdbg("No inodes, inoffset: %d\n", volume->inoffset);
|
||||
finfo("No inodes, inoffset: %d\n", volume->inoffset);
|
||||
}
|
||||
|
||||
return OK;
|
||||
@@ -468,11 +468,11 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
|
||||
*/
|
||||
|
||||
volume->froffset = offset;
|
||||
fvdbg("Free FLASH region begins at offset: %d\n", volume->froffset);
|
||||
finfo("Free FLASH region begins at offset: %d\n", volume->froffset);
|
||||
if (noinodes)
|
||||
{
|
||||
volume->inoffset = offset;
|
||||
fvdbg("First inode at offset %d\n", volume->inoffset);
|
||||
finfo("First inode at offset %d\n", volume->inoffset);
|
||||
}
|
||||
|
||||
return OK;
|
||||
|
||||
@@ -286,7 +286,7 @@ int nxffs_nextentry(FAR struct nxffs_volume_s *volume, off_t offset,
|
||||
|
||||
if (++nerased >= NXFFS_NERASED)
|
||||
{
|
||||
fvdbg("No entry found\n");
|
||||
finfo("No entry found\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
}
|
||||
@@ -337,7 +337,7 @@ int nxffs_nextentry(FAR struct nxffs_volume_s *volume, off_t offset,
|
||||
ret = nxffs_rdentry(volume, offset, entry);
|
||||
if (ret == OK)
|
||||
{
|
||||
fvdbg("Found a valid fileheader, offset: %d\n", offset);
|
||||
finfo("Found a valid fileheader, offset: %d\n", offset);
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -396,7 +396,7 @@ int nxffs_findinode(FAR struct nxffs_volume_s *volume, FAR const char *name,
|
||||
ret = nxffs_nextentry(volume, offset, entry);
|
||||
if (ret < 0)
|
||||
{
|
||||
fvdbg("No inode found: %d\n", -ret);
|
||||
finfo("No inode found: %d\n", -ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
FAR struct nxffs_volume_s *volume;
|
||||
int ret;
|
||||
|
||||
fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
finfo("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -96,7 +96,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
|
||||
if (cmd == FIOC_REFORMAT)
|
||||
{
|
||||
fvdbg("Reformat command\n");
|
||||
finfo("Reformat command\n");
|
||||
|
||||
/* We cannot reformat the volume if there are any open inodes */
|
||||
|
||||
@@ -114,7 +114,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
|
||||
else if (cmd == FIOC_OPTIMIZE)
|
||||
{
|
||||
fvdbg("Optimize command\n");
|
||||
finfo("Optimize command\n");
|
||||
|
||||
/* Pack the volume */
|
||||
|
||||
|
||||
@@ -726,7 +726,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume,
|
||||
/* Just increment the reference count on the ofile */
|
||||
|
||||
ofile->crefs++;
|
||||
fvdbg("crefs: %d\n", ofile->crefs);
|
||||
finfo("crefs: %d\n", ofile->crefs);
|
||||
}
|
||||
|
||||
/* The file has not yet been opened.
|
||||
@@ -756,7 +756,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume,
|
||||
ret = nxffs_findinode(volume, name, &ofile->entry);
|
||||
if (ret != OK)
|
||||
{
|
||||
fvdbg("Inode '%s' not found: %d\n", name, -ret);
|
||||
finfo("Inode '%s' not found: %d\n", name, -ret);
|
||||
goto errout_with_ofile;
|
||||
}
|
||||
|
||||
@@ -892,7 +892,7 @@ static inline int nxffs_wrclose(FAR struct nxffs_volume_s *volume,
|
||||
|
||||
if (wrfile->truncate && wrfile->ofile.entry.name)
|
||||
{
|
||||
fvdbg("Removing old file: %s\n", wrfile->ofile.entry.name);
|
||||
finfo("Removing old file: %s\n", wrfile->ofile.entry.name);
|
||||
|
||||
ret = nxffs_rminode(volume, wrfile->ofile.entry.name);
|
||||
if (ret < 0)
|
||||
@@ -1000,7 +1000,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
FAR struct nxffs_ofile_s *ofile = NULL;
|
||||
int ret;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1069,7 +1069,7 @@ int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
#endif
|
||||
FAR struct nxffs_ofile_s *ofile;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1126,7 +1126,7 @@ int nxffs_close(FAR struct file *filep)
|
||||
FAR struct nxffs_ofile_s *ofile;
|
||||
int ret;
|
||||
|
||||
fvdbg("Closing\n");
|
||||
finfo("Closing\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ ssize_t nxffs_read(FAR struct file *filep, FAR char *buffer, size_t buflen)
|
||||
size_t readsize;
|
||||
int ret;
|
||||
|
||||
fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -304,7 +304,7 @@ int nxffs_nextblock(FAR struct nxffs_volume_s *volume, off_t offset,
|
||||
|
||||
if (++nerased >= NXFFS_NERASED)
|
||||
{
|
||||
fvdbg("No entry found\n");
|
||||
finfo("No entry found\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
}
|
||||
@@ -358,7 +358,7 @@ int nxffs_nextblock(FAR struct nxffs_volume_s *volume, off_t offset,
|
||||
ret = nxffs_rdblkhdr(volume, blkentry->hoffset, &blkentry->datlen);
|
||||
if (ret == OK)
|
||||
{
|
||||
fvdbg("Found a valid data block, offset: %d datlen: %d\n",
|
||||
finfo("Found a valid data block, offset: %d datlen: %d\n",
|
||||
blkentry->hoffset, blkentry->datlen);
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ int nxffs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
|
||||
FAR struct nxffs_volume_s *volume;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -116,7 +116,7 @@ int nxffs_stat(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
struct nxffs_entry_s entry;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ int nxffs_unlink(FAR struct inode *mountpt, FAR const char *relpath)
|
||||
FAR struct nxffs_volume_s *volume;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
|
||||
@@ -436,7 +436,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle
|
||||
ssize_t total;
|
||||
int ret;
|
||||
|
||||
fvdbg("Write %d bytes to offset %d\n", buflen, filep->f_pos);
|
||||
finfo("Write %d bytes to offset %d\n", buflen, filep->f_pos);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
|
||||
@@ -322,7 +322,7 @@ static int procfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
{
|
||||
int x, ret = -ENOENT;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* Perform the stat based on the procfs_entry operations */
|
||||
|
||||
@@ -382,7 +382,7 @@ static ssize_t procfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
FAR struct procfs_file_s *handler;
|
||||
ssize_t ret = 0;
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -406,7 +406,7 @@ static ssize_t procfs_write(FAR struct file *filep, FAR const char *buffer,
|
||||
FAR struct procfs_file_s *handler;
|
||||
ssize_t ret = 0;
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -429,7 +429,7 @@ static ssize_t procfs_write(FAR struct file *filep, FAR const char *buffer,
|
||||
|
||||
static int procfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
{
|
||||
fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
finfo("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
|
||||
/* No IOCTL commands supported */
|
||||
|
||||
@@ -448,7 +448,7 @@ static int procfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
{
|
||||
FAR struct procfs_file_s *oldattr;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
@@ -476,7 +476,7 @@ static int procfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
FAR void *priv = NULL;
|
||||
irqstate_t flags;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
DEBUGASSERT(mountpt && relpath && dir && !dir->u.procfs);
|
||||
|
||||
/* The relative must be either:
|
||||
@@ -717,7 +717,7 @@ static int procfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
* error -ENOENT
|
||||
*/
|
||||
|
||||
fvdbg("Entry %d: End of directory\n", index);
|
||||
finfo("Entry %d: End of directory\n", index);
|
||||
ret = -ENOENT;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -138,7 +138,7 @@ static int cpuload_open(FAR struct file *filep, FAR const char *relpath,
|
||||
{
|
||||
FAR struct cpuload_file_s *attr;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -207,7 +207,7 @@ static ssize_t cpuload_read(FAR struct file *filep, FAR char *buffer,
|
||||
off_t offset;
|
||||
ssize_t ret;
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -288,7 +288,7 @@ static int cpuload_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct cpuload_file_s *oldattr;
|
||||
FAR struct cpuload_file_s *newattr;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ static int kmm_open(FAR struct file *filep, FAR const char *relpath,
|
||||
{
|
||||
FAR struct kmm_file_s *procfile;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -208,7 +208,7 @@ static ssize_t kmm_read(FAR struct file *filep, FAR char *buffer,
|
||||
size_t totalsize;
|
||||
off_t offset;
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
DEBUGASSERT(filep != NULL && buffer != NULL && buflen > 0);
|
||||
offset = filep->f_pos;
|
||||
@@ -267,7 +267,7 @@ static int kmm_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct kmm_file_s *oldattr;
|
||||
FAR struct kmm_file_s *newattr;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
|
||||
@@ -1013,7 +1013,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
|
||||
unsigned long tmp;
|
||||
pid_t pid;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -1137,7 +1137,7 @@ static ssize_t proc_read(FAR struct file *filep, FAR char *buffer,
|
||||
irqstate_t flags;
|
||||
ssize_t ret;
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -1215,7 +1215,7 @@ static int proc_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct proc_file_s *oldfile;
|
||||
FAR struct proc_file_s *newfile;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
@@ -1259,7 +1259,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
|
||||
FAR char *ptr;
|
||||
pid_t pid;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
DEBUGASSERT(relpath && dir && !dir->u.procfs);
|
||||
|
||||
/* The relative must be either:
|
||||
@@ -1415,7 +1415,7 @@ static int proc_readdir(struct fs_dirent_s *dir)
|
||||
* error -ENOENT
|
||||
*/
|
||||
|
||||
fvdbg("Entry %d: End of directory\n", index);
|
||||
finfo("Entry %d: End of directory\n", index);
|
||||
ret = -ENOENT;
|
||||
}
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@ static int uptime_open(FAR struct file *filep, FAR const char *relpath,
|
||||
{
|
||||
FAR struct uptime_file_s *attr;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -222,7 +222,7 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer,
|
||||
unsigned int csec;
|
||||
#endif
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -301,7 +301,7 @@ static int uptime_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct uptime_file_s *oldattr;
|
||||
FAR struct uptime_file_s *newattr;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
|
||||
@@ -163,7 +163,7 @@ static int skel_open(FAR struct file *filep, FAR const char *relpath,
|
||||
{
|
||||
FAR struct skel_file_s *priv;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -228,7 +228,7 @@ static ssize_t skel_read(FAR struct file *filep, FAR char *buffer,
|
||||
FAR struct skel_file_s *priv;
|
||||
ssize_t ret;
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -262,7 +262,7 @@ static int skel_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct skel_file_s *oldpriv;
|
||||
FAR struct skel_file_s *newpriv;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
@@ -300,7 +300,7 @@ static int skel_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
|
||||
{
|
||||
FAR struct skel_level1_s *level1;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
DEBUGASSERT(relpath && dir && !dir->u.procfs);
|
||||
|
||||
/* The path refers to the 1st level sbdirectory. Allocate the level1
|
||||
@@ -383,7 +383,7 @@ static int skel_readdir(FAR struct fs_dirent_s *dir)
|
||||
* error -ENOENT
|
||||
*/
|
||||
|
||||
fvdbg("Entry %d: End of directory\n", index);
|
||||
finfo("Entry %d: End of directory\n", index);
|
||||
ret = -ENOENT;
|
||||
}
|
||||
|
||||
|
||||
+19
-19
@@ -149,7 +149,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
FAR struct romfs_file_s *rf;
|
||||
int ret;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -285,7 +285,7 @@ static int romfs_close(FAR struct file *filep)
|
||||
FAR struct romfs_file_s *rf;
|
||||
int ret = OK;
|
||||
|
||||
fvdbg("Closing\n");
|
||||
finfo("Closing\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -340,7 +340,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
int sectorndx;
|
||||
int ret;
|
||||
|
||||
fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -404,7 +404,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
|
||||
/* Read all of the sectors directly into user memory */
|
||||
|
||||
fvdbg("Read %d sectors starting with %d\n", nsectors, sector);
|
||||
finfo("Read %d sectors starting with %d\n", nsectors, sector);
|
||||
ret = romfs_hwread(rm, userbuffer, sector, nsectors);
|
||||
if (ret < 0)
|
||||
{
|
||||
@@ -422,7 +422,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
* it is already there then all is well.
|
||||
*/
|
||||
|
||||
fvdbg("Read sector %d\n", sector);
|
||||
finfo("Read sector %d\n", sector);
|
||||
ret = romfs_filecacheread(rm, rf, sector);
|
||||
if (ret < 0)
|
||||
{
|
||||
@@ -446,7 +446,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
sector++;
|
||||
}
|
||||
|
||||
fvdbg("Return %d bytes from sector offset %d\n", bytesread, sectorndx);
|
||||
finfo("Return %d bytes from sector offset %d\n", bytesread, sectorndx);
|
||||
memcpy(userbuffer, &rf->rf_buffer[sectorndx], bytesread);
|
||||
}
|
||||
|
||||
@@ -477,7 +477,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
|
||||
off_t position;
|
||||
int ret;
|
||||
|
||||
fvdbg("Seek to offset: %d whence: %d\n", offset, whence);
|
||||
finfo("Seek to offset: %d whence: %d\n", offset, whence);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -537,7 +537,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
|
||||
/* Set file position and return success */
|
||||
|
||||
filep->f_pos = position;
|
||||
fvdbg("New file position: %d\n", filep->f_pos);
|
||||
finfo("New file position: %d\n", filep->f_pos);
|
||||
|
||||
romfs_semgive(rm);
|
||||
return OK;
|
||||
@@ -557,7 +557,7 @@ static int romfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
FAR struct romfs_file_s *rf;
|
||||
FAR void **ppv = (FAR void**)arg;
|
||||
|
||||
fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
finfo("cmd: %d arg: %08lx\n", cmd, arg);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -597,7 +597,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct romfs_file_s *newrf;
|
||||
int ret;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -691,7 +691,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
FAR struct romfs_dirinfo_s dirinfo;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: '%s'\n", relpath);
|
||||
finfo("relpath: '%s'\n", relpath);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -759,7 +759,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
|
||||
uint32_t size;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -851,7 +851,7 @@ static int romfs_rewinddir(FAR struct inode *mountpt,
|
||||
FAR struct romfs_mountpt_s *rm;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -891,7 +891,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
|
||||
struct romfs_mountpt_s *rm;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Open the block driver */
|
||||
|
||||
@@ -977,7 +977,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
|
||||
FAR struct romfs_mountpt_s *rm = (FAR struct romfs_mountpt_s *)handle;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
if (!rm)
|
||||
@@ -1056,7 +1056,7 @@ static int romfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
|
||||
FAR struct romfs_mountpt_s *rm;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1114,7 +1114,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
FAR struct romfs_dirinfo_s dirinfo;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
@@ -1142,7 +1142,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
fvdbg("Failed to find directory: %d\n", ret);
|
||||
finfo("Failed to find directory: %d\n", ret);
|
||||
goto errout_with_semaphore;
|
||||
}
|
||||
|
||||
@@ -1171,7 +1171,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
{
|
||||
/* Otherwise, pretend like the unsupported node does not exist */
|
||||
|
||||
fvdbg("Unsupported inode: %d\n", dirinfo.rd_next);
|
||||
finfo("Unsupported inode: %d\n", dirinfo.rd_next);
|
||||
ret = -ENOENT;
|
||||
goto errout_with_semaphore;
|
||||
}
|
||||
|
||||
@@ -437,7 +437,7 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf,
|
||||
{
|
||||
int ret;
|
||||
|
||||
fvdbg("sector: %d cached: %d sectorsize: %d XIP base: %p buffer: %p\n",
|
||||
finfo("sector: %d cached: %d sectorsize: %d XIP base: %p buffer: %p\n",
|
||||
sector, rf->rf_cachesector, rm->rm_hwsectorsize,
|
||||
rm->rm_xipbase, rf->rf_buffer);
|
||||
|
||||
@@ -457,13 +457,13 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf,
|
||||
*/
|
||||
|
||||
rf->rf_buffer = rm->rm_xipbase + sector * rm->rm_hwsectorsize;
|
||||
fvdbg("XIP buffer: %p\n", rf->rf_buffer);
|
||||
finfo("XIP buffer: %p\n", rf->rf_buffer);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* In non-XIP mode, we will have to read the new sector. */
|
||||
|
||||
fvdbg("Calling romfs_hwread\n");
|
||||
finfo("Calling romfs_hwread\n");
|
||||
ret = romfs_hwread(rm, rf->rf_buffer, sector, 1);
|
||||
if (ret < 0)
|
||||
{
|
||||
|
||||
@@ -348,7 +348,7 @@ static int smartfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
FAR struct smartfs_file_s *priv;
|
||||
int ret;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -421,7 +421,7 @@ static ssize_t smartfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
FAR struct smartfs_file_s *priv;
|
||||
ssize_t ret;
|
||||
|
||||
fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -506,7 +506,7 @@ static int smartfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct smartfs_file_s *oldpriv;
|
||||
FAR struct smartfs_file_s *newpriv;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
@@ -545,7 +545,7 @@ static int smartfs_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
|
||||
FAR struct smartfs_level1_s *level1;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
DEBUGASSERT(relpath && dir && !dir->u.procfs);
|
||||
|
||||
/* The path refers to the 1st level subdirectory. Allocate the level1
|
||||
@@ -624,7 +624,7 @@ static int smartfs_readdir(struct fs_dirent_s *dir)
|
||||
* error -ENOENT
|
||||
*/
|
||||
|
||||
fvdbg("Entry %d: End of directory\n", index);
|
||||
finfo("Entry %d: End of directory\n", index);
|
||||
ret = -ENOENT;
|
||||
}
|
||||
|
||||
|
||||
@@ -628,7 +628,7 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
|
||||
|
||||
if (sf->byteswritten > 0)
|
||||
{
|
||||
fvdbg("Syncing sector %d\n", sf->currsector);
|
||||
finfo("Syncing sector %d\n", sf->currsector);
|
||||
|
||||
/* Read the existing sector used bytes value */
|
||||
|
||||
@@ -1218,7 +1218,7 @@ static int smartfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
{
|
||||
struct smartfs_ofile_s *sf;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Sanity checks */
|
||||
|
||||
|
||||
+20
-20
@@ -1345,7 +1345,7 @@ static int tmpfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
off_t offset;
|
||||
int ret;
|
||||
|
||||
fvdbg("filep: %p\n", filep);
|
||||
finfo("filep: %p\n", filep);
|
||||
DEBUGASSERT(filep->f_priv == NULL && filep->f_inode != NULL);
|
||||
|
||||
/* Get the mountpoint inode reference from the file structure and the
|
||||
@@ -1489,7 +1489,7 @@ static int tmpfs_close(FAR struct file *filep)
|
||||
{
|
||||
FAR struct tmpfs_file_s *tfo;
|
||||
|
||||
fvdbg("filep: %p\n", filep);
|
||||
finfo("filep: %p\n", filep);
|
||||
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
@@ -1543,7 +1543,7 @@ static ssize_t tmpfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
off_t startpos;
|
||||
off_t endpos;
|
||||
|
||||
fvdbg("filep: %p buffer: %p buflen: %lu\n",
|
||||
finfo("filep: %p buffer: %p buflen: %lu\n",
|
||||
filep, buffer, (unsigned long)buflen);
|
||||
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
|
||||
|
||||
@@ -1591,7 +1591,7 @@ static ssize_t tmpfs_write(FAR struct file *filep, FAR const char *buffer,
|
||||
off_t endpos;
|
||||
int ret;
|
||||
|
||||
fvdbg("filep: %p buffer: %p buflen: %lu\n",
|
||||
finfo("filep: %p buffer: %p buflen: %lu\n",
|
||||
filep, buffer, (unsigned long)buflen);
|
||||
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
|
||||
|
||||
@@ -1646,7 +1646,7 @@ static off_t tmpfs_seek(FAR struct file *filep, off_t offset, int whence)
|
||||
FAR struct tmpfs_file_s *tfo;
|
||||
off_t position;
|
||||
|
||||
fvdbg("filep: %p\n", filep);
|
||||
finfo("filep: %p\n", filep);
|
||||
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
@@ -1706,7 +1706,7 @@ static int tmpfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
FAR struct tmpfs_file_s *tfo;
|
||||
FAR void **ppv = (FAR void**)arg;
|
||||
|
||||
fvdbg("filep: %p cmd: %d arg: %08lx\n", filep, cmd, arg);
|
||||
finfo("filep: %p cmd: %d arg: %08lx\n", filep, cmd, arg);
|
||||
DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
@@ -1739,7 +1739,7 @@ static int tmpfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
{
|
||||
FAR struct tmpfs_file_s *tfo;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
DEBUGASSERT(oldp->f_priv != NULL && oldp->f_inode != NULL &&
|
||||
newp->f_priv == NULL && newp->f_inode != NULL);
|
||||
|
||||
@@ -1774,7 +1774,7 @@ static int tmpfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
FAR struct tmpfs_directory_s *tdo;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt: %p relpath: %s dir: %p\n",
|
||||
finfo("mountpt: %p relpath: %s dir: %p\n",
|
||||
mountpt, relpath, dir);
|
||||
DEBUGASSERT(mountpt != NULL && relpath != NULL && dir != NULL);
|
||||
|
||||
@@ -1820,7 +1820,7 @@ static int tmpfs_closedir(FAR struct inode *mountpt,
|
||||
{
|
||||
FAR struct tmpfs_directory_s *tdo;
|
||||
|
||||
fvdbg("mountpt: %p dir: %p\n", mountpt, dir);
|
||||
finfo("mountpt: %p dir: %p\n", mountpt, dir);
|
||||
DEBUGASSERT(mountpt != NULL && dir != NULL);
|
||||
|
||||
/* Get the directory structure from the dir argument */
|
||||
@@ -1847,7 +1847,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt,
|
||||
unsigned int index;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt: %p dir: %p\n", mountpt, dir);
|
||||
finfo("mountpt: %p dir: %p\n", mountpt, dir);
|
||||
DEBUGASSERT(mountpt != NULL && dir != NULL);
|
||||
|
||||
/* Get the directory structure from the dir argument and lock it */
|
||||
@@ -1866,7 +1866,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt,
|
||||
* -ENOENT
|
||||
*/
|
||||
|
||||
fvdbg("End of directory\n");
|
||||
finfo("End of directory\n");
|
||||
ret = -ENOENT;
|
||||
}
|
||||
else
|
||||
@@ -1914,7 +1914,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt,
|
||||
static int tmpfs_rewinddir(FAR struct inode *mountpt,
|
||||
FAR struct fs_dirent_s *dir)
|
||||
{
|
||||
fvdbg("mountpt: %p dir: %p\n", mountpt, dir);
|
||||
finfo("mountpt: %p dir: %p\n", mountpt, dir);
|
||||
DEBUGASSERT(mountpt != NULL && dir != NULL);
|
||||
|
||||
/* Set the readdir index to zero */
|
||||
@@ -1933,7 +1933,7 @@ static int tmpfs_bind(FAR struct inode *blkdriver, FAR const void *data,
|
||||
FAR struct tmpfs_directory_s *tdo;
|
||||
FAR struct tmpfs_s *fs;
|
||||
|
||||
fvdbg("blkdriver: %p data: %p handle: %p\n", blkdriver, data, handle);
|
||||
finfo("blkdriver: %p data: %p handle: %p\n", blkdriver, data, handle);
|
||||
DEBUGASSERT(blkdriver == NULL && handle != NULL);
|
||||
|
||||
/* Create an instance of the tmpfs file system */
|
||||
@@ -1985,7 +1985,7 @@ static int tmpfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
|
||||
FAR struct tmpfs_directory_s *tdo;
|
||||
int ret;
|
||||
|
||||
fvdbg("handle: %p blkdriver: %p flags: %02x\n",
|
||||
finfo("handle: %p blkdriver: %p flags: %02x\n",
|
||||
handle, blkdriver, flags);
|
||||
DEBUGASSERT(fs != NULL && fs->tfs_root.tde_object != NULL);
|
||||
|
||||
@@ -2023,7 +2023,7 @@ static int tmpfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
|
||||
off_t blkused;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt: %p buf: %p\n", mountpt, buf);
|
||||
finfo("mountpt: %p buf: %p\n", mountpt, buf);
|
||||
DEBUGASSERT(mountpt != NULL && buf != NULL);
|
||||
|
||||
/* Get the file system structure from the inode reference. */
|
||||
@@ -2090,7 +2090,7 @@ static int tmpfs_unlink(FAR struct inode *mountpt, FAR const char *relpath)
|
||||
FAR const char *name;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt: %p relpath: %s\n", mountpt, relpath);
|
||||
finfo("mountpt: %p relpath: %s\n", mountpt, relpath);
|
||||
DEBUGASSERT(mountpt != NULL && relpath != NULL);
|
||||
|
||||
/* Get the file system structure from the inode reference. */
|
||||
@@ -2190,7 +2190,7 @@ static int tmpfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
FAR struct tmpfs_s *fs;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt: %p relpath: %s mode: %04x\n", mountpt, relpath, mode);
|
||||
finfo("mountpt: %p relpath: %s mode: %04x\n", mountpt, relpath, mode);
|
||||
DEBUGASSERT(mountpt != NULL && relpath != NULL);
|
||||
|
||||
/* Get the file system structure from the inode reference. */
|
||||
@@ -2221,7 +2221,7 @@ static int tmpfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath)
|
||||
FAR const char *name;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt: %p relpath: %s\n", mountpt, relpath);
|
||||
finfo("mountpt: %p relpath: %s\n", mountpt, relpath);
|
||||
DEBUGASSERT(mountpt != NULL && relpath != NULL);
|
||||
|
||||
/* Get the file system structure from the inode reference. */
|
||||
@@ -2322,7 +2322,7 @@ static int tmpfs_rename(FAR struct inode *mountpt, FAR const char *oldrelpath,
|
||||
FAR char *copy;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt: %p oldrelpath: %s newrelpath: %s\n",
|
||||
finfo("mountpt: %p oldrelpath: %s newrelpath: %s\n",
|
||||
mountpt, oldrelpath, newrelpath);
|
||||
DEBUGASSERT(mountpt != NULL && oldrelpath != NULL && newrelpath != NULL);
|
||||
|
||||
@@ -2462,7 +2462,7 @@ static int tmpfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
size_t objsize;
|
||||
int ret;
|
||||
|
||||
fvdbg("mountpt=%p relpath=%s buf=%p\n", mountpt, relpath, buf);
|
||||
finfo("mountpt=%p relpath=%s buf=%p\n", mountpt, relpath, buf);
|
||||
DEBUGASSERT(mountpt != NULL && relpath != NULL && buf != NULL);
|
||||
|
||||
/* Get the file system structure from the inode reference. */
|
||||
|
||||
+19
-19
@@ -843,7 +843,7 @@ static int unionfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
|
||||
ui = (FAR struct unionfs_inode_s *)filep->f_inode->i_private;
|
||||
|
||||
fvdbg("Opening: ui_nopen=%d\n", ui->ui_nopen);
|
||||
finfo("Opening: ui_nopen=%d\n", ui->ui_nopen);
|
||||
|
||||
/* Get exclusive access to the file system data structures */
|
||||
|
||||
@@ -946,7 +946,7 @@ static int unionfs_close(FAR struct file *filep)
|
||||
DEBUGASSERT(um != NULL && um->um_node != NULL && um->um_node->u.i_mops != NULL);
|
||||
ops = um->um_node->u.i_mops;
|
||||
|
||||
fvdbg("Closing: ui_nopen=%d\n", ui->ui_nopen);
|
||||
finfo("Closing: ui_nopen=%d\n", ui->ui_nopen);
|
||||
|
||||
/* Perform the lower level close operation */
|
||||
|
||||
@@ -986,7 +986,7 @@ static ssize_t unionfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
FAR const struct mountpt_operations *ops;
|
||||
int ret = -EPERM;
|
||||
|
||||
fvdbg("buflen: %lu\n", (unsigned long)buflen);
|
||||
finfo("buflen: %lu\n", (unsigned long)buflen);
|
||||
|
||||
/* Recover the open file data from the struct file instance */
|
||||
|
||||
@@ -1034,7 +1034,7 @@ static ssize_t unionfs_write(FAR struct file *filep, FAR const char *buffer,
|
||||
FAR const struct mountpt_operations *ops;
|
||||
int ret = -EPERM;
|
||||
|
||||
fvdbg("buflen: %lu\n", (unsigned long)buflen);
|
||||
finfo("buflen: %lu\n", (unsigned long)buflen);
|
||||
|
||||
/* Recover the open file data from the struct file instance */
|
||||
|
||||
@@ -1081,7 +1081,7 @@ static off_t unionfs_seek(FAR struct file *filep, off_t offset, int whence)
|
||||
FAR const struct mountpt_operations *ops;
|
||||
int ret;
|
||||
|
||||
fvdbg("offset: %lu whence: %d\n", (unsigned long)offset, whence);
|
||||
finfo("offset: %lu whence: %d\n", (unsigned long)offset, whence);
|
||||
|
||||
/* Recover the open file data from the struct file instance */
|
||||
|
||||
@@ -1157,7 +1157,7 @@ static int unionfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
|
||||
FAR const struct mountpt_operations *ops;
|
||||
int ret = -ENOTTY;
|
||||
|
||||
fvdbg("cmd: %d arg: %lu\n", cmd, arg);
|
||||
finfo("cmd: %d arg: %lu\n", cmd, arg);
|
||||
|
||||
/* Recover the open file data from the struct file instance */
|
||||
|
||||
@@ -1204,7 +1204,7 @@ static int unionfs_sync(FAR struct file *filep)
|
||||
FAR const struct mountpt_operations *ops;
|
||||
int ret = -EINVAL;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Recover the open file data from the struct file instance */
|
||||
|
||||
@@ -1252,7 +1252,7 @@ static int unionfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR const struct mountpt_operations *ops;
|
||||
int ret = -ENOMEM;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Recover the open file data from the struct file instance */
|
||||
|
||||
@@ -1323,7 +1323,7 @@ static int unionfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
FAR struct fs_dirent_s *lowerdir;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
|
||||
/* Recover the filesystem data from the struct inode instance */
|
||||
|
||||
@@ -1486,7 +1486,7 @@ static int unionfs_closedir(FAR struct inode *mountpt,
|
||||
int ret = OK;
|
||||
int i;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -1638,7 +1638,7 @@ static int unionfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
DEBUGASSERT(um->um_node != NULL && um->um_node->u.i_mops != NULL);
|
||||
ops = um->um_node->u.i_mops;
|
||||
|
||||
fvdbg("fu_ndx: %d\n", fu->fu_ndx);
|
||||
finfo("fu_ndx: %d\n", fu->fu_ndx);
|
||||
|
||||
/* Perform the lower level readdir operation */
|
||||
|
||||
@@ -1819,7 +1819,7 @@ static int unionfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir)
|
||||
FAR struct fs_unionfsdir_s *fu;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -1883,7 +1883,7 @@ static int unionfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
|
||||
{
|
||||
FAR struct unionfs_inode_s *ui;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -1929,7 +1929,7 @@ static int unionfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
|
||||
uint32_t ratiob16;
|
||||
int ret;
|
||||
|
||||
fvdbg("Entry\n");
|
||||
finfo("Entry\n");
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -2065,7 +2065,7 @@ static int unionfs_unlink(FAR struct inode *mountpt,
|
||||
struct stat buf;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: %s\n", relpath);
|
||||
finfo("relpath: %s\n", relpath);
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -2137,7 +2137,7 @@ static int unionfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
int ret2;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: %s\n", relpath);
|
||||
finfo("relpath: %s\n", relpath);
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -2210,7 +2210,7 @@ static int unionfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath)
|
||||
int tmp;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: %s\n", relpath);
|
||||
finfo("relpath: %s\n", relpath);
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -2285,7 +2285,7 @@ static int unionfs_rename(FAR struct inode *mountpt,
|
||||
int tmp;
|
||||
int ret = -ENOENT;
|
||||
|
||||
fvdbg("oldrelpath: %s newrelpath\n", oldrelpath, newrelpath);
|
||||
finfo("oldrelpath: %s newrelpath\n", oldrelpath, newrelpath);
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
@@ -2359,7 +2359,7 @@ static int unionfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
|
||||
FAR struct unionfs_mountpt_s *um;
|
||||
int ret;
|
||||
|
||||
fvdbg("relpath: %s\n", relpath);
|
||||
finfo("relpath: %s\n", relpath);
|
||||
|
||||
/* Recover the union file system data from the struct inode instance */
|
||||
|
||||
|
||||
+2
-2
@@ -114,7 +114,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
|
||||
switch (op)
|
||||
{
|
||||
case EPOLL_CTL_ADD:
|
||||
fvdbg("%08x CTL ADD(%d): fd=%d ev=%08x\n",
|
||||
finfo("%08x CTL ADD(%d): fd=%d ev=%08x\n",
|
||||
epfd, eph->occupied, fd, ev->events);
|
||||
|
||||
eph->evs[eph->occupied].events = ev->events | POLLERR | POLLHUP;
|
||||
@@ -147,7 +147,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
|
||||
{
|
||||
int i;
|
||||
|
||||
fvdbg("%08x CTL MOD(%d): fd=%d ev=%08x\n",
|
||||
finfo("%08x CTL MOD(%d): fd=%d ev=%08x\n",
|
||||
epfd, eph->occupied, fd, ev->events);
|
||||
|
||||
for (i = 0; i < eph->occupied; i++)
|
||||
|
||||
Reference in New Issue
Block a user