Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging/usbip: userspace to use linux header for usb_device_speed enum,... 


staging/usbip: userspace to use linux header for usb_device_speed enum, missing speeds to speed_strings array

Remove usb_device_speed enum define from usbip_common.h and change it to
include linux/usb/ch9.h instead. Add speed strings for usb wireless and 3.0
to speed_strings array.

Signed-off-by: default avatarShuah Khan <shuah.kh@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09c8c8fb

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

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ static const struct speed_string speed_strings[] = { 
	{ USB_SPEED_LOW,  "1.5", "Low Speed(1.5Mbps)"  },

	{ USB_SPEED_FULL, "12",  "Full Speed(12Mbps)" },

	{ USB_SPEED_HIGH, "480", "High Speed(480Mbps)" },

	{ USB_SPEED_WIRELESS, "53.3-480", "Wireless"},

	{ USB_SPEED_SUPER, "5000", "Super Speed(5000Mbps)" },

	{ 0, NULL, NULL }

};

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

+1 −7
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <syslog.h>

#include <unistd.h>

#include <linux/usb/ch9.h>



#ifndef USBIDS_FILE

#define USBIDS_FILE "/usr/share/hwdata/usb.ids"
@@ -76,13 +77,6 @@ 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. */