update for event definitions
This commit is contained in:
parent
b8979d8f90
commit
7b6981e162
@ -5,28 +5,28 @@
|
|||||||
|
|
||||||
#include "fwSubsystemIdRanges.h"
|
#include "fwSubsystemIdRanges.h"
|
||||||
|
|
||||||
using EventId_t = uint16_t;
|
|
||||||
using EventSeverity_t = uint8_t;
|
using EventSeverity_t = uint8_t;
|
||||||
using UniqueEventId_t = uint8_t;
|
using GroupId_t = uint16_t;
|
||||||
|
using UniqueEventId_t = uint16_t;
|
||||||
|
|
||||||
namespace severity {
|
namespace severity {
|
||||||
enum Severity : EventSeverity_t { INFO = 1, LOW = 2, MEDIUM = 3, HIGH = 4 };
|
enum Severity : EventSeverity_t { INFO = 0, LOW = 1, MEDIUM = 2, HIGH = 3 };
|
||||||
|
|
||||||
} // namespace severity
|
} // namespace severity
|
||||||
|
|
||||||
#define MAKE_EVENT(id, severity) (((severity) << 16) + (SUBSYSTEM_ID * 100) + (id))
|
#define MAKE_EVENT(id, severity) (((severity) << 30) | (SUBSYSTEM_ID << 16) | id)
|
||||||
|
|
||||||
typedef uint32_t Event;
|
typedef uint32_t Event;
|
||||||
|
|
||||||
namespace event {
|
namespace event {
|
||||||
|
|
||||||
constexpr EventId_t getEventId(Event event) { return (event & 0xFFFF); }
|
constexpr UniqueEventId_t getEventId(Event event) { return (event & 0xFFFF); }
|
||||||
|
|
||||||
constexpr EventSeverity_t getSeverity(Event event) { return ((event >> 16) & 0xFF); }
|
constexpr EventSeverity_t getSeverity(Event event) { return ((event >> 30) & 0b11); }
|
||||||
|
|
||||||
constexpr Event makeEvent(uint8_t subsystemId, UniqueEventId_t uniqueEventId,
|
constexpr Event makeEvent(GroupId_t groupId, UniqueEventId_t uniqueEventId,
|
||||||
EventSeverity_t eventSeverity) {
|
EventSeverity_t eventSeverity) {
|
||||||
return (eventSeverity << 16) + (subsystemId * 100) + uniqueEventId;
|
return (eventSeverity << 30) | (groupId << 16) | uniqueEventId;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace event
|
} // namespace event
|
||||||
|
Loading…
x
Reference in New Issue
Block a user