gfx: pvr: rename DEBUG to PVR_DEBUG_EXT

DEBUG is used for generic debugging in the kernel, but for PVR it
changes the IOCTL ABI. Since we don't want this do the above rename and
keep DEBUG for debug prints.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/medfield/Makefile b/drivers/staging/mrst/medfield/Makefile
index 6929601..cecba2b 100644 (file)
--- a/drivers/staging/mrst/medfield/Makefile
+++ b/drivers/staging/mrst/medfield/Makefile
@@ -73,7 +73,7 @@ ccflags-$(RES_MAN_EXTEND) += -DRES_MAN_EXTEND
 ccflags-$(PVRSRV_OS_MEM_INFO) += -DPVRSRV_OS_MEM_INFO
 
 ccflags-$(CONFIG_DRM_MID_RELEASE) += -DBUILD="\"release\"" -DPVR_BUILD_TYPE="\"release\"" -DRELEASE
-ccflags-$(CONFIG_DRM_MID_DEBUG) += -DBUILD="\"debug\"" -DPVR_BUILD_TYPE="\"debug\"" -DDEBUG -DDEBUG_LINUX_MEM_AREAS -DDEBUG_LINUX_MEMORY_ALLOCATIONS -DDEBUG_LINUX_MMAP_AREAS -DDEBUG_BRIDGE_KM
+ccflags-$(CONFIG_DRM_MID_DEBUG) += -DBUILD="\"debug\"" -DPVR_BUILD_TYPE="\"debug\"" -DPVR_DEBUG_EXT -DDEBUG_LINUX_MEM_AREAS -DDEBUG_LINUX_MEMORY_ALLOCATIONS -DDEBUG_LINUX_MMAP_AREAS -DDEBUG_BRIDGE_KM
 ccflags-$(CONFIG_PCI_MSI) += -DCONFIG_PCI_MSI
 
 PVRDIR = ../pvr

diff --git a/drivers/staging/mrst/pvr/include4/pvr_debug.h b/drivers/staging/mrst/pvr/include4/pvr_debug.h
index 09c949c..07cdcb4 100644 (file)
--- a/drivers/staging/mrst/pvr/include4/pvr_debug.h
+++ b/drivers/staging/mrst/pvr/include4/pvr_debug.h
@@ -60,7 +60,7 @@ extern "C" {
 
 #define PVR_DBGDRIV_MESSAGE            DBGPRIV_DBGDRV_MESSAGE, "", 0
 
-#if !defined(PVRSRV_NEED_PVR_ASSERT) && defined(DEBUG)
+#if !defined(PVRSRV_NEED_PVR_ASSERT) && defined(PVR_DEBUG_EXT)
 #define PVRSRV_NEED_PVR_ASSERT
 #endif
 
@@ -68,7 +68,7 @@ extern "C" {
 #define PVRSRV_NEED_PVR_DPF
 #endif
 
-#if !defined(PVRSRV_NEED_PVR_TRACE) && (defined(DEBUG) || defined(TIMING))
+#if !defined(PVRSRV_NEED_PVR_TRACE) && (defined(PVR_DEBUG_EXT) || defined(TIMING))
 #define PVRSRV_NEED_PVR_TRACE
 #endif
 

diff --git a/drivers/staging/mrst/pvr/include4/services.h b/drivers/staging/mrst/pvr/include4/services.h
index edb6d11..4faf3f2 100644 (file)
--- a/drivers/staging/mrst/pvr/include4/services.h
+++ b/drivers/staging/mrst/pvr/include4/services.h
@@ -928,7 +928,7 @@ static INLINE IMG_VOID PVRSRVPostSemaphore(PVRSRV_SEMAPHORE_HANDLE hSemaphore, I
 #endif 
 
 
-#if (defined(DEBUG) && defined(__linux__))
+#if (defined(PVR_DEBUG_EXT) && defined(__linux__))
 IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVAllocUserModeMemTracking(IMG_SIZE_T ui32Size, IMG_CHAR *pszFileName, IMG_UINT32 ui32LineNumber);
 
 IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVCallocUserModeMemTracking(IMG_SIZE_T ui32Size, IMG_CHAR *pszFileName, IMG_UINT32 ui32LineNumber);

diff --git a/drivers/staging/mrst/pvr/include4/sgx_options.h b/drivers/staging/mrst/pvr/include4/sgx_options.h
index 5777bae..17ae14a 100644 (file)
--- a/drivers/staging/mrst/pvr/include4/sgx_options.h
+++ b/drivers/staging/mrst/pvr/include4/sgx_options.h
@@ -24,7 +24,7 @@
  *
  ******************************************************************************/
 
-#if defined(DEBUG) || defined (INTERNAL_TEST)
+#if defined(PVR_DEBUG_EXT) || defined (INTERNAL_TEST)
 #define DEBUG_SET_OFFSET       OPTIONS_BIT0
 #define OPTIONS_BIT0           0x1
 #else

diff --git a/drivers/staging/mrst/pvr/services4/3rdparty/linux_framebuffer_mrst/mrstlfb.h b/drivers/staging/mrst/pvr/services4/3rdparty/linux_framebuffer_mrst/mrstlfb.h
index b4af6de..f30e5f1 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/3rdparty/linux_framebuffer_mrst/mrstlfb.h
+++ b/drivers/staging/mrst/pvr/services4/3rdparty/linux_framebuffer_mrst/mrstlfb.h
@@ -248,7 +248,7 @@ typedef struct MRSTLFB_DEVINFO_TAG
 #define        MRSTLFB_PAGE_ROUNDUP(x) (((x) + MRSTLFB_PAGE_MASK) & MRSTLFB_PAGE_TRUNC)
 #endif
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 #define        DEBUG_PRINTK(x) printk x
 #else
 #define        DEBUG_PRINTK(x)

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c
index 8e507fc..5ade07b 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c
@@ -2763,7 +2763,7 @@ DummyBW(IMG_UINT32 ui32BridgeID,
                IMG_VOID *psBridgeOut,
                PVRSRV_PER_PROCESS_DATA *psPerProc)
 {
-#if !defined(DEBUG)
+#if !defined(PVR_DEBUG_EXT)
        PVR_UNREFERENCED_PARAMETER(ui32BridgeID);
 #endif
        PVR_UNREFERENCED_PARAMETER(psBridgeIn);
@@ -2792,7 +2792,7 @@ _SetDispatchTableEntry(IMG_UINT32 ui32Index,
                                           off_t err_offset)
 {
        static IMG_UINT32 ui32PrevIndex = ~0UL;         
-#if !defined(DEBUG)
+#if !defined(PVR_DEBUG_EXT)
        PVR_UNREFERENCED_PARAMETER(pszIOCName);
 #endif
 #if !defined(DEBUG_BRIDGE_KM_DISPATCH_TABLE) && !defined(DEBUG_BRIDGE_KM)
@@ -3886,7 +3886,7 @@ IMG_INT BridgedDispatchKM(PVRSRV_PER_PROCESS_DATA * psPerProc,
                psBridgeOut = (IMG_PVOID)((IMG_PBYTE)psBridgeIn + PVRSRV_MAX_BRIDGE_IN_SIZE);
 
                
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
                PVR_ASSERT(psBridgePackageKM->ui32InBufferSize < PVRSRV_MAX_BRIDGE_IN_SIZE);
                PVR_ASSERT(psBridgePackageKM->ui32OutBufferSize < PVRSRV_MAX_BRIDGE_OUT_SIZE);
 #endif

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h
index 6ca5903..564681f 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h
@@ -229,7 +229,7 @@ _SetDispatchTableEntry(IMG_UINT32 ui32Index,
 
 #define DISPATCH_TABLE_GAP_THRESHOLD 5
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
 #define PVRSRV_BRIDGE_ASSERT_CMD(X, Y) PVR_ASSERT(X == PVRSRV_GET_BRIDGE_ID(Y))
 #else
 #define PVRSRV_BRIDGE_ASSERT_CMD(X, Y) PVR_UNREFERENCED_PARAMETER(X)

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/common/handle.c b/drivers/staging/mrst/pvr/services4/srvkm/common/handle.c
index 5e34af5..206a77a 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/common/handle.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/common/handle.c
@@ -30,7 +30,7 @@
 #include "services_headers.h"
 #include "handle.h"
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 #define        HANDLE_BLOCK_SHIFT      2
 #else
 #define        HANDLE_BLOCK_SHIFT      8
@@ -254,7 +254,7 @@ IMG_BOOL HandleListIsEmpty(IMG_UINT32 ui32Index, struct sHandleList *psList)
 
        bIsEmpty = (IMG_BOOL)(psList->ui32Next == ui32Index);
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        {
                IMG_BOOL bIsEmpty2;
 
@@ -266,7 +266,7 @@ IMG_BOOL HandleListIsEmpty(IMG_UINT32 ui32Index, struct sHandleList *psList)
        return bIsEmpty;
 }
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 #ifdef INLINE_IS_PRAGMA
 #pragma inline(NoChildren)
 #endif
@@ -773,7 +773,7 @@ static PVRSRV_ERROR FreeHandle(PVRSRV_HANDLE_BASE *psBase, struct sHandle *psHan
 
        PVR_ASSERT(INDEX_TO_FREE_HAND_BLOCK_COUNT(psBase, ui32Index)<= HANDLE_BLOCK_SIZE);
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        {
                IMG_UINT32 ui32BlockedIndex;
                IMG_UINT32 ui32FreeHandCount = 0;
@@ -1069,12 +1069,12 @@ static PVRSRV_ERROR AllocHandle(PVRSRV_HANDLE_BASE *psBase, IMG_HANDLE *phHandle
        psNewHandle->eFlag = eFlag;
 
        InitParentList(psNewHandle);
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        PVR_ASSERT(NoChildren(psNewHandle));
 #endif
 
        InitChildEntry(psNewHandle);
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        PVR_ASSERT(NoParent(psNewHandle));
 #endif
 
@@ -1475,7 +1475,7 @@ static PVRSRV_ERROR PVRSRVHandleBatchCommitOrRelease(PVRSRV_HANDLE_BASE *psBase,
                ui32IndexPlusOne = ui32NextIndexPlusOne;
        }
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        if (psBase->ui32TotalHandCountPreBatch != psBase->ui32TotalHandCount)
        {
                IMG_UINT32 ui32Delta = psBase->ui32TotalHandCount - psBase->ui32TotalHandCountPreBatch;

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/common/metrics.c b/drivers/staging/mrst/pvr/services4/srvkm/common/metrics.c
index 216696e..ac19958 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/common/metrics.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/common/metrics.c
@@ -35,7 +35,7 @@
 #include "sgxapi_km.h"
 #endif
 
-#if defined(DEBUG) || defined(TIMING)
+#if defined(PVR_DEBUG_EXT) || defined(TIMING)
 
 static volatile IMG_UINT32 *pui32TimerRegister = 0;
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/common/ra.c b/drivers/staging/mrst/pvr/services4/srvkm/common/ra.c
index 49727cb..bb33c22 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/common/ra.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/common/ra.c
@@ -141,7 +141,7 @@ struct _RA_ARENA_
        RA_STATISTICS sStatistics;
 #endif
 
-#if defined(CONFIG_PROC_FS) && defined(DEBUG)
+#if defined(CONFIG_PROC_FS) && defined(PVR_DEBUG_EXT)
 #define PROC_NAME_SIZE         32
 
        struct proc_dir_entry* pProcInfo;
@@ -154,7 +154,7 @@ struct _RA_ARENA_
 IMG_VOID RA_Dump (RA_ARENA *pArena);
 #endif
 
-#if defined(CONFIG_PROC_FS) && defined(DEBUG)
+#if defined(CONFIG_PROC_FS) && defined(PVR_DEBUG_EXT)
 
 static void RA_ProcSeqShowInfo(struct seq_file *sfile, void* el);
 static void* RA_ProcSeqOff2ElementInfo(struct seq_file * sfile, loff_t off);
@@ -168,7 +168,7 @@ static void* RA_ProcSeqOff2ElementRegs(struct seq_file * sfile, loff_t off);
 IMG_VOID CheckBMFreespace(IMG_VOID);
 #endif
 
-#if defined(CONFIG_PROC_FS) && defined(DEBUG)
+#if defined(CONFIG_PROC_FS) && defined(PVR_DEBUG_EXT)
 static IMG_CHAR *ReplaceSpaces(IMG_CHAR * const pS)
 {
        IMG_CHAR *pT;
@@ -892,7 +892,7 @@ RA_Create (IMG_CHAR *name,
        pArena->sStatistics.uExportCount = 0;
 #endif
 
-#if defined(CONFIG_PROC_FS) && defined(DEBUG)
+#if defined(CONFIG_PROC_FS) && defined(PVR_DEBUG_EXT)
        if(strcmp(pArena->name,"") != 0)
        {
                IMG_INT ret;
@@ -1003,7 +1003,7 @@ RA_Delete (RA_ARENA *pArena)
                }
        }
 
-#if defined(CONFIG_PROC_FS) && defined(DEBUG)
+#if defined(CONFIG_PROC_FS) && defined(PVR_DEBUG_EXT)
        {
                IMG_VOID (*pfnRemoveProcEntrySeq)(struct proc_dir_entry*);
 
@@ -1469,7 +1469,7 @@ IMG_VOID CheckBMFreespace(IMG_VOID)
 #endif
 
 
-#if (defined(CONFIG_PROC_FS) && defined(DEBUG)) || defined (RA_STATS)
+#if (defined(CONFIG_PROC_FS) && defined(PVR_DEBUG_EXT)) || defined (RA_STATS)
 static IMG_CHAR *
 _BTType (IMG_INT eType)
 {
@@ -1515,7 +1515,7 @@ RA_Dump (RA_ARENA *pArena)
 #endif 
 
 
-#if defined(CONFIG_PROC_FS) && defined(DEBUG)
+#if defined(CONFIG_PROC_FS) && defined(PVR_DEBUG_EXT)
 
 
 static void RA_ProcSeqShowInfo(struct seq_file *sfile, void* el)

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c b/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c
index ed385ba..c477ace 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c
@@ -64,7 +64,7 @@ static DEFINE_SEMAPHORE(lock);
 
 typedef struct _RESMAN_ITEM_
 {
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        IMG_UINT32                              ui32Signature;
 #endif
        struct _RESMAN_ITEM_    **ppsThis;      
@@ -82,7 +82,7 @@ typedef struct _RESMAN_ITEM_
 
 typedef struct _RESMAN_CONTEXT_
 {
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        IMG_UINT32                                      ui32Signature;
 #endif
        struct  _RESMAN_CONTEXT_        **ppsThis;
@@ -128,7 +128,7 @@ static PVRSRV_ERROR FreeResourceByCriteria(PRESMAN_CONTEXT  psContext,
                                                                                   IMG_BOOL                     bExecuteCallback);
 
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        static IMG_VOID ValidateResList(PRESMAN_LIST psResList);
        #define VALIDATERESLIST() ValidateResList(gpsResList)
 #else
@@ -204,7 +204,7 @@ PVRSRV_ERROR PVRSRVResManConnect(IMG_HANDLE                 hPerProc,
                return eError;
        }
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        psResManContext->ui32Signature = RESMAN_SIGNATURE;
 #endif 
        psResManContext->psResItemList  = IMG_NULL;
@@ -351,7 +351,7 @@ PRESMAN_ITEM ResManRegisterRes(PRESMAN_CONTEXT      psResManContext,
        }
 
        
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        psNewResItem->ui32Signature             = RESMAN_SIGNATURE;
 #endif 
        psNewResItem->ui32ResType               = ui32ResType;
@@ -456,7 +456,7 @@ PVRSRV_ERROR ResManDissociateRes(RESMAN_ITEM                *psResItem,
                return PVRSRV_ERROR_INVALID_PARAMS;
        }
 
-#ifdef DEBUG 
+#ifdef PVR_DEBUG_EXT
        PVR_ASSERT(psResItem->ui32Signature == RESMAN_SIGNATURE);
 #endif
 
@@ -507,7 +507,7 @@ IMG_INTERNAL PVRSRV_ERROR ResManFindResourceByPtr(PRESMAN_CONTEXT   psResManContex
                return PVRSRV_ERROR_INVALID_PARAMS;
        }
 
-#ifdef DEBUG   
+#ifdef PVR_DEBUG_EXT
        PVR_ASSERT(psItem->ui32Signature == RESMAN_SIGNATURE);
 #endif
 
@@ -559,7 +559,7 @@ static PVRSRV_ERROR FreeResourceByPtr(RESMAN_ITEM   *psItem,
                return PVRSRV_ERROR_INVALID_PARAMS;
        }
 
-#ifdef DEBUG   
+#ifdef PVR_DEBUG_EXT
        PVR_ASSERT(psItem->ui32Signature == RESMAN_SIGNATURE);
 #endif
 
@@ -667,7 +667,7 @@ static PVRSRV_ERROR FreeResourceByCriteria(PRESMAN_CONTEXT  psResManContext,
 }
 
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 static IMG_VOID ValidateResList(PRESMAN_LIST psResList)
 {
        PRESMAN_ITEM    psCurItem, *ppsThisItem;

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/pb.c b/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/pb.c
index 71d47af..1b4c7b4 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/pb.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/pb.c
@@ -233,7 +233,7 @@ static PVRSRV_ERROR SGXCleanupSharedPBDescCallback(IMG_PVOID pvParam, IMG_UINT32
 
 static PVRSRV_ERROR SGXCleanupSharedPBDescCreateLockCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param)
 {
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        PVRSRV_PER_PROCESS_DATA *psPerProc = (PVRSRV_PER_PROCESS_DATA *)pvParam;
        PVR_ASSERT(psPerProc == psPerProcCreateSharedPB);
 #else

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/sgxutils.c b/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/sgxutils.c
index de0bf63..b583b5e 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/sgxutils.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/devices/sgx/sgxutils.c
@@ -960,7 +960,7 @@ PVRSRV_ERROR SGX2DQueryBlitsCompleteKM(PVRSRV_SGXDEV_INFO   *psDevInfo,
        
        PVR_DPF((PVR_DBG_ERROR,"SGX2DQueryBlitsCompleteKM: Timed out. Ops pending."));
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        {
                PVRSRV_SYNC_DATA *psSyncData = psSyncInfo->psSyncData;
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/event.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/event.c
index ad435a2..c51bf41 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/event.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/event.c
@@ -64,7 +64,7 @@ typedef struct PVRSRV_LINUX_EVENT_OBJECT_TAG
 {
        atomic_t        sTimeStamp;
        IMG_UINT32  ui32TimeStampPrevious;
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        IMG_UINT        ui32Stats;
 #endif
     wait_queue_head_t sWait;
@@ -120,7 +120,7 @@ PVRSRV_ERROR LinuxEventObjectDelete(IMG_HANDLE hOSEventObjectList, IMG_HANDLE hO
                if(hOSEventObject)
                {
                        PVRSRV_LINUX_EVENT_OBJECT *psLinuxEventObject = (PVRSRV_LINUX_EVENT_OBJECT *)hOSEventObject;
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
                        PVR_DPF((PVR_DBG_MESSAGE, "LinuxEventObjectListDelete: Event object waits: %lu", psLinuxEventObject->ui32Stats));
 #endif
                        if(ResManFreeResByPtr(psLinuxEventObject->hResItem) != PVRSRV_OK)
@@ -146,7 +146,7 @@ static PVRSRV_ERROR LinuxEventObjectDeleteCallback(IMG_PVOID pvParam, IMG_UINT32
        list_del(&psLinuxEventObject->sList);
        write_unlock_bh(&psLinuxEventObjectList->sLock);
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        PVR_DPF((PVR_DBG_MESSAGE, "LinuxEventObjectDeleteCallback: Event object waits: %lu", psLinuxEventObject->ui32Stats));
 #endif
 
@@ -183,7 +183,7 @@ PVRSRV_ERROR LinuxEventObjectAdd(IMG_HANDLE hOSEventObjectList, IMG_HANDLE *phOS
        atomic_set(&psLinuxEventObject->sTimeStamp, 0);
        psLinuxEventObject->ui32TimeStampPrevious = 0;
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        psLinuxEventObject->ui32Stats = 0;
 #endif
     init_waitqueue_head(&psLinuxEventObject->sWait);
@@ -249,7 +249,7 @@ PVRSRV_ERROR LinuxEventObjectWait(IMG_HANDLE hOSEventObject, IMG_UINT32 ui32MSTi
                ui32TimeOutJiffies = (IMG_UINT32)schedule_timeout((IMG_INT32)ui32TimeOutJiffies);
 
                mutex_lock(&gPVRSRVLock);
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
                psLinuxEventObject->ui32Stats++;
 #endif
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/linkage.h b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/linkage.h
index 1ec2696..4f23194 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/linkage.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/linkage.h
@@ -35,7 +35,7 @@ IMG_VOID PVRDPFInit(IMG_VOID);
 PVRSRV_ERROR PVROSFuncInit(IMG_VOID);
 IMG_VOID PVROSFuncDeInit(IMG_VOID);
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 IMG_INT PVRDebugProcSetLevel(struct file *file, const IMG_CHAR *buffer, IMG_UINT32 count, IMG_VOID *data);
 IMG_VOID PVRDebugSetLevel(IMG_UINT32 uDebugLevel);
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mm.h b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mm.h
index 13ca102..3918808 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mm.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mm.h
@@ -190,7 +190,7 @@ LinuxMemAreaRootType(LinuxMemArea *psLinuxMemArea)
 const IMG_CHAR *LinuxMemAreaTypeToString(LINUX_MEM_AREA_TYPE eMemAreaType);
 
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
 const IMG_CHAR *HAPFlagsToString(u32 ui32Flags);
 #endif
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mmap.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mmap.c
index 7ddf739..f76a302 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mmap.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mmap.c
@@ -132,11 +132,11 @@ static PKV_OFFSET_STRUCT
 CreateOffsetStruct(LinuxMemArea *psLinuxMemArea, IMG_UINT32 ui32Offset, IMG_UINT32 ui32RealByteSize)
 {
     PKV_OFFSET_STRUCT psOffsetStruct;
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     const IMG_CHAR *pszName = LinuxMemAreaTypeToString(LinuxMemAreaRootType(psLinuxMemArea));
 #endif
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     PVR_DPF((PVR_DBG_MESSAGE,
              "%s(%s, psLinuxMemArea: 0x%p, ui32AllocFlags: 0x%8lx)",
              __FUNCTION__, pszName, psLinuxMemArea, psLinuxMemArea->ui32AreaFlags));
@@ -655,13 +655,13 @@ PVRSRV_ERROR
 PVRMMapRegisterArea(LinuxMemArea *psLinuxMemArea)
 {
     PVRSRV_ERROR eError;
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     const IMG_CHAR *pszName = LinuxMemAreaTypeToString(LinuxMemAreaRootType(psLinuxMemArea));
 #endif
 
     mutex_lock(&g_sMMapMutex);
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     PVR_DPF((PVR_DBG_MESSAGE,
              "%s(%s, psLinuxMemArea 0x%p, ui32AllocFlags 0x%8lx)",
              __FUNCTION__, pszName, psLinuxMemArea,  psLinuxMemArea->ui32AreaFlags));

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/module.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/module.c
index a7375b2..0cffaee 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/module.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/module.c
@@ -60,7 +60,7 @@
 #include <linux/pci.h>
 #endif 
 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
 #include <asm/uaccess.h>
 #endif
 
@@ -97,7 +97,7 @@
 #endif
 
 MODULE_SUPPORTED_DEVICE(DEVNAME);
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 static IMG_INT debug = DBGPRIV_WARNING;
 #include <linux/moduleparam.h>
 module_param(debug, int, 0);
@@ -134,7 +134,7 @@ struct mutex gPVRSRVLock;
 
 IMG_UINT32 gui32ReleasePID;
 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
 static IMG_UINT32 gPVRPowerLevel;
 #endif
 
@@ -258,7 +258,7 @@ static IMG_VOID __devexit PVRSRVDriverRemove(LDM_DEV *pDevice)
 
        if (SysAcquireData(&psSysData) == PVRSRV_OK)
        {
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
                if (gPVRPowerLevel != 0)
                {
                        if (PVRSRVSetPowerStateKM(PVRSRV_SYS_POWER_STATE_D0) == PVRSRV_OK)
@@ -305,7 +305,7 @@ IMG_INT PVRSRVDriverSuspend(struct drm_device *pDevice, pm_message_t state)
 static IMG_INT PVRSRVDriverSuspend(LDM_DEV *pDevice, pm_message_t state)
 #endif
 {
-#if !(defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
+#if !(defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
        PVR_TRACE(( "PVRSRVDriverSuspend(pDevice=%p)", pDevice));
        printk(KERN_ALERT  "PVRSRVDriverSuspend(pDevice=%p)", pDevice);
 
@@ -324,7 +324,7 @@ IMG_INT PVRSRVDriverResume(struct drm_device *pDevice)
 static IMG_INT PVRSRVDriverResume(LDM_DEV *pDevice)
 #endif
 {
-#if !(defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
+#if !(defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
        PVR_TRACE(("PVRSRVDriverResume(pDevice=%p)", pDevice));
        printk(KERN_ALERT "PVRSRVDriverResume(pDevice=%p)", pDevice);
 
@@ -338,7 +338,7 @@ static IMG_INT PVRSRVDriverResume(LDM_DEV *pDevice)
 #endif 
 
 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM)
 IMG_INT PVRProcSetPowerLevel(struct file *file, const IMG_CHAR *buffer, IMG_UINT32 count, IMG_VOID *data)
 {
        IMG_CHAR data_buffer[2];
@@ -520,7 +520,7 @@ static IMG_INT __init PVRCore_Init(IMG_VOID)
 
        mutex_init(&gPVRSRVLock);
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        PVRDebugSetLevel(debug);
 #endif
 
@@ -711,7 +711,7 @@ static IMG_VOID __exit PVRCore_Cleanup(IMG_VOID)
 #endif
 
 #else 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
        if (gPVRPowerLevel != 0)
        {
                if (PVRSRVSetPowerStateKM(PVRSRV_SYS_POWER_STATE_D0) == PVRSRV_OK)

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mutils.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mutils.c
index d9ad5ff..4da26b7 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mutils.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/mutils.c
@@ -94,7 +94,7 @@ PVRLinuxX86PATProbe(IMG_VOID)
                g_write_combining_available = (IMG_BOOL)(pat_entry == PAT_LINUX_X86_WC);
 #endif
        }
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
 #if defined(SUPPORT_LINUX_X86_WRITECOMBINE)
        if (g_write_combining_available)
        {

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/osfunc.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/osfunc.c
index 640d9d3..4bb9257 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/osfunc.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/osfunc.c
@@ -2030,7 +2030,7 @@ typedef struct _sWrapMemInfo_
     IMG_SYS_PHYADDR *psPhysAddr;
     IMG_INT iPageOffset;
     IMG_INT iContiguous;
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     IMG_UINT32 ulStartAddr;
     IMG_UINT32 ulBeyondEndAddr;
     struct vm_area_struct *psVMArea;
@@ -2197,7 +2197,7 @@ PVRSRV_ERROR OSAcquirePhysPageAddr(IMG_VOID* pvCPUVAddr,
     memset(psInfo, 0, sizeof(*psInfo));
     psInfo->bWrapWorkaround = bWrapWorkaround;
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     psInfo->ulStartAddr = ulStartAddrOrig;
     psInfo->ulBeyondEndAddr = ulBeyondEndAddrOrig;
 #endif
@@ -2273,7 +2273,7 @@ PVRSRV_ERROR OSAcquirePhysPageAddr(IMG_VOID* pvCPUVAddr,
         
         goto error_release_mmap_sem;
     }
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     psInfo->psVMArea = psVMArea;
 #endif
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/proc.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/proc.c
index c5760e3..9d38ffa 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/proc.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/proc.c
@@ -89,7 +89,7 @@ static struct proc_dir_entry* g_pProcQueue;
 static struct proc_dir_entry* g_pProcVersion;
 static struct proc_dir_entry* g_pProcSysNodes;
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 static struct proc_dir_entry* g_pProcDebugLevel;
 #endif
 
@@ -599,7 +599,7 @@ IMG_INT CreateProcEntries(IMG_VOID)
     }
 
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 
 #ifdef PVR_PROC_USE_SEQ_FILE
        g_pProcDebugLevel = CreateProcEntrySeq("debug_level", NULL, NULL,
@@ -689,7 +689,7 @@ IMG_VOID RemovePerProcessProcDir(PVRSRV_ENV_PER_PROCESS_DATA *psPerProc)
 
 IMG_VOID RemoveProcEntries(IMG_VOID)
 {
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 
 #ifdef PVR_PROC_USE_SEQ_FILE
     RemoveProcEntrySeq( g_pProcDebugLevel );

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/pvr_debug.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/pvr_debug.c
index 7b41fc9..0b212b2 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/pvr_debug.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux-intel/pvr_debug.c
@@ -373,7 +373,7 @@ IMG_VOID PVRSRVDebugPrintf  (
 
 #endif 
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
 
 IMG_VOID PVRDebugSetLevel(IMG_UINT32 uDebugLevel)
 {

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/event.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/event.c
index 3b8ab2f..7bc7e94 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/event.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/event.c
@@ -69,7 +69,7 @@ typedef struct PVRSRV_LINUX_EVENT_OBJECT_TAG
 {
        atomic_t        sTimeStamp;
        IMG_UINT32  ui32TimeStampPrevious;
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        IMG_UINT        ui32Stats;
 #endif
     wait_queue_head_t sWait;   
@@ -133,7 +133,7 @@ PVRSRV_ERROR LinuxEventObjectDelete(IMG_HANDLE hOSEventObjectList, IMG_HANDLE hO
                if(hOSEventObject)
                {
                        PVRSRV_LINUX_EVENT_OBJECT *psLinuxEventObject = (PVRSRV_LINUX_EVENT_OBJECT *)hOSEventObject; 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
                        PVR_DPF((PVR_DBG_MESSAGE, "LinuxEventObjectListDelete: Event object waits: %u", psLinuxEventObject->ui32Stats));
 #endif
                        if(ResManFreeResByPtr(psLinuxEventObject->hResItem) != PVRSRV_OK)
@@ -160,7 +160,7 @@ static PVRSRV_ERROR LinuxEventObjectDeleteCallback(IMG_PVOID pvParam, IMG_UINT32
        list_del(&psLinuxEventObject->sList);
        write_unlock_irqrestore(&psLinuxEventObjectList->sLock, ulLockFlags);
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        PVR_DPF((PVR_DBG_MESSAGE, "LinuxEventObjectDeleteCallback: Event object waits: %u", psLinuxEventObject->ui32Stats));
 #endif 
 
@@ -198,7 +198,7 @@ PVRSRV_ERROR LinuxEventObjectAdd(IMG_HANDLE hOSEventObjectList, IMG_HANDLE *phOS
        atomic_set(&psLinuxEventObject->sTimeStamp, 0);
        psLinuxEventObject->ui32TimeStampPrevious = 0;
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
        psLinuxEventObject->ui32Stats = 0;
 #endif
     init_waitqueue_head(&psLinuxEventObject->sWait);
@@ -268,7 +268,7 @@ PVRSRV_ERROR LinuxEventObjectWait(IMG_HANDLE hOSEventObject, IMG_UINT32 ui32MSTi
                ui32TimeOutJiffies = (IMG_UINT32)schedule_timeout((IMG_INT32)ui32TimeOutJiffies);
                
                LinuxLockMutex(&gPVRSRVLock);
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
                psLinuxEventObject->ui32Stats++;
 #endif                 
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/linkage.h b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/linkage.h
index 7e6d09a..c2ce1b8 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/linkage.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/linkage.h
@@ -35,7 +35,7 @@ IMG_VOID PVRDPFInit(IMG_VOID);
 PVRSRV_ERROR PVROSFuncInit(IMG_VOID);
 IMG_VOID PVROSFuncDeInit(IMG_VOID);
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 
 IMG_INT PVRDebugProcSetLevel(struct file *file, const IMG_CHAR *buffer, IMG_UINT32 count, IMG_VOID *data);
 void ProcSeqShowDebugLevel(struct seq_file *sfile,void* el);

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mm.h b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mm.h
index 4d37131..092f0c5 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mm.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mm.h
@@ -320,7 +320,7 @@ LinuxMemAreaRootType(LinuxMemArea *psLinuxMemArea)
 const IMG_CHAR *LinuxMemAreaTypeToString(LINUX_MEM_AREA_TYPE eMemAreaType);
 
 
-#if defined(DEBUG) || defined(DEBUG_LINUX_MEM_AREAS)
+#if defined(PVR_DEBUG_EXT) || defined(DEBUG_LINUX_MEM_AREAS)
 const IMG_CHAR *HAPFlagsToString(IMG_UINT32 ui32Flags);
 #endif
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mmap.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mmap.c
index 5f1e982..bf75799 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mmap.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mmap.c
@@ -177,11 +177,11 @@ static PKV_OFFSET_STRUCT
 CreateOffsetStruct(LinuxMemArea *psLinuxMemArea, IMG_UINT32 ui32Offset, IMG_UINT32 ui32RealByteSize)
 {
     PKV_OFFSET_STRUCT psOffsetStruct;
-#if defined(DEBUG) || defined(DEBUG_LINUX_MMAP_AREAS)
+#if defined(PVR_DEBUG_EXT) || defined(DEBUG_LINUX_MMAP_AREAS)
     const IMG_CHAR *pszName = LinuxMemAreaTypeToString(LinuxMemAreaRootType(psLinuxMemArea));
 #endif
 
-#if defined(DEBUG) || defined(DEBUG_LINUX_MMAP_AREAS)
+#if defined(PVR_DEBUG_EXT) || defined(DEBUG_LINUX_MMAP_AREAS)
     PVR_DPF((PVR_DBG_MESSAGE,
              "%s(%s, psLinuxMemArea: 0x%p, ui32AllocFlags: 0x%8x)",
              __FUNCTION__, pszName, psLinuxMemArea, psLinuxMemArea->ui32AreaFlags));
@@ -224,7 +224,7 @@ CreateOffsetStruct(LinuxMemArea *psLinuxMemArea, IMG_UINT32 ui32Offset, IMG_UINT
 static IMG_VOID
 DestroyOffsetStruct(PKV_OFFSET_STRUCT psOffsetStruct)
 {
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
     IMG_CPU_PHYADDR CpuPAddr;
     CpuPAddr = LinuxMemAreaToCpuPAddr(psOffsetStruct->psLinuxMemArea, 0);
 #endif
@@ -236,7 +236,7 @@ DestroyOffsetStruct(PKV_OFFSET_STRUCT psOffsetStruct)
         list_del(&psOffsetStruct->sMMapItem);
     }
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
     PVR_DPF((PVR_DBG_MESSAGE, "%s: Table entry: "
              "psLinuxMemArea=%p, CpuPAddr=0x%08X", __FUNCTION__,
              psOffsetStruct->psLinuxMemArea,
@@ -914,13 +914,13 @@ PVRSRV_ERROR
 PVRMMapRegisterArea(LinuxMemArea *psLinuxMemArea)
 {
     PVRSRV_ERROR eError;
-#if defined(DEBUG) || defined(DEBUG_LINUX_MMAP_AREAS)
+#if defined(PVR_DEBUG_EXT) || defined(DEBUG_LINUX_MMAP_AREAS)
     const IMG_CHAR *pszName = LinuxMemAreaTypeToString(LinuxMemAreaRootType(psLinuxMemArea));
 #endif
 
     LinuxLockMutex(&g_sMMapMutex);
 
-#if defined(DEBUG) || defined(DEBUG_LINUX_MMAP_AREAS)
+#if defined(PVR_DEBUG_EXT) || defined(DEBUG_LINUX_MMAP_AREAS)
     PVR_DPF((PVR_DBG_MESSAGE,
              "%s(%s, psLinuxMemArea 0x%p, ui32AllocFlags 0x%8x)",
              __FUNCTION__, pszName, psLinuxMemArea,  psLinuxMemArea->ui32AreaFlags));

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/module.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/module.c
index 4613496..d23bcde 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/module.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/module.c
@@ -59,7 +59,7 @@
 #include <linux/pci.h>
 #endif 
 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
 #include <asm/uaccess.h>
 #endif
 
@@ -130,7 +130,7 @@ PVRSRV_LINUX_MUTEX gPVRSRVLock;
 
 IMG_UINT32 gui32ReleasePID;
 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
 static IMG_UINT32 gPVRPowerLevel;
 #endif
 
@@ -257,7 +257,7 @@ static void __devexit PVRSRVDriverRemove(LDM_DEV *pDevice)
 
        SysAcquireData(&psSysData);
        
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
        if (gPVRPowerLevel != 0)
        {
                if (PVRSRVSetPowerStateKM(PVRSRV_SYS_POWER_STATE_D0) == PVRSRV_OK)
@@ -303,7 +303,7 @@ int PVRSRVDriverSuspend(struct drm_device *pDevice, pm_message_t state)
 static int PVRSRVDriverSuspend(LDM_DEV *pDevice, pm_message_t state)
 #endif
 {
-#if !(defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
+#if !(defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
        PVR_TRACE(( "PVRSRVDriverSuspend(pDevice=%p)", pDevice));
        printk(KERN_ALERT  "PVRSRVDriverSuspend(pDevice=%p)", pDevice);
 
@@ -322,7 +322,7 @@ int PVRSRVDriverResume(struct drm_device *pDevice)
 static int PVRSRVDriverResume(LDM_DEV *pDevice)
 #endif
 {
-#if !(defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
+#if !(defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM))
        PVR_TRACE(("PVRSRVDriverResume(pDevice=%p)", pDevice));
        printk(KERN_ALERT "PVRSRVDriverResume(pDevice=%p)", pDevice);
 
@@ -336,7 +336,7 @@ static int PVRSRVDriverResume(LDM_DEV *pDevice)
 #endif 
 
 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL) && !defined(SUPPORT_DRI_DRM)
 IMG_INT PVRProcSetPowerLevel(struct file *file, const IMG_CHAR *buffer, IMG_UINT32 count, IMG_VOID *data)
 {
        IMG_CHAR data_buffer[2];
@@ -709,7 +709,7 @@ static void __exit PVRCore_Cleanup(void)
 #endif
 
 #else 
-#if defined(DEBUG) && defined(PVR_MANUAL_POWER_CONTROL)
+#if defined(PVR_DEBUG_EXT) && defined(PVR_MANUAL_POWER_CONTROL)
        if (gPVRPowerLevel != 0)
        {
                if (PVRSRVSetPowerStateKM(PVRSRV_SYS_POWER_STATE_D0) == PVRSRV_OK)

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mutils.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mutils.c
index d9ad5ff..4da26b7 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mutils.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/mutils.c
@@ -94,7 +94,7 @@ PVRLinuxX86PATProbe(IMG_VOID)
                g_write_combining_available = (IMG_BOOL)(pat_entry == PAT_LINUX_X86_WC);
 #endif
        }
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
 #if defined(SUPPORT_LINUX_X86_WRITECOMBINE)
        if (g_write_combining_available)
        {

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c
index 04b55b4..596896c 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c
@@ -2165,7 +2165,7 @@ typedef struct _sWrapMemInfo_
     struct page **ppsPages;
     IMG_SYS_PHYADDR *psPhysAddr;
     IMG_INT iPageOffset;
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     IMG_UINT32 ulStartAddr;
     IMG_UINT32 ulBeyondEndAddr;
     struct vm_area_struct *psVMArea;
@@ -2341,7 +2341,7 @@ PVRSRV_ERROR OSAcquirePhysPageAddr(IMG_VOID *pvCPUVAddr,
     }
     memset(psInfo, 0, sizeof(*psInfo));
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     psInfo->ulStartAddr = ulStartAddrOrig;
     psInfo->ulBeyondEndAddr = ulBeyondEndAddrOrig;
 #endif
@@ -2434,7 +2434,7 @@ PVRSRV_ERROR OSAcquirePhysPageAddr(IMG_VOID *pvCPUVAddr,
 
         goto error;
     }
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
     psInfo->psVMArea = psVMArea;
 #endif
 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/proc.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/proc.c
index 0cea222..fd26f07 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/proc.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/proc.c
@@ -77,7 +77,7 @@ static struct proc_dir_entry* g_pProcQueue;
 static struct proc_dir_entry* g_pProcVersion;
 static struct proc_dir_entry* g_pProcSysNodes;
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 static struct proc_dir_entry* g_pProcDebugLevel;
 #endif
 
@@ -593,7 +593,7 @@ IMG_INT CreateProcEntries(IMG_VOID)
     }
 
 
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
 
        g_pProcDebugLevel = CreateProcEntrySeq("debug_level", NULL, NULL,
                                                                                        ProcSeqShowDebugLevel,
@@ -675,7 +675,7 @@ IMG_VOID RemovePerProcessProcDir(PVRSRV_ENV_PER_PROCESS_DATA *psPerProc)
 
 IMG_VOID RemoveProcEntries(IMG_VOID)
 {
-#ifdef DEBUG
+#ifdef PVR_DEBUG_EXT
        RemoveProcEntrySeq( g_pProcDebugLevel );
 #ifdef PVR_MANUAL_POWER_CONTROL
        RemoveProcEntrySeq( g_pProcPowerLevel );

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c
index 4f4eae5..930af00 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c
@@ -385,7 +385,7 @@ IMG_VOID PVRSRVDebugPrintf  (
 
 #endif 
 
-#if defined(DEBUG)
+#if defined(PVR_DEBUG_EXT)
 
 IMG_INT PVRDebugProcSetLevel(struct file *file, const IMG_CHAR *buffer, IMG_UINT32 count, IMG_VOID *data)
 {

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/include/metrics.h b/drivers/staging/mrst/pvr/services4/srvkm/include/metrics.h
index 2632f8d..f166cd5 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/include/metrics.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/include/metrics.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 
-#if defined(DEBUG) || defined(TIMING)
+#if defined(PVR_DEBUG_EXT) || defined(TIMING)
 
 
 typedef struct 

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/include/osfunc.h b/drivers/staging/mrst/pvr/services4/srvkm/include/osfunc.h
index 314cd63..546c522 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/include/osfunc.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/include/osfunc.h
@@ -26,7 +26,7 @@
 
 #ifdef DEBUG_RELEASE_BUILD
 #pragma optimize( "", off )
-#define DEBUG          1
+#define PVR_DEBUG_EXT          1
 #endif
 
 #ifndef __OSFUNC_H__

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/include/services_headers.h b/drivers/staging/mrst/pvr/services4/srvkm/include/services_headers.h
index f5f3db2..596137b 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/include/services_headers.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/include/services_headers.h
@@ -29,7 +29,7 @@
 
 #ifdef DEBUG_RELEASE_BUILD
 #pragma optimize( "", off )
-#define DEBUG          1
+#define PVR_DEBUG_EXT          1
 #endif
 
 #include "img_defs.h"

diff --git a/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c b/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c
index a78f60a..1372a3b 100644 (file)
--- a/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c
+++ b/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c
@@ -55,7 +55,7 @@
 #include "hostfunc.h"
 #include "dbgdriv.h"
 
-#if defined(MODULE) && defined(DEBUG) && !defined(SUPPORT_DRI_DRM)
+#if defined(MODULE) && defined(PVR_DEBUG_EXT) && !defined(SUPPORT_DRI_DRM)
 IMG_UINT32     gPVRDebugLevel = (DBGPRIV_FATAL | DBGPRIV_ERROR | DBGPRIV_WARNING);
 
 #define PVR_STRING_TERMINATOR          '\0'