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

Commit 80adad85 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: xgifb: Remove typedefs in vb_struct.h 



This removes all the remaining typedefs in vb_struct.h

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 e4147abe

drivers/staging/xgifb/XGI_main.h

+12 −12
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ unsigned char XGIfb_detectedlcda = 0xff; 
struct xgi_hw_device_info XGIhw_ext;



/* TW: XGI private structure */

VB_DEVICE_INFO  XGI_Pr;

struct vb_device_info  XGI_Pr;



/* card parameters */

static unsigned long XGIfb_mmio_size = 0;
@@ -820,7 +820,7 @@ extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_d 
*/

extern unsigned char XGI_SearchModeID(unsigned short ModeNo,

				unsigned short *ModeIdIndex,

				PVB_DEVICE_INFO);

				struct vb_device_info *);

static int      XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,

			      struct fb_info *info);
@@ -887,31 +887,31 @@ unsigned char XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext 




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

extern void     InitTo330Pointer(unsigned char, PVB_DEVICE_INFO pVBInfo);

extern void     InitTo330Pointer(unsigned char, struct vb_device_info *pVBInfo);

extern unsigned char  XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension);

extern unsigned char XGISetModeNew(struct xgi_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 void     XGI_LongWait(struct vb_device_info *XGI_Pr);

extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,

					 unsigned short ModeNo,

					 unsigned short ModeIdIndex,

					 PVB_DEVICE_INFO pVBInfo);

					 struct vb_device_info *pVBInfo);

/* TW: Chrontel TV functions */

extern unsigned short XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr,

extern unsigned short XGI_GetCH700x(struct 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,

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

extern unsigned short XGI_GetCH701x(struct 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,

extern void XGI_SetCH701x(struct vb_device_info *XGI_Pr, unsigned short tempbx);

extern void XGI_SetCH70xxANDOR(struct vb_device_info *XGI_Pr,

			       unsigned short tempax,

			       unsigned short tempbh);

extern void XGI_DDC2Delay(VB_DEVICE_INFO *XGI_Pr, unsigned short delaytime);

extern void XGI_DDC2Delay(struct vb_device_info *XGI_Pr, unsigned short delaytime);



/* TW: Sensing routines */

void            XGI_Sense30x(void);

int             XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch);



extern XGI21_LVDSCapStruct XGI21_LCDCapList[13];

extern struct XGI21_LVDSCapStruct XGI21_LCDCapList[13];

#endif

drivers/staging/xgifb/XGI_main_26.c

+6 −5
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ struct video_info xgi_video_info; 
/* --------------- Hardware Access Routines -------------------------- */



int

XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension,

XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension,

			  unsigned char modeno, unsigned char rateindex)

{

    unsigned short ModeNo = modeno;
@@ -197,7 +197,7 @@ XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwD 
}



int

XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension,

XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension,

			 unsigned char modeno, unsigned char rateindex,

			 u32 *left_margin, u32 *right_margin,

			 u32 *upper_margin, u32 *lower_margin,
@@ -377,7 +377,7 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDe 






void XGIRegInit(VB_DEVICE_INFO *XGI_Pr, unsigned long BaseAddr)

void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)

{

   XGI_Pr->RelIO = BaseAddr;

   XGI_Pr->P3c4 = BaseAddr + 0x14;
@@ -610,7 +610,8 @@ int XGIfb_GetXG21LVDSData(void) 
                i += 25;

                j--;

                k++;

        } while ( (j>0) && ( k < (sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct)) ) );

	} while ((j > 0) &&

		 (k < (sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct))));

        return 1;

    }

    return 0;
@@ -3132,7 +3133,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		    xgi_video_info.disp_state = DISPTYPE_LCD;

        	    if (!XGIfb_GetXG21LVDSData()) {

			    int m;

			    for (m=0; m < sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct); m++) {

			    for (m = 0; m < sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct); m++) {

				    if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) &&

					(XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) {

						XGINew_SetReg1( XGI_Pr.P3d4 , 0x36, m) ;

drivers/staging/xgifb/vb_ext.c

+27 −27
Original line number Diff line number Diff line
@@ -14,27 +14,27 @@ extern unsigned char XGI330_OutputSelect; 
extern   unsigned short XGI330_RGBSenseData2;

extern   unsigned short XGI330_YCSenseData2;

extern   unsigned short XGI330_VideoSenseData2;

void     XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);

unsigned char  XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo);

void     XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo);

unsigned char  XGINew_GetPanelID(struct vb_device_info *pVBInfo);

unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,

			       PVB_DEVICE_INFO pVBInfo);

			       struct vb_device_info *pVBInfo);

unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension,

			     PVB_DEVICE_INFO pVBInfo);

			     struct vb_device_info *pVBInfo);

void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE,

		unsigned long VESA_POWER_STATE);

unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo);

unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo);

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

		     PVB_DEVICE_INFO pVBInfo);

		     struct vb_device_info *pVBInfo);

unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension,

			       PVB_DEVICE_INFO pVBInfo);

			       struct vb_device_info *pVBInfo);



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

	Dynamic Sense

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



void XGI_WaitDisplay(void);

unsigned char XGI_Is301C(PVB_DEVICE_INFO);

unsigned char XGI_Is301LV(PVB_DEVICE_INFO);

unsigned char XGI_Is301C(struct vb_device_info *);

unsigned char XGI_Is301LV(struct vb_device_info *);
@@ -44,7 +44,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO); 
/* Output : */

/* Description : */

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

unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo)

unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo)

{

    unsigned short flag ;
@@ -62,7 +62,7 @@ unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo) 
/* Output : */

/* Description : */

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

unsigned char XGI_Is301C(PVB_DEVICE_INFO pVBInfo)

unsigned char XGI_Is301C(struct vb_device_info *pVBInfo)

{

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

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

/* Description : */

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

unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo)

unsigned char XGI_Is301LV(struct vb_device_info *pVBInfo)

{

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

    {
@@ -104,7 +104,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo) 
/* --------------------------------------------------------------------- */

unsigned char XGINew_Sense(unsigned short tempbx,

		     unsigned short tempcx,

		     PVB_DEVICE_INFO pVBInfo)

		     struct vb_device_info *pVBInfo)

{

    unsigned short temp, i, tempch;
@@ -140,8 +140,8 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, 
{

    unsigned short ModeNo, ModeIdIndex;

    unsigned char temp;

    VB_DEVICE_INFO VBINF;

    PVB_DEVICE_INFO pVBInfo = &VBINF;

    struct vb_device_info VBINF;

    struct vb_device_info *pVBInfo = &VBINF;

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

    pVBInfo->ROMAddr  = pXGIHWDE->pjVirtualRomBase ;
@@ -359,7 +359,7 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, 
/* Output : */

/* Description : */

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

void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)

void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo)

{

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

           P2reg0 = 0 , SenseModeNo = 0 , OutputSelect = *pVBInfo->pOutputSelect ,
@@ -559,7 +559,7 @@ void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE 
/* Description : */

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

unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension,

			       PVB_DEVICE_INFO pVBInfo)

			       struct vb_device_info *pVBInfo)

{

    /* unsigned short SoftSetting ; */

    unsigned short temp ;
@@ -582,7 +582,7 @@ unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension, 
/* Output : */

/* Description : */

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

unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)

unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo)

{

    unsigned short temp ;
@@ -635,7 +635,7 @@ unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, 
/* Output : */

/* Description : */

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

unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo )

unsigned char XGINew_GetPanelID(struct vb_device_info *pVBInfo)

{

	unsigned short PanelTypeTable[16] = {

		SyncNN | PanelRGB18Bit | Panel800x600  | _PanelType00,
@@ -708,7 +708,7 @@ unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) 
/* Output : */

/* Description : */

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

unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)

unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo)

{

    unsigned short flag ;
@@ -735,7 +735,7 @@ unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension 
/* Output : */

/* Description : */

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

unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)

unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo)

{

    unsigned short tempbx , tempcx , temp , i , tempch;
@@ -816,7 +816,7 @@ unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB 
;		     DX: PAnel V. resolution

;-----------------------------------------------------------------------------

*/

void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )

void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)

{



    unsigned short ModeIdIndex;
@@ -859,7 +859,7 @@ void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) 
;

;-----------------------------------------------------------------------------

*/

void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )

void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)

{



    unsigned short EModeCount;
@@ -905,7 +905,7 @@ void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) 
;

;-----------------------------------------------------------------------------

*/

void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )

void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)

{

    unsigned short ModeIdIndex, resindex;

    unsigned short ModeNo;
@@ -964,7 +964,7 @@ void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) 
;                       BX[6]: *Value1 D[6] Panel H. Polarity

;-----------------------------------------------------------------------------

*/

void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments )

void XGI_XG21Fun14Sub73(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments)

{

    unsigned char Select;
@@ -1000,8 +1000,8 @@ void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) 


void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments)

{

    VB_DEVICE_INFO VBINF;

    PVB_DEVICE_INFO pVBInfo = &VBINF;

    struct vb_device_info VBINF;

    struct vb_device_info *pVBInfo = &VBINF;



    pVBInfo->IF_DEF_LVDS = 0 ;

    pVBInfo->IF_DEF_CH7005 = 0 ;

drivers/staging/xgifb/vb_ext.h

+4 −4
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ typedef union _X86_REGS { 
extern   void     XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments);

extern void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE,

		       unsigned long VESA_POWER_STATE);

extern   void     XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo);

extern   void     XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ;

extern   void     XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo);

extern   void     XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;

extern void ReadVBIOSTablData(unsigned char ChipType,

			      PVB_DEVICE_INFO pVBInfo);

			      struct vb_device_info *pVBInfo);

extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,

				      PVB_DEVICE_INFO pVBInfo);

				      struct vb_device_info *pVBInfo);



#endif

drivers/staging/xgifb/vb_init.c

+82 −81

File changed.

Preview size limit exceeded, changes collapsed.