diff options
| author | matt mooney <mfm@muteddisk.com> | 2011-06-19 22:44:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 20:11:33 -0700 |
| commit | 93e18e0ece647ace11a7cdfea4ae895077190f17 (patch) | |
| tree | 4278cdcba78fd0a9aeb52c866d5a29542dca5933 /drivers/staging/usbip | |
| parent | 213fd4adcea93964f24376b6b82435d5495632a8 (diff) | |
| download | linux-0-day-93e18e0ece647ace11a7cdfea4ae895077190f17.tar.gz linux-0-day-93e18e0ece647ace11a7cdfea4ae895077190f17.tar.xz | |
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>
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/userspace/libsrc/usbip_common.h | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h index 090b7c5503579..7dadb21304bb6 100644 --- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h +++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h @@ -30,30 +30,6 @@ #define USBIP_HOST_DRV_NAME "usbip-host" #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_stderr; extern int usbip_use_debug ; @@ -102,6 +78,30 @@ extern int usbip_use_debug ; abort(); \ } 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 { uint8_t bInterfaceClass; uint8_t bInterfaceSubClass; @@ -109,8 +109,6 @@ struct usbip_usb_interface { uint8_t padding; /* alignment */ } __attribute__((packed)); - - struct usbip_usb_device { char path[SYSFS_PATH_MAX]; char busid[SYSFS_BUS_ID_SIZE]; |