/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
#include "yaffs_ecc.h"
#include "yaffs_guts.h"
-#include "yaffs_tagsvalidity.h"
#include "yaffs_packedtags2.h"
-unsigned yaffs_traceMask=0;
+unsigned yaffs_trace_mask=0;
#define MAX_OBJECTS 10000
#define spareSize 64
#define pagesPerBlock 64
-const char * mkyaffsimage_c_version = "$Id: mkyaffs2image.c,v 1.5 2010-01-11 21:43:18 charles Exp $";
typedef struct
static objItem obj_list[MAX_OBJECTS];
-static int n_obj = 0;
static int obj_id = YAFFS_NOBJECT_BUCKETS + 1;
-static int nObjects, nDirectories, nPages;
+static int n_obj, nDirectories, nPages;
static int outFile;
* NOTE: The tag is not usable after this other than calculating the CRC
* with.
*/
-static void little_to_big_endian(yaffs_Tags *tagsPtr)
+static void little_to_big_endian(struct yaffs_ext_tags *tagsPtr)
{
#if 0 // FIXME NCB
- yaffs_TagsUnion * tags = (yaffs_TagsUnion* )tagsPtr; // Work in bytes.
- yaffs_TagsUnion temp;
+ union yaffs_tags_union * tags = (union yaffs_tags_union* )tagsPtr; // Work in bytes.
+ union yaffs_tags_union temp;
memset(&temp, 0, sizeof(temp));
// Ick, I hate magic numbers.
- temp.asBytes[0] = ((tags->asBytes[2] & 0x0F) << 4) | ((tags->asBytes[1] & 0xF0) >> 4);
- temp.asBytes[1] = ((tags->asBytes[1] & 0x0F) << 4) | ((tags->asBytes[0] & 0xF0) >> 4);
- temp.asBytes[2] = ((tags->asBytes[0] & 0x0F) << 4) | ((tags->asBytes[2] & 0x30) >> 2) | ((tags->asBytes[3] & 0xC0) >> 6);
- temp.asBytes[3] = ((tags->asBytes[3] & 0x3F) << 2) | ((tags->asBytes[2] & 0xC0) >> 6);
- temp.asBytes[4] = ((tags->asBytes[6] & 0x03) << 6) | ((tags->asBytes[5] & 0xFC) >> 2);
- temp.asBytes[5] = ((tags->asBytes[5] & 0x03) << 6) | ((tags->asBytes[4] & 0xFC) >> 2);
- temp.asBytes[6] = ((tags->asBytes[4] & 0x03) << 6) | (tags->asBytes[7] & 0x3F);
- temp.asBytes[7] = (tags->asBytes[6] & 0xFC) | ((tags->asBytes[7] & 0xC0) >> 6);
+ temp.as_bytes[0] = ((tags->as_bytes[2] & 0x0F) << 4) | ((tags->as_bytes[1] & 0xF0) >> 4);
+ temp.as_bytes[1] = ((tags->as_bytes[1] & 0x0F) << 4) | ((tags->as_bytes[0] & 0xF0) >> 4);
+ temp.as_bytes[2] = ((tags->as_bytes[0] & 0x0F) << 4) | ((tags->as_bytes[2] & 0x30) >> 2) | ((tags->as_bytes[3] & 0xC0) >> 6);
+ temp.as_bytes[3] = ((tags->as_bytes[3] & 0x3F) << 2) | ((tags->as_bytes[2] & 0xC0) >> 6);
+ temp.as_bytes[4] = ((tags->as_bytes[6] & 0x03) << 6) | ((tags->as_bytes[5] & 0xFC) >> 2);
+ temp.as_bytes[5] = ((tags->as_bytes[5] & 0x03) << 6) | ((tags->as_bytes[4] & 0xFC) >> 2);
+ temp.as_bytes[6] = ((tags->as_bytes[4] & 0x03) << 6) | (tags->as_bytes[7] & 0x3F);
+ temp.as_bytes[7] = (tags->as_bytes[6] & 0xFC) | ((tags->as_bytes[7] & 0xC0) >> 6);
// Now copy it back.
- tags->asBytes[0] = temp.asBytes[0];
- tags->asBytes[1] = temp.asBytes[1];
- tags->asBytes[2] = temp.asBytes[2];
- tags->asBytes[3] = temp.asBytes[3];
- tags->asBytes[4] = temp.asBytes[4];
- tags->asBytes[5] = temp.asBytes[5];
- tags->asBytes[6] = temp.asBytes[6];
- tags->asBytes[7] = temp.asBytes[7];
+ tags->as_bytes[0] = temp.as_bytes[0];
+ tags->as_bytes[1] = temp.as_bytes[1];
+ tags->as_bytes[2] = temp.as_bytes[2];
+ tags->as_bytes[3] = temp.as_bytes[3];
+ tags->as_bytes[4] = temp.as_bytes[4];
+ tags->as_bytes[5] = temp.as_bytes[5];
+ tags->as_bytes[6] = temp.as_bytes[6];
+ tags->as_bytes[7] = temp.as_bytes[7];
#endif
}
-static void shuffle_oob(char *spareData, yaffs_PackedTags2 *pt)
+static void shuffle_oob(char *spareData, struct yaffs_packed_tags2 *pt)
{
assert(sizeof(*pt) <= spareSize);
// NAND LAYOUT: For non-trivial OOB orderings, here would be a good place to shuffle.
memcpy(spareData, pt, sizeof(*pt));
}
-static int write_chunk(__u8 *data, __u32 objId, __u32 chunkId, __u32 nBytes)
+static int write_chunk(u8 *data, u32 id, u32 chunk_id, u32 n_bytes)
{
- yaffs_ExtendedTags t;
- yaffs_PackedTags2 pt;
+ struct yaffs_ext_tags t;
+ struct yaffs_packed_tags2 pt;
char spareData[spareSize];
if (write(outFile,data,chunkSize) != chunkSize)
fatal("write");
- yaffs_InitialiseTags(&t);
+ memset(&t, 0, sizeof(t));
- t.chunkId = chunkId;
-// t.serialNumber = 0;
- t.serialNumber = 1; // **CHECK**
- t.byteCount = nBytes;
- t.objectId = objId;
+ t.chunk_id = chunk_id;
+// t.serial_number = 0;
+ t.serial_number = 1; // **CHECK**
+ t.n_bytes = n_bytes;
+ t.obj_id = id;
- t.sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
+ t.seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
// added NCB **CHECK**
- t.chunkUsed = 1;
+ t.chunk_used = 1;
if (convert_endian)
{
nPages++;
memset(&pt, 0, sizeof(pt));
- yaffs_PackTags2(&pt,&t,1);
+ yaffs_pack_tags2(&pt,&t,1);
memset(spareData, 0xff, sizeof(spareData));
shuffle_oob(spareData, &pt);
(((x) & 0xFF00) >> 8))
// This one is easier, since the types are more standard. No funky shifts here.
-static void object_header_little_to_big_endian(yaffs_ObjectHeader* oh)
+static void object_header_little_to_big_endian(struct yaffs_obj_hdr* oh)
{
- int i;
oh->type = SWAP32(oh->type); // GCC makes enums 32 bits.
- oh->parentObjectId = SWAP32(oh->parentObjectId); // int
- oh->sum__NoLongerUsed = SWAP16(oh->sum__NoLongerUsed); // __u16 - Not used, but done for completeness.
+ oh->parent_obj_id = SWAP32(oh->parent_obj_id); // int
+ oh->sum_no_longer_used = SWAP16(oh->sum_no_longer_used); // u16 - Not used, but done for completeness.
// name = skip. Char array. Not swapped.
oh->yst_mode = SWAP32(oh->yst_mode);
-#ifdef CONFIG_YAFFS_WINCE // WinCE doesn't implement this, but we need to just in case.
- // In fact, WinCE would be *THE* place where this would be an issue.
- // Why? WINCE is little-endian only.
- {
- int n = sizeof(oh->notForWinCE)/sizeof(oh->notForWinCE[0]);
- for(i = 0; i < n; i++)
- oh->notForWinCE[i] = SWAP32(oh->notForWinCE[i]);
- }
-#else
// Regular POSIX.
oh->yst_uid = SWAP32(oh->yst_uid);
oh->yst_gid = SWAP32(oh->yst_gid);
oh->yst_atime = SWAP32(oh->yst_atime);
oh->yst_mtime = SWAP32(oh->yst_mtime);
oh->yst_ctime = SWAP32(oh->yst_ctime);
-#endif
- oh->fileSize = SWAP32(oh->fileSize); // Aiee. An int... signed, at that!
- oh->equivalentObjectId = SWAP32(oh->equivalentObjectId);
+ oh->file_size_low = SWAP32(oh->file_size_low); // Aiee. An int... signed, at that!
+ oh->file_size_high = SWAP32(oh->file_size_high); // Aiee. An int... signed, at that!
+ oh->equiv_id = SWAP32(oh->equiv_id);
// alias - char array.
oh->yst_rdev = SWAP32(oh->yst_rdev);
-#ifdef CONFIG_YAFFS_WINCE
oh->win_ctime[0] = SWAP32(oh->win_ctime[0]);
oh->win_ctime[1] = SWAP32(oh->win_ctime[1]);
oh->win_atime[0] = SWAP32(oh->win_atime[0]);
oh->win_atime[1] = SWAP32(oh->win_atime[1]);
oh->win_mtime[0] = SWAP32(oh->win_mtime[0]);
oh->win_mtime[1] = SWAP32(oh->win_mtime[1]);
-#else
- {
- int n = sizeof(oh->roomToGrow)/sizeof(oh->roomToGrow[0]);
- for(i=0; i < n; i++)
- oh->roomToGrow[i] = SWAP32(oh->roomToGrow[i]);
- }
-#endif
+ oh->reserved[0] = SWAP32(oh->reserved[0]);
+ oh->reserved[1] = SWAP32(oh->reserved[1]);
+
+ oh->inband_shadowed_obj_id = SWAP32(oh->inband_shadowed_obj_id);
+ oh->inband_is_shrink = SWAP32(oh->inband_is_shrink);
+ oh->shadows_obj = SWAP32(oh->shadows_obj);
+ oh->is_shrink = SWAP32(oh->is_shrink);
}
-static int write_object_header(int objId, yaffs_ObjectType t, struct stat *s, int parent, const char *name, int equivalentObj, const char * alias)
+
+static int write_object_header(int id, enum yaffs_obj_type t, struct stat *s, int parent, const char *name, int equivalentObj, const char * alias)
{
- __u8 bytes[chunkSize];
+ u8 bytes[chunkSize];
- yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)bytes;
+ struct yaffs_obj_hdr *oh = (struct yaffs_obj_hdr *)bytes;
memset(bytes,0xff,sizeof(bytes));
oh->type = t;
- oh->parentObjectId = parent;
+ oh->parent_obj_id = parent;
if (strlen(name)+1 > sizeof(oh->name))
{
if(t == YAFFS_OBJECT_TYPE_FILE)
{
- oh->fileSize = s->st_size;
+ oh->file_size_low = s->st_size;
+ oh->file_size_high = (s->st_size >> 32);
}
if(t == YAFFS_OBJECT_TYPE_HARDLINK)
{
- oh->equivalentObjectId = equivalentObj;
+ oh->equiv_id = equivalentObj;
}
if(t == YAFFS_OBJECT_TYPE_SYMLINK)
object_header_little_to_big_endian(oh);
}
- return write_chunk(bytes,objId,0,0xffff);
+ return write_chunk(bytes,id,0,0xffff);
}
-static void pad_image()
+static void pad_image(void)
{
- __u8 data[chunkSize + spareSize];
+ u8 data[chunkSize + spareSize];
int padPages = (nPages % pagesPerBlock);
if (padPages)
{
newObj = obj_id++;
- nObjects++;
+ n_obj++;
printf("Object %d, %s is a ",newObj,full_name);
if(write_object_header(newObj, YAFFS_OBJECT_TYPE_FILE, &stats, parent, entry->d_name, -1, NULL) == 0)
{
int h;
- __u8 bytes[chunkSize];
- int nBytes;
+ u8 bytes[chunkSize];
+ int n_bytes;
int chunk = 0;
h = open(full_name,O_RDONLY);
if(h >= 0)
{
memset(bytes,0xff,sizeof(bytes));
- while((nBytes = read(h,bytes,sizeof(bytes))) > 0)
+ while((n_bytes = read(h,bytes,sizeof(bytes))) > 0)
{
chunk++;
- write_chunk(bytes,newObj,chunk,nBytes);
+ write_chunk(bytes,newObj,chunk,n_bytes);
memset(bytes,0xff,sizeof(bytes));
}
- if(nBytes < 0)
+ if(n_bytes < 0)
warn("read");
printf("%d data chunks written\n",chunk);
{
printf("Operation complete.\n"
"%d objects in %d directories\n"
- "%d NAND pages\n",nObjects, nDirectories, nPages);
+ "%d NAND pages\n",n_obj, nDirectories, nPages);
}
exit(error);
projects / yaffs2.git / blobdiff