projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change nBytesPerChunk to nDataBytesPerChunk
[yaffs2.git]
/
direct
/
yaffscfg2k.c
diff --git
a/direct/yaffscfg2k.c
b/direct/yaffscfg2k.c
index f51c0c460ec46ded818c98bee231065b007316f4..cb960bcf7796686d90bb8289503b6a9844116e2b 100644
(file)
--- a/
direct/yaffscfg2k.c
+++ b/
direct/yaffscfg2k.c
@@
-13,7
+13,8
@@
#include <errno.h>
#include <errno.h>
-unsigned yaffs_traceMask = 0xFFFFFFFF;
+unsigned yaffs_traceMask = YAFFS_TRACE_SCAN | YAFFS_TRACE_GC /*| YAFFS_TRACE_GC_DETAIL | YAFFS_TRACE_WRITE */ | YAFFS_TRACE_ERASE | YAFFS_TRACE_TRACING | YAFFS_TRACE_ALLOCATE | YAFFS_TRACE_CHECKPOINT;
+//unsigned yaffs_traceMask = ~0;
void yaffsfs_SetError(int err)
void yaffsfs_SetError(int err)
@@
-59,12
+60,19
@@
static yaffs_Device flashDev;
static yaffs_Device ram2kDev;
static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
static yaffs_Device ram2kDev;
static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
-
+#if 0
{ "/ram", &ramDev},
{ "/boot", &bootDev},
{ "/ram", &ramDev},
{ "/boot", &bootDev},
- { "/flash", &flashDev},
+ { "/flash
/
", &flashDev},
{ "/ram2k", &ram2kDev},
{(void *)0,(void *)0}
{ "/ram2k", &ram2kDev},
{(void *)0,(void *)0}
+#else
+ { "/", &ramDev},
+ { "/flash/boot", &bootDev},
+ { "/flash/flash", &flashDev},
+ { "/ram2k", &ram2kDev},
+ {(void *)0,(void *)0} /* Null entry to terminate list */
+#endif
};
};
@@
-77,10
+85,10
@@
int yaffs_StartUp(void)
// Set up devices
// /ram
memset(&ramDev,0,sizeof(ramDev));
// Set up devices
// /ram
memset(&ramDev,0,sizeof(ramDev));
- ramDev.nBytesPerChunk = 512;
+ ramDev.n
Data
BytesPerChunk = 512;
ramDev.nChunksPerBlock = 32;
ramDev.nReservedBlocks = 2; // Set this smaller for RAM
ramDev.nChunksPerBlock = 32;
ramDev.nReservedBlocks = 2; // Set this smaller for RAM
- ramDev.startBlock =
1; // Can't
use block 0
+ ramDev.startBlock =
0; // Can
use block 0
ramDev.endBlock = 127; // Last block in 2MB.
//ramDev.useNANDECC = 1;
ramDev.nShortOpCaches = 0; // Disable caching on this device.
ramDev.endBlock = 127; // Last block in 2MB.
//ramDev.useNANDECC = 1;
ramDev.nShortOpCaches = 0; // Disable caching on this device.
@@
-92,10
+100,10
@@
int yaffs_StartUp(void)
// /boot
memset(&bootDev,0,sizeof(bootDev));
// /boot
memset(&bootDev,0,sizeof(bootDev));
- bootDev.nBytesPerChunk = 512;
+ bootDev.n
Data
BytesPerChunk = 512;
bootDev.nChunksPerBlock = 32;
bootDev.nReservedBlocks = 5;
bootDev.nChunksPerBlock = 32;
bootDev.nReservedBlocks = 5;
- bootDev.startBlock =
1; // Can't
use block 0
+ bootDev.startBlock =
0; // Can
use block 0
bootDev.endBlock = 63; // Last block
//bootDev.useNANDECC = 0; // use YAFFS's ECC
bootDev.nShortOpCaches = 10; // Use caches
bootDev.endBlock = 63; // Last block
//bootDev.useNANDECC = 0; // use YAFFS's ECC
bootDev.nShortOpCaches = 10; // Use caches
@@
-115,13
+123,17
@@
int yaffs_StartUp(void)
// 2kpage/64chunk per block/128MB device
memset(&flashDev,0,sizeof(flashDev));
// 2kpage/64chunk per block/128MB device
memset(&flashDev,0,sizeof(flashDev));
- flashDev.nBytesPerChunk = 2048;
+ flashDev.n
Data
BytesPerChunk = 2048;
flashDev.nChunksPerBlock = 64;
flashDev.nReservedBlocks = 5;
flashDev.nChunksPerBlock = 64;
flashDev.nReservedBlocks = 5;
- flashDev.startBlock = 64; // First block after /boot
- //flashDev.endBlock = 127; // Last block in 16MB
- flashDev.endBlock = (512 * 1024 * 1024)/(flashDev.nBytesPerChunk * flashDev.nChunksPerBlock) - 1; // Last block in 512MB
+ flashDev.nCheckpointReservedBlocks = 5;
+ //flashDev.checkpointStartBlock = 1;
+ //flashDev.checkpointEndBlock = 20;
+ flashDev.startBlock = 20;
+ //flashDev.endBlock = 127; // Make it smaller
+ flashDev.endBlock = yflash_GetNumberOfBlocks()-1;
flashDev.isYaffs2 = 1;
flashDev.isYaffs2 = 1;
+ flashDev.wideTnodesDisabled=0;
flashDev.nShortOpCaches = 10; // Use caches
flashDev.genericDevice = (void *) 2; // Used to identify the device in fstat.
flashDev.writeChunkWithTagsToNAND = yflash_WriteChunkWithTagsToNAND;
flashDev.nShortOpCaches = 10; // Use caches
flashDev.genericDevice = (void *) 2; // Used to identify the device in fstat.
flashDev.writeChunkWithTagsToNAND = yflash_WriteChunkWithTagsToNAND;
@@
-137,10
+149,10
@@
int yaffs_StartUp(void)
// 2kpage/64chunk per block/128MB device
memset(&ram2kDev,0,sizeof(ram2kDev));
// 2kpage/64chunk per block/128MB device
memset(&ram2kDev,0,sizeof(ram2kDev));
- ram2kDev.nBytesPerChunk = nandemul2k_GetBytesPerChunk();
+ ram2kDev.n
Data
BytesPerChunk = nandemul2k_GetBytesPerChunk();
ram2kDev.nChunksPerBlock = nandemul2k_GetChunksPerBlock();
ram2kDev.nReservedBlocks = 5;
ram2kDev.nChunksPerBlock = nandemul2k_GetChunksPerBlock();
ram2kDev.nReservedBlocks = 5;
- ram2kDev.startBlock =
1
; // First block after /boot
+ ram2kDev.startBlock =
0
; // First block after /boot
//ram2kDev.endBlock = 127; // Last block in 16MB
ram2kDev.endBlock = nandemul2k_GetNumberOfBlocks() - 1; // Last block in 512MB
ram2kDev.isYaffs2 = 1;
//ram2kDev.endBlock = 127; // Last block in 16MB
ram2kDev.endBlock = nandemul2k_GetNumberOfBlocks() - 1; // Last block in 512MB
ram2kDev.isYaffs2 = 1;
@@
-160,4
+172,8
@@
int yaffs_StartUp(void)
+void SetCheckpointReservedBlocks(int n)
+{
+ flashDev.nCheckpointReservedBlocks = n;
+}