Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-23 20:29:42 +00:00
Code Issues Projects Releases Wiki Activity

fbsplash: use line_length instead of xres * bytes_per_pixel

Browse Source 
In some system (e.g. my "strange" device), line_length is not equal xres *
bytes_per_pixel, so we need to use line_length in scr_fix to mmap and draw
rectangle etc.

My "strange" device output this:
bytes_per_pixel: 4
xres: 600, yres: 1024
yoffset: 0, xoffset: 0, line_length: 2432
G.addr: b74da000

Signed-off-by: Yin Kangkai <kangkai.yin@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Yin Kangkai 2012-02-23 15:56:36 +08:00 committed by Denys Vlasenko
parent 62c006d508
commit 3ac066c256
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
miscutils/fbsplash.c
View File

@ -143,7 +143,7 @@ static void fb_open(const char *strfb_device)
// map the device in memory // map the device in memory
G.addr = mmap(NULL, G.addr = mmap(NULL,
G.scr_var.xres * G.scr_var.yres * G.bytes_per_pixel, G.scr_var.yres * G.scr_fix.line_length,
PROT_WRITE, MAP_SHARED, fbfd, 0); PROT_WRITE, MAP_SHARED, fbfd, 0);
if (G.addr == MAP_FAILED) if (G.addr == MAP_FAILED)
bb_perror_msg_and_die("mmap"); bb_perror_msg_and_die("mmap");
@ -213,8 +213,8 @@ static void fb_drawrectangle(void)
thispix = fb_pixel_value(nred, ngreen, nblue); thispix = fb_pixel_value(nred, ngreen, nblue);
// horizontal lines // horizontal lines
ptr1 = G.addr + (G.nbar_posy * G.scr_var.xres + G.nbar_posx) * G.bytes_per_pixel; ptr1 = G.addr + G.nbar_posy * G.scr_fix.line_length + G.nbar_posx * G.bytes_per_pixel;
ptr2 = G.addr + ((G.nbar_posy + G.nbar_height - 1) * G.scr_var.xres + G.nbar_posx) * G.bytes_per_pixel; ptr2 = G.addr + (G.nbar_posy + G.nbar_height - 1) * G.scr_fix.line_length + G.nbar_posx * G.bytes_per_pixel;
cnt = G.nbar_width - 1; cnt = G.nbar_width - 1;
do { do {
fb_write_pixel(ptr1, thispix); fb_write_pixel(ptr1, thispix);
@ -224,14 +224,14 @@ static void fb_drawrectangle(void)
} while (--cnt >= 0); } while (--cnt >= 0);
// vertical lines // vertical lines
ptr1 = G.addr + (G.nbar_posy * G.scr_var.xres + G.nbar_posx) * G.bytes_per_pixel; ptr1 = G.addr + G.nbar_posy * G.scr_fix.line_length + G.nbar_posx * G.bytes_per_pixel;
ptr2 = G.addr + (G.nbar_posy * G.scr_var.xres + G.nbar_posx + G.nbar_width - 1) * G.bytes_per_pixel; ptr2 = G.addr + G.nbar_posy * G.scr_fix.line_length + (G.nbar_posx + G.nbar_width - 1) * G.bytes_per_pixel;
cnt = G.nbar_height - 1; cnt = G.nbar_height - 1;
do { do {
fb_write_pixel(ptr1, thispix); fb_write_pixel(ptr1, thispix);
fb_write_pixel(ptr2, thispix); fb_write_pixel(ptr2, thispix);
ptr1 += G.scr_var.xres * G.bytes_per_pixel; ptr1 += G.scr_fix.line_length;
ptr2 += G.scr_var.xres * G.bytes_per_pixel; ptr2 += G.scr_fix.line_length;
} while (--cnt >= 0); } while (--cnt >= 0);
} }
@ -254,7 +254,7 @@ static void fb_drawfullrectangle(int nx1pos, int ny1pos, int nx2pos, int ny2pos,
cnt1 = ny2pos - ny1pos; cnt1 = ny2pos - ny1pos;
nypos = ny1pos; nypos = ny1pos;
do { do {
ptr = G.addr + (nypos * G.scr_var.xres + nx1pos) * G.bytes_per_pixel; ptr = G.addr + nypos * G.scr_fix.line_length + nx1pos * G.bytes_per_pixel;
cnt2 = nx2pos - nx1pos; cnt2 = nx2pos - nx1pos;
do { do {
fb_write_pixel(ptr, thispix); fb_write_pixel(ptr, thispix);