projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set up u-boot glue code and patching scripts.
[yaffs2.git]
/
utils
/
mkyaffsimage.c
diff --git
a/utils/mkyaffsimage.c
b/utils/mkyaffsimage.c
index 5dbe51ae674895dcff83269aa508223314cb8b82..1d835953298eb1a8364ccd0be3910b991a141199 100644
(file)
--- a/
utils/mkyaffsimage.c
+++ b/
utils/mkyaffsimage.c
@@
-45,8
+45,7
@@
typedef struct
static objItem obj_list[MAX_OBJECTS];
static objItem obj_list[MAX_OBJECTS];
-static int n_obj = 0;
-static int obj_id = YAFFS_NOBJECT_BUCKETS + 1;
+static int obj_alloc_id = YAFFS_NOBJECT_BUCKETS + 1;
static int n_obj, nDirectories, nPages;
static int n_obj, nDirectories, nPages;
@@
-283,7
+282,7
@@
static void object_header_little_to_big_endian(struct yaffs_obj_hdr* oh)
oh->yst_mtime = SWAP32(oh->yst_mtime);
oh->yst_ctime = SWAP32(oh->yst_ctime);
oh->yst_mtime = SWAP32(oh->yst_mtime);
oh->yst_ctime = SWAP32(oh->yst_ctime);
- oh->file_size
= SWAP32(oh->file_size
); // Aiee. An int... signed, at that!
+ oh->file_size
_low = SWAP32(oh->file_size_low
); // Aiee. An int... signed, at that!
oh->equiv_id = SWAP32(oh->equiv_id);
// alias - char array.
oh->yst_rdev = SWAP32(oh->yst_rdev);
oh->equiv_id = SWAP32(oh->equiv_id);
// alias - char array.
oh->yst_rdev = SWAP32(oh->yst_rdev);
@@
-334,7
+333,7
@@
static int write_object_header(int obj_id, enum yaffs_obj_type t, struct stat *s
if(t == YAFFS_OBJECT_TYPE_FILE)
{
if(t == YAFFS_OBJECT_TYPE_FILE)
{
- oh->file_size = s->st_size;
+ oh->file_size
_low
= s->st_size;
}
if(t == YAFFS_OBJECT_TYPE_HARDLINK)
}
if(t == YAFFS_OBJECT_TYPE_HARDLINK)
@@
-394,7
+393,7
@@
static int process_directory(int parent, const char *path)
S_ISSOCK(stats.st_mode))
{
S_ISSOCK(stats.st_mode))
{
- newObj = obj_id++;
+ newObj = obj_
alloc_
id++;
n_obj++;
printf("Object %d, %s is a ",newObj,full_name);
n_obj++;
printf("Object %d, %s is a ",newObj,full_name);