openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging/usbip: change usbip userspace to include new uapi usbip.h 

usbip userspace has duplicated enum definition to report usbip device
status maintained by the kernel. A new uapi usbip.h now defines the
usbip device status for kernel and userspace to use. Change usbip
userspace to include uapi usbip.h for usbip device status.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shuah Khan 2014-03-03 16:38:45 -07:00 committed by Greg Kroah-Hartman
parent cd84ec9632
commit cec2e7bb6d
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/usbip/userspace/libsrc/usbip_common.h
View File

@ -15,6 +15,7 @@
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include "../../uapi/usbip.h"
#ifndef USBIDS_FILE #ifndef USBIDS_FILE
#define USBIDS_FILE "/usr/share/hwdata/usb.ids" #define USBIDS_FILE "/usr/share/hwdata/usb.ids"
@ -77,23 +78,6 @@ extern int usbip_use_debug ;
abort(); \ abort(); \
} while (0) } while (0)
/* 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;