diff --git a/drivers/usb/device/usb_dc_kinetis.c b/drivers/usb/device/usb_dc_kinetis.c index 1c1549bab22..b18e9028ff0 100644 --- a/drivers/usb/device/usb_dc_kinetis.c +++ b/drivers/usb/device/usb_dc_kinetis.c @@ -283,12 +283,12 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg) if (ep_idx & BIT(0)) { if (EP_ADDR2DIR(cfg->ep_addr) != USB_EP_DIR_IN) { - USB_INF("pre-selected as IN endpoint"); + LOG_INF("pre-selected as IN endpoint"); return -1; } } else { if (EP_ADDR2DIR(cfg->ep_addr) != USB_EP_DIR_OUT) { - USB_INF("pre-selected as OUT endpoint"); + LOG_INF("pre-selected as OUT endpoint"); return -1; } } @@ -340,9 +340,9 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg) } bdt[idx_even].buf_addr = (u32_t)block->data; - USB_INF("idx_even %x", (u32_t)block->data); + LOG_INF("idx_even %x", (u32_t)block->data); bdt[idx_odd].buf_addr = (u32_t)((u8_t *)block->data + cfg->ep_mps); - USB_INF("idx_odd %x", (u32_t)((u8_t *)block->data + cfg->ep_mps)); + LOG_INF("idx_odd %x", (u32_t)((u8_t *)block->data + cfg->ep_mps)); if (cfg->ep_addr & USB_EP_DIR_IN) { dev_data.ep_ctrl[ep_idx].mps_in = cfg->ep_mps; @@ -518,7 +518,7 @@ int usb_dc_ep_enable(const u8_t ep) dev_data.ep_ctrl[ep_idx].status.in_enabled = true; } - USB_INF("ep 0x%x, ep_idx %d", ep, ep_idx); + LOG_INF("ep 0x%x, ep_idx %d", ep, ep_idx); return 0; } @@ -534,7 +534,7 @@ int usb_dc_ep_disable(const u8_t ep) return -EINVAL; } - USB_INF("ep %x, idx %d", ep_idx, ep); + LOG_INF("ep %x, idx %d", ep_idx, ep); bdt[idx_even].bd_fields = 0; bdt[idx_odd].bd_fields = 0; diff --git a/include/usb/usb_device.h b/include/usb/usb_device.h index b7878c0d7a2..b00f7793404 100644 --- a/include/usb/usb_device.h +++ b/include/usb/usb_device.h @@ -45,7 +45,6 @@ extern "C" { #endif #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 diff --git a/samples/net/wpanusb/src/wpanusb.c b/samples/net/wpanusb/src/wpanusb.c index 74e0ebf4bf6..62eefa0eea0 100644 --- a/samples/net/wpanusb/src/wpanusb.c +++ b/samples/net/wpanusb/src/wpanusb.c @@ -264,14 +264,14 @@ static int set_pan_id(void *data, int len) static int start(void) { - USB_INF("Start IEEE 802.15.4 device"); + LOG_INF("Start IEEE 802.15.4 device"); return radio_api->start(ieee802154_dev); } static int stop(void) { - USB_INF("Stop IEEE 802.15.4 device"); + LOG_INF("Stop IEEE 802.15.4 device"); return radio_api->stop(ieee802154_dev); } @@ -498,7 +498,7 @@ void main(void) { wpanusb_start(&__dev); - USB_INF("Start"); + LOG_INF("Start"); ieee802154_dev = device_get_binding(CONFIG_NET_CONFIG_IEEE802154_DEV_NAME); if (!ieee802154_dev) { diff --git a/subsys/usb/class/mass_storage.c b/subsys/usb/class/mass_storage.c index f8370ff61cb..647537b8594 100644 --- a/subsys/usb/class/mass_storage.c +++ b/subsys/usb/class/mass_storage.c @@ -918,9 +918,9 @@ static int mass_storage_init(struct device *dev) } - USB_INF("Sect Count %d", block_count); + LOG_INF("Sect Count %d", block_count); memory_size = block_count * BLOCK_SIZE; - USB_INF("Memory Size %d", memory_size); + LOG_INF("Memory Size %d", memory_size); msd_state_machine_reset(); msd_init(); diff --git a/subsys/usb/class/netusb/function_rndis.c b/subsys/usb/class/netusb/function_rndis.c index bcb9c97ee3f..f8bb6bd7d34 100644 --- a/subsys/usb/class/netusb/function_rndis.c +++ b/subsys/usb/class/netusb/function_rndis.c @@ -1032,7 +1032,7 @@ static int rndis_class_handler(struct usb_setup_packet *setup, s32_t *len, static void cmd_thread(void) { - USB_INF("Command thread started"); + LOG_INF("Command thread started"); while (true) { struct net_buf *buf; diff --git a/subsys/usb/class/netusb/netusb.c b/subsys/usb/class/netusb/netusb.c index 434c88145a6..2a329914033 100644 --- a/subsys/usb/class/netusb/netusb.c +++ b/subsys/usb/class/netusb/netusb.c @@ -218,7 +218,7 @@ static void netusb_init(struct net_if *iface) } #endif /* CONFIG_USB_COMPOSITE_DEVICE */ - USB_INF("netusb initialized"); + LOG_INF("netusb initialized"); } static const struct ethernet_api netusb_api_funcs = { diff --git a/subsys/usb/usb_device.c b/subsys/usb/usb_device.c index eebb0db61f4..7a128d7c868 100644 --- a/subsys/usb/usb_device.c +++ b/subsys/usb/usb_device.c @@ -751,7 +751,7 @@ static bool usb_handle_std_endpoint_req(struct usb_setup_packet *setup, case REQ_CLEAR_FEATURE: if (setup->wValue == FEA_ENDPOINT_HALT) { /* clear HALT by unstalling */ - USB_INF("... EP clear halt %x", ep); + LOG_INF("... EP clear halt %x", ep); usb_dc_ep_clear_stall(ep); if (usb_dev.status_callback) { usb_dev.status_callback(USB_DC_CLEAR_HALT, &ep); @@ -764,7 +764,7 @@ static bool usb_handle_std_endpoint_req(struct usb_setup_packet *setup, case REQ_SET_FEATURE: if (setup->wValue == FEA_ENDPOINT_HALT) { /* set HALT by stalling */ - USB_INF("--- EP SET halt %x", ep); + LOG_INF("--- EP SET halt %x", ep); usb_dc_ep_set_stall(ep); if (usb_dev.status_callback) { usb_dev.status_callback(USB_DC_SET_HALT, &ep);