Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/xgifb/XGI_main.h

+27 −17
Original line number Diff line number Diff line
@@ -499,13 +499,13 @@ u8 XGIfb_mode_no = 0; 
u8  XGIfb_rate_idx = 0;



/* TW: CR36 evaluation */

const USHORT XGI300paneltype[] =

const unsigned short XGI300paneltype[] =

    { LCD_UNKNOWN,   LCD_800x600,  LCD_1024x768,  LCD_1280x1024,

      LCD_1280x960,  LCD_640x480,  LCD_1024x600,  LCD_1152x768,

       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_640x480,   LCD_1024x600, LCD_1152x864,  LCD_1280x960,

      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_ 
			 unsigned int *hsync_len, unsigned int *vsync_len,

			 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,

			      struct fb_info *info);
@@ -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_post_setmode(void);



static BOOLEAN  XGIfb_CheckVBRetrace(void);

static BOOLEAN  XGIfbcheckvretracecrt2(void);

static BOOLEAN  XGIfbcheckvretracecrt1(void);

static BOOLEAN  XGIfb_bridgeisslave(void);

static unsigned char  XGIfb_CheckVBRetrace(void);

static unsigned char  XGIfbcheckvretracecrt2(void);

static unsigned char  XGIfbcheckvretracecrt1(void);

static unsigned char  XGIfb_bridgeisslave(void);



struct XGI_memreq {

	unsigned long offset;
@@ -879,7 +881,7 @@ static XGI_OH *XGIfb_poh_free(unsigned long base); 
static void     XGIfb_free_node(XGI_OH *poh);



/* 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);

//BOOLEAN         XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,

//	         	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, 


/* Routines from init.c/init301.c */

extern void     InitTo330Pointer(UCHAR,PVB_DEVICE_INFO pVBInfo);

extern BOOLEAN  XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension);

extern BOOLEAN  XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension, USHORT ModeNo);

extern unsigned char  XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension);

extern unsigned char XGISetModeNew(PXGI_HW_DEVICE_INFO HwDeviceExtension,

			     unsigned short ModeNo);

//extern void     XGI_SetEnableDstn(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 */

extern USHORT 	XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);

extern void 	XGI_SetCH700x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);

extern USHORT 	XGI_GetCH701x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);

extern void 	XGI_SetCH701x(VB_DEVICE_INFO *XGI_Pr, USHORT tempbx);

extern void     XGI_SetCH70xxANDOR(VB_DEVICE_INFO *XGI_Pr, USHORT tempax,USHORT tempbh);

extern void     XGI_DDC2Delay(VB_DEVICE_INFO *XGI_Pr, USHORT delaytime);

extern unsigned short XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr,

				    unsigned short tempbx);

extern void XGI_SetCH700x(VB_DEVICE_INFO *XGI_Pr, unsigned short tempbx);

extern unsigned short XGI_GetCH701x(VB_DEVICE_INFO *XGI_Pr,

				    unsigned short tempbx);

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 */

void            XGI_Sense30x(void);

drivers/staging/xgifb/XGI_main_26.c

+17 −17
Original line number Diff line number Diff line
@@ -165,11 +165,11 @@ int 
XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, PXGI_HW_DEVICE_INFO HwDeviceExtension,

			  unsigned char modeno, unsigned char rateindex)

{

    USHORT ModeNo = modeno;

    USHORT ModeIdIndex = 0, ClockIndex = 0;

    USHORT RefreshRateTableIndex = 0;

    unsigned short ModeNo = modeno;

    unsigned short ModeIdIndex = 0, ClockIndex = 0;

    unsigned short RefreshRateTableIndex = 0;



    /*ULONG  temp = 0;*/

    /*unsigned long  temp = 0;*/

    int    Clock;

    XGI_Pr->ROMAddr  = HwDeviceExtension->pjVirtualRomBase;

    InitTo330Pointer( HwDeviceExtension->jChipType, XGI_Pr ) ;
@@ -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 *sync, u32 *vmode)

{

    USHORT ModeNo = modeno;

    USHORT ModeIdIndex = 0, index = 0;

    USHORT RefreshRateTableIndex = 0;

    unsigned short ModeNo = modeno;

    unsigned short ModeIdIndex = 0, index = 0;

    unsigned short RefreshRateTableIndex = 0;



    unsigned short VRE, VBE, VRS, VBS, VDE, VT;

    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 






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->P3c4 = BaseAddr + 0x14;
@@ -415,7 +415,7 @@ u32 XGIfb_get_reg3(u16 port) 


/* ------------ Interface for init & mode switching code ------------- */



BOOLEAN

unsigned char

XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,

	unsigned long offset, unsigned long set, unsigned long *value)

{
@@ -450,7 +450,7 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, 
	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)

{

	static struct pci_dev *pdev = NULL;
@@ -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;
@@ -951,7 +951,7 @@ static BOOLEAN XGIfb_bridgeisslave(void) 
	   return 0;

}



static BOOLEAN XGIfbcheckvretracecrt1(void)

static unsigned char XGIfbcheckvretracecrt1(void)

{

   unsigned char temp;
@@ -970,7 +970,7 @@ static BOOLEAN XGIfbcheckvretracecrt1(void) 
	   return 0;

}



static BOOLEAN XGIfbcheckvretracecrt2(void)

static unsigned char XGIfbcheckvretracecrt2(void)

{

   unsigned char temp;

   if (xgi_video_info.hasVB == HASVB_NONE)
@@ -982,7 +982,7 @@ static BOOLEAN XGIfbcheckvretracecrt2(void) 
	   return 1;

}



static BOOLEAN XGIfb_CheckVBRetrace(void)

static unsigned char XGIfb_CheckVBRetrace(void)

{

   if(xgi_video_info.disp_state & DISPTYPE_DISP2) {

      if(XGIfb_bridgeisslave()) {
@@ -2588,7 +2588,7 @@ static void XGIfb_pre_setmode(void) 
static void XGIfb_post_setmode(void)

{

	u8 reg;

	BOOLEAN doit = 1;

	unsigned char doit = 1;

/*	outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD);

	outXGIIDXREG(XGICR,0x13,0x00);

	setXGIIDXREG(XGISR,0x0E,0xF0,0x01);
@@ -2909,7 +2909,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	  if (pci_enable_device(pdev))

	          return -EIO;



    XGIRegInit(&XGI_Pr, (ULONG)XGIhw_ext.pjIOAddress);

    XGIRegInit(&XGI_Pr, (unsigned long)XGIhw_ext.pjIOAddress);



    outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);

    inXGIIDXREG(XGISR, IND_XGI_PASSWORD, reg1);

drivers/staging/xgifb/vb_ext.c

+73 −63
Original line number Diff line number Diff line
@@ -11,25 +11,30 @@ 
#include "vb_ext.h"

extern   UCHAR XGI330_SoftSetting;

extern   UCHAR XGI330_OutputSelect;

extern   USHORT XGI330_RGBSenseData2;

extern   USHORT XGI330_YCSenseData2;

extern   USHORT XGI330_VideoSenseData2;

extern   unsigned short XGI330_RGBSenseData2;

extern   unsigned short XGI330_YCSenseData2;

extern   unsigned short XGI330_VideoSenseData2;

void     XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo );

BOOLEAN  XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo);

USHORT   XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo);

BOOLEAN  XGINew_GetLCDDDCInfo(PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo);

void XGISetDPMS( PXGI_HW_DEVICE_INFO pXGIHWDE , ULONG VESA_POWER_STATE ) ;

BOOLEAN  XGINew_BridgeIsEnable(PXGI_HW_DEVICE_INFO,PVB_DEVICE_INFO pVBInfo );

BOOLEAN  XGINew_Sense(USHORT tempbx,USHORT tempcx, PVB_DEVICE_INFO pVBInfo);

BOOLEAN  XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo ) ;

unsigned char  XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo);

unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO,

			       PVB_DEVICE_INFO pVBInfo);

unsigned char XGINew_GetLCDDDCInfo(PXGI_HW_DEVICE_INFO HwDeviceExtension,

			     PVB_DEVICE_INFO pVBInfo);

void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE,

		unsigned long VESA_POWER_STATE);

unsigned char XGINew_BridgeIsEnable(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO pVBInfo);

unsigned char XGINew_Sense(unsigned short tempbx, unsigned short tempcx,

		     PVB_DEVICE_INFO pVBInfo);

unsigned char XGINew_SenseHiTV(PXGI_HW_DEVICE_INFO HwDeviceExtension,

			       PVB_DEVICE_INFO pVBInfo);



/**************************************************************

	Dynamic Sense

*************************************************************/



void XGI_WaitDisplay(void);

BOOLEAN XGI_Is301C(PVB_DEVICE_INFO);

BOOLEAN XGI_Is301LV(PVB_DEVICE_INFO);

unsigned char XGI_Is301C(PVB_DEVICE_INFO);

unsigned char XGI_Is301LV(PVB_DEVICE_INFO);
@@ -39,9 +44,9 @@ BOOLEAN XGI_Is301LV(PVB_DEVICE_INFO); 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

BOOLEAN XGINew_Is301B( PVB_DEVICE_INFO pVBInfo )

unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo)

{

    USHORT flag ;

    unsigned short flag ;



    flag = XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) ;
@@ -57,7 +62,7 @@ BOOLEAN XGINew_Is301B( PVB_DEVICE_INFO pVBInfo ) 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

BOOLEAN XGI_Is301C( PVB_DEVICE_INFO pVBInfo )

unsigned char XGI_Is301C(PVB_DEVICE_INFO pVBInfo)

{

    if ( ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) & 0xF0 ) == 0xC0 )

        return( 1 ) ;
@@ -78,7 +83,7 @@ BOOLEAN XGI_Is301C( PVB_DEVICE_INFO pVBInfo ) 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

BOOLEAN XGI_Is301LV( PVB_DEVICE_INFO pVBInfo )

unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo)

{

    if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) >= 0xD0 )

    {
@@ -97,9 +102,11 @@ BOOLEAN XGI_Is301LV( PVB_DEVICE_INFO pVBInfo ) 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

BOOLEAN XGINew_Sense(  USHORT tempbx , USHORT tempcx, PVB_DEVICE_INFO pVBInfo )

unsigned char XGINew_Sense(unsigned short tempbx,

		     unsigned short tempcx,

		     PVB_DEVICE_INFO pVBInfo)

{

    USHORT temp , i , tempch ;

    unsigned short temp, i, tempch;



    temp = tempbx & 0xFF ;

    XGINew_SetReg1( pVBInfo->Part4Port , 0x11 , temp ) ;
@@ -128,13 +135,14 @@ BOOLEAN XGINew_Sense( USHORT tempbx , USHORT tempcx, PVB_DEVICE_INFO pVBInfo ) 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

VOID XGISetDPMS( PXGI_HW_DEVICE_INFO pXGIHWDE , ULONG VESA_POWER_STATE )

void XGISetDPMS(PXGI_HW_DEVICE_INFO pXGIHWDE,

		unsigned long VESA_POWER_STATE)

{

    USHORT ModeNo, ModeIdIndex ;

    unsigned short ModeNo, ModeIdIndex;

    UCHAR  temp ;

    VB_DEVICE_INFO VBINF;

    PVB_DEVICE_INFO pVBInfo = &VBINF;

    pVBInfo->BaseAddr = (ULONG)pXGIHWDE->pjIOAddress ;

    pVBInfo->BaseAddr = (unsigned long)pXGIHWDE->pjIOAddress ;

    pVBInfo->ROMAddr  = pXGIHWDE->pjVirtualRomBase ;
@@ -353,10 +361,10 @@ VOID XGISetDPMS( PXGI_HW_DEVICE_INFO pXGIHWDE , ULONG VESA_POWER_STATE ) 
/* --------------------------------------------------------------------- */

void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)

{

    USHORT tempax = 0 , tempbx , tempcx , temp ,

    unsigned short tempax = 0 , tempbx , tempcx , temp ,

           P2reg0 = 0 , SenseModeNo = 0 , OutputSelect = *pVBInfo->pOutputSelect ,

           ModeIdIndex , i ;

    pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;

    pVBInfo->BaseAddr = (unsigned long)HwDeviceExtension->pjIOAddress ;



    if ( pVBInfo->IF_DEF_LVDS == 1 )

    {
@@ -550,10 +558,11 @@ void XGI_GetSenseStatus( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

USHORT XGINew_SenseLCD( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo)

unsigned short XGINew_SenseLCD(PXGI_HW_DEVICE_INFO HwDeviceExtension,

			       PVB_DEVICE_INFO pVBInfo)

{

    /* USHORT SoftSetting ; */

    USHORT temp ;

    /* unsigned short SoftSetting ; */

    unsigned short temp ;



    if ( ( HwDeviceExtension->jChipType >= XG20 ) || ( HwDeviceExtension->jChipType >= XG40 ) )

        temp = 0 ;
@@ -573,9 +582,9 @@ USHORT XGINew_SenseLCD( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO p 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

BOOLEAN XGINew_GetLCDDDCInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo)

unsigned char XGINew_GetLCDDDCInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_INFO pVBInfo)

{

    USHORT temp ;

    unsigned short temp ;



    /* add lcd sense */

    if ( HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN )
@@ -584,7 +593,7 @@ BOOLEAN XGINew_GetLCDDDCInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_I 
    }

    else

    {

        temp = ( USHORT )HwDeviceExtension->ulCRT2LCDType ;

	    temp = (unsigned short)HwDeviceExtension->ulCRT2LCDType ;

        switch( HwDeviceExtension->ulCRT2LCDType )

        {

            case LCD_INVALID:
@@ -626,9 +635,10 @@ BOOLEAN XGINew_GetLCDDDCInfo( PXGI_HW_DEVICE_INFO HwDeviceExtension,PVB_DEVICE_I 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

BOOLEAN XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo )

unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo )

{

    USHORT PanelTypeTable[ 16 ] = { SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType00 ,

	unsigned short PanelTypeTable[16] = {

		SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType00,

		SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType01,

		SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType02,

		SyncNN | PanelRGB18Bit | Panel640x480  | _PanelType03,
@@ -644,8 +654,8 @@ BOOLEAN XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) 
		SyncNN | PanelRGB24Bit | Panel1024x768 | _PanelType0D,

		SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType0E,

		SyncNN | PanelRGB18Bit | Panel1024x768 | _PanelType0F };

    USHORT tempax , tempbx , temp ;

    /* USHORT return_flag ; */

	unsigned short tempax , tempbx, temp;

    /* unsigned short return_flag ; */



    tempax = XGINew_GetReg1( pVBInfo->P3c4 , 0x1A ) ;

    tempbx = tempax & 0x1E ;
@@ -698,9 +708,9 @@ BOOLEAN XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) 
/* Output : */

/* Description : */

/* --------------------------------------------------------------------- */

BOOLEAN XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo)

unsigned char XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE_INFO pVBInfo)

{

    USHORT flag ;

    unsigned short flag ;



    if ( XGI_BridgeIsOn( pVBInfo ) == 0 )

    {
@@ -725,9 +735,9 @@ BOOLEAN XGINew_BridgeIsEnable( PXGI_HW_DEVICE_INFO HwDeviceExtension ,PVB_DEVICE 
/* Output : */

/* Description : */

/* ------------------------------------------------------ */

BOOLEAN XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo )

unsigned char XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo )

{

    USHORT tempbx , tempcx , temp , i , tempch;

    unsigned short tempbx , tempcx , temp , i , tempch;



    tempbx = *pVBInfo->pYCSenseData2 ;
@@ -809,11 +819,11 @@ BOOLEAN XGINew_SenseHiTV( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INF 
void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )

{



    USHORT ModeIdIndex;

    USHORT ModeNo;

    unsigned short ModeIdIndex;

    unsigned short ModeNo;



    USHORT EModeCount;

    USHORT lvdstableindex;

    unsigned short EModeCount;

    unsigned short lvdstableindex;



    lvdstableindex = XGI_GetLVDSOEMTableIndex( pVBInfo );

    pBiosArguments->h.bl = 0x81;
@@ -852,10 +862,10 @@ void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) 
void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )

{



    USHORT EModeCount;

    USHORT ModeIdIndex,resindex;

    USHORT ModeNo;

    USHORT EModeIndex = pBiosArguments->h.bh;

    unsigned short EModeCount;

    unsigned short ModeIdIndex, resindex;

    unsigned short ModeNo;

    unsigned short EModeIndex = pBiosArguments->h.bh;



    EModeCount = 0;

    for( ModeIdIndex = 0 ; ;  ModeIdIndex ++ )
@@ -897,8 +907,8 @@ void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) 
*/

void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )

{

    USHORT ModeIdIndex,resindex;

    USHORT ModeNo;

    unsigned short ModeIdIndex, resindex;

    unsigned short ModeNo;





    ModeNo = pBiosArguments->h.bl ;
@@ -958,7 +968,7 @@ void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) 
{

    UCHAR Select;



    USHORT lvdstableindex;

    unsigned short lvdstableindex;



    lvdstableindex = XGI_GetLVDSOEMTableIndex( pVBInfo );

    Select = pBiosArguments->h.bl;

drivers/staging/xgifb/vb_ext.h

+7 −4
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@ 
#define  _VBEXT_



struct DWORDREGS {

    ULONG    Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp;

    unsigned long    Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp;

};



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 {
@@ -20,10 +21,12 @@ typedef union _X86_REGS { 
} X86_REGS, *PX86_REGS;



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     XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , 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

drivers/staging/xgifb/vb_init.c

+175 −141

File changed.

Preview size limit exceeded, changes collapsed.