From 33ed221e2e8e3a77b5f543061e0cce07b259fc64 Mon Sep 17 00:00:00 2001 From: Keith Davis Date: Mon, 30 Mar 2020 10:43:41 +0100 Subject: IVGCVSW-4455 Add an Activate and Deactivate control packet to the protocol * Add Activate/Deactivate command handlers * Add IReportStructure, INotifyBackends single function interfaces * Add overrided mechanism to report structure in Runtime.cpp * Add overrided mechanism to notify backends in ProfilingService.cpp * Add optional IReportStructure argument to ProfilingService constructor for use in ActivateTimelineReportingCommandHandler * Refactoring and tidying up indentation * Removal of unused code in ProfilingUtils.cpp and ProfilingService.cpp * Added GatordMock end to end test * Fixed an issue with SendCounterPacket sending duplicate packets * Fixed an issue with DirectoryCaptureCommandHandler handling of Optional Signed-off-by: Keith Davis Signed-off-by: Finn Williams Change-Id: I5ef1b74171459bfc649861dedf99921d22c9e63f --- src/profiling/ProfilingUtils.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/profiling/ProfilingUtils.cpp') diff --git a/src/profiling/ProfilingUtils.cpp b/src/profiling/ProfilingUtils.cpp index 002eeb9616..e419769600 100644 --- a/src/profiling/ProfilingUtils.cpp +++ b/src/profiling/ProfilingUtils.cpp @@ -96,17 +96,8 @@ void WriteBytes(const IPacketBufferPtr& packetBuffer, unsigned int offset, cons uint32_t ConstructHeader(uint32_t packetFamily, uint32_t packetId) { - return ((packetFamily & 0x3F) << 26)| - ((packetId & 0x3FF) << 16); -} - -uint32_t ConstructHeader(uint32_t packetFamily, - uint32_t packetClass, - uint32_t packetType) -{ - return ((packetFamily & 0x3F) << 26)| - ((packetClass & 0x3FF) << 19)| - ((packetType & 0x3FFF) << 16); + return (( packetFamily & 0x0000003F ) << 26 )| + (( packetId & 0x000003FF ) << 16 ); } void WriteUint64(const std::unique_ptr& packetBuffer, unsigned int offset, uint64_t value) -- cgit v1.2.1