projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[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 f92fa8f415fa9093ef583281aec2c2865bf01c9c..267e1341bc0d3d09805a94adb94b6e5a89d65372 100644
(file)
--- a/
direct/basic-test/yaffs_fileem.c
+++ b/
direct/basic-test/yaffs_fileem.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-201
0
Aleph One Ltd.
+ * Copyright (C) 2002-201
1
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-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>
@@
-187,7
+185,9
@@
int yflash_EraseBlockInNAND(struct yaffs_dev *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