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
/
yaffs_nandif.c
diff --git
a/direct/yaffs_nandif.c
b/direct/yaffs_nandif.c
index 135e89457c0b5963419976835199032cf785848d..f2806e1940acdc98787625f42e6dd5647792dc7b 100644
(file)
--- a/
direct/yaffs_nandif.c
+++ b/
direct/yaffs_nandif.c
@@
-13,7
+13,6
@@
#include "yportenv.h"
#include "yaffs_guts.h"
#include "yportenv.h"
#include "yaffs_guts.h"
-#include "devextras.h"
#include "yaffs_nandif.h"
#include "yaffs_nandif.h"
@@
-29,13
+28,13
@@
* We assume that the data buffer is of size totalBytersPerChunk so that we can also
* use it to load the tags.
*/
* We assume that the data buffer is of size totalBytersPerChunk so that we can also
* use it to load the tags.
*/
-int ynandif_WriteChunkWithTagsToNAND(
yaffs_dev_t
* dev, int nand_chunk,
- const
__
u8 * data,
- const yaffs_ext_tags * tags)
+int ynandif_WriteChunkWithTagsToNAND(
struct yaffs_dev
* dev, int nand_chunk,
+ const u8 * data,
+ const
struct
yaffs_ext_tags * tags)
{
int retval = 0;
{
int retval = 0;
- yaffs_packed_tags2 pt;
+
struct
yaffs_packed_tags2 pt;
void *spare;
unsigned spareSize = 0;
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
void *spare;
unsigned spareSize = 0;
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
@@
-52,8
+51,8
@@
int ynandif_WriteChunkWithTagsToNAND(yaffs_dev_t * dev, int nand_chunk,
*/
if(dev->param.inband_tags){
*/
if(dev->param.inband_tags){
- yaffs_packed_tags2_tags_only *pt2tp;
- pt2tp = (yaffs_packed_tags2_tags_only *)(data + dev->data_bytes_per_chunk);
+
struct
yaffs_packed_tags2_tags_only *pt2tp;
+ pt2tp = (
struct
yaffs_packed_tags2_tags_only *)(data + dev->data_bytes_per_chunk);
yaffs_pack_tags2_tags_only(pt2tp,tags);
spare = NULL;
spareSize = 0;
yaffs_pack_tags2_tags_only(pt2tp,tags);
spare = NULL;
spareSize = 0;
@@
-61,7
+60,7
@@
int ynandif_WriteChunkWithTagsToNAND(yaffs_dev_t * dev, int nand_chunk,
else{
yaffs_pack_tags2(&pt, tags,!dev->param.no_tags_ecc);
spare = &pt;
else{
yaffs_pack_tags2(&pt, tags,!dev->param.no_tags_ecc);
spare = &pt;
- spareSize = sizeof(yaffs_packed_tags2);
+ spareSize = sizeof(
struct
yaffs_packed_tags2);
}
retval = geometry->writeChunk(dev,nand_chunk,
}
retval = geometry->writeChunk(dev,nand_chunk,
@@
-70,10
+69,10
@@
int ynandif_WriteChunkWithTagsToNAND(yaffs_dev_t * dev, int nand_chunk,
return retval;
}
return retval;
}
-int ynandif_ReadChunkWithTagsFromNAND(
yaffs_dev_t
* dev, int nand_chunk,
-
__u8 * data,
yaffs_ext_tags * tags)
+int ynandif_ReadChunkWithTagsFromNAND(
struct yaffs_dev
* dev, int nand_chunk,
+
u8 * data, struct
yaffs_ext_tags * tags)
{
{
- yaffs_packed_tags2 pt;
+
struct
yaffs_packed_tags2 pt;
int localData = 0;
void *spare = NULL;
unsigned spareSize;
int localData = 0;
void *spare = NULL;
unsigned spareSize;
@@
-100,7
+99,7
@@
int ynandif_ReadChunkWithTagsFromNAND(yaffs_dev_t * dev, int nand_chunk,
}
else {
spare = &pt;
}
else {
spare = &pt;
- spareSize = sizeof(yaffs_packed_tags2);
+ spareSize = sizeof(
struct
yaffs_packed_tags2);
}
retval = geometry->readChunk(dev,nand_chunk,
}
retval = geometry->readChunk(dev,nand_chunk,
@@
-111,8
+110,8
@@
int ynandif_ReadChunkWithTagsFromNAND(yaffs_dev_t * dev, int nand_chunk,
if(dev->param.inband_tags){
if(tags){
if(dev->param.inband_tags){
if(tags){
- yaffs_packed_tags2_tags_only * pt2tp;
- pt2tp = (
yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+
struct
yaffs_packed_tags2_tags_only * pt2tp;
+ pt2tp = (
struct yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
yaffs_unpack_tags2_tags_only(tags,pt2tp);
}
}
yaffs_unpack_tags2_tags_only(tags,pt2tp);
}
}
@@
-139,14
+138,14
@@
int ynandif_ReadChunkWithTagsFromNAND(yaffs_dev_t * dev, int nand_chunk,
return retval;
}
return retval;
}
-int ynandif_MarkNANDBlockBad(struct yaffs_dev
_s
*dev, int blockId)
+int ynandif_MarkNANDBlockBad(struct yaffs_dev *dev, int blockId)
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
return geometry->markBlockBad(dev,blockId);
}
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
return geometry->markBlockBad(dev,blockId);
}
-int ynandif_EraseBlockInNAND(struct yaffs_dev
_s
*dev, int blockId)
+int ynandif_EraseBlockInNAND(struct yaffs_dev *dev, int blockId)
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
@@
-155,17
+154,17
@@
int ynandif_EraseBlockInNAND(struct yaffs_dev_s *dev, int blockId)
}
}
-static int ynandif_IsBlockOk(struct yaffs_dev
_s
*dev, int blockId)
+static int ynandif_IsBlockOk(struct yaffs_dev *dev, int blockId)
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
return geometry->checkBlockOk(dev,blockId);
}
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
return geometry->checkBlockOk(dev,blockId);
}
-int ynandif_QueryNANDBlock(struct yaffs_dev
_s *dev, int blockId, yaffs_block_state_t *state, __
u32 *seq_number)
+int ynandif_QueryNANDBlock(struct yaffs_dev
*dev, int blockId, enum yaffs_block_state *state,
u32 *seq_number)
{
unsigned chunkNo;
{
unsigned chunkNo;
- yaffs_ext_tags tags;
+
struct
yaffs_ext_tags tags;
*seq_number = 0;
*seq_number = 0;
@@
-193,7
+192,7
@@
int ynandif_QueryNANDBlock(struct yaffs_dev_s *dev, int blockId, yaffs_block_sta
}
}
-int ynandif_InitialiseNAND(
yaffs_dev_t
*dev)
+int ynandif_InitialiseNAND(
struct yaffs_dev
*dev)
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
@@
-202,7
+201,7
@@
int ynandif_InitialiseNAND(yaffs_dev_t *dev)
return YAFFS_OK;
}
return YAFFS_OK;
}
-int ynandif_Deinitialise_flash_fn(
yaffs_dev_t
*dev)
+int ynandif_Deinitialise_flash_fn(
struct yaffs_dev
*dev)
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
{
ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
@@
-212,16
+211,16
@@
int ynandif_Deinitialise_flash_fn(yaffs_dev_t *dev)
}
}
-struct yaffs_dev
_s
*
+struct yaffs_dev *
yaffs_add_dev_from_geometry(const YCHAR *name,
const ynandif_Geometry *geometry)
{
yaffs_add_dev_from_geometry(const YCHAR *name,
const ynandif_Geometry *geometry)
{
- YCHAR *clonedName =
YMALLOC(sizeof(YCHAR) * (yaffs_
strnlen(name,YAFFS_MAX_NAME_LENGTH)+1));
- struct yaffs_dev
_s *dev = YMALLOC(sizeof(struct yaffs_dev_s
));
+ YCHAR *clonedName =
malloc(sizeof(YCHAR) * (
strnlen(name,YAFFS_MAX_NAME_LENGTH)+1));
+ struct yaffs_dev
*dev = malloc(sizeof(struct yaffs_dev
));
if(dev && clonedName){
if(dev && clonedName){
- memset(dev,0,sizeof(struct yaffs_dev
_s
));
-
yaffs_
strcpy(clonedName,name);
+ memset(dev,0,sizeof(struct yaffs_dev));
+ strcpy(clonedName,name);
dev->param.name = clonedName;
dev->param.write_chunk_tags_fn = ynandif_WriteChunkWithTagsToNAND;
dev->param.name = clonedName;
dev->param.write_chunk_tags_fn = ynandif_WriteChunkWithTagsToNAND;
@@
-248,9
+247,9
@@
struct yaffs_dev_s *
}
if(dev)
}
if(dev)
-
YFREE
(dev);
+
free
(dev);
if(clonedName)
if(clonedName)
-
YFREE
(clonedName);
+
free
(clonedName);
return NULL;
}
return NULL;
}