Skip to content

Commit

Permalink
Staging: xgifb: Remove defines for TRUE, FALSE, and NULL
Browse files Browse the repository at this point in the history 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Jun 22, 2010
1 parent 1e59f71 commit dda08c5
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 122 deletions.
79 changes: 43 additions & 36 deletions drivers/staging/xgifb/XGI_main_26.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,26 +440,26 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
DPRINTK("XGIfb: Set offset 0x%lx to 0x%lx\n", offset, *value);

if (!init) {
init = TRUE;
init = 1;
pdev = pci_get_device(PCI_VENDOR_ID_XG, xgi_video_info.chip_id, pdev);
if (pdev) {
valid_pdev = TRUE;
valid_pdev = 1;
pci_dev_put(pdev);
}
}

if (!valid_pdev) {
printk(KERN_DEBUG "XGIfb: Can't find XGI %d VGA device.\n",
xgi_video_info.chip_id);
return FALSE;
return 0;
}

if (set == 0)
pci_read_config_dword(pdev, offset, (u32 *)value);
else
pci_write_config_dword(pdev, offset, (u32)(*value));

return TRUE;
return 1;
}

/*BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
Expand All @@ -470,7 +470,7 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
u16 nbridge_id = 0;
if (!init) {
init = TRUE;
init = 1;
switch (xgi_video_info.chip) {
case XGI_540:
nbridge_id = PCI_DEVICE_ID_XG_540;
Expand All @@ -497,21 +497,21 @@ XGIfb_query_VGA_config_space(PXGI_HW_DEVICE_INFO pXGIhw_ext,
pdev = pci_find_device(PCI_VENDOR_ID_SI, nbridge_id, pdev);
if (pdev)
valid_pdev = TRUE;
valid_pdev = 1;
}
if (!valid_pdev) {
printk(KERN_DEBUG "XGIfb: Can't find XGI %d North Bridge device.\n",
nbridge_id);
return FALSE;
return 0;
}
if (set == 0)
pci_read_config_dword(pdev, offset, (u32 *)value);
else
pci_write_config_dword(pdev, offset, (u32)(*value));
return TRUE;
return 1;
}
*/
/* ------------------ Internal helper routines ----------------- */
Expand Down Expand Up @@ -953,39 +953,45 @@ static BOOLEAN XGIfb_bridgeisslave(void)
{
unsigned char usScratchP1_00;

if(xgi_video_info.hasVB == HASVB_NONE) return FALSE;
if (xgi_video_info.hasVB == HASVB_NONE)
return 0;

inXGIIDXREG(XGIPART1,0x00,usScratchP1_00);
if( (usScratchP1_00 & 0x50) == 0x10) {
return TRUE;
} else {
return FALSE;
}
if ((usScratchP1_00 & 0x50) == 0x10)
return 1;
else
return 0;
}

static BOOLEAN XGIfbcheckvretracecrt1(void)
{
unsigned char temp;

inXGIIDXREG(XGICR,0x17,temp);
if(!(temp & 0x80)) return FALSE;
if (!(temp & 0x80))
return 0;


inXGIIDXREG(XGISR,0x1f,temp);
if(temp & 0xc0) return FALSE;

if (temp & 0xc0)
return 0;

if(inXGIREG(XGIINPSTAT) & 0x08) return TRUE;
else return FALSE;
if (inXGIREG(XGIINPSTAT) & 0x08)
return 1;
else
return 0;
}

static BOOLEAN XGIfbcheckvretracecrt2(void)
{
unsigned char temp;
if(xgi_video_info.hasVB == HASVB_NONE) return FALSE;
if (xgi_video_info.hasVB == HASVB_NONE)
return 0;
inXGIIDXREG(XGIPART1, 0x30, temp);
if(temp & 0x02) return FALSE;
else return TRUE;
if (temp & 0x02)
return 0;
else
return 1;
}

static BOOLEAN XGIfb_CheckVBRetrace(void)
Expand Down Expand Up @@ -1989,9 +1995,9 @@ static int XGIfb_has_VB(void)
break;
default:
xgi_video_info.hasVB = HASVB_NONE;
return FALSE;
return 0;
}
return TRUE;
return 1;
}


Expand Down Expand Up @@ -2645,7 +2651,7 @@ static void XGIfb_pre_setmode(void)
static void XGIfb_post_setmode(void)
{
u8 reg;
BOOLEAN doit = TRUE;
BOOLEAN doit = 1;
#if 0 /* TW: Wrong: Is not in MMIO space, but in RAM */
/* Backup mode number to MMIO space */
if(xgi_video_info.mmio_vbase) {
Expand All @@ -2659,11 +2665,11 @@ static void XGIfb_post_setmode(void)
if (xgi_video_info.video_bpp == 8) {
/* TW: We can't switch off CRT1 on LVDS/Chrontel in 8bpp Modes */
if ((xgi_video_info.hasVB == HASVB_LVDS) || (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL)) {
doit = FALSE;
doit = 0;
}
/* TW: We can't switch off CRT1 on 301B-DH in 8bpp Modes if using LCD */
if (xgi_video_info.disp_state & DISPTYPE_LCD) {
doit = FALSE;
doit = 0;
}
}

Expand All @@ -2672,14 +2678,15 @@ static void XGIfb_post_setmode(void)
inXGIIDXREG(XGIPART1, 0x00, reg);


if((reg & 0x50) == 0x10) {
doit = FALSE;
}
if ((reg & 0x50) == 0x10)
doit = 0;

} else XGIfb_crt1off = 0;

} else
XGIfb_crt1off = 0;

inXGIIDXREG(XGICR, 0x17, reg);
if((XGIfb_crt1off) && (doit))
if ((XGIfb_crt1off) && (doit))
reg &= ~0x80;
else
reg |= 0x80;
Expand Down Expand Up @@ -3027,7 +3034,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
case XG20:
case XG21:
case XG27:
XGIhw_ext.bIntegratedMMEnabled = TRUE;
XGIhw_ext.bIntegratedMMEnabled = 1;
break;

default:
Expand Down Expand Up @@ -3316,14 +3323,14 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
inXGIIDXREG(XGICR,0x38,tmp);
if((tmp & 0x03) == 0x03)
{
// XGI_Pr.XGI_UseLCDA = TRUE;
/* XGI_Pr.XGI_UseLCDA = 1; */
}else
{
// Currently on LCDA? (Some newer BIOSes set D0 in CR35)
inXGIIDXREG(XGICR,0x35,tmp);
if(tmp & 0x01)
{
// XGI_Pr.XGI_UseLCDA = TRUE;
/* XGI_Pr.XGI_UseLCDA = 1; */
}else
{
inXGIIDXREG(XGICR,0x30,tmp);
Expand All @@ -3332,7 +3339,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
inXGIIDXREG(XGIPART1,0x13,tmp);
if(tmp & 0x04)
{
// XGI_Pr.XGI_UseLCDA = TRUE;
/* XGI_Pr.XGI_UseLCDA = 1; */
}
}
}
Expand Down
43 changes: 19 additions & 24 deletions drivers/staging/xgifb/vb_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,18 +148,16 @@ BOOLEAN XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension )


/* if ( pVBInfo->ROMAddr == 0 ) */
/* return( FALSE ) ; */
/* return( 0 ) ; */

if ( pVBInfo->FBAddr == 0 )
{
if (pVBInfo->FBAddr == 0) {
printk("\n pVBInfo->FBAddr == 0 ");
return( FALSE ) ;
}
return 0;
}
printk("1");
if ( pVBInfo->BaseAddr == 0 )
{
printk("\npVBInfo->BaseAddr == 0 ");
return( FALSE ) ;
if (pVBInfo->BaseAddr == 0) {
printk("\npVBInfo->BaseAddr == 0 ");
return 0;
}
printk("2");

Expand All @@ -169,9 +167,8 @@ printk("2");
printk("3");

if ( !HwDeviceExtension->bIntegratedMMEnabled )
{
return( FALSE ) ; /* alan */
}
return 0; /* alan */

printk("4");

// VBIOSVersion[ 4 ] = 0x0 ;
Expand Down Expand Up @@ -422,15 +419,14 @@ printk("18");
XGINew_SetReg1( pVBInfo->P3d4 , 0x83 , 0x00 ) ;
printk("181");

if ( HwDeviceExtension->bSkipSense == FALSE )
{
printk("182");
if (HwDeviceExtension->bSkipSense == 0) {
printk("182");

XGI_SenseCRT1(pVBInfo) ;

printk("183");
printk("183");
/* XGINew_DetectMonitor( HwDeviceExtension ) ; */
pVBInfo->IF_DEF_CH7007 = 0;
pVBInfo->IF_DEF_CH7007 = 0;
if ( ( HwDeviceExtension->jChipType == XG21 ) && (pVBInfo->IF_DEF_CH7007) )
{
printk("184");
Expand Down Expand Up @@ -466,8 +462,7 @@ printk("19");

XGINew_SetDRAMDefaultRegister340( HwDeviceExtension , pVBInfo->P3d4, pVBInfo ) ;

if ( HwDeviceExtension->bSkipDramSizing == TRUE )
{
if (HwDeviceExtension->bSkipDramSizing == 1) {
pSR = HwDeviceExtension->pSR ;
if ( pSR!=NULL )
{
Expand Down Expand Up @@ -547,7 +542,7 @@ XGINew_SetReg1( pVBInfo->P3d4 , 0x8c , 0x87);
XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , 0x31);
printk("25");

return( TRUE ) ;
return 1;
} /* end of init */


Expand Down Expand Up @@ -2608,10 +2603,10 @@ void XGINew_SetMemoryClock( PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_IN
/* --------------------------------------------------------------------- */
BOOLEAN ChkLFB( PVB_DEVICE_INFO pVBInfo )
{
if ( LFBDRAMTrap & XGINew_GetReg1( pVBInfo->P3d4 , 0x78 ) )
return( TRUE ) ;
else
return( FALSE );
if (LFBDRAMTrap & XGINew_GetReg1(pVBInfo->P3d4 , 0x78))
return 1;
else
return 0;
}


Expand Down
Loading

0 comments on commit dda08c5

Please sign in to comment.