diff --git a/drivers/usb/device/usb_dc_dw.c b/drivers/usb/device/usb_dc_dw.c index 41c6282920b..3e2462c83ce 100644 --- a/drivers/usb/device/usb_dc_dw.c +++ b/drivers/usb/device/usb_dc_dw.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include "usb_dw_registers.h" #include @@ -29,12 +28,6 @@ #include LOG_MODULE_REGISTER(usb_dc_dw); -#define USB_DBG(fmt, ...) LOG_DBG("(%p): %s: " fmt, k_current_get(), \ - __func__, ##__VA_ARGS__) -#define USB_ERR(fmt, ...) LOG_ERR(fmt, ##__VA_ARGS__) -#define USB_WRN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__) -#define USB_INF(fmt, ...) LOG_INF(fmt, ##__VA_ARGS__) - /* convert from endpoint address to hardware endpoint index */ #define USB_DW_EP_ADDR2IDX(ep) ((ep) & ~USB_EP_DIR_MASK) /* get direction from endpoint address */ diff --git a/drivers/usb/device/usb_dc_kinetis.c b/drivers/usb/device/usb_dc_kinetis.c index 82093a31a3f..4ce74f1fc3b 100644 --- a/drivers/usb/device/usb_dc_kinetis.c +++ b/drivers/usb/device/usb_dc_kinetis.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include @@ -19,12 +19,6 @@ #include LOG_MODULE_REGISTER(usb_dc_kinetis); -#define USB_DBG(fmt, ...) LOG_DBG("(%p): %s: " fmt, k_current_get(), \ - __func__, ##__VA_ARGS__) -#define USB_ERR(fmt, ...) LOG_ERR(fmt, ##__VA_ARGS__) -#define USB_WRN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__) -#define USB_INF(fmt, ...) LOG_INF(fmt, ##__VA_ARGS__) - #define NUM_OF_EP_MAX CONFIG_USBD_KINETIS_NUM_BIDIR_EP #define BD_OWN_MASK (1 << 5) diff --git a/drivers/usb/device/usb_dc_nrf5.c b/drivers/usb/device/usb_dc_nrf5.c index 7a6fd49abd1..49d8f1d242c 100644 --- a/drivers/usb/device/usb_dc_nrf5.c +++ b/drivers/usb/device/usb_dc_nrf5.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -33,12 +32,6 @@ #include LOG_MODULE_REGISTER(usb_dc_nrf5); -#define USB_DBG(fmt, ...) LOG_DBG("(%p): %s: " fmt, k_current_get(), \ - __func__, ##__VA_ARGS__) -#define USB_ERR(fmt, ...) LOG_ERR(fmt, ##__VA_ARGS__) -#define USB_WRN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__) -#define USB_INF(fmt, ...) LOG_INF(fmt, ##__VA_ARGS__) - #define MAX_EP_BUF_SZ 64UL #define MAX_ISO_EP_BUF_SZ 1024UL diff --git a/drivers/usb/device/usb_dc_sam0.c b/drivers/usb/device/usb_dc_sam0.c index ba132f1b2a4..2eb6186db9f 100644 --- a/drivers/usb/device/usb_dc_sam0.c +++ b/drivers/usb/device/usb_dc_sam0.c @@ -8,13 +8,7 @@ #include LOG_MODULE_REGISTER(usb_dc_sam0); -#define USB_DBG(fmt, ...) LOG_DBG("(%p): %s: " fmt, k_current_get(), \ - __func__, ##__VA_ARGS__) -#define USB_ERR(fmt, ...) LOG_ERR(fmt, ##__VA_ARGS__) -#define USB_WRN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__) -#define USB_INF(fmt, ...) LOG_INF(fmt, ##__VA_ARGS__) - -#include +#include #include #include diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c index 98afbcfb3a8..900c3114170 100644 --- a/drivers/usb/device/usb_dc_stm32.c +++ b/drivers/usb/device/usb_dc_stm32.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include @@ -56,12 +55,6 @@ #include LOG_MODULE_REGISTER(usb_dc_stm32); -#define USB_DBG(fmt, ...) LOG_DBG("(%p): %s: " fmt, k_current_get(), \ - __func__, ##__VA_ARGS__) -#define USB_ERR(fmt, ...) LOG_ERR(fmt, ##__VA_ARGS__) -#define USB_WRN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__) -#define USB_INF(fmt, ...) LOG_INF(fmt, ##__VA_ARGS__) - #if defined(CONFIG_USB_BASE_ADDRESS) && defined(CONFIG_USB_HS_BASE_ADDRES) #error "Only one interface should be enabled at a time, OTG FS or OTG HS" #endif diff --git a/include/usb/usb_device.h b/include/usb/usb_device.h index e30f9f0a46a..3c59afd3070 100644 --- a/include/usb/usb_device.h +++ b/include/usb/usb_device.h @@ -38,11 +38,18 @@ #include #include +#include #ifdef __cplusplus extern "C" { #endif +#define USB_DBG(fmt, ...) LOG_DBG("(%p): %s: " fmt, k_current_get(), \ + __func__, ##__VA_ARGS__) +#define USB_ERR(fmt, ...) LOG_ERR(fmt, ##__VA_ARGS__) +#define USB_WRN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__) +#define USB_INF(fmt, ...) LOG_INF(fmt, ##__VA_ARGS__) + /* * These macros should be used to place the USB descriptors * in predetermined order in the RAM.