Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 485 → Rev 486

/shark/trunk/drivers/fb/fun16.c
138,14 → 138,13
#define memsetw(addr, val, n) {LIN_ADDR i; for(i = addr; i < addr + n; i += 2) *(WORD *)i = val;}
 
struct fb_info *grx_info = NULL;
extern struct fb_info *registered_fb[FB_MAX];
 
void grx_fb_init(struct fb_info *info)
void grx_fb_init(int num)
{
 
if (!info) return;
grx_info = registered_fb[num];
 
grx_info = info;
 
}
 
void grx_putimage(WORD x1, WORD y1, WORD x2, WORD y2, BYTE *buf)
/shark/trunk/drivers/fb/include/drivers/grx_fb.h
3,7 → 3,7
 
/* GRX emulation under FrameBuffer */
 
void grx_fb_init(struct fb_info *info);
void grx_fb_init(int num);
void grx_plot(WORD x, WORD y, DWORD color);
DWORD grx_getpixel(WORD x, WORD y);
void grx_getimage(WORD x1, WORD y1, WORD x2, WORD y2, BYTE *buf);
/shark/trunk/drivers/fb/makefile
12,11 → 12,11
 
OBJS = fbmem.o fbcmap.o cfbfillrect.o softcursor.o cfbcopyarea.o cfbimgblt.o\
modedb.o vga16fb.o vgastate.o vesafb.o radeonfb.o shark_fb26.o gdvesa.o\
logo.o logo_bmp.o ./riva/fbdev.o ./riva/nv_driver.o ./riva/riva_hw.o
logo.o logo_bmp.o ./riva/fbdev.o ./riva/nv_driver.o ./riva/riva_hw.o fun16.o
 
OTHERINCL += -I$(BASE)/drivers/linuxc26/include -I.
OTHERINCL += -I$(BASE)/drivers/linuxc26/include -I./include -I.
 
C_OPT += -D__KERNEL__ -D__i386__ -DCONFIG_FB_RIVA -DCONFIG_LOGO
C_OPT += -D__KERNEL__ -D__i386__ -DCONFIG_FB_VESA -DCONFIG_LOGO
 
include $(BASE)/config/lib.mk