From b7da6babe8eed764a1f6ac7c2bc2c04b1292875c Mon Sep 17 00:00:00 2001 From: proski Date: Tue, 18 Aug 2009 17:26:35 +0000 Subject: [PATCH] 2009-08-18 Pavel Roskin * include/grub/fbfill.h (struct grub_video_fbrender_target): Use grub_uint8_t pointer for data. * include/grub/fbutil.h (struct grub_video_fbblit_info): Likewise. * video/fb/fbutil.c: Remove unnecessary casts. --- ChangeLog | 8 ++++++++ include/grub/fbfill.h | 2 +- include/grub/fbutil.h | 2 +- video/fb/fbutil.c | 22 ++++++---------------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index b76fe3858..e132a24f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-08-18 Pavel Roskin + + * include/grub/fbfill.h (struct grub_video_fbrender_target): Use + grub_uint8_t pointer for data. + * include/grub/fbutil.h (struct grub_video_fbblit_info): + Likewise. + * video/fb/fbutil.c: Remove unnecessary casts. + 2009-08-17 Michal Suchanek VBE cleanup. diff --git a/include/grub/fbfill.h b/include/grub/fbfill.h index 08cd7b887..c85fa12dd 100644 --- a/include/grub/fbfill.h +++ b/include/grub/fbfill.h @@ -44,7 +44,7 @@ struct grub_video_fbrender_target /* Pointer to data. Can either be in video card memory or in local host's memory. */ - void *data; + grub_uint8_t *data; }; void diff --git a/include/grub/fbutil.h b/include/grub/fbutil.h index cf7ecc0d8..065ccf9e3 100644 --- a/include/grub/fbutil.h +++ b/include/grub/fbutil.h @@ -28,7 +28,7 @@ struct grub_video_fbblit_info { struct grub_video_mode_info *mode_info; - void *data; + grub_uint8_t *data; }; grub_uint8_t *grub_video_fb_get_video_ptr (struct grub_video_fbblit_info *source, diff --git a/video/fb/fbutil.c b/video/fb/fbutil.c index 1fa48ec59..511beaafc 100644 --- a/video/fb/fbutil.c +++ b/video/fb/fbutil.c @@ -40,28 +40,20 @@ grub_video_fb_get_video_ptr (struct grub_video_fbblit_info *source, switch (source->mode_info->bpp) { case 32: - ptr = (grub_uint8_t *)source->data - + y * source->mode_info->pitch - + x * 4; + ptr = source->data + y * source->mode_info->pitch + x * 4; break; case 24: - ptr = (grub_uint8_t *)source->data - + y * source->mode_info->pitch - + x * 3; + ptr = source->data + y * source->mode_info->pitch + x * 3; break; case 16: case 15: - ptr = (grub_uint8_t *)source->data - + y * source->mode_info->pitch - + x * 2; + ptr = source->data + y * source->mode_info->pitch + x * 2; break; case 8: - ptr = (grub_uint8_t *)source->data - + y * source->mode_info->pitch - + x; + ptr = source->data + y * source->mode_info->pitch + x; break; case 1: @@ -107,8 +99,7 @@ get_pixel (struct grub_video_fbblit_info *source, if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED) { int bit_index = y * source->mode_info->width + x; - grub_uint8_t *ptr = (grub_uint8_t *)source->data - + bit_index / 8; + grub_uint8_t *ptr = source->data + bit_index / 8; int bit_pos = 7 - bit_index % 8; color = (*ptr >> bit_pos) & 0x01; } @@ -175,8 +166,7 @@ set_pixel (struct grub_video_fbblit_info *source, if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED) { int bit_index = y * source->mode_info->width + x; - grub_uint8_t *ptr = (grub_uint8_t *)source->data - + bit_index / 8; + grub_uint8_t *ptr = source->data + bit_index / 8; int bit_pos = 7 - bit_index % 8; *ptr = (*ptr & ~(1 << bit_pos)) | ((color & 0x01) << bit_pos); }