projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt the code structure after removing of the yaffsram support.
[yaffs2.git]
/
mtdemul
/
nandemul2k.c
diff --git
a/mtdemul/nandemul2k.c
b/mtdemul/nandemul2k.c
index f3c1c9a853c2377f4e5476d4c493ed4fe0cc1e40..6f10746e3e433f0752c7f5e39b240f517924e841 100644
(file)
--- a/
mtdemul/nandemul2k.c
+++ b/
mtdemul/nandemul2k.c
@@
-44,13
+44,14
@@
-#define EM_SIZE_IN_MEG 4
-#define PAGE_DATA_SIZE (2048)
-#define PAGE_SPARE_SIZE (64)
-#define PAGES_PER_BLOCK (64)
#define NAND_SHIFT (11) // Shifter for 2k
#define NAND_SHIFT (11) // Shifter for 2k
+#define PAGE_DATA_SIZE (1 << NAND_SHIFT)
+#define PAGE_SPARE_SIZE (64)
+#define BLK_SHIFT 6
+#define PAGES_PER_BLOCK (1 << BLK_SHIFT) // = 64
+#define EM_SIZE_IN_MEG 4
#define EM_SIZE_IN_BYTES (EM_SIZE_IN_MEG * (1<<20))
#define PAGE_TOTAL_SIZE (PAGE_DATA_SIZE+PAGE_SPARE_SIZE)
#define EM_SIZE_IN_BYTES (EM_SIZE_IN_MEG * (1<<20))
#define PAGE_TOTAL_SIZE (PAGE_DATA_SIZE+PAGE_SPARE_SIZE)
@@
-253,7
+254,7
@@
int nandemul2k_GetNumberOfBlocks(void) {return nandemul2k_CalcNBlocks();}
-int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId)
+
static
int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId)
{
*vendorId = 'Y';
*deviceId = '2';
{
*vendorId = 'Y';
*deviceId = '2';
@@
-262,7
+263,7
@@
int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId)
}
}
-int nandemul2k_ReadStatus(__u8 *status)
+
static
int nandemul2k_ReadStatus(__u8 *status)
{
*status = 0;
return 1;
{
*status = 0;
return 1;
@@
-557,8
+558,8
@@
static int nand_erase (struct mtd_info *mtd, struct erase_info *instr)
return -EINVAL;
}
return -EINVAL;
}
- nBlocks = instr->len >> (NAND_SHIFT +
5
);
- block = instr->addr >> (NAND_SHIFT +
5
);
+ nBlocks = instr->len >> (NAND_SHIFT +
BLK_SHIFT
);
+ block = instr->addr >> (NAND_SHIFT +
BLK_SHIFT
);
for(i = 0; i < nBlocks; i++)
{
for(i = 0; i < nBlocks; i++)
{
@@
-650,9
+651,9
@@
__setup("sizeInMB=",sizeInMB);
static struct mtd_partition nandemul2k_partition[] =
{
static struct mtd_partition nandemul2k_partition[] =
{
- {
name:
"NANDemul partition 1",
-
offset:
0,
-
size:
0 },
+ {
.name =
"NANDemul partition 1",
+
.offset =
0,
+
.size =
0 },
};
static int nPartitions = sizeof(nandemul2k_partition)/sizeof(nandemul2k_partition[0]);
};
static int nPartitions = sizeof(nandemul2k_partition)/sizeof(nandemul2k_partition[0]);