--- a/imgtools/romtools/rofsbuild/r_obey.h	Wed Jun 23 17:27:59 2010 +0800
+++ b/imgtools/romtools/rofsbuild/r_obey.h	Wed Jun 30 11:35:58 2010 +0800
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <e32capability.h>
 #include <kernel/kernboot.h>
+#include "fatdefines.h"
 
 #include <vector>
 #include <map>
@@ -46,6 +47,7 @@
 	EKeywordNone=0,	// backwards compatibility, but now ignored
 	EKeywordFile,
 	EKeywordData,
+	EKeywordDir,
 	EKeywordRofsName,
 	EKeywordExtensionRofs, 
 	EKeywordCoreRofsName,
@@ -178,7 +180,8 @@
 	};
 
 class CPatchDataProcessor;
-struct ConfigurableFatAttributes;
+// Configurable FAT attributes
+
 
 class CObeyFile
 	{
@@ -194,10 +197,9 @@
 	TRomNode* iRootDirectory;
 	TInt iNumberOfDataFiles;
 	// Added to support Data Drive Images.
-	char* iDriveFileName;
-	TInt64 iDataSize;
+	char* iDriveFileName; 
 	char* iDriveFileFormat;
-	ConfigurableFatAttributes* iConfigurableFatAttributes;
+	ConfigurableFatAttributes iConfigurableFatAttributes;
 
 private:
 	ObeyFileReader& iReader;
@@ -252,6 +254,7 @@
 	
 	static TBool GetNextBitOfFileName(char*& epocEndPtr);
 	static const char *IsValidFilePath(const char *aPath);
+	static const char* IsValidDirPath(const char* aPath);
 
 	TBool iAutoSize;
 	TUint32 iAutoPageSize;