From d248a3a2887dc4ec56c5d9cf8ffa535665f42eeb Mon Sep 17 00:00:00 2001 From: GuEe-GUI <2991707448@qq.com> Date: Wed, 11 Dec 2024 19:28:20 +0800 Subject: [DM/FIXUP] Fixup PCI build 1. Add PCI include in rtdevice.h 2. Fixup `RT_KEY_ENABLED` loss. 3. remove waring type of `dw_pcie_ep_get_func_from_ep` return. Signed-off-by: GuEe-GUI <2991707448@qq.com> --- components/drivers/include/drivers/misc.h | 6 ++++++ components/drivers/include/rtdevice.h | 10 ++++++++++ 2 files changed, 16 insertions(+) (limited to 'components/drivers/include') diff --git a/components/drivers/include/drivers/misc.h b/components/drivers/include/drivers/misc.h index 9579773e9a..516a2f3721 100644 --- a/components/drivers/include/drivers/misc.h +++ b/components/drivers/include/drivers/misc.h @@ -34,6 +34,12 @@ (((__x) - ((__d) / 2)) / (__d)); \ }) +#define __KEY_PLACEHOLDER_1 0, +#define ____KEY_ENABLED(__ignored, val, ...) val +#define ___KEY_ENABLED(arg1_or_junk) ____KEY_ENABLED(arg1_or_junk 1, 0) +#define __KEY_ENABLED(value) ___KEY_ENABLED(__KEY_PLACEHOLDER_##value) +#define RT_KEY_ENABLED(key) __KEY_ENABLED(key) + #define RT_FIELD_PREP(mask, val) (((rt_uint64_t)(val) << (__rt_ffsl((mask)) - 1)) & (mask)) #define RT_FIELD_GET(mask, val) (((val) & (mask)) >> (__rt_ffsl((mask)) - 1)) diff --git a/components/drivers/include/rtdevice.h b/components/drivers/include/rtdevice.h index 1f007630df..09f5e455f7 100644 --- a/components/drivers/include/rtdevice.h +++ b/components/drivers/include/rtdevice.h @@ -89,6 +89,16 @@ extern "C" { #include "drivers/pic.h" #endif /* RT_USING_PIC */ +#ifdef RT_USING_PCI +#include "drivers/pci.h" +#ifdef RT_PCI_MSI +#include "drivers/pci_msi.h" +#endif /* RT_PCI_MSI */ +#ifdef RT_PCI_ENDPOINT +#include "drivers/pci_endpoint.h" +#endif /* RT_PCI_ENDPOINT */ +#endif /* RT_USING_PCI */ + #ifdef RT_USING_REGULATOR #include "drivers/regulator.h" #endif /* RT_USING_REGULATOR */ -- cgit v1.3.1