projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Remove malloc allocator
[yaffs2.git]
/
direct
/
basic-test
/
yaffs_fileem.c
diff --git
a/direct/basic-test/yaffs_fileem.c
b/direct/basic-test/yaffs_fileem.c
index 419b16f756c1558a937c08a78e4335f613fd1850..66ba93a778466d794b3dbc1876a18edecad946c8 100644
(file)
--- a/
direct/basic-test/yaffs_fileem.c
+++ b/
direct/basic-test/yaffs_fileem.c
@@
-25,8
+25,6
@@
const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.7 2010-02-18 01:1
#include "yaffs_flashif.h"
#include "yaffs_guts.h"
#include "yaffs_flashif.h"
#include "yaffs_guts.h"
-#include "devextras.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@
-43,7
+41,7
@@
const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.7 2010-02-18 01:1
typedef struct
{
typedef struct
{
-
__
u8 data[528]; // Data + spare
+ u8 data[528]; // Data + spare
} yflash_Page;
typedef struct
} yflash_Page;
typedef struct
@@
-62,7
+60,7
@@
typedef struct
static yflash_Device filedisk;
static yflash_Device filedisk;
-static int CheckInit(
yaffs_dev_t
*dev)
+static int CheckInit(
struct yaffs_dev
*dev)
{
static int initialised = 0;
{
static int initialised = 0;
@@
-118,7
+116,7
@@
static int CheckInit(yaffs_dev_t *dev)
return 1;
}
return 1;
}
-int yflash_WriteChunkToNAND(
yaffs_dev_t *dev,int nand_chunk,const __u8 *data, cons
t yaffs_spare *spare)
+int yflash_WriteChunkToNAND(
struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struc
t yaffs_spare *spare)
{
int written;
{
int written;
@@
-148,7
+146,7
@@
int yflash_WriteChunkToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, co
}
}
-int yflash_ReadChunkFromNAND(
yaffs_dev_t *dev,int nand_chunk, __u8 *data,
yaffs_spare *spare)
+int yflash_ReadChunkFromNAND(
struct yaffs_dev *dev,int nand_chunk, u8 *data, struct
yaffs_spare *spare)
{
int nread;
{
int nread;
@@
-178,7
+176,7
@@
int yflash_ReadChunkFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs_
}
}
-int yflash_EraseBlockInNAND(
yaffs_dev_t
*dev, int blockNumber)
+int yflash_EraseBlockInNAND(
struct yaffs_dev
*dev, int blockNumber)
{
int i;
{
int i;
@@
-187,7
+185,9
@@
int yflash_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
if(blockNumber < 0 || blockNumber >= filedisk.nBlocks)
{
if(blockNumber < 0 || blockNumber >= filedisk.nBlocks)
{
- T(YAFFS_TRACE_ALWAYS,("Attempt to erase non-existant block %d\n",blockNumber));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Attempt to erase non-existant block %d\n",
+ blockNumber);
return YAFFS_FAIL;
}
else
return YAFFS_FAIL;
}
else
@@
-208,7
+208,7
@@
int yflash_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
}
}
-int yflash_InitialiseNAND(
yaffs_dev_t
*dev)
+int yflash_InitialiseNAND(
struct yaffs_dev
*dev)
{
return YAFFS_OK;
{
return YAFFS_OK;