]> git.sur5r.net Git - u-boot/blobdiff - fs/yaffs2/direct/yaffscfg.c
Incorporate yaffs2 into U-boot
[u-boot] / fs / yaffs2 / direct / yaffscfg.c
index b1d311e56937b0ba62a4468b6f699b8ad75cac42..a4a0924ef9114b7255600b083d4c55b83fae8177 100644 (file)
  * There is no need to redistribute this file.
  */
 
+/* XXX U-BOOT XXX */
+#include <common.h>
+
+#include <config.h>
+#include "nand.h"
 #include "yaffscfg.h"
 #include "yaffsfs.h"
+#include "yaffs_packedtags2.h"
+#include "yaffs_mtdif.h"
+#include "yaffs_mtdif2.h"
+#if 0
 #include <errno.h>
+#else
+#include "malloc.h"
+#endif
 
 unsigned yaffs_traceMask = 0xFFFFFFFF;
-
+static int yaffs_errno = 0;
 
 void yaffsfs_SetError(int err)
 {
        //Do whatever to set error
-       errno = err;
+       yaffs_errno = err;
+}
+
+int yaffsfs_GetError(void)
+{
+       return yaffs_errno;
 }
 
 void yaffsfs_Lock(void)
@@ -71,27 +88,47 @@ void yaffsfs_LocalInitialisation(void)
 #include "yaffs_ramdisk.h"
 #include "yaffs_flashif.h"
 
+static int isMounted = 0;
+#define MOUNT_POINT "/flash"
+extern nand_info_t nand_info[];
+
+/* XXX U-BOOT XXX */
+#if 0
 static yaffs_Device ramDev;
 static yaffs_Device bootDev;
 static yaffs_Device flashDev;
+#endif
 
 static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
-
+/* XXX U-BOOT XXX */
+#if 0
        { "/ram", &ramDev},
        { "/boot", &bootDev},
        { "/flash", &flashDev},
+#else
+       { MOUNT_POINT, 0},
+#endif
        {(void *)0,(void *)0}
 };
 
 
 int yaffs_StartUp(void)
 {
+       struct mtd_info *mtd = &nand_info[0];
+       int yaffsVersion = 2;
+       int nBlocks;
+
+       yaffs_Device *flashDev = calloc(1, sizeof(yaffs_Device));
+       yaffsfs_config[0].dev = flashDev;
+
        // Stuff to configure YAFFS
        // Stuff to initialise anything special (eg lock semaphore).
        yaffsfs_LocalInitialisation();
        
        // Set up devices
 
+/* XXX U-BOOT XXX */
+#if 0
        // /ram
        ramDev.nBytesPerChunk = 512;
        ramDev.nChunksPerBlock = 32;
@@ -119,20 +156,50 @@ int yaffs_StartUp(void)
        bootDev.readChunkFromNAND = yflash_ReadChunkFromNAND;
        bootDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
        bootDev.initialiseNAND = yflash_InitialiseNAND;
+#endif
 
                // /flash
-       flashDev.nBytesPerChunk =  512;
-       flashDev.nChunksPerBlock = 32;
-       flashDev.nReservedBlocks = 5;
-       flashDev.startBlock = 128; // First block after 2MB
-       flashDev.endBlock = 1023; // Last block in 16MB
-       flashDev.useNANDECC = 0; // use YAFFS's ECC
-       flashDev.nShortOpCaches = 10; // Use caches
-       flashDev.genericDevice = (void *) 2;    // Used to identify the device in fstat.
-       flashDev.writeChunkToNAND = yflash_WriteChunkToNAND;
-       flashDev.readChunkFromNAND = yflash_ReadChunkFromNAND;
-       flashDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
-       flashDev.initialiseNAND = yflash_InitialiseNAND;
+       flashDev->nReservedBlocks = 5;
+//  flashDev->nShortOpCaches = (options.no_cache) ? 0 : 10;
+       flashDev->nShortOpCaches = 10; // Use caches
+       flashDev->useNANDECC = 0; // do not use YAFFS's ECC
+
+       if (yaffsVersion == 2)
+       {
+               flashDev->writeChunkWithTagsToNAND = nandmtd2_WriteChunkWithTagsToNAND;
+               flashDev->readChunkWithTagsFromNAND = nandmtd2_ReadChunkWithTagsFromNAND;
+               flashDev->markNANDBlockBad = nandmtd2_MarkNANDBlockBad;
+               flashDev->queryNANDBlock = nandmtd2_QueryNANDBlock;
+               flashDev->spareBuffer = YMALLOC(mtd->oobsize);
+               flashDev->isYaffs2 = 1;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+               flashDev->nDataBytesPerChunk = mtd->writesize;
+               flashDev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
+#else
+               flashDev->nDataBytesPerChunk = mtd->oobblock;
+               flashDev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
+#endif
+               nBlocks = mtd->size / mtd->erasesize;
+
+               flashDev->nCheckpointReservedBlocks = 10;
+               flashDev->startBlock = 0;
+               flashDev->endBlock = nBlocks - 1;
+       }
+       else
+       {
+               flashDev->writeChunkToNAND = nandmtd_WriteChunkToNAND;
+               flashDev->readChunkFromNAND = nandmtd_ReadChunkFromNAND;
+               flashDev->isYaffs2 = 0;
+               nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+               flashDev->startBlock = 320;
+               flashDev->endBlock = nBlocks - 1;
+               flashDev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
+               flashDev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
+       }
+       
+       /* ... and common functions */
+       flashDev->eraseBlockInNAND = nandmtd_EraseBlockInNAND;
+       flashDev->initialiseNAND = nandmtd_InitialiseNAND;
 
        yaffs_initialise(yaffsfs_config);
        
@@ -140,5 +207,211 @@ int yaffs_StartUp(void)
 }
 
 
+void make_a_file(char *yaffsName,char bval,int sizeOfFile)
+{
+       int outh;
+       int i;
+       unsigned char buffer[100];
+
+       outh = yaffs_open(yaffsName, O_CREAT | O_RDWR | O_TRUNC, S_IREAD | S_IWRITE);
+       if (outh < 0)
+       {
+               printf("Error opening file: %d\n", outh);
+               return;
+       }
+       
+       memset(buffer,bval,100);
+       
+       do{
+               i = sizeOfFile;
+               if(i > 100) i = 100;
+               sizeOfFile -= i;
+               
+               yaffs_write(outh,buffer,i);
+               
+       } while (sizeOfFile > 0);
+       
+               
+       yaffs_close(outh);
+}
+
+void read_a_file(char *fn)
+{
+       int h;
+       int i = 0;
+       unsigned char b;
+
+       h = yaffs_open(fn, O_RDWR,0);
+       if(h<0)
+       {
+               printf("File not found\n");
+               return;
+       }
+
+       while(yaffs_read(h,&b,1)> 0)
+       {
+               printf("%02x ",b);
+               i++;
+               if(i > 32) 
+               {
+                  printf("\n");
+                  i = 0;;
+                }
+       }
+       printf("\n");
+       yaffs_close(h);
+}
+
+void cmd_yaffs_mount(char *mp)
+{
+       yaffs_StartUp();
+       int retval = yaffs_mount(mp);
+       if( retval != -1)
+               isMounted = 1;
+       else
+               printf("Error mounting %s, return value: %d\n", mp, yaffsfs_GetError());
+}
+
+static void checkMount(void)
+{
+       if( !isMounted )
+       {
+               cmd_yaffs_mount(MOUNT_POINT);
+       }
+}
+
+void cmd_yaffs_umount(char *mp)
+{
+       checkMount();
+       if( yaffs_unmount(mp) == -1)
+               printf("Error umounting %s, return value: %d\n", mp, yaffsfs_GetError());
+}
+
+void cmd_yaffs_write_file(char *yaffsName,char bval,int sizeOfFile)
+{
+       checkMount();
+       make_a_file(yaffsName,bval,sizeOfFile);
+}
 
 
+void cmd_yaffs_read_file(char *fn)
+{
+       checkMount();
+       read_a_file(fn);
+}
+
+
+void cmd_yaffs_mread_file(char *fn, char *addr)
+{
+       int h;
+       struct yaffs_stat s;
+       
+       checkMount();
+
+       yaffs_stat(fn,&s);
+
+       printf ("Copy %s to 0x%08x... ", fn, addr);
+       h = yaffs_open(fn, O_RDWR,0);
+       if(h<0)
+       {
+               printf("File not found\n");
+               return;
+       }
+                               
+       yaffs_read(h,addr,(int)s.st_size);
+       printf("\t[DONE]\n");
+
+       yaffs_close(h);
+}
+
+
+void cmd_yaffs_mwrite_file(char *fn, char *addr, int size)
+{
+       int outh;
+
+       checkMount();
+       outh = yaffs_open(fn, O_CREAT | O_RDWR | O_TRUNC, S_IREAD | S_IWRITE);
+       if (outh < 0)
+       {
+               printf("Error opening file: %d\n", outh);
+       }
+       
+       yaffs_write(outh,addr,size);
+       
+       yaffs_close(outh);
+}
+
+
+void cmd_yaffs_ls(const char *mountpt, int longlist)
+{
+       int i;
+       yaffs_DIR *d;
+       yaffs_dirent *de;
+       struct yaffs_stat stat;
+       char tempstr[255];
+
+       checkMount();
+       d = yaffs_opendir(mountpt);
+
+       if(!d)
+       {
+               printf("opendir failed\n");
+       }
+       else
+       {
+               for(i = 0; (de = yaffs_readdir(d)) != NULL; i++)
+               {
+                       if (longlist)
+                       {
+                               sprintf(tempstr, "%s/%s", mountpt, de->d_name);
+                               yaffs_stat(tempstr, &stat);
+                               printf("%-25s\t%7d\n",de->d_name, stat.st_size);
+                       }
+                       else
+                       {
+                               printf("%s\n",de->d_name);
+                       }
+               }
+       }
+}
+
+
+void cmd_yaffs_mkdir(const char *dir)
+{
+       checkMount();
+
+       int retval = yaffs_mkdir(dir, 0);
+       
+       if ( retval < 0)
+               printf("yaffs_mkdir returning error: %d\n", retval);
+}
+
+void cmd_yaffs_rmdir(const char *dir)
+{
+       checkMount();
+
+       int retval = yaffs_rmdir(dir);
+       
+       if ( retval < 0)
+               printf("yaffs_rmdir returning error: %d\n", retval);
+}
+
+void cmd_yaffs_rm(const char *path)
+{
+       checkMount();
+
+       int retval = yaffs_unlink(path);
+       
+       if ( retval < 0)
+               printf("yaffs_unlink returning error: %d\n", retval);
+}
+
+void cmd_yaffs_mv(const char *oldPath, const char *newPath)
+{
+       checkMount();
+
+       int retval = yaffs_rename(newPath, oldPath);
+       
+       if ( retval < 0)
+               printf("yaffs_unlink returning error: %d\n", retval);
+}