From: Luc Verhaegen <Luc.Verhaegen@basyskom.de>
Date: Fri, 11 Mar 2011 14:02:41 +0000 (+0100)
Subject: gpu: pvr: pdump: move pdump.c and pdump_km.h to pvr_pdump.[ch]
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d0362da82677b76b6a43c57b37f66b396ec7bb;p=sgx.git

gpu: pvr: pdump: move pdump.c and pdump_km.h to pvr_pdump.[ch]

Also make pvr_pdump.c build fully conditional.

Signed-off-by: Luc Verhaegen <Luc.Verhaegen@basyskom.de>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
---

diff --git a/pvr/Makefile b/pvr/Makefile
index db1f491..efb593b 100644
--- a/pvr/Makefile
+++ b/pvr/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_PVR)	+= omaplfb.o pvrsrvkm.o
 
 omaplfb-objs		:= omaplfb_displayclass.o omaplfb_linux.o
 
-pvrsrvkm-objs		:= osfunc.o mmap.o module.o pdump.o proc.o	   \
+pvrsrvkm-objs		:= osfunc.o mmap.o module.o proc.o	   \
 			   pvr_bridge_k.o mm.o event.o	   \
 			   buffer_manager.o devicemem.o deviceclass.o	   \
 			   handle.o hash.o pvrsrv.o queue.o ra.o	   \
@@ -15,6 +15,7 @@ pvrsrvkm-objs		:= osfunc.o mmap.o module.o pdump.o proc.o	   \
 pvrsrvkm-objs-$(CONFIG_PVR_DEBUG) += pvr_debug.o
 pvrsrvkm-objs-$(CONFIG_DEBUG_FS) += pvr_debugfs.o
 pvrsrvkm-objs-$(CONFIG_PVR_TIMING) += pvr_debug.o
+pvrsrvkm-objs-$(CONFIG_PVR_DEBUG_PDUMP) += pvr_pdump.o
 
 pvrsrvkm-objs		+= $(pvrsrvkm-objs-y) $(pvrsrvkm-objs-m)
 
diff --git a/pvr/bridged_pvr_bridge.c b/pvr/bridged_pvr_bridge.c
index 6568cb6..2ce50ce 100644
--- a/pvr/bridged_pvr_bridge.c
+++ b/pvr/bridged_pvr_bridge.c
@@ -37,7 +37,7 @@
 #include "device.h"
 #include "buffer_manager.h"
 
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "syscommon.h"
 
 #include "bridged_pvr_bridge.h"
diff --git a/pvr/bridged_sgx_bridge.c b/pvr/bridged_sgx_bridge.c
index 7f61b30..a6afdb7 100644
--- a/pvr/bridged_sgx_bridge.c
+++ b/pvr/bridged_sgx_bridge.c
@@ -41,7 +41,7 @@
 #include "bridged_pvr_bridge.h"
 #include "bridged_sgx_bridge.h"
 #include "sgxutils.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "pvr_events.h"
 
 int SGXGetClientInfoBW(u32 ui32BridgeID,
diff --git a/pvr/buffer_manager.c b/pvr/buffer_manager.c
index 87e60cf..535f3ae 100644
--- a/pvr/buffer_manager.c
+++ b/pvr/buffer_manager.c
@@ -28,7 +28,7 @@
 #include "sysconfig.h"
 #include "hash.h"
 #include "ra.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "mmu.h"
 
 #define MIN(a, b)       (a > b ? b : a)
diff --git a/pvr/devicemem.c b/pvr/devicemem.c
index 3912f2b..881cf24 100644
--- a/pvr/devicemem.c
+++ b/pvr/devicemem.c
@@ -28,7 +28,7 @@
 
 #include "services_headers.h"
 #include "buffer_manager.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "pvr_bridge_km.h"
 
 #include <linux/pagemap.h>
diff --git a/pvr/mmu.c b/pvr/mmu.c
index af3bcfa..2311626 100644
--- a/pvr/mmu.c
+++ b/pvr/mmu.c
@@ -30,7 +30,7 @@
 #include "buffer_manager.h"
 #include "hash.h"
 #include "ra.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "sgxapi_km.h"
 #include "sgx_bridge_km.h"
 #include "sgxinfo.h"
diff --git a/pvr/pb.c b/pvr/pb.c
index ffd8f69..5088a8c 100644
--- a/pvr/pb.c
+++ b/pvr/pb.c
@@ -32,7 +32,7 @@
 #include "sgxinfokm.h"
 #include "pvr_bridge_km.h"
 #include "sgx_bridge_km.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "sgxutils.h"
 
 static struct RESMAN_ITEM *psResItemCreateSharedPB;
diff --git a/pvr/power.c b/pvr/power.c
index a33e0de..3d6d087 100644
--- a/pvr/power.c
+++ b/pvr/power.c
@@ -24,7 +24,7 @@
  *
  ******************************************************************************/
 #include "services_headers.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include <linux/kernel.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
diff --git a/pvr/pdump.c b/pvr/pvr_pdump.c
similarity index 99%
rename from pvr/pdump.c
rename to pvr/pvr_pdump.c
index daf50a3..4bf8cd4 100644
--- a/pvr/pdump.c
+++ b/pvr/pvr_pdump.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/*
  *
  * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved.
  *
@@ -22,9 +22,8 @@
  * Imagination Technologies Ltd. <gpl-support@imgtec.com>
  * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
  *
- ******************************************************************************/
+ */
 
-#if defined(PDUMP)
 #include <asm/atomic.h>
 #include <stdarg.h>
 
@@ -33,7 +32,7 @@
 #include "pvrversion.h"
 #include "sgxmmu.h"
 #include "mm.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 
 /*
  * There is no sense in having SGX_MMU_PAGE_SIZE differ from PAGE_SIZE.
@@ -762,5 +761,3 @@ void PDumpIDLWithFlags(u32 ui32Clocks, u32 ui32Flags)
 {
 	pdump_print(ui32Flags, "IDL %u\r\n", ui32Clocks);
 }
-
-#endif
diff --git a/pvr/pdump_km.h b/pvr/pvr_pdump.h
similarity index 98%
rename from pvr/pdump_km.h
rename to pvr/pvr_pdump.h
index f3d7146..30232cb 100644
--- a/pvr/pdump_km.h
+++ b/pvr/pvr_pdump.h
@@ -24,8 +24,8 @@
  *
  ******************************************************************************/
 
-#ifndef _PDUMP_KM_H_
-#define _PDUMP_KM_H_
+#ifndef _PVR_PDUMP_H_
+#define _PVR_PDUMP_H_
 
 
 #define PDUMP_FLAGS_NEVER		0x08000000
@@ -183,4 +183,4 @@ void PDumpResumeKM(void);
 #define PDUMPRESUME(args...)
 #endif
 
-#endif
+#endif /* _PVR_PDUMP_H_ */
diff --git a/pvr/pvrsrv.c b/pvr/pvrsrv.c
index 72365ea..2bfb856 100644
--- a/pvr/pvrsrv.c
+++ b/pvr/pvrsrv.c
@@ -31,7 +31,7 @@
 #include "pvr_bridge_km.h"
 #include "handle.h"
 #include "perproc.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "ra.h"
 #include "pvr_events.h"
 
diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c
index 1942ba6..210c66d 100644
--- a/pvr/sgxinit.c
+++ b/pvr/sgxinit.c
@@ -47,7 +47,7 @@
 #include "resman.h"
 #include "bridged_support.h"
 
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "ra.h"
 #include "mmu.h"
 #include "mm.h"
diff --git a/pvr/sgxkick.c b/pvr/sgxkick.c
index 4054988..6678b49 100644
--- a/pvr/sgxkick.c
+++ b/pvr/sgxkick.c
@@ -30,7 +30,7 @@
 #include "sgxinfokm.h"
 #if defined(PDUMP)
 #include "sgxapi_km.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #endif
 #include "sgx_bridge_km.h"
 #include "osfunc.h"
diff --git a/pvr/sgxpower.c b/pvr/sgxpower.c
index 551b1a2..30cfb58 100644
--- a/pvr/sgxpower.c
+++ b/pvr/sgxpower.c
@@ -33,7 +33,7 @@
 #include "sgxapi_km.h"
 #include "sgxinfokm.h"
 #include "sgxutils.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 
 #define MS_TO_NS(x)			((x) * 1000000ULL)
 #define SGX_CMD_BURST_THRESHOLD_NS	MS_TO_NS(3)
diff --git a/pvr/sgxreset.c b/pvr/sgxreset.c
index ad76a01..4d9dab0 100644
--- a/pvr/sgxreset.c
+++ b/pvr/sgxreset.c
@@ -30,7 +30,7 @@
 #include "sgxinfokm.h"
 #include "sgxconfig.h"
 
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 
 static void SGXResetSoftReset(struct PVRSRV_SGXDEV_INFO *psDevInfo,
 				  IMG_BOOL bResetBIF, u32 ui32PDUMPFlags,
diff --git a/pvr/sgxtransfer.c b/pvr/sgxtransfer.c
index 410b97e..22d2ac8 100644
--- a/pvr/sgxtransfer.c
+++ b/pvr/sgxtransfer.c
@@ -32,7 +32,7 @@
 #include "buffer_manager.h"
 #include "sgxinfo.h"
 #include "sysconfig.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "mmu.h"
 #include "pvr_bridge.h"
 #include "sgx_bridge_km.h"
diff --git a/pvr/sgxutils.c b/pvr/sgxutils.c
index 05973df..860cbb6 100644
--- a/pvr/sgxutils.c
+++ b/pvr/sgxutils.c
@@ -33,7 +33,7 @@
 #include "sgxinfo.h"
 #include "sgxinfokm.h"
 #include "sysconfig.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "mmu.h"
 #include "pvr_bridge_km.h"
 #include "sgx_bridge_km.h"
diff --git a/pvr/sysconfig.c b/pvr/sysconfig.c
index 8ce48e4..45b9d1f 100644
--- a/pvr/sysconfig.c
+++ b/pvr/sysconfig.c
@@ -30,7 +30,7 @@
 #include "kerneldisplay.h"
 #include "oemfuncs.h"
 #include "sgxinfo.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "sgxinfokm.h"
 #include "syslocal.h"
 #include "sysconfig.h"