Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1022 → Rev 1021

/shark/trunk/drivers/fb/fbmem.c
1342,8 → 1342,8
extern int linuxcomp_setfd(struct inode *i, int i_rdev);
 
/* Shark Inode emulation */
int fb_open_inode(int num)
{
int fb_open_inode(int num) {
struct inode *i;
 
i = (struct inode *)kmalloc(sizeof(struct inode),GFP_KERNEL);
1357,11 → 1357,12
 
kfree(i);
return 0;
}
 
/* Shark Inode emulation */
int fb_close_inode(int num)
{
int fb_close_inode(int num) {
 
struct inode *i;
 
i = (struct inode *)kmalloc(sizeof(struct inode),GFP_KERNEL);
1376,10 → 1377,11
kfree(i);
 
return 0;
 
}
 
int fb_set_mode_inode(int num, unsigned char *modeopt)
{
int fb_set_mode_inode(int num, unsigned char *modeopt) {
 
struct fb_var_screeninfo var;
struct fb_info *info = registered_fb[num];
struct fb_fillrect rect;
1413,6 → 1415,7
cfb_fillrect(info,&rect);
 
return 0;
}
 
/**
/shark/trunk/drivers/fb/vesafb.c
224,6 → 224,7
 
static int vesafb_set_par(struct fb_info *info)
{
 
ModeInfoBlock ModeInfo;
int wx,wy,bpp,mode;
int video_cmap_len;
/shark/trunk/drivers/fb/gdvesa.c
91,10 → 91,11
return mode;
}
 
void vbe_restore_vga(void)
{
void vbe_restore_vga(void) {
 
X_REGS16 inregs, outregs;
X_SREGS16 sregs;
 
#ifndef VM86
BYTE p1,p2;
#endif
111,6 → 112,7
#else
vm86_callBIOS(0x10, &inregs, &outregs, &sregs);
#endif
 
}
 
int vbe_getinfo(void)
145,7 → 147,6
VbeInfo.VbeSignature[3] = '2';
 
memcpy((void *)linearaddr, &VbeInfo, sizeof(VbeInfo));
 
#ifndef VM86
p1 = inp(0x21);
p2 = inp(0xA1);
160,7 → 161,6
if (vbe_check_status(outregs.x.ax) < 0)
return -1;
memcpy(&VbeInfo, (void *)linearaddr, sizeof(VbeInfo));
 
return 0;
}
}
259,7 → 259,9
#else
vm86_callBIOS(0x10, &inregs, &outregs, &sregs);
#endif
 
return 1; //vbe_check_status (outregs.x.ax);
 
}
 
WORD vbe_getbpr(ModeInfoBlock *ModeInfo)