Commit cec2e7bb authored by Shuah Khan's avatar Shuah Khan Committed by Greg Kroah-Hartman
Browse files

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: default avatarShuah Khan <shuah.kh@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd84ec96

drivers/staging/usbip/userspace/libsrc/usbip_common.h

+1 −17
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <syslog.h>

#include <unistd.h>

#include <linux/usb/ch9.h>

#include "../../uapi/usbip.h"



#ifndef USBIDS_FILE

#define USBIDS_FILE "/usr/share/hwdata/usb.ids"
@@ -77,23 +78,6 @@ extern int usbip_use_debug ; 
		abort();				\

	} 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 {

	uint8_t bInterfaceClass;

	uint8_t bInterfaceSubClass;