projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs Still hunting the bug.
[yaffs2.git]
/
direct
/
basic-test
/
yaffs_ramdisk.c
diff --git
a/direct/basic-test/yaffs_ramdisk.c
b/direct/basic-test/yaffs_ramdisk.c
index 9834bb20893f6241d8b7a971ee2f77b977010bdf..babddde3eda963e0a7189d6d3f4df2cb27f52047 100644
(file)
--- a/
direct/basic-test/yaffs_ramdisk.c
+++ b/
direct/basic-test/yaffs_ramdisk.c
@@
-26,7
+26,6
@@
const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
#include "yaffs_ramdisk.h"
#include "yaffs_guts.h"
#include "yaffs_ramdisk.h"
#include "yaffs_guts.h"
-#include "devextras.h"
#include "yaffs_packedtags1.h"
#include "yaffs_packedtags1.h"
@@
-42,7
+41,7
@@
const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
typedef struct
{
typedef struct
{
-
__
u8 data[528]; // Data + spare
+ u8 data[528]; // Data + spare
} yramdisk_page;
typedef struct
} yramdisk_page;
typedef struct
@@
-61,7
+60,7
@@
typedef struct
static yramdisk_device ramdisk;
static yramdisk_device ramdisk;
-static int CheckInit(
yaffs_dev_t
*dev)
+static int CheckInit(
struct yaffs_dev
*dev)
{
static int initialised = 0;
{
static int initialised = 0;
@@
-119,7
+118,7
@@
static int CheckInit(yaffs_dev_t *dev)
return 1;
}
return 1;
}
-int yramdisk_wr_chunk(
yaffs_dev_t *dev,int nand_chunk,const __u8 *data, cons
t yaffs_ext_tags *tags)
+int yramdisk_wr_chunk(
struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struc
t yaffs_ext_tags *tags)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-139,7
+138,7
@@
int yramdisk_wr_chunk(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, const ya
if(tags)
{
if(tags)
{
- yaffs_packed_tags1 pt;
+
struct
yaffs_packed_tags1 pt;
yaffs_pack_tags1(&pt,tags);
memcpy(&ramdisk.block[blk]->page[pg].data[512],&pt,sizeof(pt));
yaffs_pack_tags1(&pt,tags);
memcpy(&ramdisk.block[blk]->page[pg].data[512],&pt,sizeof(pt));
@@
-150,7
+149,7
@@
int yramdisk_wr_chunk(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, const ya
}
}
-int yramdisk_rd_chunk(
yaffs_dev_t *dev,int nand_chunk, __u8 *data,
yaffs_ext_tags *tags)
+int yramdisk_rd_chunk(
struct yaffs_dev *dev,int nand_chunk, u8 *data, struct
yaffs_ext_tags *tags)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-170,7
+169,7
@@
int yramdisk_rd_chunk(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs_ext_tag
if(tags)
{
if(tags)
{
- yaffs_packed_tags1 pt;
+
struct
yaffs_packed_tags1 pt;
memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt));
yaffs_unpack_tags1(tags,&pt);
memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt));
yaffs_unpack_tags1(tags,&pt);
@@
-181,7
+180,7
@@
int yramdisk_rd_chunk(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs_ext_tag
}
}
-int yramdisk_check_chunk_erased(
yaffs_dev_t
*dev,int nand_chunk)
+int yramdisk_check_chunk_erased(
struct yaffs_dev
*dev,int nand_chunk)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-206,7
+205,7
@@
int yramdisk_check_chunk_erased(yaffs_dev_t *dev,int nand_chunk)
}
}
-int yramdisk_erase(
yaffs_dev_t
*dev, int blockNumber)
+int yramdisk_erase(
struct yaffs_dev
*dev, int blockNumber)
{
CheckInit(dev);
{
CheckInit(dev);
@@
-224,7
+223,7
@@
int yramdisk_erase(yaffs_dev_t *dev, int blockNumber)
}
}
-int yramdisk_initialise(
yaffs_dev_t
*dev)
+int yramdisk_initialise(
struct yaffs_dev
*dev)
{
//dev->use_nand_ecc = 1; // force on use_nand_ecc which gets faked.
// This saves us doing ECC checks.
{
//dev->use_nand_ecc = 1; // force on use_nand_ecc which gets faked.
// This saves us doing ECC checks.