Commit 82d6eb5b authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: xgifb: Remove USHORT, ULONG, BOOLEAN, and VOID typedefs

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 490ce818
...@@ -499,13 +499,13 @@ u8 XGIfb_mode_no = 0; ...@@ -499,13 +499,13 @@ u8 XGIfb_mode_no = 0;
u8 XGIfb_rate_idx = 0; u8 XGIfb_rate_idx = 0;
/* TW: CR36 evaluation */ /* TW: CR36 evaluation */
const USHORT XGI300paneltype[] = const unsigned short XGI300paneltype[] =
{ LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, { LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024,
LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768, LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768,
LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768,
LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768 }; LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768 };
const USHORT XGI310paneltype[] = const unsigned short XGI310paneltype[] =
{ LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, { LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024,
LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960,
LCD_1152x768, LCD_1400x1050,LCD_1280x768, LCD_1600x1200, LCD_1152x768, LCD_1400x1050,LCD_1280x768, LCD_1600x1200,
...@@ -821,7 +821,9 @@ extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_ ...@@ -821,7 +821,9 @@ extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_
unsigned int *hsync_len, unsigned int *vsync_len, unsigned int *hsync_len, unsigned int *vsync_len,
unsigned int *sync, unsigned int *vmode); unsigned int *sync, unsigned int *vmode);
*/ */
extern BOOLEAN XGI_SearchModeID( USHORT ModeNo,USHORT *ModeIdIndex, PVB_DEVICE_INFO ); extern unsigned char XGI_SearchModeID(unsigned short ModeNo,
unsigned short *ModeIdIndex,
PVB_DEVICE_INFO);
static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con, static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
struct fb_info *info); struct fb_info *info);
...@@ -841,10 +843,10 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, ...@@ -841,10 +843,10 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
static void XGIfb_pre_setmode(void); static void XGIfb_pre_setmode(void);
static void XGIfb_post_setmode(void); static void XGIfb_post_setmode(void);
static BOOLEAN XGIfb_CheckVBRetrace(void); static unsigned char XGIfb_CheckVBRetrace(void);
static BOOLEAN XGIfbcheckvretracecrt2(void); static unsigned char XGIfbcheckvretracecrt2(void);
static BOOLEAN XGIfbcheckvretracecrt1(void); static unsigned char XGIfbcheckvretracecrt1(void);
static BOOLEAN XGIfb_bridgeisslave(void); static unsigned char XGIfb_bridgeisslave(void);
struct XGI_memreq { struct XGI_memreq {
unsigned long offset; unsigned long offset;
...@@ -879,7 +881,7 @@ static XGI_OH *XGIfb_poh_free(unsigned long base); ...@@ -879,7 +881,7 @@ static XGI_OH *XGIfb_poh_free(unsigned long base);
static void XGIfb_free_node(XGI_OH *poh); static void XGIfb_free_node(XGI_OH *poh);
/* Internal routines to access PCI configuration space */ /* Internal routines to access PCI configuration space */
BOOLEAN XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, unsigned char XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
unsigned long offset, unsigned long set, unsigned long *value); unsigned long offset, unsigned long set, unsigned long *value);
//BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, //BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
// unsigned long offset, unsigned long set, unsigned long *value); // unsigned long offset, unsigned long set, unsigned long *value);
...@@ -887,18 +889,26 @@ BOOLEAN XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, ...@@ -887,18 +889,26 @@ BOOLEAN XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
/* Routines from init.c/init301.c */ /* Routines from init.c/init301.c */
extern void InitTo330Pointer(UCHAR,PVB_DEVICE_INFO pVBInfo); extern void InitTo330Pointer(UCHAR,PVB_DEVICE_INFO pVBInfo);
extern BOOLEAN XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension); extern unsigned char XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension);
extern BOOLEAN XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, USHORT ModeNo); extern unsigned char XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension,
unsigned short ModeNo);
//extern void XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr); //extern void XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr);
extern void XGI_LongWait(VB_DEVICE_INFO *XGI_Pr); extern void XGI_LongWait(VB_DEVICE_INFO *XGI_Pr);
extern USHORT XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO pVBInfo ); extern unsigned short XGI_GetRatePtrCRT2(PXGI_HW_DEVICE_INFO pXGIHWDE,
unsigned short ModeNo,
unsigned short ModeIdIndex,
PVB_DEVICE_INFO pVBInfo);
/* TW: Chrontel TV functions */ /* TW: Chrontel TV functions */
extern USHORT XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx); extern unsigned short XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr,
extern void XGI_SetCH700x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx); unsigned short tempbx);
extern USHORT XGI_GetCH701x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx); extern void XGI_SetCH700x(VB_DEVICE_INFO *XGI_Pr, unsigned short tempbx);
extern void XGI_SetCH701x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx); extern unsigned short XGI_GetCH701x(VB_DEVICE_INFO *XGI_Pr,
extern void XGI_SetCH70xxANDOR(VB_DEVICE_INFO *XGI_Pr, USHORT tempax,USHORT tempbh); unsigned short tempbx);
extern void XGI_DDC2Delay(VB_DEVICE_INFO *XGI_Pr, USHORT delaytime); extern void XGI_SetCH701x(VB_DEVICE_INFO *XGI_Pr, unsigned short tempbx);
extern void XGI_SetCH70xxANDOR(VB_DEVICE_INFO *XGI_Pr,
unsigned short tempax,
unsigned short tempbh);
extern void XGI_DDC2Delay(VB_DEVICE_INFO *XGI_Pr, unsigned short delaytime);
/* TW: Sensing routines */ /* TW: Sensing routines */
void XGI_Sense30x(void); void XGI_Sense30x(void);
......
...@@ -165,11 +165,11 @@ int ...@@ -165,11 +165,11 @@ int
XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension, XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension,
unsigned char modeno, unsigned char rateindex) unsigned char modeno, unsigned char rateindex)
{ {
USHORT ModeNo = modeno; unsigned short ModeNo = modeno;
USHORT ModeIdIndex = 0, ClockIndex = 0; unsigned short ModeIdIndex = 0, ClockIndex = 0;
USHORT RefreshRateTableIndex = 0; unsigned short RefreshRateTableIndex = 0;
/*ULONG temp = 0;*/ /*unsigned long temp = 0;*/
int Clock; int Clock;
XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase; XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
InitTo330Pointer( HwDeviceExtension->jChipType, XGI_Pr ) ; InitTo330Pointer( HwDeviceExtension->jChipType, XGI_Pr ) ;
...@@ -204,9 +204,9 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExt ...@@ -204,9 +204,9 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExt
u32 *hsync_len, u32 *vsync_len, u32 *hsync_len, u32 *vsync_len,
u32 *sync, u32 *vmode) u32 *sync, u32 *vmode)
{ {
USHORT ModeNo = modeno; unsigned short ModeNo = modeno;
USHORT ModeIdIndex = 0, index = 0; unsigned short ModeIdIndex = 0, index = 0;
USHORT RefreshRateTableIndex = 0; unsigned short RefreshRateTableIndex = 0;
unsigned short VRE, VBE, VRS, VBS, VDE, VT; unsigned short VRE, VBE, VRS, VBS, VDE, VT;
unsigned short HRE, HBE, HRS, HBS, HDE, HT; unsigned short HRE, HBE, HRS, HBS, HDE, HT;
...@@ -377,7 +377,7 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExt ...@@ -377,7 +377,7 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExt
void XGIRegInit(VB_DEVICE_INFO *XGI_Pr, ULONG BaseAddr) void XGIRegInit(VB_DEVICE_INFO *XGI_Pr, unsigned long BaseAddr)
{ {
XGI_Pr->RelIO = BaseAddr; XGI_Pr->RelIO = BaseAddr;
XGI_Pr->P3c4 = BaseAddr + 0x14; XGI_Pr->P3c4 = BaseAddr + 0x14;
...@@ -415,7 +415,7 @@ u32 XGIfb_get_reg3(u16 port) ...@@ -415,7 +415,7 @@ u32 XGIfb_get_reg3(u16 port)
/* ------------ Interface for init & mode switching code ------------- */ /* ------------ Interface for init & mode switching code ------------- */
BOOLEAN unsigned char
XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
unsigned long offset, unsigned long set, unsigned long *value) unsigned long offset, unsigned long set, unsigned long *value)
{ {
...@@ -450,7 +450,7 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, ...@@ -450,7 +450,7 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
return 1; return 1;
} }
/*BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, /*unsigned char XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
unsigned long offset, unsigned long set, unsigned long *value) unsigned long offset, unsigned long set, unsigned long *value)
{ {
static struct pci_dev *pdev = NULL; static struct pci_dev *pdev = NULL;
...@@ -937,7 +937,7 @@ static void XGIfb_search_tvstd(const char *name) ...@@ -937,7 +937,7 @@ static void XGIfb_search_tvstd(const char *name)
} }
} }
static BOOLEAN XGIfb_bridgeisslave(void) static unsigned char XGIfb_bridgeisslave(void)
{ {
unsigned char usScratchP1_00; unsigned char usScratchP1_00;
...@@ -951,7 +951,7 @@ static BOOLEAN XGIfb_bridgeisslave(void) ...@@ -951,7 +951,7 @@ static BOOLEAN XGIfb_bridgeisslave(void)
return 0; return 0;
} }
static BOOLEAN XGIfbcheckvretracecrt1(void) static unsigned char XGIfbcheckvretracecrt1(void)
{ {
unsigned char temp; unsigned char temp;
...@@ -970,7 +970,7 @@ static BOOLEAN XGIfbcheckvretracecrt1(void) ...@@ -970,7 +970,7 @@ static BOOLEAN XGIfbcheckvretracecrt1(void)
return 0; return 0;
} }
static BOOLEAN XGIfbcheckvretracecrt2(void) static unsigned char XGIfbcheckvretracecrt2(void)
{ {
unsigned char temp; unsigned char temp;
if (xgi_video_info.hasVB == HASVB_NONE) if (xgi_video_info.hasVB == HASVB_NONE)
...@@ -982,7 +982,7 @@ static BOOLEAN XGIfbcheckvretracecrt2(void) ...@@ -982,7 +982,7 @@ static BOOLEAN XGIfbcheckvretracecrt2(void)
return 1; return 1;
} }
static BOOLEAN XGIfb_CheckVBRetrace(void) static unsigned char XGIfb_CheckVBRetrace(void)
{ {
if(xgi_video_info.disp_state & DISPTYPE_DISP2) { if(xgi_video_info.disp_state & DISPTYPE_DISP2) {
if(XGIfb_bridgeisslave()) { if(XGIfb_bridgeisslave()) {
...@@ -2588,7 +2588,7 @@ static void XGIfb_pre_setmode(void) ...@@ -2588,7 +2588,7 @@ static void XGIfb_pre_setmode(void)
static void XGIfb_post_setmode(void) static void XGIfb_post_setmode(void)
{ {
u8 reg; u8 reg;
BOOLEAN doit = 1; unsigned char doit = 1;
/* outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD); /* outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD);
outXGIIDXREG(XGICR,0x13,0x00); outXGIIDXREG(XGICR,0x13,0x00);
setXGIIDXREG(XGISR,0x0E,0xF0,0x01); setXGIIDXREG(XGISR,0x0E,0xF0,0x01);
...@@ -2826,7 +2826,7 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) ...@@ -2826,7 +2826,7 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)
static unsigned char VBIOS_BUF[65535]; static unsigned char VBIOS_BUF[65535];
unsigned char* attempt_map_rom(struct pci_dev *dev,void *copy_address) unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address)
{ {
u32 rom_size = 0; u32 rom_size = 0;
u32 rom_address = 0; u32 rom_address = 0;
...@@ -2909,7 +2909,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2909,7 +2909,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (pci_enable_device(pdev)) if (pci_enable_device(pdev))
return -EIO; return -EIO;
XGIRegInit(&XGI_Pr, (ULONG)XGIhw_ext.pjIOAddress); XGIRegInit(&XGI_Pr, (unsigned long)XGIhw_ext.pjIOAddress);
outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD); outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
inXGIIDXREG(XGISR, IND_XGI_PASSWORD, reg1); inXGIIDXREG(XGISR, IND_XGI_PASSWORD, reg1);
......
This diff is collapsed.
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
#define _VBEXT_ #define _VBEXT_
struct DWORDREGS { struct DWORDREGS {
ULONG Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp; unsigned long Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp;
}; };
struct WORDREGS { struct WORDREGS {
USHORT ax, hi_ax, bx, hi_bx, cx, hi_cx, dx, hi_dx, si, hi_si, di ,hi_di, bp, hi_bp; unsigned short ax, hi_ax, bx, hi_bx, cx, hi_cx, dx, hi_dx, si,
hi_si, di, hi_di, bp, hi_bp;
}; };
struct BYTEREGS { struct BYTEREGS {
...@@ -20,10 +21,12 @@ typedef union _X86_REGS { ...@@ -20,10 +21,12 @@ typedef union _X86_REGS {
} X86_REGS, *PX86_REGS; } X86_REGS, *PX86_REGS;
extern void XGI_XG21Fun14( PXGI_HW_DEVICE_INFO pXGIHWDE, PX86_REGS pBiosArguments); extern void XGI_XG21Fun14( PXGI_HW_DEVICE_INFO pXGIHWDE, PX86_REGS pBiosArguments);
extern void XGISetDPMS( PXGI_HW_DEVICE_INFO pXGIHWDE , ULONG VESA_POWER_STATE ) ; extern void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE,
unsigned long VESA_POWER_STATE);
extern void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ); extern void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo );
extern void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ; extern void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ;
extern void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo); extern void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo);
extern USHORT XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo); extern unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,
PVB_DEVICE_INFO pVBInfo);
#endif #endif
This diff is collapsed.
#ifndef _VBINIT_ #ifndef _VBINIT_
#define _VBINIT_ #define _VBINIT_
extern BOOLEAN XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension ) ; extern unsigned char XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension ) ;
extern XGI21_LVDSCapStruct XGI21_LCDCapList[13]; extern XGI21_LVDSCapStruct XGI21_LCDCapList[13];
#endif #endif
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -5,7 +5,7 @@ extern void InitTo330Pointer(UCHAR,PVB_DEVICE_INFO); ...@@ -5,7 +5,7 @@ extern void InitTo330Pointer(UCHAR,PVB_DEVICE_INFO);
extern void XGI_UnLockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_UnLockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_LockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_LockCRT2(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_LongWait( PVB_DEVICE_INFO ); extern void XGI_LongWait( PVB_DEVICE_INFO );
extern void XGI_SetCRT2ModeRegs(USHORT ModeNo,PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo,PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO );
extern void XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_DisableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_EnableBridge(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_DisplayOff( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); extern void XGI_DisplayOff( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO );
...@@ -13,28 +13,28 @@ extern void XGI_DisplayOn( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO ); ...@@ -13,28 +13,28 @@ extern void XGI_DisplayOn( PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO );
extern void XGI_GetVBType(PVB_DEVICE_INFO); extern void XGI_GetVBType(PVB_DEVICE_INFO);
extern void XGI_SenseCRT1(PVB_DEVICE_INFO ); extern void XGI_SenseCRT1(PVB_DEVICE_INFO );
extern void XGI_GetVGAType(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_GetVGAType(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_GetVBInfo(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_GetVBInfo(unsigned short ModeNo,unsigned short ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_GetTVInfo(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO ); extern void XGI_GetTVInfo(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO );
extern void XGI_SetCRT1Offset(USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_SetCRT1Offset(unsigned short ModeNo,unsigned short ModeIdIndex,unsigned short RefreshRateTableIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_SetLCDAGroup(USHORT ModeNo,USHORT ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO ); extern void XGI_SetLCDAGroup(unsigned short ModeNo,unsigned short ModeIdIndex,PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO );
extern void XGI_WaitDisply( PVB_DEVICE_INFO ); extern void XGI_WaitDisply( PVB_DEVICE_INFO );
extern USHORT XGI_GetResInfo(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo); extern unsigned short XGI_GetResInfo(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo);
extern BOOLEAN XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo ) ; extern unsigned char XGISetModeNew( PXGI_HW_DEVICE_INFO HwDeviceExtension , unsigned short ModeNo ) ;
extern BOOLEAN XGI_SearchModeID( USHORT ModeNo,USHORT *ModeIdIndex, PVB_DEVICE_INFO ); extern unsigned char XGI_SearchModeID( unsigned short ModeNo,unsigned short *ModeIdIndex, PVB_DEVICE_INFO );
extern BOOLEAN XGI_GetLCDInfo(USHORT ModeNo,USHORT ModeIdIndex,PVB_DEVICE_INFO ); extern unsigned char XGI_GetLCDInfo(unsigned short ModeNo,unsigned short ModeIdIndex,PVB_DEVICE_INFO );
extern BOOLEAN XGI_BridgeIsOn( PVB_DEVICE_INFO ); extern unsigned char XGI_BridgeIsOn( PVB_DEVICE_INFO );
extern BOOLEAN XGI_SetCRT2Group301(USHORT ModeNo, PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO); extern unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO);
extern USHORT XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO ); extern unsigned short XGI_GetRatePtrCRT2( PXGI_HW_DEVICE_INFO pXGIHWDE, unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO );
extern void XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo); extern void XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo);
extern void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo); extern void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo);
extern void XGI_XG21BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo); extern void XGI_XG21BLSignalVDD(unsigned short tempbh,unsigned short tempbl, PVB_DEVICE_INFO pVBInfo);
extern void XGI_XG27BLSignalVDD(USHORT tempbh,USHORT tempbl, PVB_DEVICE_INFO pVBInfo); extern void XGI_XG27BLSignalVDD(unsigned short tempbh,unsigned short tempbl, PVB_DEVICE_INFO pVBInfo);
extern void XGI_XG21SetPanelDelay(USHORT tempbl, PVB_DEVICE_INFO pVBInfo); extern void XGI_XG21SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo);
extern BOOLEAN XGI_XG21CheckLVDSMode(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo );
extern void XGI_SetXG21LVDSPara(USHORT ModeNo,USHORT ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); extern void XGI_SetXG21LVDSPara(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo );
extern USHORT XGI_GetLVDSOEMTableIndex(PVB_DEVICE_INFO pVBInfo); extern unsigned short XGI_GetLVDSOEMTableIndex(PVB_DEVICE_INFO pVBInfo);
#endif #endif
This diff is collapsed.
...@@ -2938,7 +2938,7 @@ XGI330_TVDataTablStruct XGI_TVDataTable[]= ...@@ -2938,7 +2938,7 @@ XGI330_TVDataTablStruct XGI_TVDataTable[]=
{0xffff,0x0000,12} /* END */ {0xffff,0x0000,12} /* END */
}; };
USHORT TVLenList[]= unsigned short TVLenList[] =
{ {
LVDSCRT1Len_H, LVDSCRT1Len_H,
LVDSCRT1Len_V, LVDSCRT1Len_V,
...@@ -2980,7 +2980,7 @@ XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[]= ...@@ -2980,7 +2980,7 @@ XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[]=
{0xFFFF,0x0000,4} {0xFFFF,0x0000,4}
}; };
USHORT LCDLenList[]= unsigned short LCDLenList[] =
{ {
LVDSCRT1Len_H, LVDSCRT1Len_H,
LVDSCRT1Len_V, LVDSCRT1Len_V,
...@@ -3471,12 +3471,12 @@ UCHAR XGI330_CRT2Data_1_2 = 0x0; ...@@ -3471,12 +3471,12 @@ UCHAR XGI330_CRT2Data_1_2 = 0x0;
UCHAR XGI330_CRT2Data_4_D = 0x0; UCHAR XGI330_CRT2Data_4_D = 0x0;
UCHAR XGI330_CRT2Data_4_E = 0x0; UCHAR XGI330_CRT2Data_4_E = 0x0;
UCHAR XGI330_CRT2Data_4_10 = 0x80; UCHAR XGI330_CRT2Data_4_10 = 0x80;
USHORT XGI330_RGBSenseData = 0xd1; unsigned short XGI330_RGBSenseData = 0xd1;
USHORT XGI330_VideoSenseData = 0xb9; unsigned short XGI330_VideoSenseData = 0xb9;
USHORT XGI330_YCSenseData = 0xb3; unsigned short XGI330_YCSenseData = 0xb3;
USHORT XGI330_RGBSenseData2 = 0x0190; /*301b*/ unsigned short XGI330_RGBSenseData2 = 0x0190; /*301b*/
USHORT XGI330_VideoSenseData2 = 0x0110; unsigned short XGI330_VideoSenseData2 = 0x0110;
USHORT XGI330_YCSenseData2 = 0x016B; unsigned short XGI330_YCSenseData2 = 0x016B;
UCHAR XGI330_NTSCPhase[] = {0x21,0xed,0x8a,0x8}; UCHAR XGI330_NTSCPhase[] = {0x21,0xed,0x8a,0x8};
UCHAR XGI330_PALPhase[] = {0x2a,0x5,0xd3,0x0}; UCHAR XGI330_PALPhase[] = {0x2a,0x5,0xd3,0x0};
UCHAR XGI330_NTSCPhase2[] = {0x21,0xF0,0x7B,0xD6};/*301b*/ UCHAR XGI330_NTSCPhase2[] = {0x21,0xF0,0x7B,0xD6};/*301b*/
...@@ -4045,7 +4045,7 @@ UCHAR TVEdgeList[]= ...@@ -4045,7 +4045,7 @@ UCHAR TVEdgeList[]=
0x00 /* ; 1 HiTV */ 0x00 /* ; 1 HiTV */
}; };
ULONG TVPhaseList[]= unsigned long TVPhaseList[]=
{ 0x08BAED21, /* ; 0 NTSC phase */ { 0x08BAED21, /* ; 0 NTSC phase */
0x00E3052A, /* ; 1 PAL phase */ 0x00E3052A, /* ; 1 PAL phase */
0x9B2EE421, /* ; 2 PAL-M phase */ 0x9B2EE421, /* ; 2 PAL-M phase */
......
...@@ -6,17 +6,20 @@ ...@@ -6,17 +6,20 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/types.h> #include <linux/types.h>
void XGINew_SetReg1( ULONG , USHORT , USHORT ) ; void XGINew_SetReg1(unsigned long,unsigned short,unsigned short);
void XGINew_SetReg2( ULONG , USHORT , USHORT ) ; void XGINew_SetReg2(unsigned long,unsigned short,unsigned short);
void XGINew_SetReg3( ULONG , USHORT ) ; void XGINew_SetReg3(unsigned long,unsigned short);
void XGINew_SetReg4( ULONG , ULONG ) ; void XGINew_SetReg4(unsigned long,unsigned long);
UCHAR XGINew_GetReg1( ULONG , USHORT) ; UCHAR XGINew_GetReg1(unsigned long,unsigned short);
UCHAR XGINew_GetReg2( ULONG ) ; UCHAR XGINew_GetReg2(unsigned long);
ULONG XGINew_GetReg3( ULONG ) ; unsigned long XGINew_GetReg3(unsigned long);
void XGINew_ClearDAC(unsigned char *) ; void XGINew_ClearDAC(unsigned char *);
void XGINew_SetRegANDOR(ULONG Port,USHORT Index,USHORT DataAND,USHORT DataOR); void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index,
void XGINew_SetRegOR(ULONG Port,USHORT Index,USHORT DataOR); unsigned short DataAND,unsigned short DataOR);
void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND); void XGINew_SetRegOR(unsigned long Port,unsigned short Index,
unsigned short DataOR);
void XGINew_SetRegAND(unsigned long Port,unsigned short Index,
unsigned short DataAND);
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -25,7 +28,7 @@ void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND); ...@@ -25,7 +28,7 @@ void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND);
/* Output : */ /* Output : */
/* Description : SR CRTC GR */ /* Description : SR CRTC GR */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_SetReg1( ULONG port , USHORT index , USHORT data ) void XGINew_SetReg1( unsigned long port , unsigned short index , unsigned short data )
{ {
outb(index, port); outb(index, port);
outb(data, port + 1); outb(data, port + 1);
...@@ -38,7 +41,7 @@ void XGINew_SetReg1( ULONG port , USHORT index , USHORT data ) ...@@ -38,7 +41,7 @@ void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
/* Output : */ /* Output : */
/* Description : AR( 3C0 ) */ /* Description : AR( 3C0 ) */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/*void XGINew_SetReg2( ULONG port , USHORT index , USHORT data ) /*void XGINew_SetReg2( unsigned long port , unsigned short index , unsigned short data )
{ {
InPortByte( ( PUCHAR )port + 0x3da - 0x3c0 ) ; InPortByte( ( PUCHAR )port + 0x3da - 0x3c0 ) ;
OutPortByte( XGINew_P3c0 , index ) ; OutPortByte( XGINew_P3c0 , index ) ;
...@@ -53,7 +56,7 @@ void XGINew_SetReg1( ULONG port , USHORT index , USHORT data ) ...@@ -53,7 +56,7 @@ void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_SetReg3( ULONG port , USHORT data ) void XGINew_SetReg3( unsigned long port , unsigned short data )
{ {
outb(data, port); outb(data, port);
} }
...@@ -65,7 +68,7 @@ void XGINew_SetReg3( ULONG port , USHORT data ) ...@@ -65,7 +68,7 @@ void XGINew_SetReg3( ULONG port , USHORT data )
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_SetReg4( ULONG port , ULONG data ) void XGINew_SetReg4( unsigned long port , unsigned long data )
{ {
outl(data, port); outl(data, port);
} }
...@@ -77,7 +80,7 @@ void XGINew_SetReg4( ULONG port , ULONG data ) ...@@ -77,7 +80,7 @@ void XGINew_SetReg4( ULONG port , ULONG data )
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
UCHAR XGINew_GetReg1( ULONG port , USHORT index ) UCHAR XGINew_GetReg1( unsigned long port , unsigned short index )
{ {
UCHAR data ; UCHAR data ;
...@@ -93,7 +96,7 @@ UCHAR XGINew_GetReg1( ULONG port , USHORT index ) ...@@ -93,7 +96,7 @@ UCHAR XGINew_GetReg1( ULONG port , USHORT index )
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
UCHAR XGINew_GetReg2( ULONG port ) UCHAR XGINew_GetReg2( unsigned long port )
{ {
UCHAR data ; UCHAR data ;
...@@ -109,9 +112,9 @@ UCHAR XGINew_GetReg2( ULONG port ) ...@@ -109,9 +112,9 @@ UCHAR XGINew_GetReg2( ULONG port )
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
ULONG XGINew_GetReg3( ULONG port ) unsigned long XGINew_GetReg3( unsigned long port )
{ {
ULONG data ; unsigned long data ;
data = inl(port) ; data = inl(port) ;
...@@ -126,9 +129,9 @@ ULONG XGINew_GetReg3( ULONG port ) ...@@ -126,9 +129,9 @@ ULONG XGINew_GetReg3( ULONG port )
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_SetRegANDOR( ULONG Port , USHORT Index , USHORT DataAND , USHORT DataOR ) void XGINew_SetRegANDOR( unsigned long Port , unsigned short Index , unsigned short DataAND , unsigned short DataOR )
{ {
USHORT temp ; unsigned short temp ;
temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */ temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */
temp = ( temp & ( DataAND ) ) | DataOR ; temp = ( temp & ( DataAND ) ) | DataOR ;
...@@ -142,9 +145,9 @@ void XGINew_SetRegANDOR( ULONG Port , USHORT Index , USHORT DataAND , USHORT Dat ...@@ -142,9 +145,9 @@ void XGINew_SetRegANDOR( ULONG Port , USHORT Index , USHORT DataAND , USHORT Dat
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND) void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND)
{ {
USHORT temp ; unsigned short temp ;
temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */ temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */
temp &= DataAND ; temp &= DataAND ;
...@@ -158,9 +161,9 @@ void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND) ...@@ -158,9 +161,9 @@ void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND)
/* Output : */ /* Output : */
/* Description : */ /* Description : */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_SetRegOR( ULONG Port , USHORT Index , USHORT DataOR ) void XGINew_SetRegOR( unsigned long Port , unsigned short Index , unsigned short DataOR )
{ {
USHORT temp ; unsigned short temp ;
temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */ temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */
temp |= DataOR ; temp |= DataOR ;
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
#define _VBUTIL_ #define _VBUTIL_
extern void NewDelaySeconds( int ); extern void NewDelaySeconds( int );
extern void Newdebugcode( UCHAR ); extern void Newdebugcode( UCHAR );
extern void XGINew_SetReg1(ULONG, USHORT, USHORT); extern void XGINew_SetReg1(unsigned long, unsigned short, unsigned short);
extern void XGINew_SetReg3(ULONG, USHORT); extern void XGINew_SetReg3(unsigned long, unsigned short);
extern UCHAR XGINew_GetReg1(ULONG, USHORT); extern UCHAR XGINew_GetReg1(unsigned long, unsigned short);
extern UCHAR XGINew_GetReg2(ULONG); extern UCHAR XGINew_GetReg2(unsigned long);
extern void XGINew_SetReg4(ULONG, ULONG); extern void XGINew_SetReg4(unsigned long, unsigned long);
extern ULONG XGINew_GetReg3(ULONG); extern unsigned long XGINew_GetReg3(unsigned long);
extern void XGINew_SetRegOR(ULONG Port,USHORT Index,USHORT DataOR); extern void XGINew_SetRegOR(unsigned long Port,unsigned short Index,unsigned short DataOR);
extern void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND); extern void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND);
extern void XGINew_SetRegANDOR(ULONG Port,USHORT Index,USHORT DataAND,USHORT DataOR); extern void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index,unsigned short DataAND,unsigned short DataOR);
#endif #endif
...@@ -20,26 +20,6 @@ typedef long LONG; ...@@ -20,26 +20,6 @@ typedef long LONG;
typedef unsigned char UCHAR; typedef unsigned char UCHAR;
#endif #endif
#ifndef USHORT
typedef unsigned short USHORT;
#endif
#ifndef ULONG
typedef unsigned long ULONG;
#endif
#ifndef VOID
typedef void VOID;
#endif
#ifndef BOOLEAN
typedef UCHAR BOOLEAN;
#endif
/*
#ifndef bool
typedef UCHAR bool;
#endif
*/
typedef unsigned long XGIIOADDRESS; typedef unsigned long XGIIOADDRESS;
...@@ -103,30 +83,30 @@ typedef struct _XGI_DSReg ...@@ -103,30 +83,30 @@ typedef struct _XGI_DSReg
typedef struct _XGI_HW_DEVICE_INFO XGI_HW_DEVICE_INFO, *PXGI_HW_DEVICE_INFO; typedef struct _XGI_HW_DEVICE_INFO XGI_HW_DEVICE_INFO, *PXGI_HW_DEVICE_INFO;
typedef BOOLEAN (*PXGI_QUERYSPACE) (PXGI_HW_DEVICE_INFO, ULONG, ULONG, ULONG *); typedef unsigned char (*PXGI_QUERYSPACE) (PXGI_HW_DEVICE_INFO, unsigned long, unsigned long, unsigned long *);
struct _XGI_HW_DEVICE_INFO struct _XGI_HW_DEVICE_INFO
{ {
ULONG ulExternalChip; /* NO VB or other video bridge*/ unsigned long ulExternalChip; /* NO VB or other video bridge*/
/* if ujVBChipID = VB_CHIP_UNKNOWN, */ /* if ujVBChipID = VB_CHIP_UNKNOWN, */
unsigned char *pjVirtualRomBase; /* ROM image */ unsigned char *pjVirtualRomBase; /* ROM image */
BOOLEAN UseROM; /* Use the ROM image if provided */ unsigned char UseROM; /* Use the ROM image if provided */
void *pDevice; void *pDevice;
unsigned char *pjVideoMemoryAddress;/* base virtual memory address */ unsigned char *pjVideoMemoryAddress;/* base virtual memory address */
/* of Linear VGA memory */ /* of Linear VGA memory */
ULONG ulVideoMemorySize; /* size, in bytes, of the memory on the board */ unsigned long ulVideoMemorySize; /* size, in bytes, of the memory on the board */
unsigned char *pjIOAddress; /* base I/O address of VGA ports (0x3B0) */ unsigned char *pjIOAddress; /* base I/O address of VGA ports (0x3B0) */
unsigned char *pjCustomizedROMImage; unsigned char *pjCustomizedROMImage;
unsigned char *pj2ndVideoMemoryAddress; unsigned char *pj2ndVideoMemoryAddress;
ULONG ul2ndVideoMemorySize; unsigned long ul2ndVideoMemorySize;
unsigned char *pj2ndIOAddress; unsigned char *pj2ndIOAddress;
UCHAR jChipType; /* Used to Identify Graphics Chip */ UCHAR jChipType; /* Used to Identify Graphics Chip */
...@@ -139,20 +119,20 @@ struct _XGI_HW_DEVICE_INFO ...@@ -139,20 +119,20 @@ struct _XGI_HW_DEVICE_INFO
/* defined in the data structure type */ /* defined in the data structure type */
/* "XGI_VB_CHIP_TYPE" */ /* "XGI_VB_CHIP_TYPE" */
BOOLEAN bNewScratch; unsigned char bNewScratch;
ULONG ulCRT2LCDType; /* defined in the data structure type */ unsigned long ulCRT2LCDType; /* defined in the data structure type */
ULONG usExternalChip; /* NO VB or other video bridge (other than */ unsigned long usExternalChip; /* NO VB or other video bridge (other than */
/* video bridge) */ /* video bridge) */
BOOLEAN bIntegratedMMEnabled;/* supporting integration MM enable */ unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
BOOLEAN bSkipDramSizing; /* True: Skip video memory sizing. */ unsigned char bSkipDramSizing; /* True: Skip video memory sizing. */
BOOLEAN bSkipSense; unsigned char bSkipSense;
BOOLEAN bIsPowerSaving; /* True: XGIInit() is invoked by power management, unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management,
otherwise by 2nd adapter's initialzation */ otherwise by 2nd adapter's initialzation */
PXGI_DSReg pSR; /* restore SR registers in initial function. */ PXGI_DSReg pSR; /* restore SR registers in initial function. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment