projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some cleanups, Linux 2.6.25 handling, fix handing of root permissions
[yaffs2.git]
/
direct
/
yaffscfg2k.c
diff --git
a/direct/yaffscfg2k.c
b/direct/yaffscfg2k.c
index 2bf5f33218a52720e1ed32f39791a26e70704432..d67719b16bbd1a2ecac03c36077fdc79f19161fb 100644
(file)
--- a/
direct/yaffscfg2k.c
+++ b/
direct/yaffscfg2k.c
@@
-1,6
+1,18
@@
/*
/*
- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- * yaffscfg.c The configuration for the "direct" use of yaffs.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2007 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * yaffscfg2k.c The configuration for the "direct" use of yaffs.
*
* This file is intended to be modified to your requirements.
* There is no need to redistribute this file.
*
* This file is intended to be modified to your requirements.
* There is no need to redistribute this file.
@@
-13,13
+25,31
@@
#include <errno.h>
#include <errno.h>
-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;
+unsigned yaffs_traceMask =
+ YAFFS_TRACE_SCAN |
+ YAFFS_TRACE_GC | YAFFS_TRACE_GC_DETAIL |
+ YAFFS_TRACE_ERASE |
+ YAFFS_TRACE_TRACING |
+ YAFFS_TRACE_ALLOCATE |
+ YAFFS_TRACE_CHECKPOINT |
+ YAFFS_TRACE_BAD_BLOCKS |
+
+ 0;
+
+
+static int yaffsfs_lastError;
void yaffsfs_SetError(int err)
{
//Do whatever to set error
void yaffsfs_SetError(int err)
{
//Do whatever to set error
- errno = err;
+ yaffsfs_lastError = err;
+}
+
+
+int yaffsfs_GetLastError(void)
+{
+ return yaffsfs_lastError;
}
void yaffsfs_Lock(void)
}
void yaffsfs_Lock(void)
@@
-35,6
+65,30
@@
__u32 yaffsfs_CurrentTime(void)
return 0;
}
return 0;
}
+
+static int yaffs_kill_alloc = 0;
+static size_t total_malloced = 0;
+static size_t malloc_limit = 0 & 6000000;
+
+void *yaffs_malloc(size_t size)
+{
+ void * this;
+ if(yaffs_kill_alloc)
+ return NULL;
+ if(malloc_limit && malloc_limit <(total_malloced + size) )
+ return NULL;
+
+ this = malloc(size);
+ if(this)
+ total_malloced += size;
+ return this;
+}
+
+void yaffs_free(void *ptr)
+{
+ free(ptr);
+}
+
void yaffsfs_LocalInitialisation(void)
{
// Define locking semaphore.
void yaffsfs_LocalInitialisation(void)
{
// Define locking semaphore.
@@
-51,6
+105,7
@@
void yaffsfs_LocalInitialisation(void)
#include "yaffs_ramdisk.h"
#include "yaffs_flashif.h"
#include "yaffs_ramdisk.h"
#include "yaffs_flashif.h"
+#include "yaffs_flashif2.h"
#include "yaffs_nandemul2k.h"
static yaffs_Device ramDev;
#include "yaffs_nandemul2k.h"
static yaffs_Device ramDev;
@@
-59,12
+114,20
@@
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/yaffs1", &bootDev},
+ { "/flash/yaffs2", &flashDev},
+ { "/ram2k", &ram2kDev},
+ { "/flash/bigblock", &flashDev},
+ {(void *)0,(void *)0} /* Null entry to terminate list */
+#endif
};
};
@@
-77,10
+140,10
@@
int yaffs_StartUp(void)
// Set up devices
// /ram
memset(&ramDev,0,sizeof(ramDev));
// Set up devices
// /ram
memset(&ramDev,0,sizeof(ramDev));
- ramDev.
n
BytesPerChunk = 512;
+ ramDev.
total
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.
@@
-90,46
+153,48
@@
int yaffs_StartUp(void)
ramDev.eraseBlockInNAND = yramdisk_EraseBlockInNAND;
ramDev.initialiseNAND = yramdisk_InitialiseNAND;
ramDev.eraseBlockInNAND = yramdisk_EraseBlockInNAND;
ramDev.initialiseNAND = yramdisk_InitialiseNAND;
- // /boot
+ // /boot
(yaffs1)
memset(&bootDev,0,sizeof(bootDev));
memset(&bootDev,0,sizeof(bootDev));
- bootDev.
n
BytesPerChunk = 512;
+ bootDev.
total
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.genericDevice = (void *) 1; // Used to identify the device in fstat.
bootDev.endBlock = 63; // Last block
//bootDev.useNANDECC = 0; // use YAFFS's ECC
bootDev.nShortOpCaches = 10; // Use caches
bootDev.genericDevice = (void *) 1; // Used to identify the device in fstat.
- bootDev.writeChunk
WithTagsToNAND = yflash_WriteChunkWithTags
ToNAND;
- bootDev.readChunk
WithTagsFromNAND = yflash_ReadChunkWithTags
FromNAND;
+ bootDev.writeChunk
ToNAND = yflash_WriteChunk
ToNAND;
+ bootDev.readChunk
FromNAND = yflash_ReadChunk
FromNAND;
bootDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
bootDev.initialiseNAND = yflash_InitialiseNAND;
bootDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
bootDev.initialiseNAND = yflash_InitialiseNAND;
- bootDev.markNANDBlockBad = yflash_MarkNANDBlockBad;
- bootDev.queryNANDBlock = yflash_QueryNANDBlock;
- // /flash
+ // /flash
(yaffs2)
// Set this puppy up to use
// the file emulation space as
// 2kpage/64chunk per block/128MB device
memset(&flashDev,0,sizeof(flashDev));
// Set this puppy up to use
// the file emulation space as
// 2kpage/64chunk per block/128MB device
memset(&flashDev,0,sizeof(flashDev));
- flashDev.
nBytesPerChunk = 2048
;
+ flashDev.
totalBytesPerChunk = 512
;
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 = (32 * 1024 * 1024)/(flashDev.nBytesPerChunk * flashDev.nChunksPerBlock) - 1; // Last block in 512MB
+ flashDev.inbandTags = 1;
+ //flashDev.checkpointStartBlock = 1;
+ //flashDev.checkpointEndBlock = 20;
+ flashDev.startBlock = 0;
+ flashDev.endBlock = 200; // 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.nShortOpCaches = 10; // Use caches
flashDev.genericDevice = (void *) 2; // Used to identify the device in fstat.
- flashDev.writeChunkWithTagsToNAND = yflash_WriteChunkWithTagsToNAND;
- flashDev.readChunkWithTagsFromNAND = yflash_ReadChunkWithTagsFromNAND;
- flashDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
- flashDev.initialiseNAND = yflash_InitialiseNAND;
- flashDev.markNANDBlockBad = yflash_MarkNANDBlockBad;
- flashDev.queryNANDBlock = yflash_QueryNANDBlock;
+ flashDev.writeChunkWithTagsToNAND = yflash
2
_WriteChunkWithTagsToNAND;
+ flashDev.readChunkWithTagsFromNAND = yflash
2
_ReadChunkWithTagsFromNAND;
+ flashDev.eraseBlockInNAND = yflash
2
_EraseBlockInNAND;
+ flashDev.initialiseNAND = yflash
2
_InitialiseNAND;
+ flashDev.markNANDBlockBad = yflash
2
_MarkNANDBlockBad;
+ flashDev.queryNANDBlock = yflash
2
_QueryNANDBlock;
// /ram2k
// Set this puppy up to use
// /ram2k
// Set this puppy up to use
@@
-137,10
+202,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.
n
BytesPerChunk = nandemul2k_GetBytesPerChunk();
+ ram2kDev.
total
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
+225,8
@@
int yaffs_StartUp(void)
+void SetCheckpointReservedBlocks(int n)
+{
+// flashDev.nCheckpointReservedBlocks = n;
+}