staging: usbip: userspace: usbip_common.h: move enums
Relocate enums to follow logging macros. Signed-off-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
213fd4adce
commit
93e18e0ece
|
@ -30,30 +30,6 @@
|
||||||
#define USBIP_HOST_DRV_NAME "usbip-host"
|
#define USBIP_HOST_DRV_NAME "usbip-host"
|
||||||
#define USBIP_VHCI_DRV_NAME "vhci_hcd"
|
#define USBIP_VHCI_DRV_NAME "vhci_hcd"
|
||||||
|
|
||||||
enum usb_device_speed {
|
|
||||||
USB_SPEED_UNKNOWN = 0, /* enumerating */
|
|
||||||
USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */
|
|
||||||
USB_SPEED_HIGH, /* usb 2.0 */
|
|
||||||
USB_SPEED_VARIABLE /* wireless (usb 2.5) */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* FIXME: how to sync with drivers/usbip_common.h ? */
|
|
||||||
enum usbip_device_status{
|
|
||||||
/* sdev is available. */
|
|
||||||
SDEV_ST_AVAILABLE = 0x01,
|
|
||||||
/* sdev is now used. */
|
|
||||||
SDEV_ST_USED,
|
|
||||||
/* sdev is unusable because of a fatal error. */
|
|
||||||
SDEV_ST_ERROR,
|
|
||||||
|
|
||||||
/* vdev does not connect a remote device. */
|
|
||||||
VDEV_ST_NULL,
|
|
||||||
/* vdev is used, but the USB address is not assigned yet */
|
|
||||||
VDEV_ST_NOTASSIGNED,
|
|
||||||
VDEV_ST_USED,
|
|
||||||
VDEV_ST_ERROR
|
|
||||||
};
|
|
||||||
|
|
||||||
extern int usbip_use_syslog;
|
extern int usbip_use_syslog;
|
||||||
extern int usbip_use_stderr;
|
extern int usbip_use_stderr;
|
||||||
extern int usbip_use_debug ;
|
extern int usbip_use_debug ;
|
||||||
|
@ -102,6 +78,30 @@ extern int usbip_use_debug ;
|
||||||
abort(); \
|
abort(); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
enum usb_device_speed {
|
||||||
|
USB_SPEED_UNKNOWN = 0, /* enumerating */
|
||||||
|
USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */
|
||||||
|
USB_SPEED_HIGH, /* usb 2.0 */
|
||||||
|
USB_SPEED_VARIABLE /* wireless (usb 2.5) */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* FIXME: how to sync with drivers/usbip_common.h ? */
|
||||||
|
enum usbip_device_status{
|
||||||
|
/* sdev is available. */
|
||||||
|
SDEV_ST_AVAILABLE = 0x01,
|
||||||
|
/* sdev is now used. */
|
||||||
|
SDEV_ST_USED,
|
||||||
|
/* sdev is unusable because of a fatal error. */
|
||||||
|
SDEV_ST_ERROR,
|
||||||
|
|
||||||
|
/* vdev does not connect a remote device. */
|
||||||
|
VDEV_ST_NULL,
|
||||||
|
/* vdev is used, but the USB address is not assigned yet */
|
||||||
|
VDEV_ST_NOTASSIGNED,
|
||||||
|
VDEV_ST_USED,
|
||||||
|
VDEV_ST_ERROR
|
||||||
|
};
|
||||||
|
|
||||||
struct usbip_usb_interface {
|
struct usbip_usb_interface {
|
||||||
uint8_t bInterfaceClass;
|
uint8_t bInterfaceClass;
|
||||||
uint8_t bInterfaceSubClass;
|
uint8_t bInterfaceSubClass;
|
||||||
|
@ -109,8 +109,6 @@ struct usbip_usb_interface {
|
||||||
uint8_t padding; /* alignment */
|
uint8_t padding; /* alignment */
|
||||||
} __attribute__((packed));
|
} __attribute__((packed));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct usbip_usb_device {
|
struct usbip_usb_device {
|
||||||
char path[SYSFS_PATH_MAX];
|
char path[SYSFS_PATH_MAX];
|
||||||
char busid[SYSFS_BUS_ID_SIZE];
|
char busid[SYSFS_BUS_ID_SIZE];
|
||||||
|
|
Loading…
Reference in New Issue