From fafbd9a04f2a225ca27f7b8689e7cad6dfd0f664 Mon Sep 17 00:00:00 2001 From: joevt Date: Fri, 8 Mar 2024 00:17:27 -0800 Subject: [PATCH] mmiodevice: Move SIZE_ARG macro from pcibase. --- devices/common/mmiodevice.h | 3 +++ devices/common/pci/pcibase.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devices/common/mmiodevice.h b/devices/common/mmiodevice.h index 41b86a0..730e79e 100644 --- a/devices/common/mmiodevice.h +++ b/devices/common/mmiodevice.h @@ -36,4 +36,7 @@ public: virtual ~MMIODevice() = default; }; +#define SIZE_ARG(size) (size == 4 ? 'l' : size == 2 ? 'w' : \ + size == 1 ? 'b' : '0' + size) + #endif /* MMIO_DEVICE_H */ diff --git a/devices/common/pci/pcibase.h b/devices/common/pci/pcibase.h index 4a3f88c..4553157 100644 --- a/devices/common/pci/pcibase.h +++ b/devices/common/pci/pcibase.h @@ -197,9 +197,6 @@ inline uint32_t pci_cfg_log(uint32_t value, AccessDetails &details) { } } -#define SIZE_ARG(size) (size == 4 ? 'l' : size == 2 ? 'w' : \ - size == 1 ? 'b' : '0' + size) - #define LOG_READ_UNIMPLEMENTED_CONFIG_REGISTER() \ do { if ((details.flags & PCI_CONFIG_DIRECTION) == PCI_CONFIG_READ) { \ VLOG_F( \