#include "yaffs_packedtags2.h"
#include "yaffs_mtdif.h"
#include "yaffs_mtdif2.h"
+#include "yaffs_uboot_glue.h"
+
#if 0
#include <errno.h>
#else
#endif
unsigned yaffs_trace_mask = 0x0; /* Disable logging */
-static int yaffs_errno = 0;
+static int yaffs_errno;
void yaffs_bug_fn(const char *fn, int n)
static const char *yaffs_file_type_str(struct yaffs_stat *stat)
{
- switch(stat->st_mode & S_IFMT) {
- case S_IFREG: return "regular file";
- case S_IFDIR: return "directory";
- case S_IFLNK: return "symlink";
- default: return "unknown";
+ switch (stat->st_mode & S_IFMT) {
+ case S_IFREG: return "regular file";
+ case S_IFDIR: return "directory";
+ case S_IFLNK: return "symlink";
+ default: return "unknown";
}
}
{
int error = yaffsfs_GetLastError();
- if(error < 0)
+ if (error < 0)
error = -error;
switch (error) {
- case EBUSY: return "Busy";
- case ENODEV: return "No such device";
- case EINVAL: return "Invalid parameter";
- case ENFILE: return "Too many open files";
- case EBADF: return "Bad handle";
- case EACCES: return "Wrong permissions";
- case EXDEV: return "Not on same device";
- case ENOENT: return "No such entry";
- case ENOSPC: return "Device full";
- case EROFS: return "Read only file system";
- case ERANGE: return "Range error";
- case ENOTEMPTY: return "Not empty";
- case ENAMETOOLONG: return "Name too long";
- case ENOMEM: return "Out of memory";
- case EFAULT: return "Fault";
- case EEXIST: return "Name exists";
- case ENOTDIR: return "Not a directory";
- case EISDIR: return "Not permitted on a directory";
- case ELOOP: return "Symlink loop";
- case 0: return "No error";
- default: return "Unknown error";
+ case EBUSY: return "Busy";
+ case ENODEV: return "No such device";
+ case EINVAL: return "Invalid parameter";
+ case ENFILE: return "Too many open files";
+ case EBADF: return "Bad handle";
+ case EACCES: return "Wrong permissions";
+ case EXDEV: return "Not on same device";
+ case ENOENT: return "No such entry";
+ case ENOSPC: return "Device full";
+ case EROFS: return "Read only file system";
+ case ERANGE: return "Range error";
+ case ENOTEMPTY: return "Not empty";
+ case ENAMETOOLONG: return "Name too long";
+ case ENOMEM: return "Out of memory";
+ case EFAULT: return "Fault";
+ case EEXIST: return "Name exists";
+ case ENOTDIR: return "Not a directory";
+ case EISDIR: return "Not permitted on a directory";
+ case ELOOP: return "Symlink loop";
+ case 0: return "No error";
+ default: return "Unknown error";
}
}
extern nand_info_t nand_info[];
-void cmd_yaffs_tracemask(unsigned set, unsigned mask)
+int cmd_yaffs_tracemask(unsigned set, unsigned mask)
{
- if(set)
+ if (set)
yaffs_trace_mask = mask;
- printf("yaffs trace mask: %08x\n",yaffs_trace_mask);
+ printf("yaffs trace mask: %08x\n", yaffs_trace_mask);
+ return 0;
}
static int yaffs_regions_overlap(int a, int b, int x, int y)
{
- return
- (a <= x && x <= b) ||
+ return (a <= x && x <= b) ||
(a <= y && y <= b) ||
(x <= a && a <= y) ||
(x <= b && b <= y);
}
-void cmd_yaffs_devconfig(char *_mp, int flash_dev,
+int cmd_yaffs_devconfig(char *_mp, int flash_dev,
int start_block, int end_block)
{
struct mtd_info *mtd = NULL;
mtd = &nand_info[flash_dev];
- if(!dev || !mp) {
+ if (!dev || !mp) {
/* Alloc error */
printf("Failed to allocate memory\n");
goto err;
}
- if(flash_dev >= CONFIG_SYS_MAX_NAND_DEVICE) {
+ if (flash_dev >= CONFIG_SYS_MAX_NAND_DEVICE) {
printf("Flash device invalid\n");
goto err;
}
yaffs_dev_rewind();
while (1) {
chk = yaffs_next_dev();
- if(!chk)
+ if (!chk)
break;
- if(strcmp(chk->param.name, mp) == 0) {
+ if (strcmp(chk->param.name, mp) == 0) {
printf("Mount point name already used\n");
goto err;
}
- if(chk->driver_context == mtd &&
+ if (chk->driver_context == mtd &&
yaffs_regions_overlap(
chk->param.start_block, chk->param.end_block,
start_block, end_block)) {
dev->param.use_nand_ecc = 1;
dev->param.n_reserved_blocks = 5;
if (chip->ecc.layout->oobavail < sizeof(struct yaffs_packed_tags2))
- dev->param.inband_tags =1;
+ dev->param.inband_tags = 1;
dev->param.n_caches = 10;
dev->param.write_chunk_tags_fn = nandmtd2_write_chunk_tags;
dev->param.read_chunk_tags_fn = nandmtd2_read_chunk_tags;
printf("Configures yaffs mount %s: dev %d start block %d, end block %d %s\n",
mp, flash_dev, start_block, end_block,
dev->param.inband_tags ? "using inband tags" : "");
- return;
+ return 0;
err:
free(dev);
free(mp);
+ return -1;
}
-void cmd_yaffs_dev_ls(void)
+int cmd_yaffs_dev_ls(void)
{
struct yaffs_dev *dev;
int flash_dev;
yaffs_dev_rewind();
- while(1) {
+ while (1) {
dev = yaffs_next_dev();
- if(!dev)
- return;
+ if (!dev)
+ break;
flash_dev =
((unsigned) dev->driver_context - (unsigned) nand_info)/
sizeof(nand_info[0]);
dev->param.inband_tags ? "using inband tags, " : "");
free_space = yaffs_freespace(dev->param.name);
- if(free_space < 0)
+ if (free_space < 0)
printf("not mounted\n");
else
printf("free 0x%x\n", free_space);
}
+
+ return 0;
}
-void make_a_file(char *yaffsName,char bval,int sizeOfFile)
+int make_a_file(char *yaffsName, char bval, int sizeOfFile)
{
int outh;
int i;
+ int written;
unsigned char buffer[100];
outh = yaffs_open(yaffsName,
S_IREAD | S_IWRITE);
if (outh < 0) {
printf("Error opening file: %d. %s\n", outh, yaffs_error_str());
- return;
+ return -1;
}
- memset(buffer,bval,100);
-
- do{
- i = sizeOfFile;
- if(i > 100) i = 100;
- sizeOfFile -= i;
-
- yaffs_write(outh,buffer,i);
+ memset(buffer, bval, 100);
- } while (sizeOfFile > 0);
+ written = 0;
+ while (written < sizeOfFile) {
+ i = sizeOfFile - written;
+ if (i > 100)
+ i = 100;
+ if (yaffs_write(outh, buffer, i) != i)
+ break;
+ written += i;
+ }
yaffs_close(outh);
+
+ return (written == sizeOfFile) ? 0 : -1;
}
-void read_a_file(char *fn)
+int read_a_file(char *fn)
{
int h;
int i = 0;
unsigned char b;
- h = yaffs_open(fn, O_RDWR,0);
- if(h<0)
- {
+ h = yaffs_open(fn, O_RDWR, 0);
+ if (h < 0) {
printf("File not found\n");
- return;
+ return -1;
}
- while(yaffs_read(h,&b,1)> 0)
- {
- printf("%02x ",b);
+ while (yaffs_read(h, &b, 1) > 0) {
+ printf("%02x ", b);
i++;
- if(i > 32)
- {
- printf("\n");
- i = 0;;
- }
+ if (i > 32) {
+ printf("\n");
+ i = 0;;
+ }
}
printf("\n");
yaffs_close(h);
+
+ return 0;
}
-void cmd_yaffs_mount(char *mp)
+int cmd_yaffs_mount(char *mp)
{
int retval = yaffs_mount(mp);
- if( retval < 0)
+ if (retval < 0)
printf("Error mounting %s, return value: %d, %s\n", mp,
yaffsfs_GetError(), yaffs_error_str());
+ return retval;
}
-void cmd_yaffs_umount(char *mp)
+int cmd_yaffs_umount(char *mp)
{
- if( yaffs_unmount(mp) == -1)
+ int retval = yaffs_unmount(mp);
+
+ if (retval < 0)
printf("Error umounting %s, return value: %d, %s\n", mp,
yaffsfs_GetError(), yaffs_error_str());
+ return retval;
}
-void cmd_yaffs_write_file(char *yaffsName,char bval,int sizeOfFile)
+int cmd_yaffs_write_file(char *yaffsName, char bval, int sizeOfFile)
{
- make_a_file(yaffsName,bval,sizeOfFile);
+ return make_a_file(yaffsName, bval, sizeOfFile);
}
-void cmd_yaffs_read_file(char *fn)
+int cmd_yaffs_read_file(char *fn)
{
- read_a_file(fn);
+ return read_a_file(fn);
}
-void cmd_yaffs_mread_file(char *fn, char *addr)
+int cmd_yaffs_mread_file(char *fn, char *addr)
{
int h;
+ int retval = 0;
struct yaffs_stat s;
+ int read_size;
+ char buf[16];
- yaffs_stat(fn,&s);
+ yaffs_stat(fn, &s);
- printf ("Copy %s to 0x%p... ", fn, addr);
- h = yaffs_open(fn, O_RDWR,0);
- if(h<0)
- {
+ printf("Copy %s to 0x%p... ", fn, addr);
+ h = yaffs_open(fn, O_RDWR, 0);
+ if (h < 0) {
printf("File not found\n");
- return;
+ retval = -1;
+ read_size = 0;
+ } else {
+ read_size = (int) s.st_size;
+ yaffs_read(h, addr, read_size);
+ printf("\t[DONE]\n");
+
+ yaffs_close(h);
}
+ sprintf(buf,"%x", read_size);
+ setenv("filesize", buf);
- yaffs_read(h,addr,(int)s.st_size);
- printf("\t[DONE]\n");
-
- yaffs_close(h);
+ return retval;
}
-void cmd_yaffs_mwrite_file(char *fn, char *addr, int size)
+int cmd_yaffs_mwrite_file(char *fn, char *addr, int size)
{
int outh;
+ int wrote;
outh = yaffs_open(fn, O_CREAT | O_RDWR | O_TRUNC, S_IREAD | S_IWRITE);
- if (outh < 0)
- {
+ if (outh < 0) {
printf("Error opening file: %d, %s\n", outh, yaffs_error_str());
+ return -1;
}
- yaffs_write(outh,addr,size);
-
+ wrote = yaffs_write(outh, addr, size);
yaffs_close(outh);
+
+ if(wrote != size) {
+ printf("only wrote %d (0x%x) bytes\n", wrote, wrote);
+ return -1;
+ }
+ return 0;
+
+
}
-void cmd_yaffs_ls(const char *mountpt, int longlist)
+int cmd_yaffs_ls(const char *mountpt, int longlist)
{
int i;
yaffs_DIR *d;
- yaffs_dirent *de;
+ struct yaffs_dirent *de;
struct yaffs_stat stat;
char tempstr[255];
d = yaffs_opendir(mountpt);
- if(!d) {
+ if (!d) {
printf("opendir failed, %s\n", yaffs_error_str());
- return;
+ return -1;
}
- for(i = 0; (de = yaffs_readdir(d)) != NULL; i++) {
+ for (i = 0; (de = yaffs_readdir(d)) != NULL; i++) {
if (longlist) {
sprintf(tempstr, "%s/%s", mountpt, de->d_name);
yaffs_lstat(tempstr, &stat);
stat.st_ino,
yaffs_file_type_str(&stat));
} else {
- printf("%s\n",de->d_name);
+ printf("%s\n", de->d_name);
}
}
yaffs_closedir(d);
+
+ return 0;
+}
+
+int cmd_yaffs_check(const char *fname, const char *type)
+{
+ int retval = 0;
+ int ret;
+ struct yaffs_stat stat;
+
+ ret = yaffs_stat(fname, &stat);
+ if (ret < 0) {
+ printf("%s not found\n", fname);
+ return -1;
+ }
+
+ printf("%s is a %s\n", fname, yaffs_file_type_str(&stat));
+
+ if (strcmp(type, "REG") == 0 &&
+ (stat.st_mode & S_IFMT) != S_IFREG)
+ retval = -1;
+
+ if (strcmp(type, "DIR") == 0 &&
+ (stat.st_mode & S_IFMT) != S_IFDIR)
+ retval = -1;
+
+ if (retval == 0)
+ printf("check ok\n");
+ else
+ printf("check failed\n");
+
+ return retval;
}
-void cmd_yaffs_mkdir(const char *dir)
+int cmd_yaffs_mkdir(const char *dir)
{
int retval = yaffs_mkdir(dir, 0);
- if ( retval < 0)
+ if (retval < 0) {
printf("yaffs_mkdir returning error: %d, %s\n",
retval, yaffs_error_str());
+ return -1;
+ }
+ return 0;
}
-void cmd_yaffs_rmdir(const char *dir)
+int cmd_yaffs_rmdir(const char *dir)
{
int retval = yaffs_rmdir(dir);
- if ( retval < 0)
+ if (retval < 0) {
printf("yaffs_rmdir returning error: %d, %s\n",
retval, yaffs_error_str());
+ return -1;
+ }
+ return 0;
}
-void cmd_yaffs_rm(const char *path)
+int cmd_yaffs_rm(const char *path)
{
int retval = yaffs_unlink(path);
- if ( retval < 0)
+ if (retval < 0) {
printf("yaffs_unlink returning error: %d, %s\n",
retval, yaffs_error_str());
+ return -1;
+ }
+
+ return 0;
}
-void cmd_yaffs_mv(const char *oldPath, const char *newPath)
+int cmd_yaffs_mv(const char *oldPath, const char *newPath)
{
int retval = yaffs_rename(newPath, oldPath);
- if ( retval < 0)
+ if (retval < 0) {
printf("yaffs_unlink returning error: %d, %s\n",
retval, yaffs_error_str());
+ return -1;
+ }
+
+ return 0;
}
projects / yaffs2.git / blobdiff