Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 1 | From 1f48917d8ddb490dcdc70176e0f58136b7f7811a Mon Sep 17 00:00:00 2001 |
| 2 | From: Elyes Haouas <ehaouas@noos.fr> |
| 3 | Date: Fri, 4 Mar 2022 07:42:13 +0100 |
| 4 | Subject: [PATCH] video: Remove trailing whitespaces |
| 5 | |
| 6 | Signed-off-by: Elyes Haouas <ehaouas@noos.fr> |
| 7 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> |
| 8 | |
| 9 | Upstream-Status: Backport |
| 10 | |
| 11 | Reference to upstream patch: |
| 12 | https://git.savannah.gnu.org/cgit/grub.git/commit/?id=1f48917d8ddb490dcdc70176e0f58136b7f7811a |
| 13 | |
| 14 | Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> |
| 15 | --- |
| 16 | grub-core/video/bochs.c | 2 +- |
| 17 | grub-core/video/capture.c | 2 +- |
| 18 | grub-core/video/cirrus.c | 4 ++-- |
| 19 | grub-core/video/coreboot/cbfb.c | 2 +- |
| 20 | grub-core/video/efi_gop.c | 22 +++++++++---------- |
| 21 | grub-core/video/fb/fbblit.c | 8 +++---- |
| 22 | grub-core/video/fb/video_fb.c | 10 ++++----- |
| 23 | grub-core/video/i386/pc/vbe.c | 34 ++++++++++++++--------------- |
| 24 | grub-core/video/i386/pc/vga.c | 6 ++--- |
| 25 | grub-core/video/ieee1275.c | 4 ++-- |
| 26 | grub-core/video/radeon_fuloong2e.c | 6 ++--- |
| 27 | grub-core/video/radeon_yeeloong3a.c | 6 ++--- |
| 28 | grub-core/video/readers/png.c | 2 +- |
| 29 | grub-core/video/readers/tga.c | 2 +- |
| 30 | grub-core/video/sis315_init.c | 2 +- |
| 31 | grub-core/video/sis315pro.c | 8 +++---- |
| 32 | grub-core/video/sm712.c | 10 ++++----- |
| 33 | grub-core/video/video.c | 8 +++---- |
| 34 | 18 files changed, 69 insertions(+), 69 deletions(-) |
| 35 | |
| 36 | diff --git a/grub-core/video/bochs.c b/grub-core/video/bochs.c |
| 37 | index 30ea1bd82..edc651697 100644 |
| 38 | --- a/grub-core/video/bochs.c |
| 39 | +++ b/grub-core/video/bochs.c |
| 40 | @@ -212,7 +212,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) |
| 41 | |
| 42 | if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x11111234) |
| 43 | return 0; |
| 44 | - |
| 45 | + |
| 46 | addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); |
| 47 | framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK; |
| 48 | if (!framebuffer.base) |
| 49 | diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c |
| 50 | index 4d3195e01..c653d89f9 100644 |
| 51 | --- a/grub-core/video/capture.c |
| 52 | +++ b/grub-core/video/capture.c |
| 53 | @@ -92,7 +92,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info, |
| 54 | framebuffer.ptr = grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch); |
| 55 | if (!framebuffer.ptr) |
| 56 | return grub_errno; |
| 57 | - |
| 58 | + |
| 59 | err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, |
| 60 | &framebuffer.mode_info, |
| 61 | framebuffer.ptr); |
| 62 | diff --git a/grub-core/video/cirrus.c b/grub-core/video/cirrus.c |
| 63 | index e2149e8ce..f5542ccdc 100644 |
| 64 | --- a/grub-core/video/cirrus.c |
| 65 | +++ b/grub-core/video/cirrus.c |
| 66 | @@ -354,11 +354,11 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height, |
| 67 | grub_uint8_t sr_ext = 0, hidden_dac = 0; |
| 68 | |
| 69 | grub_vga_set_geometry (&config, grub_vga_cr_write); |
| 70 | - |
| 71 | + |
| 72 | grub_vga_gr_write (GRUB_VGA_GR_MODE_256_COLOR | GRUB_VGA_GR_MODE_READ_MODE1, |
| 73 | GRUB_VGA_GR_MODE); |
| 74 | grub_vga_gr_write (GRUB_VGA_GR_GR6_GRAPHICS_MODE, GRUB_VGA_GR_GR6); |
| 75 | - |
| 76 | + |
| 77 | grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE); |
| 78 | |
| 79 | grub_vga_cr_write ((config.pitch >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT) |
| 80 | diff --git a/grub-core/video/coreboot/cbfb.c b/grub-core/video/coreboot/cbfb.c |
| 81 | index 9af81fa5b..986003c51 100644 |
| 82 | --- a/grub-core/video/coreboot/cbfb.c |
| 83 | +++ b/grub-core/video/coreboot/cbfb.c |
| 84 | @@ -106,7 +106,7 @@ grub_video_cbfb_setup (unsigned int width, unsigned int height, |
| 85 | |
| 86 | grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, |
| 87 | grub_video_fbstd_colors); |
| 88 | - |
| 89 | + |
| 90 | return err; |
| 91 | } |
| 92 | |
| 93 | diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c |
| 94 | index b7590dc6c..7a5054631 100644 |
| 95 | --- a/grub-core/video/efi_gop.c |
| 96 | +++ b/grub-core/video/efi_gop.c |
| 97 | @@ -273,7 +273,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo |
| 98 | grub_efi_status_t status; |
| 99 | struct grub_efi_gop_mode_info *info = NULL; |
| 100 | struct grub_video_mode_info mode_info; |
| 101 | - |
| 102 | + |
| 103 | status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); |
| 104 | |
| 105 | if (status) |
| 106 | @@ -390,7 +390,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, |
| 107 | found = 1; |
| 108 | } |
| 109 | } |
| 110 | - |
| 111 | + |
| 112 | if (!found) |
| 113 | { |
| 114 | unsigned mode; |
| 115 | @@ -399,7 +399,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, |
| 116 | { |
| 117 | grub_efi_uintn_t size; |
| 118 | grub_efi_status_t status; |
| 119 | - |
| 120 | + |
| 121 | status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); |
| 122 | if (status) |
| 123 | { |
| 124 | @@ -472,11 +472,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, |
| 125 | framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; |
| 126 | framebuffer.offscreen |
| 127 | = grub_malloc (framebuffer.mode_info.height |
| 128 | - * framebuffer.mode_info.width |
| 129 | + * framebuffer.mode_info.width |
| 130 | * sizeof (struct grub_efi_gop_blt_pixel)); |
| 131 | |
| 132 | buffer = framebuffer.offscreen; |
| 133 | - |
| 134 | + |
| 135 | if (!buffer) |
| 136 | { |
| 137 | grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); |
| 138 | @@ -485,11 +485,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, |
| 139 | &framebuffer.mode_info); |
| 140 | buffer = framebuffer.ptr; |
| 141 | } |
| 142 | - |
| 143 | + |
| 144 | grub_dprintf ("video", "GOP: initialising FB @ %p %dx%dx%d\n", |
| 145 | framebuffer.ptr, framebuffer.mode_info.width, |
| 146 | framebuffer.mode_info.height, framebuffer.mode_info.bpp); |
| 147 | - |
| 148 | + |
| 149 | err = grub_video_fb_create_render_target_from_pointer |
| 150 | (&framebuffer.render_target, &framebuffer.mode_info, buffer); |
| 151 | |
| 152 | @@ -498,15 +498,15 @@ grub_video_gop_setup (unsigned int width, unsigned int height, |
| 153 | grub_dprintf ("video", "GOP: Couldn't create FB target\n"); |
| 154 | return err; |
| 155 | } |
| 156 | - |
| 157 | + |
| 158 | err = grub_video_fb_set_active_render_target (framebuffer.render_target); |
| 159 | - |
| 160 | + |
| 161 | if (err) |
| 162 | { |
| 163 | grub_dprintf ("video", "GOP: Couldn't set FB target\n"); |
| 164 | return err; |
| 165 | } |
| 166 | - |
| 167 | + |
| 168 | err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, |
| 169 | grub_video_fbstd_colors); |
| 170 | |
| 171 | @@ -514,7 +514,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, |
| 172 | grub_dprintf ("video", "GOP: Couldn't set palette\n"); |
| 173 | else |
| 174 | grub_dprintf ("video", "GOP: Success\n"); |
| 175 | - |
| 176 | + |
| 177 | return err; |
| 178 | } |
| 179 | |
| 180 | diff --git a/grub-core/video/fb/fbblit.c b/grub-core/video/fb/fbblit.c |
| 181 | index d55924837..1010ef393 100644 |
| 182 | --- a/grub-core/video/fb/fbblit.c |
| 183 | +++ b/grub-core/video/fb/fbblit.c |
| 184 | @@ -466,7 +466,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, |
| 185 | for (i = 0; i < width; i++) |
| 186 | { |
| 187 | register grub_uint32_t col; |
| 188 | - if (*srcptr == 0xf0) |
| 189 | + if (*srcptr == 0xf0) |
| 190 | col = palette[16]; |
| 191 | else |
| 192 | col = palette[*srcptr & 0xf]; |
| 193 | @@ -478,7 +478,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, |
| 194 | *dstptr++ = col >> 0; |
| 195 | *dstptr++ = col >> 8; |
| 196 | *dstptr++ = col >> 16; |
| 197 | -#endif |
| 198 | +#endif |
| 199 | srcptr++; |
| 200 | } |
| 201 | |
| 202 | @@ -651,7 +651,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, |
| 203 | for (i = 0; i < width; i++) |
| 204 | { |
| 205 | register grub_uint32_t col; |
| 206 | - if (*srcptr != 0xf0) |
| 207 | + if (*srcptr != 0xf0) |
| 208 | { |
| 209 | col = palette[*srcptr & 0xf]; |
| 210 | #ifdef GRUB_CPU_WORDS_BIGENDIAN |
| 211 | @@ -662,7 +662,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, |
| 212 | *dstptr++ = col >> 0; |
| 213 | *dstptr++ = col >> 8; |
| 214 | *dstptr++ = col >> 16; |
| 215 | -#endif |
| 216 | +#endif |
| 217 | } |
| 218 | else |
| 219 | dstptr += 3; |
| 220 | diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c |
| 221 | index ae6b89f9a..fa4ebde26 100644 |
| 222 | --- a/grub-core/video/fb/video_fb.c |
| 223 | +++ b/grub-core/video/fb/video_fb.c |
| 224 | @@ -754,7 +754,7 @@ grub_video_fb_unmap_color_int (struct grub_video_fbblit_info * source, |
| 225 | *alpha = 0; |
| 226 | return; |
| 227 | } |
| 228 | - |
| 229 | + |
| 230 | /* If we have an out-of-bounds color, return transparent black. */ |
| 231 | if (color > 255) |
| 232 | { |
| 233 | @@ -1141,7 +1141,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) |
| 234 | /* If everything is aligned on 32-bit use 32-bit copy. */ |
| 235 | if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) |
| 236 | % sizeof (grub_uint32_t) == 0 |
| 237 | - && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) |
| 238 | + && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) |
| 239 | % sizeof (grub_uint32_t) == 0 |
| 240 | && linelen % sizeof (grub_uint32_t) == 0 |
| 241 | && linedelta % sizeof (grub_uint32_t) == 0) |
| 242 | @@ -1155,7 +1155,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) |
| 243 | else if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) |
| 244 | % sizeof (grub_uint16_t) == 0 |
| 245 | && (grub_addr_t) grub_video_fb_get_video_ptr (&target, |
| 246 | - dst_x, dst_y) |
| 247 | + dst_x, dst_y) |
| 248 | % sizeof (grub_uint16_t) == 0 |
| 249 | && linelen % sizeof (grub_uint16_t) == 0 |
| 250 | && linedelta % sizeof (grub_uint16_t) == 0) |
| 251 | @@ -1170,7 +1170,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) |
| 252 | { |
| 253 | grub_uint8_t *src, *dst; |
| 254 | DO_SCROLL |
| 255 | - } |
| 256 | + } |
| 257 | } |
| 258 | |
| 259 | /* 4. Fill empty space with specified color. In this implementation |
| 260 | @@ -1615,7 +1615,7 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask, |
| 261 | framebuffer.render_target = framebuffer.back_target; |
| 262 | return GRUB_ERR_NONE; |
| 263 | } |
| 264 | - |
| 265 | + |
| 266 | mode_info->mode_type &= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED |
| 267 | | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); |
| 268 | |
| 269 | diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c |
| 270 | index b7f911926..0e65b5206 100644 |
| 271 | --- a/grub-core/video/i386/pc/vbe.c |
| 272 | +++ b/grub-core/video/i386/pc/vbe.c |
| 273 | @@ -219,7 +219,7 @@ grub_vbe_disable_mtrr (int mtrr) |
| 274 | } |
| 275 | |
| 276 | /* Call VESA BIOS 0x4f09 to set palette data, return status. */ |
| 277 | -static grub_vbe_status_t |
| 278 | +static grub_vbe_status_t |
| 279 | grub_vbe_bios_set_palette_data (grub_uint32_t color_count, |
| 280 | grub_uint32_t start_index, |
| 281 | struct grub_vbe_palette_data *palette_data) |
| 282 | @@ -237,7 +237,7 @@ grub_vbe_bios_set_palette_data (grub_uint32_t color_count, |
| 283 | } |
| 284 | |
| 285 | /* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status. */ |
| 286 | -grub_vbe_status_t |
| 287 | +grub_vbe_status_t |
| 288 | grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) |
| 289 | { |
| 290 | struct grub_bios_int_registers regs; |
| 291 | @@ -251,7 +251,7 @@ grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) |
| 292 | } |
| 293 | |
| 294 | /* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status. */ |
| 295 | -grub_vbe_status_t |
| 296 | +grub_vbe_status_t |
| 297 | grub_vbe_bios_get_mode_info (grub_uint32_t mode, |
| 298 | struct grub_vbe_mode_info_block *mode_info) |
| 299 | { |
| 300 | @@ -285,7 +285,7 @@ grub_vbe_bios_set_mode (grub_uint32_t mode, |
| 301 | } |
| 302 | |
| 303 | /* Call VESA BIOS 0x4f03 to return current VBE Mode, return status. */ |
| 304 | -grub_vbe_status_t |
| 305 | +grub_vbe_status_t |
| 306 | grub_vbe_bios_get_mode (grub_uint32_t *mode) |
| 307 | { |
| 308 | struct grub_bios_int_registers regs; |
| 309 | @@ -298,7 +298,7 @@ grub_vbe_bios_get_mode (grub_uint32_t *mode) |
| 310 | return regs.eax & 0xffff; |
| 311 | } |
| 312 | |
| 313 | -grub_vbe_status_t |
| 314 | +grub_vbe_status_t |
| 315 | grub_vbe_bios_getset_dac_palette_width (int set, int *dac_mask_size) |
| 316 | { |
| 317 | struct grub_bios_int_registers regs; |
| 318 | @@ -346,7 +346,7 @@ grub_vbe_bios_get_memory_window (grub_uint32_t window, |
| 319 | } |
| 320 | |
| 321 | /* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status. */ |
| 322 | -grub_vbe_status_t |
| 323 | +grub_vbe_status_t |
| 324 | grub_vbe_bios_set_scanline_length (grub_uint32_t length) |
| 325 | { |
| 326 | struct grub_bios_int_registers regs; |
| 327 | @@ -354,14 +354,14 @@ grub_vbe_bios_set_scanline_length (grub_uint32_t length) |
| 328 | regs.ecx = length; |
| 329 | regs.eax = 0x4f06; |
| 330 | /* BL = 2, Set Scan Line in Bytes. */ |
| 331 | - regs.ebx = 0x0002; |
| 332 | + regs.ebx = 0x0002; |
| 333 | regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; |
| 334 | grub_bios_interrupt (0x10, ®s); |
| 335 | return regs.eax & 0xffff; |
| 336 | } |
| 337 | |
| 338 | /* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status. */ |
| 339 | -grub_vbe_status_t |
| 340 | +grub_vbe_status_t |
| 341 | grub_vbe_bios_get_scanline_length (grub_uint32_t *length) |
| 342 | { |
| 343 | struct grub_bios_int_registers regs; |
| 344 | @@ -377,7 +377,7 @@ grub_vbe_bios_get_scanline_length (grub_uint32_t *length) |
| 345 | } |
| 346 | |
| 347 | /* Call VESA BIOS 0x4f07 to set display start, return status. */ |
| 348 | -static grub_vbe_status_t |
| 349 | +static grub_vbe_status_t |
| 350 | grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) |
| 351 | { |
| 352 | struct grub_bios_int_registers regs; |
| 353 | @@ -390,7 +390,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) |
| 354 | regs.edx = y; |
| 355 | regs.eax = 0x4f07; |
| 356 | /* BL = 80h, Set Display Start during Vertical Retrace. */ |
| 357 | - regs.ebx = 0x0080; |
| 358 | + regs.ebx = 0x0080; |
| 359 | regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; |
| 360 | grub_bios_interrupt (0x10, ®s); |
| 361 | |
| 362 | @@ -401,7 +401,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) |
| 363 | } |
| 364 | |
| 365 | /* Call VESA BIOS 0x4f07 to get display start, return status. */ |
| 366 | -grub_vbe_status_t |
| 367 | +grub_vbe_status_t |
| 368 | grub_vbe_bios_get_display_start (grub_uint32_t *x, |
| 369 | grub_uint32_t *y) |
| 370 | { |
| 371 | @@ -419,7 +419,7 @@ grub_vbe_bios_get_display_start (grub_uint32_t *x, |
| 372 | } |
| 373 | |
| 374 | /* Call VESA BIOS 0x4f0a. */ |
| 375 | -grub_vbe_status_t |
| 376 | +grub_vbe_status_t |
| 377 | grub_vbe_bios_get_pm_interface (grub_uint16_t *segment, grub_uint16_t *offset, |
| 378 | grub_uint16_t *length) |
| 379 | { |
| 380 | @@ -896,7 +896,7 @@ vbe2videoinfo (grub_uint32_t mode, |
| 381 | case GRUB_VBE_MEMORY_MODEL_YUV: |
| 382 | mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_YUV; |
| 383 | break; |
| 384 | - |
| 385 | + |
| 386 | case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR: |
| 387 | mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_RGB; |
| 388 | break; |
| 389 | @@ -923,10 +923,10 @@ vbe2videoinfo (grub_uint32_t mode, |
| 390 | break; |
| 391 | case 8: |
| 392 | mode_info->bytes_per_pixel = 1; |
| 393 | - break; |
| 394 | + break; |
| 395 | case 4: |
| 396 | mode_info->bytes_per_pixel = 0; |
| 397 | - break; |
| 398 | + break; |
| 399 | } |
| 400 | |
| 401 | if (controller_info.version >= 0x300) |
| 402 | @@ -976,7 +976,7 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info, vo |
| 403 | |
| 404 | static grub_err_t |
| 405 | grub_video_vbe_setup (unsigned int width, unsigned int height, |
| 406 | - grub_video_mode_type_t mode_type, |
| 407 | + grub_video_mode_type_t mode_type, |
| 408 | grub_video_mode_type_t mode_mask) |
| 409 | { |
| 410 | grub_uint16_t *p; |
| 411 | @@ -1193,7 +1193,7 @@ grub_video_vbe_print_adapter_specific_info (void) |
| 412 | controller_info.version & 0xFF, |
| 413 | controller_info.oem_software_rev >> 8, |
| 414 | controller_info.oem_software_rev & 0xFF); |
| 415 | - |
| 416 | + |
| 417 | /* The total_memory field is in 64 KiB units. */ |
| 418 | grub_printf_ (N_(" total memory: %d KiB\n"), |
| 419 | (controller_info.total_memory << 6)); |
| 420 | diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c |
| 421 | index b2f776c99..50d0b5e02 100644 |
| 422 | --- a/grub-core/video/i386/pc/vga.c |
| 423 | +++ b/grub-core/video/i386/pc/vga.c |
| 424 | @@ -48,7 +48,7 @@ static struct |
| 425 | int back_page; |
| 426 | } framebuffer; |
| 427 | |
| 428 | -static unsigned char |
| 429 | +static unsigned char |
| 430 | grub_vga_set_mode (unsigned char mode) |
| 431 | { |
| 432 | struct grub_bios_int_registers regs; |
| 433 | @@ -182,10 +182,10 @@ grub_video_vga_setup (unsigned int width, unsigned int height, |
| 434 | |
| 435 | is_target = 1; |
| 436 | err = grub_video_fb_set_active_render_target (framebuffer.render_target); |
| 437 | - |
| 438 | + |
| 439 | if (err) |
| 440 | return err; |
| 441 | - |
| 442 | + |
| 443 | err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, |
| 444 | grub_video_fbstd_colors); |
| 445 | |
| 446 | diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c |
| 447 | index f437fb0df..ca3d3c3b2 100644 |
| 448 | --- a/grub-core/video/ieee1275.c |
| 449 | +++ b/grub-core/video/ieee1275.c |
| 450 | @@ -233,7 +233,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, |
| 451 | /* TODO. */ |
| 452 | return grub_error (GRUB_ERR_IO, "can't set mode %dx%d", width, height); |
| 453 | } |
| 454 | - |
| 455 | + |
| 456 | err = grub_video_ieee1275_fill_mode_info (dev, &framebuffer.mode_info); |
| 457 | if (err) |
| 458 | { |
| 459 | @@ -260,7 +260,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, |
| 460 | |
| 461 | grub_video_ieee1275_set_palette (0, framebuffer.mode_info.number_of_colors, |
| 462 | grub_video_fbstd_colors); |
| 463 | - |
| 464 | + |
| 465 | return err; |
| 466 | } |
| 467 | |
| 468 | diff --git a/grub-core/video/radeon_fuloong2e.c b/grub-core/video/radeon_fuloong2e.c |
| 469 | index b4da34b5e..40917acb7 100644 |
| 470 | --- a/grub-core/video/radeon_fuloong2e.c |
| 471 | +++ b/grub-core/video/radeon_fuloong2e.c |
| 472 | @@ -75,7 +75,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) |
| 473 | if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA |
| 474 | || pciid != 0x515a1002) |
| 475 | return 0; |
| 476 | - |
| 477 | + |
| 478 | *found = 1; |
| 479 | |
| 480 | addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); |
| 481 | @@ -139,7 +139,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, |
| 482 | framebuffer.mapped = 1; |
| 483 | |
| 484 | /* Prevent garbage from appearing on the screen. */ |
| 485 | - grub_memset (framebuffer.ptr, 0x55, |
| 486 | + grub_memset (framebuffer.ptr, 0x55, |
| 487 | framebuffer.mode_info.height * framebuffer.mode_info.pitch); |
| 488 | |
| 489 | #ifndef TEST |
| 490 | @@ -152,7 +152,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, |
| 491 | return err; |
| 492 | |
| 493 | err = grub_video_fb_set_active_render_target (framebuffer.render_target); |
| 494 | - |
| 495 | + |
| 496 | if (err) |
| 497 | return err; |
| 498 | |
| 499 | diff --git a/grub-core/video/radeon_yeeloong3a.c b/grub-core/video/radeon_yeeloong3a.c |
| 500 | index 52614feb6..48631c181 100644 |
| 501 | --- a/grub-core/video/radeon_yeeloong3a.c |
| 502 | +++ b/grub-core/video/radeon_yeeloong3a.c |
| 503 | @@ -74,7 +74,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) |
| 504 | if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA |
| 505 | || pciid != 0x96151002) |
| 506 | return 0; |
| 507 | - |
| 508 | + |
| 509 | *found = 1; |
| 510 | |
| 511 | addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); |
| 512 | @@ -137,7 +137,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, |
| 513 | #endif |
| 514 | |
| 515 | /* Prevent garbage from appearing on the screen. */ |
| 516 | - grub_memset (framebuffer.ptr, 0, |
| 517 | + grub_memset (framebuffer.ptr, 0, |
| 518 | framebuffer.mode_info.height * framebuffer.mode_info.pitch); |
| 519 | |
| 520 | #ifndef TEST |
| 521 | @@ -150,7 +150,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, |
| 522 | return err; |
| 523 | |
| 524 | err = grub_video_fb_set_active_render_target (framebuffer.render_target); |
| 525 | - |
| 526 | + |
| 527 | if (err) |
| 528 | return err; |
| 529 | |
| 530 | diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c |
| 531 | index 0157ff742..54dfedf43 100644 |
| 532 | --- a/grub-core/video/readers/png.c |
| 533 | +++ b/grub-core/video/readers/png.c |
| 534 | @@ -916,7 +916,7 @@ grub_png_convert_image (struct grub_png_data *data) |
| 535 | } |
| 536 | return; |
| 537 | } |
| 538 | - |
| 539 | + |
| 540 | if (data->is_gray) |
| 541 | { |
| 542 | switch (data->bpp) |
| 543 | diff --git a/grub-core/video/readers/tga.c b/grub-core/video/readers/tga.c |
| 544 | index 7cb9d1d2a..a9ec3a1b6 100644 |
| 545 | --- a/grub-core/video/readers/tga.c |
| 546 | +++ b/grub-core/video/readers/tga.c |
| 547 | @@ -127,7 +127,7 @@ tga_load_palette (struct tga_data *data) |
| 548 | |
| 549 | if (len > sizeof (data->palette)) |
| 550 | len = sizeof (data->palette); |
| 551 | - |
| 552 | + |
| 553 | if (grub_file_read (data->file, &data->palette, len) |
| 554 | != (grub_ssize_t) len) |
| 555 | return grub_errno; |
| 556 | diff --git a/grub-core/video/sis315_init.c b/grub-core/video/sis315_init.c |
| 557 | index ae5c1419c..09c3c7bbe 100644 |
| 558 | --- a/grub-core/video/sis315_init.c |
| 559 | +++ b/grub-core/video/sis315_init.c |
| 560 | @@ -1,4 +1,4 @@ |
| 561 | -static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = |
| 562 | +static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = |
| 563 | { |
| 564 | { 0x28, 0x81 }, |
| 565 | { 0x2a, 0x00 }, |
| 566 | diff --git a/grub-core/video/sis315pro.c b/grub-core/video/sis315pro.c |
| 567 | index 22a0c85a6..4d2f9999a 100644 |
| 568 | --- a/grub-core/video/sis315pro.c |
| 569 | +++ b/grub-core/video/sis315pro.c |
| 570 | @@ -103,7 +103,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) |
| 571 | if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA |
| 572 | || pciid != GRUB_SIS315PRO_PCIID) |
| 573 | return 0; |
| 574 | - |
| 575 | + |
| 576 | *found = 1; |
| 577 | |
| 578 | addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); |
| 579 | @@ -218,7 +218,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, |
| 580 | |
| 581 | #ifndef TEST |
| 582 | /* Prevent garbage from appearing on the screen. */ |
| 583 | - grub_memset (framebuffer.ptr, 0, |
| 584 | + grub_memset (framebuffer.ptr, 0, |
| 585 | framebuffer.mode_info.height * framebuffer.mode_info.pitch); |
| 586 | grub_arch_sync_dma_caches (framebuffer.ptr, |
| 587 | framebuffer.mode_info.height |
| 588 | @@ -231,7 +231,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, |
| 589 | | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 |
| 590 | | GRUB_VGA_IO_MISC_28MHZ |
| 591 | | GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS |
| 592 | - | GRUB_VGA_IO_MISC_COLOR, |
| 593 | + | GRUB_VGA_IO_MISC_COLOR, |
| 594 | GRUB_VGA_IO_MISC_WRITE + GRUB_MACHINE_PCI_IO_BASE); |
| 595 | |
| 596 | grub_vga_sr_write (0x86, 5); |
| 597 | @@ -335,7 +335,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, |
| 598 | { |
| 599 | if (read_sis_cmd (0x5) != 0xa1) |
| 600 | write_sis_cmd (0x86, 0x5); |
| 601 | - |
| 602 | + |
| 603 | write_sis_cmd (read_sis_cmd (0x20) | 0xa1, 0x20); |
| 604 | write_sis_cmd (read_sis_cmd (0x1e) | 0xda, 0x1e); |
| 605 | |
| 606 | diff --git a/grub-core/video/sm712.c b/grub-core/video/sm712.c |
| 607 | index 10c46eb65..65f59f84b 100644 |
| 608 | --- a/grub-core/video/sm712.c |
| 609 | +++ b/grub-core/video/sm712.c |
| 610 | @@ -167,7 +167,7 @@ enum |
| 611 | GRUB_SM712_CR_SHADOW_VGA_VBLANK_START = 0x46, |
| 612 | GRUB_SM712_CR_SHADOW_VGA_VBLANK_END = 0x47, |
| 613 | GRUB_SM712_CR_SHADOW_VGA_VRETRACE_START = 0x48, |
| 614 | - GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, |
| 615 | + GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, |
| 616 | GRUB_SM712_CR_SHADOW_VGA_OVERFLOW = 0x4a, |
| 617 | GRUB_SM712_CR_SHADOW_VGA_CELL_HEIGHT = 0x4b, |
| 618 | GRUB_SM712_CR_SHADOW_VGA_HDISPLAY_END = 0x4c, |
| 619 | @@ -375,7 +375,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) |
| 620 | if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA |
| 621 | || pciid != GRUB_SM712_PCIID) |
| 622 | return 0; |
| 623 | - |
| 624 | + |
| 625 | *found = 1; |
| 626 | |
| 627 | addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); |
| 628 | @@ -471,7 +471,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, |
| 629 | |
| 630 | #if !defined (TEST) && !defined(GENINIT) |
| 631 | /* Prevent garbage from appearing on the screen. */ |
| 632 | - grub_memset ((void *) framebuffer.cached_ptr, 0, |
| 633 | + grub_memset ((void *) framebuffer.cached_ptr, 0, |
| 634 | framebuffer.mode_info.height * framebuffer.mode_info.pitch); |
| 635 | #endif |
| 636 | |
| 637 | @@ -482,7 +482,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, |
| 638 | grub_sm712_sr_write (0x2, 0x6b); |
| 639 | grub_sm712_write_reg (0, GRUB_VGA_IO_PIXEL_MASK); |
| 640 | grub_sm712_sr_write (GRUB_VGA_SR_RESET_ASYNC, GRUB_VGA_SR_RESET); |
| 641 | - grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY |
| 642 | + grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY |
| 643 | | GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY |
| 644 | | GRUB_VGA_IO_MISC_UPPER_64K |
| 645 | | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 |
| 646 | @@ -694,7 +694,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, |
| 647 | for (i = 0; i < ARRAY_SIZE (dda_lookups); i++) |
| 648 | grub_sm712_write_dda_lookup (i, dda_lookups[i].compare, dda_lookups[i].dda, |
| 649 | dda_lookups[i].vcentering); |
| 650 | - |
| 651 | + |
| 652 | /* Undocumented */ |
| 653 | grub_sm712_cr_write (0, 0x9c); |
| 654 | grub_sm712_cr_write (0, 0x9d); |
| 655 | diff --git a/grub-core/video/video.c b/grub-core/video/video.c |
| 656 | index 983424107..8937da745 100644 |
| 657 | --- a/grub-core/video/video.c |
| 658 | +++ b/grub-core/video/video.c |
| 659 | @@ -491,13 +491,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) |
| 660 | current_mode); |
| 661 | |
| 662 | param++; |
| 663 | - |
| 664 | + |
| 665 | *width = grub_strtoul (value, 0, 0); |
| 666 | if (grub_errno != GRUB_ERR_NONE) |
| 667 | return grub_error (GRUB_ERR_BAD_ARGUMENT, |
| 668 | N_("invalid video mode specification `%s'"), |
| 669 | current_mode); |
| 670 | - |
| 671 | + |
| 672 | /* Find height value. */ |
| 673 | value = param; |
| 674 | param = grub_strchr(param, 'x'); |
| 675 | @@ -513,13 +513,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) |
| 676 | { |
| 677 | /* We have optional color depth value. */ |
| 678 | param++; |
| 679 | - |
| 680 | + |
| 681 | *height = grub_strtoul (value, 0, 0); |
| 682 | if (grub_errno != GRUB_ERR_NONE) |
| 683 | return grub_error (GRUB_ERR_BAD_ARGUMENT, |
| 684 | N_("invalid video mode specification `%s'"), |
| 685 | current_mode); |
| 686 | - |
| 687 | + |
| 688 | /* Convert color depth value. */ |
| 689 | value = param; |
| 690 | *depth = grub_strtoul (value, 0, 0); |
| 691 | -- |
| 692 | 2.34.1 |
| 693 | |