X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=yaffs_guts.h;h=b7e2f4bcc569e087069f1f6398f6008712273730;hb=4a700fe570d217c2c5df87070db7c2652bc0eaaf;hp=ca18503d5ae29de13e50b88ec728a20d7314a867;hpb=bfb36fe45ceea5a7e8347b24a575ab627e60df94;p=yaffs2.git

diff --git a/yaffs_guts.h b/yaffs_guts.h
index ca18503..b7e2f4b 100644
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -16,8 +16,9 @@
 #ifndef __YAFFS_GUTS_H__
 #define __YAFFS_GUTS_H__
 
-#include "devextras.h"
 #include "yportenv.h"
+#include "devextras.h"
+#include "yaffs_list.h"
 
 #define YAFFS_OK	1
 #define YAFFS_FAIL  0
@@ -52,7 +53,6 @@
 
 #define YAFFS_MAX_CHUNK_ID		0x000FFFFF
 
-#define YAFFS_UNUSED_OBJECT_ID		0x0003FFFF
 
 #define YAFFS_ALLOCATION_NOBJECTS	100
 #define YAFFS_ALLOCATION_NTNODES	100
@@ -62,6 +62,7 @@
 
 
 #define YAFFS_OBJECT_SPACE		0x40000
+#define YAFFS_MAX_OBJECT_ID		(YAFFS_OBJECT_SPACE -1)
 
 #define YAFFS_CHECKPOINT_VERSION 	4
 
@@ -598,6 +599,10 @@ struct yaffs_DeviceParamStruct {
 	int disableSoftDelete;  /* yaffs 1 only: Set to disable the use of softdeletion. */
 	
 	int deferDirectoryUpdate; /* Set to defer directory updates */
+
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
+	int autoUnicode;
+#endif
 	
 };
 
@@ -608,7 +613,10 @@ struct yaffs_DeviceStruct {
 
         /* Context storage. Holds extra OS specific data for this device */
 
-	void *context;
+	void *osContext;
+	void *driverContext;
+
+	struct ylist_head devList;
 
 	/* Runtime parameters. Set up by YAFFS. */
 	int nDataBytesPerChunk;	
@@ -928,6 +936,7 @@ yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
 int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
 			        int chunkInNAND, int inScan);
 void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name);
+void yaffs_SetObjectNameFromOH(yaffs_Object *obj, const yaffs_ObjectHeader *oh);
 void yaffs_AddObjectToDirectory(yaffs_Object *directory,
 					yaffs_Object *obj);
 YCHAR *yaffs_CloneString(const YCHAR *str);