iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: xgifb: Remove PUCHAR typedef

Browse Source 
PUCHAR was unsigned char *, use that instead

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2010-06-17 13:10:43 -04:00 committed by Greg Kroah-Hartman
parent dda08c5968
commit 274afb73bd
5 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/xgifb/XGI_main_26.c
View File

@ -2970,9 +2970,10 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
xgi_video_info.mmio_base = pci_resource_start(pdev, 1); xgi_video_info.mmio_base = pci_resource_start(pdev, 1);
XGIfb_mmio_size = pci_resource_len(pdev, 1); XGIfb_mmio_size = pci_resource_len(pdev, 1);
xgi_video_info.vga_base = pci_resource_start(pdev, 2) + 0x30; xgi_video_info.vga_base = pci_resource_start(pdev, 2) + 0x30;
XGIhw_ext.pjIOAddress = (PUCHAR)xgi_video_info.vga_base; XGIhw_ext.pjIOAddress = (unsigned char *)xgi_video_info.vga_base;
//XGI_Pr.RelIO = ioremap(pci_resource_start(pdev, 2), 128) + 0x30; //XGI_Pr.RelIO = ioremap(pci_resource_start(pdev, 2), 128) + 0x30;
printk("XGIfb: Relocate IO address: %lx [%08lx] \n", (unsigned long)pci_resource_start(pdev, 2), XGI_Pr.RelIO); printk("XGIfb: Relocate IO address: %lx [%08lx]\n",
(unsigned long)pci_resource_start(pdev, 2), XGI_Pr.RelIO);
if (pci_enable_device(pdev)) if (pci_enable_device(pdev))
return -EIO; return -EIO;

12
drivers/staging/xgifb/vb_init.c
View File

@ -127,7 +127,7 @@ BOOLEAN XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension )
PVB_DEVICE_INFO pVBInfo = &VBINF; PVB_DEVICE_INFO pVBInfo = &VBINF;
UCHAR i , temp = 0 , temp1 ; UCHAR i , temp = 0 , temp1 ;
// VBIOSVersion[ 5 ] ; // VBIOSVersion[ 5 ] ;
PUCHAR volatile pVideoMemory; volatile unsigned char *pVideoMemory;
/* ULONG j, k ; */ /* ULONG j, k ; */
@ -141,7 +141,7 @@ BOOLEAN XGIInitNew( PXGI_HW_DEVICE_INFO HwDeviceExtension )
pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ; pVBInfo->BaseAddr = (ULONG)HwDeviceExtension->pjIOAddress ;
pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr; pVideoMemory = (unsigned char *)pVBInfo->ROMAddr;
// Newdebugcode( 0x99 ) ; // Newdebugcode( 0x99 ) ;
@ -1254,7 +1254,7 @@ void XGINew_DDR_MRS(PVB_DEVICE_INFO pVBInfo)
{ {
USHORT data ; USHORT data ;
PUCHAR volatile pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr ; volatile unsigned char *pVideoMemory = (unsigned char *)pVBInfo->ROMAddr;
/* SR16 <- 1F,DF,2F,AF */ /* SR16 <- 1F,DF,2F,AF */
/* yriver modified SR16 <- 0F,DF,0F,AF */ /* yriver modified SR16 <- 0F,DF,0F,AF */
@ -1320,7 +1320,7 @@ void XGINew_DDR_MRS(PVB_DEVICE_INFO pVBInfo)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_VerifyMclk( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo) void XGINew_VerifyMclk( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_INFO pVBInfo)
{ {
PUCHAR pVideoMemory = pVBInfo->FBAddr ; unsigned char *pVideoMemory = pVBInfo->FBAddr ;
UCHAR i , j ; UCHAR i , j ;
USHORT Temp , SR21 ; USHORT Temp , SR21 ;
@ -2697,7 +2697,7 @@ void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo) void ReadVBIOSTablData( UCHAR ChipType , PVB_DEVICE_INFO pVBInfo)
{ {
PUCHAR volatile pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr ; volatile unsigned char *pVideoMemory = (unsigned char *)pVBInfo->ROMAddr;
ULONG i ; ULONG i ;
UCHAR j , k ; UCHAR j , k ;
#if 0 #if 0
@ -3279,7 +3279,7 @@ void XGINew_SetModeScratch ( PXGI_HW_DEVICE_INFO HwDeviceExtension , PVB_DEVICE_
void XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) void XGINew_GetXG21Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo)
{ {
UCHAR Temp; UCHAR Temp;
PUCHAR volatile pVideoMemory = ( PUCHAR )pVBInfo->ROMAddr ; volatile unsigned char *pVideoMemory = (unsigned char *)pVBInfo->ROMAddr;
pVBInfo->IF_DEF_LVDS = 0 ; pVBInfo->IF_DEF_LVDS = 0 ;

4
drivers/staging/xgifb/vb_struct.h
View File

@ -415,8 +415,8 @@ struct _VB_DEVICE_INFO
USHORT NewFlickerMode; USHORT NewFlickerMode;
USHORT SelectCRT2Rate; USHORT SelectCRT2Rate;
PUCHAR ROMAddr; unsigned char *ROMAddr;
PUCHAR FBAddr; unsigned char *FBAddr;
ULONG BaseAddr; ULONG BaseAddr;
ULONG RelIO; ULONG RelIO;

2
drivers/staging/xgifb/vb_util.c
View File

@ -13,7 +13,7 @@ void XGINew_SetReg4( ULONG , ULONG ) ;
UCHAR XGINew_GetReg1( ULONG , USHORT) ; UCHAR XGINew_GetReg1( ULONG , USHORT) ;
UCHAR XGINew_GetReg2( ULONG ) ; UCHAR XGINew_GetReg2( ULONG ) ;
ULONG XGINew_GetReg3( ULONG ) ; ULONG XGINew_GetReg3( ULONG ) ;
void XGINew_ClearDAC( PUCHAR ) ; void XGINew_ClearDAC(unsigned char *) ;
void XGINew_SetRegANDOR(ULONG Port,USHORT Index,USHORT DataAND,USHORT DataOR); void XGINew_SetRegANDOR(ULONG Port,USHORT Index,USHORT DataAND,USHORT DataOR);
void XGINew_SetRegOR(ULONG Port,USHORT Index,USHORT DataOR); void XGINew_SetRegOR(ULONG Port,USHORT Index,USHORT DataOR);
void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND); void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND);

16
drivers/staging/xgifb/vgatypes.h
View File

@ -28,10 +28,6 @@ typedef unsigned short USHORT;
typedef unsigned long ULONG; typedef unsigned long ULONG;
#endif #endif
#ifndef PUCHAR
typedef UCHAR *PUCHAR;
#endif
#ifndef PUSHORT #ifndef PUSHORT
typedef USHORT *PUSHORT; typedef USHORT *PUSHORT;
#endif #endif
@ -126,25 +122,25 @@ struct _XGI_HW_DEVICE_INFO
ULONG ulExternalChip; /* NO VB or other video bridge*/ ULONG ulExternalChip; /* NO VB or other video bridge*/
/* if ujVBChipID = VB_CHIP_UNKNOWN, */ /* if ujVBChipID = VB_CHIP_UNKNOWN, */
PUCHAR pjVirtualRomBase; /* ROM image */ unsigned char *pjVirtualRomBase; /* ROM image */
BOOLEAN UseROM; /* Use the ROM image if provided */ BOOLEAN UseROM; /* Use the ROM image if provided */
PVOID pDevice; PVOID pDevice;
PUCHAR 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 */ ULONG ulVideoMemorySize; /* size, in bytes, of the memory on the board */
PUCHAR pjIOAddress; /* base I/O address of VGA ports (0x3B0) */ unsigned char *pjIOAddress; /* base I/O address of VGA ports (0x3B0) */
PUCHAR pjCustomizedROMImage; unsigned char *pjCustomizedROMImage;
PUCHAR pj2ndVideoMemoryAddress; unsigned char *pj2ndVideoMemoryAddress;
ULONG ul2ndVideoMemorySize; ULONG ul2ndVideoMemorySize;
PUCHAR pj2ndIOAddress; unsigned char *pj2ndIOAddress;
UCHAR jChipType; /* Used to Identify Graphics Chip */ UCHAR jChipType; /* Used to Identify Graphics Chip */
/* defined in the data structure type */ /* defined in the data structure type */
/* "XGI_CHIP_TYPE" */ /* "XGI_CHIP_TYPE" */