vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge mainline into ofwfb

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-14 15:43:22 +01:00
commit 9a1e70432b
110 changed files with 1545 additions and 1097 deletions
Download patch file Download diff file Expand all files Collapse all files

6
video/fb/video_fb.c
View file

@ -1006,11 +1006,13 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)
{ \
/* 3b. Move data downwards. */ \
dst = (void *) grub_video_fb_get_video_ptr (&target, \
dst_x + width - 1, \
dst_x + width, \
dst_y + height - 1); \
src = (void *) grub_video_fb_get_video_ptr (&target, \
src_x + width - 1, \
src_x + width, \
src_y + height - 1); \
dst--; \
src--; \
for (j = 0; j < height; j++) \
{ \
for (i = 0; i < linelen; i++) \

1
video/i386/pc/vbe.c
View file

@ -22,6 +22,7 @@
#include <grub/machine/memory.h>
#include <grub/machine/vga.h>
#include <grub/machine/vbe.h>
#include <grub/video_fb.h>
#include <grub/types.h>
#include <grub/dl.h>
#include <grub/misc.h>