From 90ef117b68387d66763291af0117677644166611 Mon Sep 17 00:00:00 2001 From: William Juul Date: Thu, 15 Nov 2007 12:23:57 +0100 Subject: Incorporate yaffs2 into U-boot To use YAFFS2 define CONFIG_YAFFS2 Signed-off-by: William Juul Signed-off-by: Scott Wood --- fs/yaffs2/yaffs_guts.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'fs/yaffs2/yaffs_guts.h') diff --git a/fs/yaffs2/yaffs_guts.h b/fs/yaffs2/yaffs_guts.h index 87b539b05b..ecf701f5a0 100644 --- a/fs/yaffs2/yaffs_guts.h +++ b/fs/yaffs2/yaffs_guts.h @@ -446,9 +446,10 @@ struct yaffs_ObjectStruct { YCHAR shortName[YAFFS_SHORT_NAME_LENGTH + 1]; #endif -#ifndef __KERNEL__ +/* XXX U-BOOT XXX */ +/* #ifndef __KERNEL__ */ __u32 inUse; -#endif +/* #endif */ #ifdef CONFIG_YAFFS_WINCE __u32 win_ctime[2]; @@ -464,10 +465,10 @@ struct yaffs_ObjectStruct { __u32 yst_rdev; -#ifdef __KERNEL__ +/* XXX U-BOOT XXX */ +/* #ifndef __KERNEL__ */ struct inode *myInode; - -#endif +/* #endif */ yaffs_ObjectType variantType; @@ -626,15 +627,18 @@ struct yaffs_DeviceStruct { __u32 chunkMask; -#ifdef __KERNEL__ +/* XXX U-BOOT XXX */ +#if 0 +#ifndef __KERNEL__ struct semaphore sem; /* Semaphore for waiting on erasure.*/ struct semaphore grossLock; /* Gross locking semaphore */ + void (*putSuperFunc) (struct super_block * sb); +#endif +#endif __u8 *spareBuffer; /* For mtdif2 use. Don't know the size of the buffer * at compile time so we have to allocate it. */ - void (*putSuperFunc) (struct super_block * sb); -#endif int isMounted; @@ -883,10 +887,12 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device * dev); void yfsd_WinFileTimeNow(__u32 target[2]); #endif -#ifdef __KERNEL__ - +/* XXX U-BOOT XXX */ +#if 0 +#ifndef __KERNEL__ void yaffs_HandleDeferedFree(yaffs_Object * obj); #endif +#endif /* Debug dump */ int yaffs_DumpObject(yaffs_Object * obj); -- cgit v1.2.1