diff options
Diffstat (limited to 'jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_bridge_k.c')
-rw-r--r-- | jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_bridge_k.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_bridge_k.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_bridge_k.c index 23379b9..2a61e54 100644 --- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_bridge_k.c +++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_bridge_k.c | |||
@@ -41,6 +41,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |||
41 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 41 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
42 | */ /**************************************************************************/ | 42 | */ /**************************************************************************/ |
43 | 43 | ||
44 | #include <linux/fs.h> | ||
45 | |||
44 | #include "img_defs.h" | 46 | #include "img_defs.h" |
45 | #include "services.h" | 47 | #include "services.h" |
46 | #include "pvr_bridge.h" | 48 | #include "pvr_bridge.h" |
@@ -84,7 +86,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
84 | 86 | ||
85 | #if defined(DEBUG_BRIDGE_KM) | 87 | #if defined(DEBUG_BRIDGE_KM) |
86 | 88 | ||
87 | static struct proc_dir_entry *g_ProcBridgeStats =0; | 89 | static struct pvr_proc_dir_entry *g_ProcBridgeStats =0; |
88 | static void* ProcSeqNextBridgeStats(struct seq_file *sfile,void* el,loff_t off); | 90 | static void* ProcSeqNextBridgeStats(struct seq_file *sfile,void* el,loff_t off); |
89 | static void ProcSeqShowBridgeStats(struct seq_file *sfile,void* el); | 91 | static void ProcSeqShowBridgeStats(struct seq_file *sfile,void* el); |
90 | static void* ProcSeqOff2ElementBridgeStats(struct seq_file * sfile, loff_t off); | 92 | static void* ProcSeqOff2ElementBridgeStats(struct seq_file * sfile, loff_t off); |
@@ -95,7 +97,7 @@ static void ProcSeqStartstopBridgeStats(struct seq_file *sfile,IMG_BOOL start); | |||
95 | extern PVRSRV_LINUX_MUTEX gPVRSRVLock; | 97 | extern PVRSRV_LINUX_MUTEX gPVRSRVLock; |
96 | 98 | ||
97 | #if defined(SUPPORT_MEMINFO_IDS) | 99 | #if defined(SUPPORT_MEMINFO_IDS) |
98 | static IMG_UINT64 ui64Stamp; | 100 | IMG_UINT64 g_ui64MemInfoID; |
99 | #endif /* defined(SUPPORT_MEMINFO_IDS) */ | 101 | #endif /* defined(SUPPORT_MEMINFO_IDS) */ |
100 | 102 | ||
101 | PVRSRV_ERROR | 103 | PVRSRV_ERROR |
@@ -231,7 +233,6 @@ static void ProcSeqShowBridgeStats(struct seq_file *sfile,void* el) | |||
231 | psEntry->ui32CopyFromUserTotalBytes, | 233 | psEntry->ui32CopyFromUserTotalBytes, |
232 | psEntry->ui32CopyToUserTotalBytes); | 234 | psEntry->ui32CopyToUserTotalBytes); |
233 | } | 235 | } |
234 | |||
235 | #endif /* DEBUG_BRIDGE_KM */ | 236 | #endif /* DEBUG_BRIDGE_KM */ |
236 | 237 | ||
237 | 238 | ||
@@ -474,7 +475,7 @@ PVRSRV_BridgeDispatchKM(struct file *pFile, unsigned int unref__ ioctlCmd, unsig | |||
474 | 475 | ||
475 | psPrivateData->hKernelMemInfo = hMemInfo; | 476 | psPrivateData->hKernelMemInfo = hMemInfo; |
476 | #if defined(SUPPORT_MEMINFO_IDS) | 477 | #if defined(SUPPORT_MEMINFO_IDS) |
477 | psPrivateData->ui64Stamp = ++ui64Stamp; | 478 | psPrivateData->ui64Stamp = ++g_ui64MemInfoID; |
478 | 479 | ||
479 | psKernelMemInfo->ui64Stamp = psPrivateData->ui64Stamp; | 480 | psKernelMemInfo->ui64Stamp = psPrivateData->ui64Stamp; |
480 | if (pvr_put_user(psPrivateData->ui64Stamp, &psExportDeviceMemOUT->ui64Stamp) != 0) | 481 | if (pvr_put_user(psPrivateData->ui64Stamp, &psExportDeviceMemOUT->ui64Stamp) != 0) |
@@ -505,7 +506,7 @@ PVRSRV_BridgeDispatchKM(struct file *pFile, unsigned int unref__ ioctlCmd, unsig | |||
505 | { | 506 | { |
506 | PVRSRV_BRIDGE_OUT_MAP_DEVICECLASS_MEMORY *psDeviceClassMemoryOUT = | 507 | PVRSRV_BRIDGE_OUT_MAP_DEVICECLASS_MEMORY *psDeviceClassMemoryOUT = |
507 | (PVRSRV_BRIDGE_OUT_MAP_DEVICECLASS_MEMORY *)psBridgePackageKM->pvParamOut; | 508 | (PVRSRV_BRIDGE_OUT_MAP_DEVICECLASS_MEMORY *)psBridgePackageKM->pvParamOut; |
508 | if (pvr_put_user(++ui64Stamp, &psDeviceClassMemoryOUT->sClientMemInfo.ui64Stamp) != 0) | 509 | if (pvr_put_user(++g_ui64MemInfoID, &psDeviceClassMemoryOUT->sClientMemInfo.ui64Stamp) != 0) |
509 | { | 510 | { |
510 | err = -EFAULT; | 511 | err = -EFAULT; |
511 | goto unlock_and_return; | 512 | goto unlock_and_return; |