diff options
-rw-r--r-- | sys/dev/fb/splash_bmp.c | 58 | ||||
-rw-r--r-- | sys/i386/include/pc/vesa.h | 22 |
2 files changed, 40 insertions, 40 deletions
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c index ca4885c..139d1e9 100644 --- a/sys/dev/fb/splash_bmp.c +++ b/sys/dev/fb/splash_bmp.c @@ -179,44 +179,44 @@ bmp_splash(video_adapter_t *adp, int on) */ typedef struct tagBITMAPFILEHEADER { /* bmfh */ - u_short bfType __packed; - int bfSize __packed; - u_short bfReserved1 __packed; - u_short bfReserved2 __packed; - int bfOffBits __packed; -} BITMAPFILEHEADER; + u_short bfType; + int bfSize; + u_short bfReserved1; + u_short bfReserved2; + int bfOffBits; +} __packed BITMAPFILEHEADER; typedef struct tagBITMAPINFOHEADER { /* bmih */ - int biSize __packed; - int biWidth __packed; - int biHeight __packed; - short biPlanes __packed; - short biBitCount __packed; - int biCompression __packed; - int biSizeImage __packed; - int biXPelsPerMeter __packed; - int biYPelsPerMeter __packed; - int biClrUsed __packed; - int biClrImportant __packed; -} BITMAPINFOHEADER; + int biSize; + int biWidth; + int biHeight; + short biPlanes; + short biBitCount; + int biCompression; + int biSizeImage; + int biXPelsPerMeter; + int biYPelsPerMeter; + int biClrUsed; + int biClrImportant; +} __packed BITMAPINFOHEADER; typedef struct tagRGBQUAD { /* rgbq */ - u_char rgbBlue __packed; - u_char rgbGreen __packed; - u_char rgbRed __packed; - u_char rgbReserved __packed; -} RGBQUAD; + u_char rgbBlue; + u_char rgbGreen; + u_char rgbRed; + u_char rgbReserved; +} __packed RGBQUAD; typedef struct tagBITMAPINFO { /* bmi */ - BITMAPINFOHEADER bmiHeader __packed; - RGBQUAD bmiColors[256] __packed; -} BITMAPINFO; + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[256]; +} __packed BITMAPINFO; typedef struct tagBITMAPF { - BITMAPFILEHEADER bmfh __packed; - BITMAPINFO bmfi __packed; -} BITMAPF; + BITMAPFILEHEADER bmfh; + BITMAPINFO bmfi; +} __packed BITMAPF; #define BI_RGB 0 #define BI_RLE8 1 diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h index 11f69ba..06f1c11 100644 --- a/sys/i386/include/pc/vesa.h +++ b/sys/i386/include/pc/vesa.h @@ -32,21 +32,21 @@ struct vesa_info { /* mandatory fields */ - u_int8_t v_sig[4]; /* VESA */ - u_int16_t v_version __packed; /* ver in BCD */ - u_int32_t v_oemstr __packed; /* OEM string */ - u_int32_t v_flags __packed; /* flags */ + u_int8_t v_sig[4]; /* VESA */ + u_int16_t v_version; /* ver in BCD */ + u_int32_t v_oemstr; /* OEM string */ + u_int32_t v_flags; /* flags */ #define V_DAC8 (1<<0) #define V_NONVGA (1<<1) #define V_SNOW (1<<2) - u_int32_t v_modetable __packed; /* modes */ - u_int16_t v_memsize __packed; /* in 64K */ + u_int32_t v_modetable; /* modes */ + u_int16_t v_memsize; /* in 64K */ /* 2.0 */ - u_int16_t v_revision __packed; /* software rev */ - u_int32_t v_venderstr __packed; /* vender */ - u_int32_t v_prodstr __packed; /* product name */ - u_int32_t v_revstr __packed; /* product rev */ -}; + u_int16_t v_revision; /* software rev */ + u_int32_t v_venderstr; /* vender */ + u_int32_t v_prodstr; /* product name */ + u_int32_t v_revstr; /* product rev */ +} __packed; struct vesa_mode { |