Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250473
b: refs/heads/master
c: 3627924
h: refs/heads/master
i:
  250471: 56d85a0
v: v3
  • Loading branch information
Artem Bityutskiy authored and Artem Bityutskiy committed Apr 14, 2011
1 parent eac156c commit b206d9f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e8e088de305d7cc00b2c8b2a857ceb62d5fa68d3
refs/heads/master: 3627924acf70a9a26587712e4888ee7144489678
6 changes: 3 additions & 3 deletions trunk/drivers/mtd/ubi/ubi-media.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ struct ubi_ec_hdr {
__be32 image_seq;
__u8 padding2[32];
__be32 hdr_crc;
} __attribute__ ((packed));
} __packed;

/**
* struct ubi_vid_hdr - on-flash UBI volume identifier header.
Expand Down Expand Up @@ -292,7 +292,7 @@ struct ubi_vid_hdr {
__be64 sqnum;
__u8 padding3[12];
__be32 hdr_crc;
} __attribute__ ((packed));
} __packed;

/* Internal UBI volumes count */
#define UBI_INT_VOL_COUNT 1
Expand Down Expand Up @@ -373,6 +373,6 @@ struct ubi_vtbl_record {
__u8 flags;
__u8 padding[23];
__be32 crc;
} __attribute__ ((packed));
} __packed;

#endif /* !__UBI_MEDIA_H__ */
12 changes: 6 additions & 6 deletions trunk/include/mtd/ubi-user.h
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ struct ubi_mkvol_req {
__s16 name_len;
__s8 padding2[4];
char name[UBI_MAX_VOLUME_NAME + 1];
} __attribute__ ((packed));
} __packed;

/**
* struct ubi_rsvol_req - a data structure used in volume re-size requests.
Expand All @@ -326,7 +326,7 @@ struct ubi_mkvol_req {
struct ubi_rsvol_req {
__s64 bytes;
__s32 vol_id;
} __attribute__ ((packed));
} __packed;

/**
* struct ubi_rnvol_req - volumes re-name request.
Expand Down Expand Up @@ -368,7 +368,7 @@ struct ubi_rnvol_req {
__s8 padding2[2];
char name[UBI_MAX_VOLUME_NAME + 1];
} ents[UBI_MAX_RNVOL];
} __attribute__ ((packed));
} __packed;

/**
* struct ubi_leb_change_req - a data structure used in atomic LEB change
Expand All @@ -383,7 +383,7 @@ struct ubi_leb_change_req {
__s32 bytes;
__s8 dtype;
__s8 padding[7];
} __attribute__ ((packed));
} __packed;

/**
* struct ubi_map_req - a data structure used in map LEB requests.
Expand All @@ -395,7 +395,7 @@ struct ubi_map_req {
__s32 lnum;
__s8 dtype;
__s8 padding[3];
} __attribute__ ((packed));
} __packed;


/**
Expand All @@ -409,6 +409,6 @@ struct ubi_set_vol_prop_req {
__u8 property;
__u8 padding[7];
__u64 value;
} __attribute__ ((packed));
} __packed;

#endif /* __UBI_USER_H__ */

0 comments on commit b206d9f

Please sign in to comment.