Seperate drivers and tags handlers into their own interface structures

[yaffs2.git] / direct / basic-test / yaffs_norif1.c

diff --git a/direct/basic-test/yaffs_norif1.c b/direct/basic-test/yaffs_norif1.c
index 20511e45e85c973d35bc86882a917f964f159431..d358a43a06a387ba42a50c346e2fb01505371aaf 100644 (file)
--- a/direct/basic-test/yaffs_norif1.c
+++ b/direct/basic-test/yaffs_norif1.c
@@ -35,8 +35,6 @@
  *
  */
 
-const char *yaffs_norif1_c_version = "$Id: yaffs_norif1.c,v 1.6 2010-02-18 01:18:04 charles Exp $";
-
 #include "yaffs_norif1.h"
 
 #include "yportenv.h"
@@ -147,9 +145,7 @@ static void ynorif1_AndBytes(u8*target, const u8   *src, int nbytes)
                 nbytes--;
         }
 }
-       int (*drv_write_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
-                                  const u8 *data, int data_len,
-                                  const u8 *oob, int oob_len);
+
 static int ynorif1_WriteChunkToNAND(struct yaffs_dev *dev,int nand_chunk,
                                    const u8 *data, int data_len,
                                    const u8 *oob, int oob_len)
@@ -326,6 +322,7 @@ static int ynorif1_Deinitialise_flash_fn(struct yaffs_dev *dev)
 void ynorif1_install_drv(struct yaffs_dev *dev)
 {
        struct yaffs_param *param = &dev->param;
+       struct yaffs_driver *drv = &dev->drv;
 
        param->total_bytes_per_chunk = 1024;
        param->chunks_per_block =248;
@@ -333,10 +330,10 @@ void ynorif1_install_drv(struct yaffs_dev *dev)
        param->start_block = 0; // Can use block 0
        param->end_block = 31; // Last block
        param->use_nand_ecc = 0; // use YAFFS's ECC
-       param->drv_write_chunk_fn = ynorif1_WriteChunkToNAND;
-       param->drv_read_chunk_fn = ynorif1_ReadChunkFromNAND;
-       param->drv_erase_fn = ynorif1_EraseBlockInNAND;
-       param->drv_initialise_fn = ynorif1_InitialiseNAND;
-       param->drv_deinitialise_fn = ynorif1_Deinitialise_flash_fn;
+       drv->drv_write_chunk_fn = ynorif1_WriteChunkToNAND;
+       drv->drv_read_chunk_fn = ynorif1_ReadChunkFromNAND;
+       drv->drv_erase_fn = ynorif1_EraseBlockInNAND;
+       drv->drv_initialise_fn = ynorif1_InitialiseNAND;
+       drv->drv_deinitialise_fn = ynorif1_Deinitialise_flash_fn;
 }