aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ice4100/sgx535
diff options
context:
space:
mode:
authorMichael Demeter <michael.demeter@intel.com>2010-12-09 10:37:31 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-09 10:37:31 +0000
commita92730bb69fc96b63a77d4b7205754b7f736a2a2 (patch)
tree4114cab324c3dc99bb5085b615f1127bb2bfa1d1 /drivers/staging/ice4100/sgx535
parent505b3162efb233ef187dd3054729065fece716c3 (diff)
downloadmrst-s0i3-test-a92730bb69fc96b63a77d4b7205754b7f736a2a2.tar.gz
mrst-s0i3-test-a92730bb69fc96b63a77d4b7205754b7f736a2a2.tar.xz
mrst-s0i3-test-a92730bb69fc96b63a77d4b7205754b7f736a2a2.zip
Kill off IMG_BYTE, IMG_PBYTE, IMG_HVOID, IMG_PHVOID and IMG_RESULT
Signed-off-by: Michael Demeter <michael.demeter@intel.com>
Diffstat (limited to 'drivers/staging/ice4100/sgx535')
-rwxr-xr-xdrivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/common/pvrsrv.c5
-rwxr-xr-xdrivers/staging/ice4100/sgx535/common/ra.c20
-rwxr-xr-xdrivers/staging/ice4100/sgx535/devices/sgx/mmu.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/img_types.h10
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/servicesext.h10
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/sgx_bridge.h6
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/sgxapi_km.h6
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/srvkm.h2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/osfunc.c8
-rwxr-xr-xdrivers/staging/ice4100/sgx535/system/sgx_intel_ce/oemfuncs.h4
-rwxr-xr-xdrivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysconfig.c4
-rwxr-xr-xdrivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysutils.c2
13 files changed, 35 insertions, 46 deletions
diff --git a/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c b/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c
index 7d24e774a7a..9a74bcfe83d 100755
--- a/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c
+++ b/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c
@@ -3359,7 +3359,7 @@ int BridgedDispatchKM(PVRSRV_PER_PROCESS_DATA * psPerProc,
psBridgeIn =
((ENV_DATA *) psSysData->pvEnvSpecificData)->pvBridgeData;
psBridgeOut =
- (void *)((IMG_PBYTE) psBridgeIn +
+ (void *)((unsigned char *) psBridgeIn +
PVRSRV_MAX_BRIDGE_IN_SIZE);
if (psBridgePackageKM->ui32InBufferSize > 0) {
diff --git a/drivers/staging/ice4100/sgx535/common/pvrsrv.c b/drivers/staging/ice4100/sgx535/common/pvrsrv.c
index cfde445c77d..880f0903ad5 100755
--- a/drivers/staging/ice4100/sgx535/common/pvrsrv.c
+++ b/drivers/staging/ice4100/sgx535/common/pvrsrv.c
@@ -42,9 +42,6 @@
#include <linux/wait.h>
#include <linux/jiffies.h>
-/* FIXME MLD */
-/* #include "pal.h" */
-
#define GFX_MS_TO_JIFFIES(time_ms) msecs_to_jiffies((time_ms))
#define WAIT_FOR_WRITE_OP_SYNC_TIMEOUT 10000
@@ -1021,7 +1018,7 @@ void PVRSRVProcessDisconnect(u32 ui32PID)
PVRSRVPerProcessDataDisconnect(ui32PID);
}
-PVRSRV_ERROR PVRSRVSaveRestoreLiveSegments(void *hArena, IMG_PBYTE pbyBuffer,
+PVRSRV_ERROR PVRSRVSaveRestoreLiveSegments(void *hArena, unsigned char *pbyBuffer,
u32 * puiBufSize, int bSave)
{
u32 uiBytesSaved = 0;
diff --git a/drivers/staging/ice4100/sgx535/common/ra.c b/drivers/staging/ice4100/sgx535/common/ra.c
index 056ff0465b8..b458ca33d9f 100755
--- a/drivers/staging/ice4100/sgx535/common/ra.c
+++ b/drivers/staging/ice4100/sgx535/common/ra.c
@@ -1418,15 +1418,15 @@ void RA_Free(RA_ARENA * pArena, u32 base, int bFreeBackingStore)
#ifdef USE_BM_FREESPACE_CHECK
{
- IMG_BYTE *p;
- IMG_BYTE *endp;
+ unsigned char *p;
+ unsigned char *endp;
- p = (IMG_BYTE *) pBT->base + SysGetDevicePhysOffset();
- endp = (IMG_BYTE *) ((u32) (p + pBT->uSize));
+ p = (unsigned char *) pBT->base + SysGetDevicePhysOffset();
+ endp = (unsigned char *) ((u32) (p + pBT->uSize));
while ((u32) p & 3) {
*p++ = 0xAA;
}
- while (p < (IMG_BYTE *) ((u32) endp & 0xfffffffc)) {
+ while (p < (unsigned char *) ((u32) endp & 0xfffffffc)) {
*(u32 *) p = 0xAAAAAAAA;
p += sizeof(u32);
}
@@ -1435,7 +1435,7 @@ void RA_Free(RA_ARENA * pArena, u32 base, int bFreeBackingStore)
}
PVR_DPF((PVR_DBG_MESSAGE,
"BM_FREESPACE_CHECK: RA_Free Cleared %08X to %08X (size=0x%x)",
- (IMG_BYTE *) pBT->base +
+ (unsigned char *) pBT->base +
SysGetDevicePhysOffset(), endp - 1,
pBT->uSize));
}
@@ -1481,17 +1481,17 @@ RA_ARENA *pJFSavedArena = NULL;
void CheckBMFreespace(void)
{
BT *pBT;
- IMG_BYTE *p;
- IMG_BYTE *endp;
+ unsigned char *p;
+ unsigned char *endp;
if (pJFSavedArena != NULL) {
for (pBT = pJFSavedArena->pHeadSegment; pBT != NULL;
pBT = pBT->pNextSegment) {
if (pBT->type == btt_free) {
- p = (IMG_BYTE *) pBT->base +
+ p = (unsigned char *) pBT->base +
SysGetDevicePhysOffset();
endp =
- (IMG_BYTE *) ((u32) (p + pBT->uSize) &
+ (unsigned char *) ((u32) (p + pBT->uSize) &
0xfffffffc);
while ((u32) p & 3) {
diff --git a/drivers/staging/ice4100/sgx535/devices/sgx/mmu.c b/drivers/staging/ice4100/sgx535/devices/sgx/mmu.c
index 728207ae695..f66523112f0 100755
--- a/drivers/staging/ice4100/sgx535/devices/sgx/mmu.c
+++ b/drivers/staging/ice4100/sgx535/devices/sgx/mmu.c
@@ -1943,7 +1943,7 @@ PVRSRV_ERROR MMU_BIFResetPDAlloc(PVRSRV_SGXDEV_INFO * psDevInfo)
SYS_DATA *psSysData;
RA_ARENA *psLocalDevMemArena;
void *hOSMemHandle = NULL;
- IMG_BYTE *pui8MemBlock = NULL;
+ unsigned char *pui8MemBlock = NULL;
IMG_SYS_PHYADDR sMemBlockSysPAddr;
IMG_CPU_PHYADDR sMemBlockCpuPAddr;
diff --git a/drivers/staging/ice4100/sgx535/include/img_types.h b/drivers/staging/ice4100/sgx535/include/img_types.h
index de93826a828..97db3344092 100755
--- a/drivers/staging/ice4100/sgx535/include/img_types.h
+++ b/drivers/staging/ice4100/sgx535/include/img_types.h
@@ -36,19 +36,11 @@
#define IMG_ADDRSPACE_PHYSADDR_BITS 32
#endif
-typedef unsigned char IMG_BYTE, *IMG_PBYTE;
-typedef char *IMG_PCHAR;
-
#if !defined(u32_MAX)
#define u32_MAX 0xFFFFFFFFUL
#endif
-typedef s32 IMG_RESULT;
-
-typedef void** IMG_HVOID, * IMG_PHVOID;
-
-
-typedef void * IMG_CPU_VIRTADDR;
+typedef void *IMG_CPU_VIRTADDR;
typedef struct
{
diff --git a/drivers/staging/ice4100/sgx535/include/servicesext.h b/drivers/staging/ice4100/sgx535/include/servicesext.h
index 09cee35a9dc..fe4b13247d6 100755
--- a/drivers/staging/ice4100/sgx535/include/servicesext.h
+++ b/drivers/staging/ice4100/sgx535/include/servicesext.h
@@ -616,11 +616,11 @@ typedef struct PVRSRV_CURSOR_INFO_TAG
typedef struct _PVRSRV_REGISTRY_INFO_
{
- u32 ui32DevCookie;
- IMG_PCHAR pszKey;
- IMG_PCHAR pszValue;
- IMG_PCHAR pszBuf;
- u32 ui32BufSize;
+ u32 ui32DevCookie;
+ char *pszKey;
+ char *pszValue;
+ char *pszBuf;
+ u32 ui32BufSize;
} PVRSRV_REGISTRY_INFO, *PPVRSRV_REGISTRY_INFO;
diff --git a/drivers/staging/ice4100/sgx535/include/sgx_bridge.h b/drivers/staging/ice4100/sgx535/include/sgx_bridge.h
index 47bafa29b22..c4f1b9298f6 100755
--- a/drivers/staging/ice4100/sgx535/include/sgx_bridge.h
+++ b/drivers/staging/ice4100/sgx535/include/sgx_bridge.h
@@ -202,9 +202,9 @@ typedef struct PVRSRV_BRIDGE_IN_SUBMIT2D_TAG
typedef struct PVRSRV_BRIDGE_IN_READREGDWORD_TAG
{
u32 ui32BridgeFlags;
- void * hDevCookie;
- IMG_PCHAR pszKey;
- IMG_PCHAR pszValue;
+ void *hDevCookie;
+ char *pszKey;
+ char *pszValue;
}PVRSRV_BRIDGE_IN_READREGDWORD;
diff --git a/drivers/staging/ice4100/sgx535/include/sgxapi_km.h b/drivers/staging/ice4100/sgx535/include/sgxapi_km.h
index eacb24a2e2b..0449e18fd48 100755
--- a/drivers/staging/ice4100/sgx535/include/sgxapi_km.h
+++ b/drivers/staging/ice4100/sgx535/include/sgxapi_km.h
@@ -271,11 +271,11 @@ typedef struct _PVRSRV_SGX_PDUMP_CONTEXT_
typedef struct _SGX_KICKTA_DUMP_ROFF_
{
- void * hKernelMemInfo;
+ void *hKernelMemInfo;
u32 uiAllocIndex;
u32 ui32Offset;
u32 ui32Value;
- IMG_PCHAR pszName;
+ char *pszName;
} SGX_KICKTA_DUMP_ROFF, *PSGX_KICKTA_DUMP_ROFF;
typedef struct _SGX_KICKTA_DUMP_BUFFER_
@@ -292,7 +292,7 @@ typedef struct _SGX_KICKTA_DUMP_BUFFER_
void * hCtrlKernelMemInfo;
IMG_DEV_VIRTADDR sCtrlDevVAddr;
#endif
- IMG_PCHAR pszName;
+ char *pszName;
} SGX_KICKTA_DUMP_BUFFER, *PSGX_KICKTA_DUMP_BUFFER;
#ifdef PDUMP
diff --git a/drivers/staging/ice4100/sgx535/include/srvkm.h b/drivers/staging/ice4100/sgx535/include/srvkm.h
index d58e6a1165a..76b735c6f21 100755
--- a/drivers/staging/ice4100/sgx535/include/srvkm.h
+++ b/drivers/staging/ice4100/sgx535/include/srvkm.h
@@ -47,7 +47,7 @@ extern "C" {
void PVRSRVSetDCState(u32 ui32State);
- PVRSRV_ERROR PVRSRVSaveRestoreLiveSegments(void * hArena, IMG_PBYTE pbyBuffer, u32 *puiBufSize, int bSave);
+ PVRSRV_ERROR PVRSRVSaveRestoreLiveSegments(void *hArena, unsigned char *pbyBuffer, u32 *puiBufSize, int bSave);
#if defined (__cplusplus)
}
diff --git a/drivers/staging/ice4100/sgx535/osfunc.c b/drivers/staging/ice4100/sgx535/osfunc.c
index c877637319c..e4b6bae47ef 100755
--- a/drivers/staging/ice4100/sgx535/osfunc.c
+++ b/drivers/staging/ice4100/sgx535/osfunc.c
@@ -1288,18 +1288,18 @@ PVRSRV_ERROR OSBaseFreeContigMemory(u32 ui32Size, IMG_CPU_VIRTADDR pvLinAddr,
u32 OSReadHWReg(void *pvLinRegBaseAddr, u32 ui32Offset)
{
#if !defined(NO_HARDWARE)
- return (u32) readl((IMG_PBYTE) pvLinRegBaseAddr + ui32Offset);
+ return (u32) readl((unsigned char *) pvLinRegBaseAddr + ui32Offset);
#else
- return *(u32 *) ((IMG_PBYTE) pvLinRegBaseAddr + ui32Offset);
+ return *(u32 *) ((unsigned char *) pvLinRegBaseAddr + ui32Offset);
#endif
}
void OSWriteHWReg(void *pvLinRegBaseAddr, u32 ui32Offset, u32 ui32Value)
{
#if !defined(NO_HARDWARE)
- writel(ui32Value, (IMG_PBYTE) pvLinRegBaseAddr + ui32Offset);
+ writel(ui32Value, (unsigned char *) pvLinRegBaseAddr + ui32Offset);
#else
- *(u32 *) ((IMG_PBYTE) pvLinRegBaseAddr + ui32Offset) = ui32Value;
+ *(u32 *) ((unsigned char *) pvLinRegBaseAddr + ui32Offset) = ui32Value;
#endif
}
diff --git a/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/oemfuncs.h b/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/oemfuncs.h
index fdc30209c33..d0d6cbb4042 100755
--- a/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/oemfuncs.h
+++ b/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/oemfuncs.h
@@ -53,9 +53,9 @@ typedef struct OEM_ACCESS_INFO_TAG
typedef u32 (*PFN_SRV_BRIDGEDISPATCH)( u32 Ioctl,
- IMG_BYTE *pInBuf,
+ unsigned char *pInBuf,
u32 InBufLen,
- IMG_BYTE *pOutBuf,
+ unsigned char *pOutBuf,
u32 OutBufLen,
u32 *pdwBytesTransferred);
diff --git a/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysconfig.c b/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysconfig.c
index 54b86d87bc8..ad2d0196ae5 100755
--- a/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysconfig.c
+++ b/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysconfig.c
@@ -67,9 +67,9 @@ extern struct pci_dev *gpsPVRLDMDev;
#endif
u32 PVRSRV_BridgeDispatchKM(u32 Ioctl,
- IMG_BYTE * pInBuf,
+ unsigned char * pInBuf,
u32 InBufLen,
- IMG_BYTE * pOutBuf,
+ unsigned char * pOutBuf,
u32 OutBufLen, u32 * pdwBytesTransferred);
static PVRSRV_ERROR SysLocateDevices(SYS_DATA * psSysData)
diff --git a/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysutils.c b/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysutils.c
index 0d814b351a1..e03a528a150 100755
--- a/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysutils.c
+++ b/drivers/staging/ice4100/sgx535/system/sgx_intel_ce/sysutils.c
@@ -64,7 +64,7 @@ char *SysCreateVersionString(IMG_CPU_PHYADDR sRegRegion)
}
ui32SGXRevision =
- OSReadHWReg((void *)((IMG_PBYTE) pvRegsLinAddr +
+ OSReadHWReg((void *)((unsigned char *) pvRegsLinAddr +
SYS_SGX_REG_OFFSET), EUR_CR_CORE_REVISION);
if (SysAcquireData(&psSysData) != PVRSRV_OK) {