Further extensions for VxWorks wrapper

[yaffs2.git] / direct / yaffs_attribs.c

diff --git a/direct/yaffs_attribs.c b/direct/yaffs_attribs.c
index 648e137374d143732c18574b07659440b003229d..de80fe42fcd0e70f7a147707b900b55f67fcca9d 100644 (file)
--- a/direct/yaffs_attribs.c
+++ b/direct/yaffs_attribs.c
@@ -16,42 +16,50 @@
 
 void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
 {
+#ifdef CONFIG_YAFFS_WINCE
+       obj->win_atime[0] = oh->win_atime[0];
+       obj->win_ctime[0] = oh->win_ctime[0];
+       obj->win_mtime[0] = oh->win_mtime[0];
+       obj->win_atime[1] = oh->win_atime[1];
+       obj->win_ctime[1] = oh->win_ctime[1];
+       obj->win_mtime[1] = oh->win_mtime[1];
+#else
        obj->yst_uid = oh->yst_uid;
        obj->yst_gid = oh->yst_gid;
        obj->yst_atime = oh->yst_atime;
        obj->yst_mtime = oh->yst_mtime;
        obj->yst_ctime = oh->yst_ctime;
        obj->yst_rdev = oh->yst_rdev;
+#endif
 }
 
 
 void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
 {
 #ifdef CONFIG_YAFFS_WINCE
-               oh->win_atime[0] = obj->win_atime[0];
-               oh->win_ctime[0] = obj->win_ctime[0];
-               oh->win_mtime[0] = obj->win_mtime[0];
-               oh->win_atime[1] = obj->win_atime[1];
-               oh->win_ctime[1] = obj->win_ctime[1];
-               oh->win_mtime[1] = obj->win_mtime[1];
+       oh->win_atime[0] = obj->win_atime[0];
+       oh->win_ctime[0] = obj->win_ctime[0];
+       oh->win_mtime[0] = obj->win_mtime[0];
+       oh->win_atime[1] = obj->win_atime[1];
+       oh->win_ctime[1] = obj->win_ctime[1];
+       oh->win_mtime[1] = obj->win_mtime[1];
 #else
-               oh->yst_uid = obj->yst_uid;
-               oh->yst_gid = obj->yst_gid;
-               oh->yst_atime = obj->yst_atime;
-               oh->yst_mtime = obj->yst_mtime;
-               oh->yst_ctime = obj->yst_ctime;
-               oh->yst_rdev = obj->yst_rdev;
+       oh->yst_uid = obj->yst_uid;
+       oh->yst_gid = obj->yst_gid;
+       oh->yst_atime = obj->yst_atime;
+       oh->yst_mtime = obj->yst_mtime;
+       oh->yst_ctime = obj->yst_ctime;
+       oh->yst_rdev = obj->yst_rdev;
 #endif
-
 }
 
 void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
 {
 
 #ifdef CONFIG_YAFFS_WINCE
-               yfsd_win_file_time_now(obj->win_atime);
-               obj->win_ctime[0] = obj->win_mtime[0] = obj->win_atime[0];
-               obj->win_ctime[1] = obj->win_mtime[1] = obj->win_atime[1];
+       yfsd_win_file_time_now(obj->win_atime);
+       obj->win_ctime[0] = obj->win_mtime[0] = obj->win_atime[0];
+       obj->win_ctime[1] = obj->win_mtime[1] = obj->win_atime[1];
 
 #else
        yaffs_load_current_time(obj, 1, 1);
@@ -64,11 +72,11 @@ void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
 void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
 {
 #ifdef CONFIG_YAFFS_WINCE
-               yfsd_win_file_time_now(the_obj->win_atime);
-               the_obj->win_ctime[0] = the_obj->win_mtime[0] =
-                   the_obj->win_atime[0];
-               the_obj->win_ctime[1] = the_obj->win_mtime[1] =
-                   the_obj->win_atime[1];
+       yfsd_win_file_time_now(obj->win_atime);
+       obj->win_ctime[0] = obj->win_mtime[0] =
+           obj->win_atime[0];
+       obj->win_ctime[1] = obj->win_mtime[1] =
+           obj->win_atime[1];
 
 #else
 
@@ -80,7 +88,7 @@ void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
 #endif
 }
 
-loff_t yaffs_get_file_size(struct yaffs_obj *obj)
+static Y_LOFF_T yaffs_get_file_size(struct yaffs_obj *obj)
 {
        YCHAR *alias = NULL;
        obj = yaffs_get_equivalent_obj(obj);
@@ -98,56 +106,3 @@ loff_t yaffs_get_file_size(struct yaffs_obj *obj)
        }
 }
 
-int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr)
-{
-       unsigned int valid = attr->ia_valid;
-
-       if (valid & ATTR_MODE)
-               obj->yst_mode = attr->ia_mode;
-       if (valid & ATTR_UID)
-               obj->yst_uid = attr->ia_uid;
-       if (valid & ATTR_GID)
-               obj->yst_gid = attr->ia_gid;
-
-       if (valid & ATTR_ATIME)
-               obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
-       if (valid & ATTR_CTIME)
-               obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
-       if (valid & ATTR_MTIME)
-               obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
-
-       if (valid & ATTR_SIZE)
-               yaffs_resize_file(obj, attr->ia_size);
-
-       yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
-
-       return YAFFS_OK;
-
-}
-
-int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr)
-{
-       unsigned int valid = 0;
-
-       attr->ia_mode = obj->yst_mode;
-       valid |= ATTR_MODE;
-       attr->ia_uid = obj->yst_uid;
-       valid |= ATTR_UID;
-       attr->ia_gid = obj->yst_gid;
-       valid |= ATTR_GID;
-
-       Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
-       valid |= ATTR_ATIME;
-       Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
-       valid |= ATTR_CTIME;
-       Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
-       valid |= ATTR_MTIME;
-
-       attr->ia_size = yaffs_get_file_size(obj);
-       valid |= ATTR_SIZE;
-
-       attr->ia_valid = valid;
-
-       return YAFFS_OK;
-}
-