summaryrefslogtreecommitdiff
path: root/include/bmp_layout.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-05-13 07:02:27 -0600
committerSimon Glass <sjg@chromium.org>2015-06-10 19:26:54 -0600
commit1c3dbe56f720132723a89709ef5f2baeb52b44d4 (patch)
tree8b2f24397e38f448ea7c885e623d1b587d1e37f7 /include/bmp_layout.h
parent29748515fd7ba49fe027b39eb184b84f2890631e (diff)
Remove typedefs from bmp_layout.h
We try to avoid typedefs and these ones are easy enough to remove. Before changing this header in the next patch, remove the typedefs. Signed-off-by: Simon Glass <sjg@chromium.org> Suggested-by: Joe Hershberger <joe.hershberger@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'include/bmp_layout.h')
-rw-r--r--include/bmp_layout.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/bmp_layout.h b/include/bmp_layout.h
index 22b1fbc9435..55db8b86eab 100644
--- a/include/bmp_layout.h
+++ b/include/bmp_layout.h
@@ -11,17 +11,17 @@
#ifndef _BMP_H_
#define _BMP_H_
-typedef struct bmp_color_table_entry {
+struct __packed bmp_color_table_entry {
__u8 blue;
__u8 green;
__u8 red;
__u8 reserved;
-} __attribute__ ((packed)) bmp_color_table_entry_t;
+};
/* When accessing these fields, remember that they are stored in little
endian format, so use linux macros, e.g. le32_to_cpu(width) */
-typedef struct bmp_header {
+struct __packed bmp_header {
/* Header */
char signature[2];
__u32 file_size;
@@ -40,15 +40,14 @@ typedef struct bmp_header {
__u32 colors_used;
__u32 colors_important;
/* ColorTable */
+};
-} __attribute__ ((packed)) bmp_header_t;
-
-typedef struct bmp_image {
- bmp_header_t header;
+struct bmp_image {
+ struct bmp_header header;
/* We use a zero sized array just as a placeholder for variable
sized array */
- bmp_color_table_entry_t color_table[0];
-} bmp_image_t;
+ struct bmp_color_table_entry color_table[0];
+};
/* Data in the bmp_image is aligned to this length */
#define BMP_DATA_ALIGN 4