diff --git a/headers/os/drivers/bus/USB.h b/headers/os/drivers/bus/USB.h new file mode 100644 index 0000000000..35facac52d --- /dev/null +++ b/headers/os/drivers/bus/USB.h @@ -0,0 +1,15 @@ +/* + * Copyright 2022, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT license. + */ +#ifndef _BUS_USB_H +#define _BUS_USB_H + + +#define USB_DEVICE_ID_ITEM "usb/id" +#define USB_DEVICE_CLASS "usb/class" +#define USB_DEVICE_SUBCLASS "usb/subclass" +#define USB_DEVICE_PROTOCOL "usb/protocol" + + +#endif /* _BUS_USB_H */ diff --git a/src/add-ons/kernel/bus_managers/usb/usb_private.h b/src/add-ons/kernel/bus_managers/usb/usb_private.h index 2e8364c961..0af2c8aadf 100644 --- a/src/add-ons/kernel/bus_managers/usb/usb_private.h +++ b/src/add-ons/kernel/bus_managers/usb/usb_private.h @@ -11,6 +11,7 @@ #include +#include #include "usbspec_private.h" #include @@ -798,10 +799,6 @@ typedef struct { } usb_device_interface; -#define USB_DEVICE_ID_ITEM "usb/id" -#define USB_DEVICE_CLASS "usb/class" -#define USB_DEVICE_SUBCLASS "usb/subclass" -#define USB_DEVICE_PROTOCOL "usb/protocol" #define USB_DEVICE_MODULE_NAME "bus_managers/usb/device/driver_v1" #endif // _USB_PRIVATE_H diff --git a/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp index e56ae9d9a7..9832121940 100644 --- a/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp +++ b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp @@ -8,6 +8,9 @@ #include #include +#include + + #include "Driver.h" #include "ECMDevice.h" @@ -21,12 +24,6 @@ device_manager_info *gDeviceManager; #define USB_ECM_DEVICE_MODULE_NAME "drivers/network/usb_ecm/device_v1" #define USB_ECM_DEVICE_ID_GENERATOR "usb_ecm/device_id" -// TODO: move these to a common header -#define USB_DEVICE_ID_ITEM "usb/id" -#define USB_DEVICE_CLASS "usb/class" -#define USB_DEVICE_SUBCLASS "usb/subclass" -#define USB_DEVICE_PROTOCOL "usb/protocol" - // #pragma mark - device module API diff --git a/src/apps/devices/DeviceUSB.cpp b/src/apps/devices/DeviceUSB.cpp index 640b6b5876..507c9b9436 100644 --- a/src/apps/devices/DeviceUSB.cpp +++ b/src/apps/devices/DeviceUSB.cpp @@ -13,6 +13,7 @@ #include #include +#include #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "DeviceUSB" @@ -22,12 +23,6 @@ extern "C" { #include "usb-utils.h" } -// from usb_private.h -#define USB_DEVICE_CLASS "usb/class" -#define USB_DEVICE_SUBCLASS "usb/subclass" -#define USB_DEVICE_PROTOCOL "usb/protocol" - - DeviceUSB::DeviceUSB(Device* parent) : diff --git a/src/bin/listdev/listdev.cpp b/src/bin/listdev/listdev.cpp index 6cf7b0edf7..312d4adac4 100644 --- a/src/bin/listdev/listdev.cpp +++ b/src/bin/listdev/listdev.cpp @@ -17,6 +17,7 @@ #include #include #include +#include extern "C" { #include "dm_wrapper.h" @@ -38,12 +39,6 @@ int gMode = USER_MODE; #define BUS_USB 4 -// from usb_private.h -#define USB_DEVICE_CLASS "usb/class" -#define USB_DEVICE_SUBCLASS "usb/subclass" -#define USB_DEVICE_PROTOCOL "usb/protocol" - - static const char * get_scsi_device_type(uint8 type) {