diff -r 22486c9c7b15 -r 378360dbbdba imgtools/romtools/rofsbuild/r_driveimage.h --- a/imgtools/romtools/rofsbuild/r_driveimage.h Wed Jun 23 17:27:59 2010 +0800 +++ b/imgtools/romtools/rofsbuild/r_driveimage.h Wed Jun 30 11:35:58 2010 +0800 @@ -21,13 +21,9 @@ #ifndef __R_DRIVEIMAGE_H__ #define __R_DRIVEIMAGE_H__ -#include -#include "filesysteminterface.h" +#include #include -typedef vector EntryReferenceVector; -typedef list EntryList; - const TInt KMaxGenBuffer=0x14; // Node Type. @@ -40,12 +36,8 @@ }; // File Format Supported. -struct DriveFileFormatSupported - { - const char* iDriveFileFormat; - enum TFileSystem iFileSystem; - }; +class TFSNode ; // Image creation class. class CDriveImage { @@ -53,37 +45,14 @@ CDriveImage(CObeyFile *aObey); ~CDriveImage(); TInt CreateImage(const char* alogfile); - static TBool FormatTranslation(const char* aUserFileFormat,enum TFileSystem& aDriveFileFormat); - + private: - - TInt CreateList(); - TInt GenTreeTraverse(TRomNode* anode,enum KNodeType anodeType); - TInt CreateDirOrFileEntry(TRomNode* atempnode,enum KNodeType aType); - TInt ConstructOptions(); - TInt PlaceFileTemporary(const TInt afileSize,TRomNode* acurrentNode); - TInt DeleteTempFolder(const char* aTempDirName); - -private: - + + TFSNode* PrepareFileSystem(TRomNode* aRomNode); // Holds the address of CObeyFile object. used to get the object information. - CObeyFile *iObey; - // Container required for file sysem module. - EntryList iNodeList; - // Pointer for nested Container. - CDirectory* iParentDirEntry ; - - // For temp storge of Container address. - EntryReferenceVector iNodeAddStore; - - // For file format support. - static DriveFileFormatSupported iFormatType[]; - // Reference variable used for converting tree to list. - TInt iListReference; - // Holds temp folder name. - char *iTempDirName; - // Pointer to buffer, which will be used for compression/un-compression purpose. - char *iData; + CObeyFile *iObey; + + }; #endif