yaffs: Merge branch 'python_play'

[yaffs2.git] / direct / yaffs_flashif.c

diff --git a/direct/yaffs_flashif.c b/direct/yaffs_flashif.c
index 73c07c8a1df0747f3297507b85e41a637ef781dd..79732a1f435e018df33dfed2e0b0c85da3c31c41 100644 (file)
--- a/direct/yaffs_flashif.c
+++ b/direct/yaffs_flashif.c
@@ -1,22 +1,18 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
- * yaffs_ramdisk.c: yaffs ram disk component
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
  */
 
-// This provides a rma disk under yaffs.
-// NB this is not intended for NAND emulation.
-// Use this with dev->useNANDECC enabled, then ECC overheads are not required.
 
-const char *yaffs_flashif_c_version = "$Id: yaffs_flashif.c,v 1.1 2004-11-03 08:29:28 charles Exp $";
+const char *yaffs_flashif_c_version = "$Id: yaffs_flashif.c,v 1.3 2007-02-14 01:09:06 wookey Exp $";
 
 
 #include "yportenv.h"
@@ -54,7 +50,7 @@ typedef struct
 
 static yflash_Device ramdisk;
 
-static int  CheckInit(yaffs_Device *dev)
+static int  CheckInit(yaffs_dev_t *dev)
 {
        static int initialised = 0;
        
@@ -112,7 +108,7 @@ static int  CheckInit(yaffs_Device *dev)
        return 1;
 }
 
-int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, yaffs_ExtendedTags *tags)
+int yflash_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, yaffs_ext_tags *tags)
 {
        int blk;
        int pg;
@@ -120,8 +116,8 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
 
        CheckInit(dev);
        
-       blk = chunkInNAND/32;
-       pg = chunkInNAND%32;
+       blk = nand_chunk/32;
+       pg = nand_chunk%32;
        
        
        if(data)
@@ -142,7 +138,7 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
 }
 
 
-int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Tags *tags)
+int yflash_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs_tags_t *tags)
 {
        int blk;
        int pg;
@@ -150,8 +146,8 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da
        
        CheckInit(dev);
        
-       blk = chunkInNAND/32;
-       pg = chunkInNAND%32;
+       blk = nand_chunk/32;
+       pg = nand_chunk%32;
        
        
        if(data)
@@ -164,14 +160,14 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da
        {
                yaffs_PackedTags pt;
                memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(yaffs_PackedTags));
-               yaffs_UnpackTags(tags,&pt);
+               yaffs_unpack_tags(tags,&pt);
        }
 
        return YAFFS_OK;
 }
 
 
-int yflash_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
+int yflash_CheckChunkErased(yaffs_dev_t *dev,int nand_chunk)
 {
        int blk;
        int pg;
@@ -180,8 +176,8 @@ int yflash_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
        
        CheckInit(dev);
        
-       blk = chunkInNAND/32;
-       pg = chunkInNAND%32;
+       blk = nand_chunk/32;
+       pg = nand_chunk%32;
        
        
        for(i = 0; i < 528; i++)
@@ -196,7 +192,7 @@ int yflash_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
 
 }
 
-int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+int yflash_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
 {
        
        CheckInit(dev);
@@ -214,19 +210,19 @@ int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
        
 }
 
-int yflash_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
+int yflash_MarkNANDBlockBad(struct yaffs_dev_s *dev, int block_no)
 {
        return YAFFS_OK;
        
 }
-int yflash_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, int *sequenceNumber)
+int yflash_QueryNANDBlock(struct yaffs_dev_s *dev, int block_no, yaffs_block_state_t *state, int *seq_number)
 {
        *state = YAFFS_BLOCK_STATE_EMPTY;
-       *sequenceNumber = 0;
+       *seq_number = 0;
 }
 
 
-int yflash_InitialiseNAND(yaffs_Device *dev)
+int yflash_InitialiseNAND(yaffs_dev_t *dev)
 {
        return YAFFS_OK;
 }