Use PVR_BUILD_DIR in logging
This should make it possible to distinguish no-hardware vs. production
(mt8167) logs.
Change-Id: I23ac9e30aadf9eeaa04bd333381dc786f3b8a843
diff --git a/services/server/env/fuchsia/osfunc.cc b/services/server/env/fuchsia/osfunc.cc
index 40fe7e1..6402b2f 100644
--- a/services/server/env/fuchsia/osfunc.cc
+++ b/services/server/env/fuchsia/osfunc.cc
@@ -56,7 +56,7 @@
#include "pvr_debug.h"
#include "pvrsrv_memallocflags.h"
}
-#define NOT_IMPLEMENTED() fprintf(stderr, "msd-img-rgx-mtk: Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+#define NOT_IMPLEMENTED() fprintf(stderr, PVR_BUILD_DIR ": Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
namespace msd_img
{
diff --git a/services/server/env/fuchsia/osfunc_platform.cc b/services/server/env/fuchsia/osfunc_platform.cc
index 0099433..052500a 100644
--- a/services/server/env/fuchsia/osfunc_platform.cc
+++ b/services/server/env/fuchsia/osfunc_platform.cc
@@ -45,7 +45,7 @@
#error "CONFIG_OUTER_CACHE not supported on arm64."
#endif
-#define NOT_IMPLEMENTED() fprintf(stderr, "msd-img-rgx-mtk: Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+#define NOT_IMPLEMENTED() fprintf(stderr, PVR_BUILD_DIR ": Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
PVRSRV_ERROR
OSCPUOperation(PVRSRV_CACHE_OP uiCacheOp)
diff --git a/services/server/env/fuchsia/physmem_osmem_fuchsia.cc b/services/server/env/fuchsia/physmem_osmem_fuchsia.cc
index ee16293..30d9bf5 100644
--- a/services/server/env/fuchsia/physmem_osmem_fuchsia.cc
+++ b/services/server/env/fuchsia/physmem_osmem_fuchsia.cc
@@ -55,7 +55,7 @@
#include "platform_buffer.h"
#include "platform_bus_mapper.h"
-#define NOT_IMPLEMENTED() fprintf(stderr, "msd-img-rgx-mtk: Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+#define NOT_IMPLEMENTED() fprintf(stderr, PVR_BUILD_DIR ": Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
struct MagmaPhysicalMemoryResource
{
diff --git a/services/server/env/fuchsia/pmr_os.cc b/services/server/env/fuchsia/pmr_os.cc
index 56c1c6a..bf43cbc 100644
--- a/services/server/env/fuchsia/pmr_os.cc
+++ b/services/server/env/fuchsia/pmr_os.cc
@@ -36,7 +36,8 @@
#include "pmr_os.h"
}
-#define NOT_IMPLEMENTED() fprintf(stderr, "msd-img-rgx-mtk:Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+#define NOT_IMPLEMENTED() fprintf(stderr, PVR_BUILD_DIR ": Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+
PVRSRV_ERROR
OSMMapPMRGeneric(PMR *psPMR, PMR_MMAP_DATA pOSMMapData)
{
diff --git a/services/server/env/fuchsia/pvr_bridge_k.cc b/services/server/env/fuchsia/pvr_bridge_k.cc
index 7f953aa..9c4ac5f 100644
--- a/services/server/env/fuchsia/pvr_bridge_k.cc
+++ b/services/server/env/fuchsia/pvr_bridge_k.cc
@@ -40,7 +40,7 @@
#include "common_srvcore_bridge.h"
}
-#define NOT_IMPLEMENTED() fprintf(stderr, "msd-img-rgx-mtk: Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+#define NOT_IMPLEMENTED() fprintf(stderr, PVR_BUILD_DIR ": Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
PVRSRV_ERROR
OSPlatformBridgeInit(void)
diff --git a/services/server/env/fuchsia/pvr_debug.cc b/services/server/env/fuchsia/pvr_debug.cc
index e781ba0..822f49b 100644
--- a/services/server/env/fuchsia/pvr_debug.cc
+++ b/services/server/env/fuchsia/pvr_debug.cc
@@ -41,7 +41,7 @@
#include "pvrsrv.h"
}
-#define NOT_IMPLEMENTED() fprintf(stderr, "msd-img-rgx-mtk: Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+#define NOT_IMPLEMENTED() fprintf(stderr, PVR_BUILD_DIR ": Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
/*************************************************************************/ /*!
@Function PVRSRVReleasePrintf
@@ -56,7 +56,12 @@
va_start(vl, pszFormat);
char data[512];
vsnprintf(data, sizeof(data), pszFormat, vl);
- zxlogf(INFO, "msd-img-rgx-mtk: %s\n", data);
+#if defined(NO_HARDWARE)
+ // Reduce logging when using the debug-only no-hardware driver.
+ zxlogf(TRACE, PVR_BUILD_DIR ": %s\n", data);
+#else
+ zxlogf(INFO, PVR_BUILD_DIR ": %s\n", data);
+#endif
va_end(vl);
}
@@ -75,7 +80,7 @@
va_start(vl, pszFormat);
char data[512];
vsnprintf(data, sizeof(data), pszFormat, vl);
- zxlogf(TRACE, "msd-img-rgx-mtk: %s\n", data);
+ zxlogf(TRACE, PVR_BUILD_DIR ": %s\n", data);
va_end(vl);
}
@@ -120,7 +125,7 @@
va_start(vl, pszFormat);
char data[512];
vsnprintf(data, sizeof(data), pszFormat, vl);
- driver_printf(log_level, "msd-img-rgx-mtk at %s:%d - %s\n", pszFullFileName, ui32Line, data);
+ driver_printf(log_level, PVR_BUILD_DIR " at %s:%d - %s\n", pszFullFileName, ui32Line, data);
va_end(vl);
}
}
@@ -128,7 +133,7 @@
IMG_EXPORT void IMG_CALLCONV __noreturn
PVRSRVDebugAssertFail(const IMG_CHAR *pszFile, IMG_UINT32 ui32Line, const IMG_CHAR *pszAssertion)
{
- fprintf(stderr, "ASSERT at %s:%d - %s\n", pszFile, ui32Line, pszAssertion);
+ fprintf(stderr, PVR_BUILD_DIR " ASSERT at %s:%d - %s\n", pszFile, ui32Line, pszAssertion);
abort();
}
diff --git a/services/system/fuchsia/sysconfig.cc b/services/system/fuchsia/sysconfig.cc
index da92a8e..be53258 100644
--- a/services/system/fuchsia/sysconfig.cc
+++ b/services/system/fuchsia/sysconfig.cc
@@ -42,7 +42,7 @@
#include "fuchsia/fuchsia_sys_info.h"
#include "fuchsia/msd_img_device.h"
-#define NOT_IMPLEMENTED() fprintf(stderr, "msd-img-rgx-mtk:Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
+#define NOT_IMPLEMENTED() fprintf(stderr, PVR_BUILD_DIR ": Not implemented in %s:%s:%d\n", __func__, __FILE__, __LINE__);
class LisrData
{
