sunxi: increase SYS_MONITOR_LEN

[karo-tx-uboot.git] / include / bmp_layout.h

diff --git a/include/bmp_layout.h b/include/bmp_layout.h
index d823de910fb748019d6c415510ddb499a482cf68..55db8b86eab413b613f8b1d3951ec935860519ea 100644 (file)
--- a/include/bmp_layout.h
+++ b/include/bmp_layout.h
@@ -1,23 +1,7 @@
 /* (C) Copyright 2002
  * Detlev Zundel, DENX Software Engineering, dzu@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /************************************************************************/
@@ -27,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;
@@ -56,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