Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 486 → Rev 487

/shark/trunk/drivers/fb/fun16.c
144,6 → 144,7
{
 
grx_info = registered_fb[num];
grx_info->fix.visual = FB_VISUAL_DIRECTCOLOR;
 
}
 
196,7 → 197,7
rect.dx = x1;
rect.dy = y1;
rect.width = x2-x1+1;
rect.height = x2-x1+1;
rect.height = y2-y1+1;
rect.color = color;
rect.rop = ROP_COPY;
252,7 → 253,7
}
}
 
void linLine16(WORD x1, WORD y1, WORD x2, WORD y2, DWORD color)
void grx_line(WORD x1, WORD y1, WORD x2, WORD y2, DWORD color)
{
register int t, distance;
register DWORD addr;
/shark/trunk/drivers/fb/cfbfillrect.c
391,8 → 391,8
width = x2 - rect->dx;
height = y2 - rect->dy;
if (p->fix.visual == FB_VISUAL_TRUECOLOR ||
p->fix.visual == FB_VISUAL_DIRECTCOLOR )
if (!(p->fix.visual == FB_VISUAL_TRUECOLOR ||
p->fix.visual == FB_VISUAL_DIRECTCOLOR ))
fg = ((u32 *) (p->pseudo_palette))[rect->color];
else
fg = rect->color;
/shark/trunk/drivers/fb/makefile
16,7 → 16,7
 
OTHERINCL += -I$(BASE)/drivers/linuxc26/include -I./include -I.
 
C_OPT += -D__KERNEL__ -D__i386__ -DCONFIG_FB_VESA -DCONFIG_LOGO
C_OPT += -D__KERNEL__ -D__i386__ $(CFG_VIDEO_OPT)
 
include $(BASE)/config/lib.mk