projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Remove a whole lot of function wrappers and forward declarations
[yaffs2.git]
/
direct
/
basic-test
/
yaffs_ramem2k.c
diff --git
a/direct/basic-test/yaffs_ramem2k.c
b/direct/basic-test/yaffs_ramem2k.c
index 0310357a34e1cd68ee7de5a3ffac0ba843f70b6d..9a857fd116f6554b10790d2c302b052c2877b07b 100644
(file)
--- a/
direct/basic-test/yaffs_ramem2k.c
+++ b/
direct/basic-test/yaffs_ramem2k.c
@@
-31,7
+31,6
@@
const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.8 2010-02-18 01:
#include "yaffs_nandemul2k.h"
#include "yaffs_guts.h"
#include "yaffs_nandemul2k.h"
#include "yaffs_guts.h"
-#include "devextras.h"
#include "yaffs_packedtags2.h"
#include "yaffs_packedtags2.h"
@@
-136,7
+135,7
@@
static int CheckInit(void)
ned.nBlocks = nBlocks = nandemul2k_CalcNBlocks();
ned.nBlocks = nBlocks = nandemul2k_CalcNBlocks();
- ned.block =
YMALLOC
(sizeof(nandemul_Block*) * nBlocks );
+ ned.block =
malloc
(sizeof(nandemul_Block*) * nBlocks );
if(!ned.block) return YAFFS_FAIL;
if(!ned.block) return YAFFS_FAIL;
@@
-149,7
+148,7
@@
static int CheckInit(void)
nandemul_Block *blk;
nandemul_Block *blk;
- if(!(blk = ned.block[i] =
YMALLOC
(sizeof(nandemul_Block))))
+ if(!(blk = ned.block[i] =
malloc
(sizeof(nandemul_Block))))
{
fail = 1;
}
{
fail = 1;
}
@@
-157,7
+156,7
@@
static int CheckInit(void)
{
for(j = 0; j < PAGES_PER_BLOCK; j++)
{
{
for(j = 0; j < PAGES_PER_BLOCK; j++)
{
- if((blk->page[j] =
YMALLOC
(sizeof(nandemul_Page))) == 0)
+ if((blk->page[j] =
malloc
(sizeof(nandemul_Page))) == 0)
{
fail = 1;
}
{
fail = 1;
}
@@
-174,9
+173,9
@@
static int CheckInit(void)
for(i = 0; i < nAllocated; i++)
{
for(i = 0; i < nAllocated; i++)
{
-
YFREE
(ned.block[i]);
+
kfree
(ned.block[i]);
}
}
-
YFREE
(ned.block);
+
kfree
(ned.block);
T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
nAllocated/64,sizeInMB));
T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
nAllocated/64,sizeInMB));