Skip to content

Commit

Permalink
staging/usbip: userspace to use linux header for usb_device_speed enu…
Browse files Browse the repository at this point in the history
…m, 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: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Shuah Khan authored and Greg Kroah-Hartman committed Feb 7, 2014
1 parent 09c8c8f commit d1fd43d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 2 additions & 0 deletions drivers/staging/usbip/userspace/libsrc/usbip_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
};

Expand Down
8 changes: 1 addition & 7 deletions drivers/staging/usbip/userspace/libsrc/usbip_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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. */
Expand Down

0 comments on commit d1fd43d

Please sign in to comment.