diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2010-06-17 13:10:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 14:30:54 -0700 |
commit | 490ce818c6ff60257b543207aa042991e32017af (patch) | |
tree | 0d9099a147cb4165cc96a6019ef66678c284888f /drivers/staging/xgifb/vb_init.c | |
parent | fc3678a6c0ee4eb59244a5ba2da58ca47fd20501 (diff) | |
download | kernel_samsung_smdk4412-490ce818c6ff60257b543207aa042991e32017af.zip kernel_samsung_smdk4412-490ce818c6ff60257b543207aa042991e32017af.tar.gz kernel_samsung_smdk4412-490ce818c6ff60257b543207aa042991e32017af.tar.bz2 |
Staging: xgifb: Remove unused code
Remove code that was removed using #if 0
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/vb_init.c')
-rw-r--r-- | drivers/staging/xgifb/vb_init.c | 198 |
1 files changed, 0 insertions, 198 deletions
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 04e6f6e..2abdd24 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -476,15 +476,6 @@ printk("19"); } /* SkipDramSizing */ else { -#if 0 - if ( HwDeviceExtension->jChipType == XG20 ) - { - XGINew_SetReg1( pVBInfo->P3c4 , 0x13 , pVBInfo->SR15[0][XGINew_RAMType] ) ; - XGINew_SetReg1( pVBInfo->P3c4 , 0x14 , pVBInfo->SR15[1][XGINew_RAMType] ) ; - XGINew_SetReg1( pVBInfo->P3c4 , 0x20 , 0x20 ) ; - } - else -#endif { printk("20"); @@ -2700,195 +2691,6 @@ void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo) volatile unsigned char *pVideoMemory = (unsigned char *)pVBInfo->ROMAddr; ULONG i ; UCHAR j , k ; -#if 0 - ULONG ii , jj ; - i = pVideoMemory[ 0x1CF ] | ( pVideoMemory[ 0x1D0 ] << 8 ) ; /* UniROM */ - if ( i != 0 ) - UNIROM = 1 ; - - ii = 0x90 ; - for( jj = 0x00 ; jj < 0x08 ; jj++ ) - { - pVBInfo->MCLKData[ jj ].SR28 = pVideoMemory[ ii ] ; - pVBInfo->MCLKData[ jj ].SR29 = pVideoMemory[ ii + 1] ; - pVBInfo->MCLKData[ jj ].SR2A = pVideoMemory[ ii + 2] ; - pVBInfo->MCLKData[ jj ].CLOCK = pVideoMemory[ ii + 3 ] | ( pVideoMemory[ ii + 4 ] << 8 ) ; - ii += 0x05 ; - } - - ii = 0xB8 ; - for( jj = 0x00 ; jj < 0x08 ; jj++ ) - { - pVBInfo->ECLKData[ jj ].SR2E = pVideoMemory[ ii ] ; - pVBInfo->ECLKData[ jj ].SR2F=pVideoMemory[ ii + 1 ] ; - pVBInfo->ECLKData[ jj ].SR30= pVideoMemory[ ii + 2 ] ; - pVBInfo->ECLKData[ jj ].CLOCK= pVideoMemory[ ii + 3 ] | ( pVideoMemory[ ii + 4 ] << 8 ) ; - ii += 0x05 ; - } - - /* Volari customize data area start */ - /* if ( ChipType == XG40 ) */ - if ( ChipType >= XG40 ) - { - ii = 0xE0 ; - for( jj = 0x00 ; jj < 0x03 ; jj++ ) - { - pVBInfo->SR15[ jj ][ 0 ] = pVideoMemory[ ii ] ; /* SR13, SR14, and SR18 */ - pVBInfo->SR15[ jj ][ 1 ] = pVideoMemory[ ii + 1 ] ; - pVBInfo->SR15[ jj ][ 2 ] = pVideoMemory[ ii + 2 ] ; - pVBInfo->SR15[ jj ][ 3 ] = pVideoMemory[ ii + 3 ] ; - pVBInfo->SR15[ jj ][ 4 ] = pVideoMemory[ ii + 4 ] ; - pVBInfo->SR15[ jj ][ 5 ] = pVideoMemory[ ii + 5 ] ; - pVBInfo->SR15[ jj ][ 6 ] = pVideoMemory[ ii + 6 ] ; - pVBInfo->SR15[ jj ][ 7 ] = pVideoMemory[ ii + 7 ] ; - ii += 0x08 ; - } - ii = 0x110 ; - jj = 0x03 ; - pVBInfo->SR15[ jj ][ 0 ] = pVideoMemory[ ii ] ; /* SR1B */ - pVBInfo->SR15[ jj ][ 1 ] = pVideoMemory[ ii + 1 ] ; - pVBInfo->SR15[ jj ][ 2 ] = pVideoMemory[ ii + 2 ] ; - pVBInfo->SR15[ jj ][ 3 ] = pVideoMemory[ ii + 3 ] ; - pVBInfo->SR15[ jj ][ 4 ] = pVideoMemory[ ii + 4 ] ; - pVBInfo->SR15[ jj ][ 5 ] = pVideoMemory[ ii + 5 ] ; - pVBInfo->SR15[ jj ][ 6 ] = pVideoMemory[ ii + 6 ] ; - pVBInfo->SR15[ jj ][ 7 ] = pVideoMemory[ ii + 7 ] ; - - *pVBInfo->pSR07 = pVideoMemory[ 0x74 ] ; - *pVBInfo->pSR1F = pVideoMemory[ 0x75 ] ; - *pVBInfo->pSR21 = pVideoMemory[ 0x76 ] ; - *pVBInfo->pSR22 = pVideoMemory[ 0x77 ] ; - *pVBInfo->pSR23 = pVideoMemory[ 0x78 ] ; - *pVBInfo->pSR24 = pVideoMemory[ 0x79 ] ; - pVBInfo->SR25[ 0 ] = pVideoMemory[ 0x7A ] ; - *pVBInfo->pSR31 = pVideoMemory[ 0x7B ] ; - *pVBInfo->pSR32 = pVideoMemory[ 0x7C ] ; - *pVBInfo->pSR33 = pVideoMemory[ 0x7D ] ; - ii = 0xF8 ; - - for( jj = 0 ; jj < 3 ; jj++ ) - { - pVBInfo->CR40[ jj ][ 0 ] = pVideoMemory[ ii ] ; - pVBInfo->CR40[ jj ][ 1 ] = pVideoMemory[ ii + 1 ] ; - pVBInfo->CR40[ jj ][ 2 ] = pVideoMemory[ ii + 2 ] ; - pVBInfo->CR40[ jj ][ 3 ] = pVideoMemory[ ii + 3 ] ; - pVBInfo->CR40[ jj ][ 4 ] = pVideoMemory[ ii + 4 ] ; - pVBInfo->CR40[ jj ][ 5 ] = pVideoMemory[ ii + 5 ] ; - pVBInfo->CR40[ jj ][ 6 ] = pVideoMemory[ ii + 6 ] ; - pVBInfo->CR40[ jj ][ 7 ] = pVideoMemory[ ii + 7 ] ; - ii += 0x08 ; - } - - ii = 0x118 ; - for( j = 3 ; j < 24 ; j++ ) - { - pVBInfo->CR40[ j ][ 0 ] = pVideoMemory[ ii ] ; - pVBInfo->CR40[ j ][ 1 ] = pVideoMemory[ ii + 1 ] ; - pVBInfo->CR40[ j ][ 2 ] = pVideoMemory[ ii + 2 ] ; - pVBInfo->CR40[ j ][ 3 ] = pVideoMemory[ ii + 3 ] ; - pVBInfo->CR40[ j ][ 4 ] = pVideoMemory[ ii + 4 ] ; - pVBInfo->CR40[ j ][ 5 ] = pVideoMemory[ ii + 5 ] ; - pVBInfo->CR40[ j ][ 6 ] = pVideoMemory[ ii + 6 ] ; - pVBInfo->CR40[ j ][ 7 ] = pVideoMemory[ ii + 7 ] ; - ii += 0x08 ; - } - - i = pVideoMemory[ 0x1C0 ] | ( pVideoMemory[ 0x1C1 ] << 8 ) ; - - for( j = 0 ; j < 8 ; j++ ) - { - for( k = 0 ; k < 4 ; k++ ) - pVBInfo->CR6B[ j ][ k ] = pVideoMemory[ i + 4 * j + k ] ; - } - - i = pVideoMemory[ 0x1C2 ] | ( pVideoMemory[ 0x1C3 ] << 8 ) ; - - for( j = 0 ; j < 8 ; j++ ) - { - for( k = 0 ; k < 4 ; k++ ) - pVBInfo->CR6E[ j ][ k ] = pVideoMemory[ i + 4 * j + k ] ; - } - - i = pVideoMemory[ 0x1C4 ] | ( pVideoMemory[ 0x1C5 ] << 8 ) ; - for( j = 0 ; j < 8 ; j++ ) - { - for( k = 0 ; k < 32 ; k++ ) - pVBInfo->CR6F[ j ][ k ] = pVideoMemory[ i + 32 * j + k ] ; - } - - i = pVideoMemory[ 0x1C6 ] | ( pVideoMemory[ 0x1C7 ] << 8 ) ; - - for( j = 0 ; j < 8 ; j++ ) - { - for( k = 0 ; k < 2 ; k++ ) - pVBInfo->CR89[ j ][ k ] = pVideoMemory[ i + 2 * j + k ] ; - } - - i = pVideoMemory[ 0x1C8 ] | ( pVideoMemory[ 0x1C9 ] << 8 ) ; - for( j = 0 ; j < 12 ; j++ ) - pVBInfo->AGPReg[ j ] = pVideoMemory[ i + j ] ; - - i = pVideoMemory[ 0x1CF ] | ( pVideoMemory[ 0x1D0 ] << 8 ) ; - for( j = 0 ; j < 4 ; j++ ) - pVBInfo->SR16[ j ] = pVideoMemory[ i + j ] ; - - if ( ChipType == XG21 ) - { - if (pVideoMemory[ 0x67 ] & 0x80) - { - *pVBInfo->pDVOSetting = pVideoMemory[ 0x67 ]; - } - if ( (pVideoMemory[ 0x67 ] & 0xC0) == 0xC0 ) - { - *pVBInfo->pCR2E = pVideoMemory[ i + 4 ] ; - *pVBInfo->pCR2F = pVideoMemory[ i + 5 ] ; - *pVBInfo->pCR46 = pVideoMemory[ i + 6 ] ; - *pVBInfo->pCR47 = pVideoMemory[ i + 7 ] ; - } - } - - if ( ChipType == XG27 ) - { - jj = i+j; - for( i = 0 ; i <= 0xB ; i++,jj++ ) - pVBInfo->pCRD0[i] = pVideoMemory[ jj ] ; - for( i = 0x0 ; i <= 0x1 ; i++,jj++ ) - pVBInfo->pCRDE[i] = pVideoMemory[ jj ] ; - - *pVBInfo->pSR40 = pVideoMemory[ jj ] ; - jj++; - *pVBInfo->pSR41 = pVideoMemory[ jj ] ; - - if (pVideoMemory[ 0x67 ] & 0x80) - { - *pVBInfo->pDVOSetting = pVideoMemory[ 0x67 ]; - } - if ( (pVideoMemory[ 0x67 ] & 0xC0) == 0xC0 ) - { - jj++; - *pVBInfo->pCR2E = pVideoMemory[ jj ] ; - *pVBInfo->pCR2F = pVideoMemory[ jj + 1 ] ; - *pVBInfo->pCR46 = pVideoMemory[ jj + 2 ] ; - *pVBInfo->pCR47 = pVideoMemory[ jj + 3 ] ; - } - - } - - *pVBInfo->pCRCF = pVideoMemory[ 0x1CA ] ; - *pVBInfo->pXGINew_DRAMTypeDefinition = pVideoMemory[ 0x1CB ] ; - *pVBInfo->pXGINew_I2CDefinition = pVideoMemory[ 0x1D1 ] ; - if ( ChipType >= XG20 ) - { - *pVBInfo->pXGINew_CR97 = pVideoMemory[ 0x1D2 ] ; - if ( ChipType == XG27 ) - { - *pVBInfo->pSR36 = pVideoMemory[ 0x1D3 ] ; - *pVBInfo->pCR8F = pVideoMemory[ 0x1D5 ] ; - } - } - - } -#endif /* Volari customize data area end */ if ( ChipType == XG21 ) |