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
commit505b3162efb233ef187dd3054729065fece716c3 (patch)
tree3c189005e54b5f15f80427dce890f3f59a4318de /drivers/staging/ice4100/sgx535
parent31e9bab40e755067e15885d50a30970c0d2c32a7 (diff)
downloadmrst-s0i3-test-505b3162efb233ef187dd3054729065fece716c3.tar.gz
mrst-s0i3-test-505b3162efb233ef187dd3054729065fece716c3.tar.xz
mrst-s0i3-test-505b3162efb233ef187dd3054729065fece716c3.zip
Completely remove the img_defs header and references
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/bridged/bridged_support.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/bridged/sgx/bridged_sgx_bridge.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/common/hash.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/common/resman.c3
-rwxr-xr-xdrivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/img_defs.h63
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/img_types.h2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/osfunc.h5
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/pdump_km.h16
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/power.h26
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/pvr_bridge_km.h88
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/pvr_debug.h6
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/queue.h18
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/services.h210
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/services_headers.h2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/servicesint.h12
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/srvkm.h6
-rwxr-xr-xdrivers/staging/ice4100/sgx535/mm.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/mmap.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/module.c6
-rwxr-xr-xdrivers/staging/ice4100/sgx535/mutils.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/pvr_bridge_k.c2
-rwxr-xr-xdrivers/staging/ice4100/sgx535/pvr_drm.c2
24 files changed, 209 insertions, 274 deletions
diff --git a/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c b/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c
index 5cc012fb89b..7d24e774a7a 100755
--- a/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c
+++ b/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.c
@@ -27,7 +27,7 @@
#include <stddef.h>
-#include "img_defs.h"
+
#include "services.h"
#include "pvr_bridge_km.h"
#include "pvr_debug.h"
diff --git a/drivers/staging/ice4100/sgx535/bridged/bridged_support.c b/drivers/staging/ice4100/sgx535/bridged/bridged_support.c
index 99578bb0bef..af2d421375e 100755
--- a/drivers/staging/ice4100/sgx535/bridged/bridged_support.c
+++ b/drivers/staging/ice4100/sgx535/bridged/bridged_support.c
@@ -24,7 +24,7 @@
*
******************************************************************************/
-#include "img_defs.h"
+
#include "servicesint.h"
#include "bridged_support.h"
diff --git a/drivers/staging/ice4100/sgx535/bridged/sgx/bridged_sgx_bridge.c b/drivers/staging/ice4100/sgx535/bridged/sgx/bridged_sgx_bridge.c
index df307a89bdd..82720964fb8 100755
--- a/drivers/staging/ice4100/sgx535/bridged/sgx/bridged_sgx_bridge.c
+++ b/drivers/staging/ice4100/sgx535/bridged/sgx/bridged_sgx_bridge.c
@@ -29,7 +29,7 @@
#include <stddef.h>
-#include "img_defs.h"
+
#if defined(SUPPORT_SGX)
diff --git a/drivers/staging/ice4100/sgx535/common/hash.c b/drivers/staging/ice4100/sgx535/common/hash.c
index 3485434c95a..b4b2f414408 100755
--- a/drivers/staging/ice4100/sgx535/common/hash.c
+++ b/drivers/staging/ice4100/sgx535/common/hash.c
@@ -25,7 +25,7 @@
******************************************************************************/
#include "pvr_debug.h"
-#include "img_defs.h"
+
#include "services.h"
#include "servicesint.h"
#include "hash.h"
diff --git a/drivers/staging/ice4100/sgx535/common/resman.c b/drivers/staging/ice4100/sgx535/common/resman.c
index 5c8d0810807..ad749199b31 100755
--- a/drivers/staging/ice4100/sgx535/common/resman.c
+++ b/drivers/staging/ice4100/sgx535/common/resman.c
@@ -431,7 +431,8 @@ int ResManFindResourceByPtr_AnyVaCb(RESMAN_ITEM * psCurItem, va_list va)
return (int)(psCurItem == psItem);
}
-IMG_INTERNAL PVRSRV_ERROR ResManFindResourceByPtr(PRESMAN_CONTEXT
+/* FIXME MLD IMG_INTERNAL PVRSRV_ERROR ResManFindResourceByPtr(PRESMAN_CONTEXT*/
+PVRSRV_ERROR ResManFindResourceByPtr(PRESMAN_CONTEXT
psResManContext,
RESMAN_ITEM * psItem)
{
diff --git a/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c b/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
index 5a7f1bfee14..8430e1a09e5 100755
--- a/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
+++ b/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
@@ -86,7 +86,7 @@ PVRSRV_ERROR SGXGetMiscInfoUkernel(PVRSRV_SGXDEV_INFO * psDevInfo,
static void SGXCommandComplete(PVRSRV_DEVICE_NODE * psDeviceNode)
{
#if defined(OS_SUPPORTS_IN_LISR)
- if (OSInLISR(psDeviceNode->psSysData)) {
+ if (in_irq()) {
psDeviceNode->bReProcessDeviceCommandComplete = 1;
} else {
diff --git a/drivers/staging/ice4100/sgx535/include/img_defs.h b/drivers/staging/ice4100/sgx535/include/img_defs.h
deleted file mode 100755
index 30d9f332124..00000000000
--- a/drivers/staging/ice4100/sgx535/include/img_defs.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**********************************************************************
- *
- * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful but, except
- * as otherwise stated in writing, without any warranty; without even the
- * implied warranty of merchantability or fitness for a particular purpose.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
- * Contact Information:
- * Imagination Technologies Ltd. <gpl-support@imgtec.com>
- * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
- *
- ******************************************************************************/
-
-#if !defined (__IMG_DEFS_H__)
-#define __IMG_DEFS_H__
-
-#include "img_types.h"
-
-#if defined (NO_INLINE_FUNCS)
- #define INLINE
- #define FORCE_INLINE
-#else
-#if defined (__cplusplus)
- #define INLINE inline
- #define FORCE_INLINE inline
-#else
-#if !defined(INLINE)
- #define INLINE __inline
-#endif
- #define FORCE_INLINE static __inline
-#endif
-
- #if defined(__linux__) || defined(__METAG)
-
- #define IMG_CALLCONV
- #define IMG_INTERNAL __attribute__ ((visibility ("hidden")))
- #define IMG_EXPORT
- #define IMG_IMPORT
- #define IMG_RESTRICT __restrict__
-
- #else
- #error("define an OS")
- #endif
-
-#ifdef __GNUC__
-#define unref__ __attribute__ ((unused))
-#endif
-
-#endif
-#endif
diff --git a/drivers/staging/ice4100/sgx535/include/img_types.h b/drivers/staging/ice4100/sgx535/include/img_types.h
index ec6614ca55d..de93826a828 100755
--- a/drivers/staging/ice4100/sgx535/include/img_types.h
+++ b/drivers/staging/ice4100/sgx535/include/img_types.h
@@ -81,6 +81,6 @@ typedef struct _IMG_SYS_PHYADDR
u32 uiAddr;
} IMG_SYS_PHYADDR;
-#include "img_defs.h"
+
#endif
diff --git a/drivers/staging/ice4100/sgx535/include/osfunc.h b/drivers/staging/ice4100/sgx535/include/osfunc.h
index a3199d0e8a1..92691279f67 100755
--- a/drivers/staging/ice4100/sgx535/include/osfunc.h
+++ b/drivers/staging/ice4100/sgx535/include/osfunc.h
@@ -315,10 +315,7 @@ PVRSRV_ERROR OSReleasePhysPageAddr(void * hOSWrapMem);
#define OS_SUPPORTS_IN_LISR
-static inline int OSInLISR(void unref__ *pvSysData)
-{
- return in_irq();
-}
+
#endif
diff --git a/drivers/staging/ice4100/sgx535/include/pdump_km.h b/drivers/staging/ice4100/sgx535/include/pdump_km.h
index dd57c7363c0..fea7f4a8507 100755
--- a/drivers/staging/ice4100/sgx535/include/pdump_km.h
+++ b/drivers/staging/ice4100/sgx535/include/pdump_km.h
@@ -59,7 +59,7 @@
#define MAKEUNIQUETAG(hMemInfo) (((BM_BUF *)(((PVRSRV_KERNEL_MEM_INFO *)hMemInfo)->sMemBlk.hBuffer))->pMapping)
- IMG_IMPORT PVRSRV_ERROR PDumpMemPolKM(PVRSRV_KERNEL_MEM_INFO *psMemInfo,
+ PVRSRV_ERROR PDumpMemPolKM(PVRSRV_KERNEL_MEM_INFO *psMemInfo,
u32 ui32Offset,
u32 ui32Value,
u32 ui32Mask,
@@ -67,7 +67,7 @@
u32 ui32Flags,
void * hUniqueTag);
- IMG_IMPORT PVRSRV_ERROR PDumpMemUM(PVRSRV_PER_PROCESS_DATA *psProcData,
+ PVRSRV_ERROR PDumpMemUM(PVRSRV_PER_PROCESS_DATA *psProcData,
void * pvAltLinAddr,
void * pvLinAddr,
PVRSRV_KERNEL_MEM_INFO *psMemInfo,
@@ -76,7 +76,7 @@
u32 ui32Flags,
void * hUniqueTag);
- IMG_IMPORT PVRSRV_ERROR PDumpMemKM(void * pvAltLinAddr,
+ PVRSRV_ERROR PDumpMemKM(void * pvAltLinAddr,
PVRSRV_KERNEL_MEM_INFO *psMemInfo,
u32 ui32Offset,
u32 ui32Bytes,
@@ -104,9 +104,9 @@
void PDumpDeInit(void);
PVRSRV_ERROR PDumpStartInitPhaseKM(void);
PVRSRV_ERROR PDumpStopInitPhaseKM(void);
- IMG_IMPORT PVRSRV_ERROR PDumpSetFrameKM(u32 ui32Frame);
- IMG_IMPORT PVRSRV_ERROR PDumpCommentKM(char *pszComment, u32 ui32Flags);
- IMG_IMPORT PVRSRV_ERROR PDumpDriverInfoKM(char *pszString, u32 ui32Flags);
+ PVRSRV_ERROR PDumpSetFrameKM(u32 ui32Frame);
+ PVRSRV_ERROR PDumpCommentKM(char *pszComment, u32 ui32Flags);
+ PVRSRV_ERROR PDumpDriverInfoKM(char *pszString, u32 ui32Flags);
PVRSRV_ERROR PDumpRegWithFlagsKM(u32 ui32RegAddr,
u32 ui32RegValue,
@@ -191,7 +191,7 @@
const u32 ui32Physical );
int PDumpIsLastCaptureFrameKM(void);
- IMG_IMPORT int PDumpIsCaptureFrameKM(void);
+ int PDumpIsCaptureFrameKM(void);
void PDumpMallocPagesPhys(PVRSRV_DEVICE_TYPE eDeviceType,
u32 ui32DevVAddr,
@@ -265,7 +265,7 @@
u32 ui32NumBytes,
void * hUniqueTag);
- IMG_IMPORT PVRSRV_ERROR PDumpHWPerfCBKM(char *pszFileName,
+ PVRSRV_ERROR PDumpHWPerfCBKM(char *pszFileName,
u32 ui32FileOffset,
IMG_DEV_VIRTADDR sDevBaseAddr,
u32 ui32Size,
diff --git a/drivers/staging/ice4100/sgx535/include/power.h b/drivers/staging/ice4100/sgx535/include/power.h
index fbb76632222..043bb17900a 100755
--- a/drivers/staging/ice4100/sgx535/include/power.h
+++ b/drivers/staging/ice4100/sgx535/include/power.h
@@ -59,35 +59,35 @@ typedef enum _PVRSRV_INIT_SERVER_STATE_
} PVRSRV_INIT_SERVER_STATE, *PPVRSRV_INIT_SERVER_STATE;
-IMG_IMPORT
+
int PVRSRVGetInitServerState(PVRSRV_INIT_SERVER_STATE eInitServerState);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetInitServerState(PVRSRV_INIT_SERVER_STATE eInitServerState, int bState);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPowerLock(u32 ui32CallerID,
int bSystemPowerEvent);
-IMG_IMPORT
+
void PVRSRVPowerUnlock(u32 ui32CallerID);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDevicePowerStateKM(u32 ui32DeviceIndex,
PVRSRV_DEV_POWER_STATE eNewPowerState,
u32 ui32CallerID,
int bRetainMutex);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSystemPrePowerStateKM(PVRSRV_SYS_POWER_STATE eNewPowerState);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSystemPostPowerStateKM(PVRSRV_SYS_POWER_STATE eNewPowerState);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetPowerStateKM (PVRSRV_SYS_POWER_STATE ePVRState);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVRegisterPowerDevice(u32 ui32DeviceIndex,
PFN_PRE_POWER pfnPrePower,
PFN_POST_POWER pfnPostPower,
@@ -97,18 +97,18 @@ PVRSRV_ERROR PVRSRVRegisterPowerDevice(u32 ui32DeviceIndex,
PVRSRV_DEV_POWER_STATE eCurrentPowerState,
PVRSRV_DEV_POWER_STATE eDefaultPowerState);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVRemovePowerDevice (u32 ui32DeviceIndex);
-IMG_IMPORT
+
int PVRSRVIsDevicePowered(u32 ui32DeviceIndex);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDevicePreClockSpeedChange(u32 ui32DeviceIndex,
int bIdleDevice,
void *pvInfo);
-IMG_IMPORT
+
void PVRSRVDevicePostClockSpeedChange(u32 ui32DeviceIndex,
int bIdleDevice,
void *pvInfo);
diff --git a/drivers/staging/ice4100/sgx535/include/pvr_bridge_km.h b/drivers/staging/ice4100/sgx535/include/pvr_bridge_km.h
index 337b7ceccf4..96ea3db7366 100755
--- a/drivers/staging/ice4100/sgx535/include/pvr_bridge_km.h
+++ b/drivers/staging/ice4100/sgx535/include/pvr_bridge_km.h
@@ -39,27 +39,27 @@ PVRSRV_ERROR LinuxBridgeInit(void);
void LinuxBridgeDeInit(void);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumerateDevicesKM(u32 *pui32NumDevices,
PVRSRV_DEVICE_IDENTIFIER *psDevIdList);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVAcquireDeviceDataKM(u32 uiDevIndex,
PVRSRV_DEVICE_TYPE eDeviceType,
void * *phDevCookie);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCreateCommandQueueKM(u32 ui32QueueSize,
PVRSRV_QUEUE_INFO **ppsQueueInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDestroyCommandQueueKM(PVRSRV_QUEUE_INFO *psQueueInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDeviceMemHeapsKM(void * hDevCookie,
PVRSRV_HEAP_INFO *psHeapInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCreateDeviceMemContextKM(void * hDevCookie,
PVRSRV_PER_PROCESS_DATA *psPerProc,
void * *phDevMemContext,
@@ -106,35 +106,35 @@ PVRSRV_ERROR _PVRSRVAllocDeviceMemKM(void * hDevCookie,
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVFreeDeviceMemKM(void * hDevCookie,
PVRSRV_KERNEL_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDissociateDeviceMemKM(void * hDevCookie,
PVRSRV_KERNEL_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVReserveDeviceVirtualMemKM(void * hDevMemHeap,
IMG_DEV_VIRTADDR *psDevVAddr,
u32 ui32Size,
u32 ui32Alignment,
PVRSRV_KERNEL_MEM_INFO **ppsMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVFreeDeviceVirtualMemKM(PVRSRV_KERNEL_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVMapDeviceMemoryKM(PVRSRV_PER_PROCESS_DATA *psPerProc,
PVRSRV_KERNEL_MEM_INFO *psSrcMemInfo,
void * hDstDevMemHeap,
PVRSRV_KERNEL_MEM_INFO **ppsDstMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnmapDeviceMemoryKM(PVRSRV_KERNEL_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVWrapExtMemoryKM(void * hDevCookie,
PVRSRV_PER_PROCESS_DATA *psPerProc,
void * hDevMemContext,
@@ -146,42 +146,42 @@ PVRSRV_ERROR PVRSRVWrapExtMemoryKM(void * hDevCookie,
u32 ui32Flags,
PVRSRV_KERNEL_MEM_INFO **ppsMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnwrapExtMemoryKM(PVRSRV_KERNEL_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumerateDCKM(PVRSRV_DEVICE_CLASS DeviceClass,
u32 *pui32DevCount,
u32 *pui32DevID );
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVOpenDCDeviceKM(PVRSRV_PER_PROCESS_DATA *psPerProc,
u32 ui32DeviceID,
void * hDevCookie,
void * *phDeviceKM);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCloseDCDeviceKM(void * hDeviceKM, int bResManCallback);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumDCFormatsKM(void * hDeviceKM,
u32 *pui32Count,
DISPLAY_FORMAT *psFormat);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumDCDimsKM(void * hDeviceKM,
DISPLAY_FORMAT *psFormat,
u32 *pui32Count,
DISPLAY_DIMS *psDim);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDCSystemBufferKM(void * hDeviceKM,
void * *phBuffer);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDCInfoKM(void * hDeviceKM,
DISPLAY_INFO *psDisplayInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCreateDCSwapChainKM(PVRSRV_PER_PROCESS_DATA *psPerProc,
void * hDeviceKM,
u32 ui32Flags,
@@ -191,99 +191,99 @@ PVRSRV_ERROR PVRSRVCreateDCSwapChainKM(PVRSRV_PER_PROCESS_DATA *psPerProc,
u32 ui32OEMFlags,
void * *phSwapChain,
u32 *pui32SwapChainID);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDestroyDCSwapChainKM(void * hSwapChain);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCDstRectKM(void * hDeviceKM,
void * hSwapChain,
IMG_RECT *psRect);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCSrcRectKM(void * hDeviceKM,
void * hSwapChain,
IMG_RECT *psRect);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCDstColourKeyKM(void * hDeviceKM,
void * hSwapChain,
u32 ui32CKColour);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCSrcColourKeyKM(void * hDeviceKM,
void * hSwapChain,
u32 ui32CKColour);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDCBuffersKM(void * hDeviceKM,
void * hSwapChain,
u32 *pui32BufferCount,
void * *phBuffer);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSwapToDCBufferKM(void * hDeviceKM,
void * hBuffer,
u32 ui32SwapInterval,
void * hPrivateTag,
u32 ui32ClipRectCount,
IMG_RECT *psClipRect);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSwapToDCSystemKM(void * hDeviceKM,
void * hSwapChain);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVOpenBCDeviceKM(PVRSRV_PER_PROCESS_DATA *psPerProc,
u32 ui32DeviceID,
void * hDevCookie,
void * *phDeviceKM);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCloseBCDeviceKM(void * hDeviceKM, int bResManCallback);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetBCInfoKM(void * hDeviceKM,
BUFFER_INFO *psBufferInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetBCBufferKM(void * hDeviceKM,
u32 ui32BufferIndex,
void * *phBuffer);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVMapDeviceClassMemoryKM(PVRSRV_PER_PROCESS_DATA *psPerProc,
void * hDevMemContext,
void * hDeviceClassBuffer,
PVRSRV_KERNEL_MEM_INFO **ppsMemInfo,
void * *phOSMapInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnmapDeviceClassMemoryKM(PVRSRV_KERNEL_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetFreeDeviceMemKM(u32 ui32Flags,
u32 *pui32Total,
u32 *pui32Free,
u32 *pui32LargestBlock);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVAllocSyncInfoKM(void * hDevCookie,
void * hDevMemContext,
PVRSRV_KERNEL_SYNC_INFO **ppsKernelSyncInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVFreeSyncInfoKM(PVRSRV_KERNEL_SYNC_INFO *psKernelSyncInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO *psMiscInfo);
PVRSRV_ERROR PVRSRVGetFBStatsKM(u32 *pui32Total,
u32 *pui32Available);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVAllocSharedSysMemoryKM(PVRSRV_PER_PROCESS_DATA *psPerProc,
u32 ui32Flags,
u32 ui32Size,
PVRSRV_KERNEL_MEM_INFO **ppsKernelMemInfo);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVFreeSharedSysMemoryKM(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVDissociateMemFromResmanKM(PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo);
#ifdef INTEL_D3_CHANGES
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVWaitForWriteOpSyncKM(PVRSRV_KERNEL_SYNC_INFO *psKernelSyncInfo);
#endif
diff --git a/drivers/staging/ice4100/sgx535/include/pvr_debug.h b/drivers/staging/ice4100/sgx535/include/pvr_debug.h
index 412fe0870ec..5778eaa1501 100755
--- a/drivers/staging/ice4100/sgx535/include/pvr_debug.h
+++ b/drivers/staging/ice4100/sgx535/include/pvr_debug.h
@@ -68,7 +68,7 @@
#define PVR_ASSERT(EXPR) if (!(EXPR)) PVRSRVDebugAssertFail(__FILE__, __LINE__);
-IMG_IMPORT void PVRSRVDebugAssertFail(const char *pszFile,
+ void PVRSRVDebugAssertFail(const char *pszFile,
u32 ui32Line);
#if defined(PVR_DBG_BREAK_ASSERT_FAIL)
@@ -89,7 +89,7 @@ IMG_IMPORT void PVRSRVDebugAssertFail(const char *pszFile,
#define PVR_DPF(X) PVRSRVDebugPrintf X
-IMG_IMPORT void PVRSRVDebugPrintf(u32 ui32DebugLevel,
+ void PVRSRVDebugPrintf(u32 ui32DebugLevel,
const char *pszFileName,
u32 ui32Line,
const char *pszFormat,
@@ -106,7 +106,7 @@ IMG_IMPORT void PVRSRVDebugPrintf(u32 ui32DebugLevel,
#define PVR_TRACE(X) PVRSRVTrace X
-IMG_IMPORT void PVRSRVTrace(const char* pszFormat, ... );
+ void PVRSRVTrace(const char* pszFormat, ... );
#else
diff --git a/drivers/staging/ice4100/sgx535/include/queue.h b/drivers/staging/ice4100/sgx535/include/queue.h
index b37e6dfedbf..b70a3c7dd1f 100755
--- a/drivers/staging/ice4100/sgx535/include/queue.h
+++ b/drivers/staging/ice4100/sgx535/include/queue.h
@@ -50,7 +50,7 @@ extern "C" {
#if !defined(USE_CODE)
void QueueDumpDebugInfo(void);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVProcessQueues (u32 ui32CallerID,
int bFlush);
@@ -68,13 +68,13 @@ void ProcSeqShowQueue(struct seq_file *sfile,void* el);
#endif
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCreateCommandQueueKM(u32 ui32QueueSize,
PVRSRV_QUEUE_INFO **ppsQueueInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDestroyCommandQueueKM(PVRSRV_QUEUE_INFO *psQueueInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVInsertCommandKM(PVRSRV_QUEUE_INFO *psQueue,
PVRSRV_COMMAND **ppsCommand,
u32 ui32DevIndex,
@@ -85,26 +85,26 @@ PVRSRV_ERROR PVRSRVInsertCommandKM(PVRSRV_QUEUE_INFO *psQueue,
PVRSRV_KERNEL_SYNC_INFO *apsSrcSync[],
u32 ui32DataByteSize );
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetQueueSpaceKM(PVRSRV_QUEUE_INFO *psQueue,
u32 ui32ParamSize,
void **ppvSpace);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSubmitCommandKM(PVRSRV_QUEUE_INFO *psQueue,
PVRSRV_COMMAND *psCommand);
-IMG_IMPORT
+
void PVRSRVCommandCompleteKM(void * hCmdCookie, int bScheduleMISR);
void PVRSRVCommandCompleteCallbacks(void);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVRegisterCmdProcListKM(u32 ui32DevIndex,
PFN_CMD_PROC *ppfnCmdProcList,
u32 ui32MaxSyncsPerCmd[][2],
u32 ui32CmdCount);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVRemoveCmdProcListKM(u32 ui32DevIndex,
u32 ui32CmdCount);
diff --git a/drivers/staging/ice4100/sgx535/include/services.h b/drivers/staging/ice4100/sgx535/include/services.h
index 95c40eff06d..295ce658a30 100755
--- a/drivers/staging/ice4100/sgx535/include/services.h
+++ b/drivers/staging/ice4100/sgx535/include/services.h
@@ -27,7 +27,7 @@
#ifndef __SERVICES_H__
#define __SERVICES_H__
-#include "img_defs.h"
+#include "img_types.h"
#include "servicesext.h"
#include "pdumpdefs.h"
@@ -357,43 +357,43 @@ typedef enum _PVRSRV_CLIENT_EVENT_
PVRSRV_CLIENT_EVENT_HWTIMEOUT = 0,
} PVRSRV_CLIENT_EVENT;
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVClientEvent(const PVRSRV_CLIENT_EVENT eEvent,
PVRSRV_DEV_DATA *psDevData,
void * pvData);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVConnect(PVRSRV_CONNECTION *psConnection);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDisconnect(PVRSRV_CONNECTION *psConnection);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumerateDevices(const PVRSRV_CONNECTION *psConnection,
u32 *puiNumDevices,
PVRSRV_DEVICE_IDENTIFIER *puiDevIDs);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVAcquireDeviceData(const PVRSRV_CONNECTION *psConnection,
u32 uiDevIndex,
PVRSRV_DEV_DATA *psDevData,
PVRSRV_DEVICE_TYPE eDeviceType);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetMiscInfo (const PVRSRV_CONNECTION *psConnection, PVRSRV_MISC_INFO *psMiscInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVReleaseMiscInfo (const PVRSRV_CONNECTION *psConnection, PVRSRV_MISC_INFO *psMiscInfo);
#if 1
-IMG_IMPORT
+
u32 ReadHWReg(void * pvLinRegBaseAddr, u32 ui32Offset);
-IMG_IMPORT
+
void WriteHWReg(void * pvLinRegBaseAddr, u32 ui32Offset, u32 ui32Value);
-IMG_IMPORT void WriteHWRegs(void * pvLinRegBaseAddr, u32 ui32Count, PVRSRV_HWREG *psHWRegs);
+ void WriteHWRegs(void * pvLinRegBaseAddr, u32 ui32Count, PVRSRV_HWREG *psHWRegs);
#endif
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPollForValue ( const PVRSRV_CONNECTION *psConnection,
void * hOSEvent,
volatile u32 *pui32LinMemAddr,
@@ -402,17 +402,17 @@ PVRSRV_ERROR PVRSRVPollForValue ( const PVRSRV_CONNECTION *psConnection,
u32 ui32Waitus,
u32 ui32Tries);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCreateDeviceMemContext(const PVRSRV_DEV_DATA *psDevData,
void * *phDevMemContext,
u32 *pui32SharedHeapCount,
PVRSRV_HEAP_INFO *psHeapInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDestroyDeviceMemContext(const PVRSRV_DEV_DATA *psDevData,
void * hDevMemContext);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDeviceMemHeapInfo(const PVRSRV_DEV_DATA *psDevData,
void * hDevMemContext,
u32 *pui32SharedHeapCount,
@@ -429,7 +429,7 @@ PVRSRV_ERROR PVRSRVGetDeviceMemHeapInfo(const PVRSRV_DEV_DATA *psDevData,
#endif
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVAllocDeviceMem(const PVRSRV_DEV_DATA *psDevData,
void * hDevMemHeap,
u32 ui32Attribs,
@@ -437,47 +437,47 @@ PVRSRV_ERROR PVRSRVAllocDeviceMem(const PVRSRV_DEV_DATA *psDevData,
u32 ui32Alignment,
PVRSRV_CLIENT_MEM_INFO **ppsMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVFreeDeviceMem(const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVExportDeviceMem(const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo,
void * *phMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVReserveDeviceVirtualMem(const PVRSRV_DEV_DATA *psDevData,
void * hDevMemHeap,
IMG_DEV_VIRTADDR *psDevVAddr,
u32 ui32Size,
u32 ui32Alignment,
PVRSRV_CLIENT_MEM_INFO **ppsMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVFreeDeviceVirtualMem(const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVMapDeviceMemory (const PVRSRV_DEV_DATA *psDevData,
void * hKernelMemInfo,
void * hDstDevMemHeap,
PVRSRV_CLIENT_MEM_INFO **ppsDstMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnmapDeviceMemory (const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVMapExtMemory (const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo,
IMG_SYS_PHYADDR *psSysPAddr,
u32 ui32Flags);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnmapExtMemory (const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo,
u32 ui32Flags);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVWrapExtMemory2(const PVRSRV_DEV_DATA *psDevData,
void * hDevMemContext,
u32 ui32ByteSize,
@@ -487,7 +487,7 @@ PVRSRV_ERROR PVRSRVWrapExtMemory2(const PVRSRV_DEV_DATA *psDevData,
void *pvLinAddr,
u32 ui32Flags,
PVRSRV_CLIENT_MEM_INFO **ppsMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVWrapExtMemory(const PVRSRV_DEV_DATA *psDevData,
void * hDevMemContext,
u32 ui32ByteSize,
@@ -496,7 +496,7 @@ PVRSRV_ERROR PVRSRVWrapExtMemory(const PVRSRV_DEV_DATA *psDevData,
IMG_SYS_PHYADDR *psSysPAddr,
void *pvLinAddr,
PVRSRV_CLIENT_MEM_INFO **ppsMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnwrapExtMemory (const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo);
@@ -504,16 +504,16 @@ PVRSRV_ERROR PVRSRVChangeDeviceMemoryAttributes(const PVRSRV_DEV_DATA *psDevDa
PVRSRV_CLIENT_MEM_INFO *psClientMemInfo,
u32 ui32Attribs);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVMapDeviceClassMemory (const PVRSRV_DEV_DATA *psDevData,
void * hDevMemContext,
void * hDeviceClassBuffer,
PVRSRV_CLIENT_MEM_INFO **ppsMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnmapDeviceClassMemory (const PVRSRV_DEV_DATA *psDevData,
PVRSRV_CLIENT_MEM_INFO *psMemInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVMapPhysToUserSpace(const PVRSRV_DEV_DATA *psDevData,
IMG_SYS_PHYADDR sSysPhysAddr,
u32 uiSizeInBytes,
@@ -521,7 +521,7 @@ PVRSRV_ERROR PVRSRVMapPhysToUserSpace(const PVRSRV_DEV_DATA *psDevData,
u32 *puiActualSize,
void * *ppvProcess);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVUnmapPhysToUserSpace(const PVRSRV_DEV_DATA *psDevData,
void * pvUserAddr,
void * pvProcess);
@@ -535,61 +535,61 @@ typedef enum _PVRSRV_SYNCVAL_MODE_
typedef u32 PVRSRV_SYNCVAL;
-IMG_IMPORT PVRSRV_ERROR PVRSRVWaitForOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
+ PVRSRV_ERROR PVRSRVWaitForOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
PVRSRV_SYNCVAL_MODE eMode, PVRSRV_SYNCVAL OpRequired);
-IMG_IMPORT PVRSRV_ERROR PVRSRVWaitForAllOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
+ PVRSRV_ERROR PVRSRVWaitForAllOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
PVRSRV_SYNCVAL_MODE eMode);
-IMG_IMPORT int PVRSRVTestOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
+ int PVRSRVTestOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
PVRSRV_SYNCVAL_MODE eMode, PVRSRV_SYNCVAL OpRequired);
-IMG_IMPORT int PVRSRVTestAllOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
+ int PVRSRVTestAllOpsComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
PVRSRV_SYNCVAL_MODE eMode);
-IMG_IMPORT int PVRSRVTestOpsNotComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
+ int PVRSRVTestOpsNotComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
PVRSRV_SYNCVAL_MODE eMode, PVRSRV_SYNCVAL OpRequired);
-IMG_IMPORT int PVRSRVTestAllOpsNotComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
+ int PVRSRVTestAllOpsNotComplete(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
PVRSRV_SYNCVAL_MODE eMode);
-IMG_IMPORT PVRSRV_SYNCVAL PVRSRVGetPendingOpSyncVal(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
+ PVRSRV_SYNCVAL PVRSRVGetPendingOpSyncVal(PPVRSRV_CLIENT_MEM_INFO psMemInfo,
PVRSRV_SYNCVAL_MODE eMode);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumerateDeviceClass(const PVRSRV_CONNECTION *psConnection,
PVRSRV_DEVICE_CLASS DeviceClass,
u32 *pui32DevCount,
u32 *pui32DevID);
-IMG_IMPORT
+
void * PVRSRVOpenDCDevice(const PVRSRV_DEV_DATA *psDevData,
u32 ui32DeviceID);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCloseDCDevice(const PVRSRV_CONNECTION *psConnection, void * hDevice);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumDCFormats (void * hDevice,
u32 *pui32Count,
DISPLAY_FORMAT *psFormat);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVEnumDCDims (void * hDevice,
u32 *pui32Count,
DISPLAY_FORMAT *psFormat,
DISPLAY_DIMS *psDims);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDCSystemBuffer(void * hDevice,
void * *phBuffer);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDCInfo(void * hDevice,
DISPLAY_INFO* psDisplayInfo);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCreateDCSwapChain (void * hDevice,
u32 ui32Flags,
DISPLAY_SURF_ATTRIBUTES *psDstSurfAttrib,
@@ -599,36 +599,36 @@ PVRSRV_ERROR PVRSRVCreateDCSwapChain (void * hDevice,
u32 *pui32SwapChainID,
void * *phSwapChain);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVDestroyDCSwapChain (void * hDevice,
void * hSwapChain);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCDstRect (void * hDevice,
void * hSwapChain,
IMG_RECT *psDstRect);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCSrcRect (void * hDevice,
void * hSwapChain,
IMG_RECT *psSrcRect);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCDstColourKey (void * hDevice,
void * hSwapChain,
u32 ui32CKColour);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSetDCSrcColourKey (void * hDevice,
void * hSwapChain,
u32 ui32CKColour);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetDCBuffers(void * hDevice,
void * hSwapChain,
void * *phBuffer);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSwapToDCBuffer (void * hDevice,
void * hBuffer,
u32 ui32ClipRectCount,
@@ -636,39 +636,39 @@ PVRSRV_ERROR PVRSRVSwapToDCBuffer (void * hDevice,
u32 ui32SwapInterval,
void * hPrivateTag);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVSwapToDCSystem (void * hDevice,
void * hSwapChain);
-IMG_IMPORT
+
void * PVRSRVOpenBCDevice(const PVRSRV_DEV_DATA *psDevData,
u32 ui32DeviceID);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVCloseBCDevice(const PVRSRV_CONNECTION *psConnection,
void * hDevice);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetBCBufferInfo(void * hDevice,
BUFFER_INFO *psBuffer);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVGetBCBuffer(void * hDevice,
u32 ui32BufferIndex,
void * *phBuffer);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpInit(const PVRSRV_CONNECTION *psConnection);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpStartInitPhase(const PVRSRV_CONNECTION *psConnection);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpStopInitPhase(const PVRSRV_CONNECTION *psConnection);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpMemPol(const PVRSRV_CONNECTION *psConnection,
PVRSRV_CLIENT_MEM_INFO *psMemInfo,
u32 ui32Offset,
@@ -676,14 +676,14 @@ PVRSRV_ERROR PVRSRVPDumpMemPol(const PVRSRV_CONNECTION *psConnection,
u32 ui32Mask,
u32 ui32Flags);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpSyncPol(const PVRSRV_CONNECTION *psConnection,
PVRSRV_CLIENT_SYNC_INFO *psClientSyncInfo,
int bIsRead,
u32 ui32Value,
u32 ui32Mask);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpMem(const PVRSRV_CONNECTION *psConnection,
void * pvAltLinAddr,
PVRSRV_CLIENT_MEM_INFO *psMemInfo,
@@ -691,42 +691,42 @@ PVRSRV_ERROR PVRSRVPDumpMem(const PVRSRV_CONNECTION *psConnection,
u32 ui32Bytes,
u32 ui32Flags);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpSync(const PVRSRV_CONNECTION *psConnection,
void * pvAltLinAddr,
PVRSRV_CLIENT_SYNC_INFO *psClientSyncInfo,
u32 ui32Offset,
u32 ui32Bytes);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpReg(const PVRSRV_CONNECTION *psConnection,
u32 ui32RegAddr,
u32 ui32RegValue,
u32 ui32Flags);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpRegPolWithFlags(const PVRSRV_CONNECTION *psConnection,
u32 ui32RegAddr,
u32 ui32RegValue,
u32 ui32Mask,
u32 ui32Flags);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpRegPol(const PVRSRV_CONNECTION *psConnection,
u32 ui32RegAddr,
u32 ui32RegValue,
u32 ui32Mask);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpPDReg(const PVRSRV_CONNECTION *psConnection,
u32 ui32RegAddr,
u32 ui32RegValue);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpPDDevPAddr(const PVRSRV_CONNECTION *psConnection,
PVRSRV_CLIENT_MEM_INFO *psMemInfo,
u32 ui32Offset,
IMG_DEV_PHYADDR sPDDevPAddr);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpMemPages(const PVRSRV_CONNECTION *psConnection,
void * hKernelMemInfo,
IMG_DEV_PHYADDR *pPages,
@@ -736,35 +736,35 @@ PVRSRV_ERROR PVRSRVPDumpMemPages(const PVRSRV_CONNECTION *psConnection,
u32 ui32Length,
int bContinuous);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpSetFrame(const PVRSRV_CONNECTION *psConnection,
u32 ui32Frame);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpComment(const PVRSRV_CONNECTION *psConnection,
const char *pszComment,
int bContinuous);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpCommentf(const PVRSRV_CONNECTION *psConnection,
int bContinuous,
const char *pszFormat, ...);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpCommentWithFlagsf(const PVRSRV_CONNECTION *psConnection,
u32 ui32Flags,
const char *pszFormat, ...);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpDriverInfo(const PVRSRV_CONNECTION *psConnection,
char *pszString,
int bContinuous);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpIsCapturing(const PVRSRV_CONNECTION *psConnection,
int *pbIsCapturing);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpBitmap(const PVRSRV_CONNECTION *psConnection,
char *pszFileName,
u32 ui32FileOffset,
@@ -777,7 +777,7 @@ PVRSRV_ERROR PVRSRVPDumpBitmap(const PVRSRV_CONNECTION *psConnection,
PDUMP_MEM_FORMAT eMemFormat,
u32 ui32PDumpFlags);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpRegRead(const PVRSRV_CONNECTION *psConnection,
const char *pszFileName,
u32 ui32FileOffset,
@@ -786,54 +786,54 @@ PVRSRV_ERROR PVRSRVPDumpRegRead(const PVRSRV_CONNECTION *psConnection,
u32 ui32PDumpFlags);
-IMG_IMPORT
+
int PVRSRVPDumpIsCapturingTest(const PVRSRV_CONNECTION *psConnection);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVPDumpCycleCountRegRead(const PVRSRV_CONNECTION *psConnection,
u32 ui32RegOffset,
int bLastFrame);
-IMG_IMPORT void * PVRSRVLoadLibrary(const char *pszLibraryName);
-IMG_IMPORT PVRSRV_ERROR PVRSRVUnloadLibrary(void * hExtDrv);
-IMG_IMPORT PVRSRV_ERROR PVRSRVGetLibFuncAddr(void * hExtDrv, const char *pszFunctionName, void **ppvFuncAddr);
+ void * PVRSRVLoadLibrary(const char *pszLibraryName);
+ PVRSRV_ERROR PVRSRVUnloadLibrary(void * hExtDrv);
+ PVRSRV_ERROR PVRSRVGetLibFuncAddr(void * hExtDrv, const char *pszFunctionName, void **ppvFuncAddr);
-IMG_IMPORT u32 PVRSRVClockus (void);
-IMG_IMPORT void PVRSRVWaitus (u32 ui32Timeus);
-IMG_IMPORT void PVRSRVReleaseThreadQuanta (void);
-IMG_IMPORT u32 PVRSRVGetCurrentProcessID(void);
-IMG_IMPORT char * PVRSRVSetLocale(const char *pszLocale);
+ u32 PVRSRVClockus (void);
+ void PVRSRVWaitus (u32 ui32Timeus);
+ void PVRSRVReleaseThreadQuanta (void);
+ u32 PVRSRVGetCurrentProcessID(void);
+ char * PVRSRVSetLocale(const char *pszLocale);
-IMG_IMPORT void PVRSRVCreateAppHintState(IMG_MODULE_ID eModuleID,
+ void PVRSRVCreateAppHintState(IMG_MODULE_ID eModuleID,
const char *pszAppName,
void **ppvState);
-IMG_IMPORT void PVRSRVFreeAppHintState(IMG_MODULE_ID eModuleID,
+ void PVRSRVFreeAppHintState(IMG_MODULE_ID eModuleID,
void *pvHintState);
-IMG_IMPORT int PVRSRVGetAppHint(void *pvHintState,
+ int PVRSRVGetAppHint(void *pvHintState,
const char *pszHintName,
IMG_DATA_TYPE eDataType,
const void *pvDefault,
void *pvReturn);
-IMG_IMPORT void * PVRSRVAllocUserModeMem (u32 ui32Size);
-IMG_IMPORT void * PVRSRVCallocUserModeMem (u32 ui32Size);
-IMG_IMPORT void * PVRSRVReallocUserModeMem (void * pvBase, u32 uNewSize);
-IMG_IMPORT void PVRSRVFreeUserModeMem (void * pvMem);
-IMG_IMPORT void PVRSRVMemCopy(void *pvDst, const void *pvSrc, u32 ui32Size);
-IMG_IMPORT void PVRSRVMemSet(void *pvDest, u8 ui8Value, u32 ui32Size);
+ void * PVRSRVAllocUserModeMem (u32 ui32Size);
+ void * PVRSRVCallocUserModeMem (u32 ui32Size);
+ void * PVRSRVReallocUserModeMem (void * pvBase, u32 uNewSize);
+ void PVRSRVFreeUserModeMem (void * pvMem);
+ void PVRSRVMemCopy(void *pvDst, const void *pvSrc, u32 ui32Size);
+ void PVRSRVMemSet(void *pvDest, u8 ui8Value, u32 ui32Size);
struct _PVRSRV_MUTEX_OPAQUE_STRUCT_;
typedef struct _PVRSRV_MUTEX_OPAQUE_STRUCT_ *PVRSRV_MUTEX_HANDLE;
-IMG_IMPORT PVRSRV_ERROR PVRSRVCreateMutex(PVRSRV_MUTEX_HANDLE *phMutex);
-IMG_IMPORT PVRSRV_ERROR PVRSRVDestroyMutex(PVRSRV_MUTEX_HANDLE hMutex);
-IMG_IMPORT void PVRSRVLockMutex(PVRSRV_MUTEX_HANDLE hMutex);
-IMG_IMPORT void PVRSRVUnlockMutex(PVRSRV_MUTEX_HANDLE hMutex);
+ PVRSRV_ERROR PVRSRVCreateMutex(PVRSRV_MUTEX_HANDLE *phMutex);
+ PVRSRV_ERROR PVRSRVDestroyMutex(PVRSRV_MUTEX_HANDLE hMutex);
+ void PVRSRVLockMutex(PVRSRV_MUTEX_HANDLE hMutex);
+ void PVRSRVUnlockMutex(PVRSRV_MUTEX_HANDLE hMutex);
#if (defined(DEBUG) && defined(__linux__))
void * PVRSRVAllocUserModeMemTracking(u32 ui32Size, char *pszFileName, u32 ui32LineNumber);
@@ -842,17 +842,17 @@ void PVRSRVFreeUserModeMemTracking(void *pvMem);
void * PVRSRVReallocUserModeMemTracking(void *pvMem, u32 ui32NewSize, char *pszFileName, u32 ui32LineNumber);
#endif
-IMG_IMPORT PVRSRV_ERROR PVRSRVEventObjectWait(const PVRSRV_CONNECTION *psConnection,
+ PVRSRV_ERROR PVRSRVEventObjectWait(const PVRSRV_CONNECTION *psConnection,
void * hOSEvent);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVModifyPendingSyncOps(PVRSRV_CONNECTION *psConnection,
void * hKernelSyncInfo,
u32 ui32ModifyFlags,
u32 *pui32ReadOpsPending,
u32 *pui32WriteOpsPending);
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVModifyCompleteSyncOps(PVRSRV_CONNECTION *psConnection,
void * hKernelSyncInfo,
u32 ui32ModifyFlags);
diff --git a/drivers/staging/ice4100/sgx535/include/services_headers.h b/drivers/staging/ice4100/sgx535/include/services_headers.h
index 56d2587baf2..e53095ba98b 100755
--- a/drivers/staging/ice4100/sgx535/include/services_headers.h
+++ b/drivers/staging/ice4100/sgx535/include/services_headers.h
@@ -32,7 +32,7 @@
#define DEBUG 1
#endif
-#include "img_defs.h"
+
#include "services.h"
#include "servicesint.h"
#include "power.h"
diff --git a/drivers/staging/ice4100/sgx535/include/servicesint.h b/drivers/staging/ice4100/sgx535/include/servicesint.h
index 056c5fb5122..3e3494555a5 100755
--- a/drivers/staging/ice4100/sgx535/include/servicesint.h
+++ b/drivers/staging/ice4100/sgx535/include/servicesint.h
@@ -219,32 +219,32 @@ u32 PVRSRVGetReadOpsPending(PVRSRV_KERNEL_SYNC_INFO *psSyncInfo, int bIsReadOp)
return ui32ReadOpsPending;
}
-IMG_IMPORT
+
PVRSRV_ERROR PVRSRVQueueCommand(void * hQueueInfo,
PVRSRV_COMMAND *psCommand);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVGetMMUContextPDDevPAddr(const PVRSRV_CONNECTION *psConnection,
void * hDevMemContext,
IMG_DEV_PHYADDR *sPDDevPAddr);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVAllocSharedSysMem(const PVRSRV_CONNECTION *psConnection,
u32 ui32Flags,
u32 ui32Size,
PVRSRV_CLIENT_MEM_INFO **ppsClientMemInfo);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVFreeSharedSysMem(const PVRSRV_CONNECTION *psConnection,
PVRSRV_CLIENT_MEM_INFO *psClientMemInfo);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVUnrefSharedSysMem(const PVRSRV_CONNECTION *psConnection,
PVRSRV_CLIENT_MEM_INFO *psClientMemInfo);
-IMG_IMPORT PVRSRV_ERROR
+ PVRSRV_ERROR
PVRSRVMapMemInfoMem(const PVRSRV_CONNECTION *psConnection,
void * hKernelMemInfo,
PVRSRV_CLIENT_MEM_INFO **ppsClientMemInfo);
diff --git a/drivers/staging/ice4100/sgx535/include/srvkm.h b/drivers/staging/ice4100/sgx535/include/srvkm.h
index 44aa64efebc..d58e6a1165a 100755
--- a/drivers/staging/ice4100/sgx535/include/srvkm.h
+++ b/drivers/staging/ice4100/sgx535/include/srvkm.h
@@ -39,11 +39,11 @@ extern "C" {
#define PVR_LOG(X) PVRSRVReleasePrintf X
#endif
- IMG_IMPORT void PVRSRVReleasePrintf(const char *pszFormat,
+ void PVRSRVReleasePrintf(const char *pszFormat,
...);
- IMG_IMPORT PVRSRV_ERROR PVRSRVProcessConnect(u32 ui32PID);
- IMG_IMPORT void PVRSRVProcessDisconnect(u32 ui32PID);
+ PVRSRV_ERROR PVRSRVProcessConnect(u32 ui32PID);
+ void PVRSRVProcessDisconnect(u32 ui32PID);
void PVRSRVSetDCState(u32 ui32State);
diff --git a/drivers/staging/ice4100/sgx535/mm.c b/drivers/staging/ice4100/sgx535/mm.c
index 85a308926e8..2ce4253e28d 100755
--- a/drivers/staging/ice4100/sgx535/mm.c
+++ b/drivers/staging/ice4100/sgx535/mm.c
@@ -37,7 +37,7 @@
#include <linux/sched.h>
#include <linux/mutex.h>
-#include "img_defs.h"
+
#include "services.h"
#include "servicesint.h"
#include "syscommon.h"
diff --git a/drivers/staging/ice4100/sgx535/mmap.c b/drivers/staging/ice4100/sgx535/mmap.c
index 77b9bda7aba..4de7e6dd2a8 100755
--- a/drivers/staging/ice4100/sgx535/mmap.c
+++ b/drivers/staging/ice4100/sgx535/mmap.c
@@ -49,7 +49,7 @@
#include <drm/drmP.h>
#endif
-#include "img_defs.h"
+
#include "services.h"
#include "servicesint.h"
#include "pvrmmap.h"
diff --git a/drivers/staging/ice4100/sgx535/module.c b/drivers/staging/ice4100/sgx535/module.c
index ec9aa49b756..9b05625f663 100755
--- a/drivers/staging/ice4100/sgx535/module.c
+++ b/drivers/staging/ice4100/sgx535/module.c
@@ -68,7 +68,7 @@
#include <asm/uaccess.h>
#endif
-#include "img_defs.h"
+
#include "services.h"
#include "kerneldisplay.h"
#include "kernelbuffer.h"
@@ -384,7 +384,7 @@ int PVRProcGetPowerLevel(char *page, char **start, off_t off, int count,
#endif
#if defined(SUPPORT_DRI_DRM)
-int PVRSRVOpen(struct drm_device unref__ * dev, struct drm_file *pFile)
+int PVRSRVOpen(struct drm_device * dev, struct drm_file *pFile)
#else
static int PVRSRVOpen(struct inode unref__ * pInode, struct file *pFile)
#endif
@@ -447,7 +447,7 @@ err_unlock:
}
#if defined(SUPPORT_DRI_DRM)
-int PVRSRVRelease(struct drm_device unref__ * dev, struct drm_file *pFile)
+int PVRSRVRelease(struct drm_device * dev, struct drm_file *pFile)
#else
static int PVRSRVRelease(struct inode unref__ * pInode, struct file *pFile)
#endif
diff --git a/drivers/staging/ice4100/sgx535/mutils.c b/drivers/staging/ice4100/sgx535/mutils.c
index c52b6959902..8d0fe049cc0 100755
--- a/drivers/staging/ice4100/sgx535/mutils.c
+++ b/drivers/staging/ice4100/sgx535/mutils.c
@@ -34,7 +34,7 @@
#include <asm/page.h>
#include <asm/pgtable.h>
-#include "img_defs.h"
+
#include "pvr_debug.h"
#include "mutils.h"
diff --git a/drivers/staging/ice4100/sgx535/pvr_bridge_k.c b/drivers/staging/ice4100/sgx535/pvr_bridge_k.c
index 20cab3d66a0..edca959b2cb 100755
--- a/drivers/staging/ice4100/sgx535/pvr_bridge_k.c
+++ b/drivers/staging/ice4100/sgx535/pvr_bridge_k.c
@@ -25,7 +25,7 @@
*
******************************************************************************/
-#include "img_defs.h"
+
#include "services.h"
#include "pvr_bridge.h"
#include "perproc.h"
diff --git a/drivers/staging/ice4100/sgx535/pvr_drm.c b/drivers/staging/ice4100/sgx535/pvr_drm.c
index cbbf102836d..6468a09c595 100755
--- a/drivers/staging/ice4100/sgx535/pvr_drm.c
+++ b/drivers/staging/ice4100/sgx535/pvr_drm.c
@@ -41,7 +41,7 @@
#include <drm/drmP.h>
#include <drm/drm.h>
-#include "img_defs.h"
+
#include "services.h"
#include "kerneldisplay.h"
#include "kernelbuffer.h"