bus/USB.h: header for usb device items
Change-Id: Ic36733af169948f54d7d938dfab1cb5aeb34ab9a Reviewed-on: https://review.haiku-os.org/c/haiku/+/5956 Reviewed-by: Adrien Destugues <[email protected]> Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
committed by
waddlesplash
parent
8b26b08a34
commit
2c08dd5bc5
@@ -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 */
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
|
||||
#include <device_manager.h>
|
||||
#include <bus/USB.h>
|
||||
|
||||
#include "usbspec_private.h"
|
||||
#include <lock.h>
|
||||
@@ -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
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
#include <string.h>
|
||||
#include <lock.h>
|
||||
|
||||
#include <bus/USB.h>
|
||||
|
||||
|
||||
#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
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <Catalog.h>
|
||||
#include <bus/USB.h>
|
||||
|
||||
#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)
|
||||
:
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <drivers/PCI.h>
|
||||
#include <drivers/bus/PCI.h>
|
||||
#include <drivers/bus/SCSI.h>
|
||||
#include <drivers/bus/USB.h>
|
||||
|
||||
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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user