From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
To: "Luis R. Rodriguez" <mcgrof@kernel.org>
Cc: <backports@vger.kernel.org>
Subject: [RFC v3 6/9] backports: update enum usb_device_speed with USB_SPEED_SUPER
Date: Thu, 1 Aug 2013 18:00:37 +0200 [thread overview]
Message-ID: <51FA8625.9050705@fh-kl.de> (raw)
In-Reply-To: <cover.1375372668.git.patrick.ziegler@fh-kl.de>
USB_SPEED_SUPER is missing for kernel versions < 2.6.30 but used by uvc_video and
usbnet.
Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
---
backport/backport-include/linux/usb/ch9.h | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/backport/backport-include/linux/usb/ch9.h b/backport/backport-include/linux/usb/ch9.h
index 252a6f1..40d5d3f 100644
--- a/backport/backport-include/linux/usb/ch9.h
+++ b/backport/backport-include/linux/usb/ch9.h
@@ -1,9 +1,31 @@
#ifndef __BACKPORT__LINUX_USB_CH9_H
#define __BACKPORT__LINUX_USB_CH9_H
-#include_next <linux/usb/ch9.h>
#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+#define usb_device_speed old_usb_device_speed
+#define USB_SPEED_UNKNOWN OLD_USB_SPEED_UNKNOWN
+#define USB_SPEED_LOW OLD_USB_SPEED_LOW
+#define USB_SPEED_FULL OLD_USB_SPEED_FULL
+#define USB_SPEED_HIGH OLD_USB_SPEED_HIGH
+#include_next <linux/usb/ch9.h>
+#undef usb_device_speed
+#undef USB_SPEED_UNKNOWN
+#undef USB_SPEED_LOW
+#undef USB_SPEED_FULL
+#undef USB_SPEED_HIGH
+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_WIRELESS, /* wireless (usb 2.5) */
+ USB_SPEED_SUPER, /* usb 3.0 */
+};
+#else
+#include_next <linux/usb/ch9.h>
+#endif /* < 2.6.30 */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
#include <linux/types.h> /* __u8 etc */
#include <asm/byteorder.h> /* le16_to_cpu */
--
1.8.1.2
--
Dipl.-Inf. (FH) Patrick Ziegler
University Of Applied Sciences
Kaiserslautern
Amerikastrasse 1
D-66482 Zweibruecken
Germany
Phone: +49 631 3724 5526
Mail: patrick.ziegler@fh-kl.de
PGP KeyID 0xB4796B8C
http://www.fh-kl.de
http://www.fh-kl.de/fachbereiche/imst/iuk-knowhow.html
prev parent reply other threads:[~2013-08-01 16:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1375372668.git.patrick.ziegler@fh-kl.de>
2013-08-01 15:59 ` [RFC v3 1/9] backports: fix build errors for old kernel versions without PCI support Patrick Ziegler
2013-08-01 15:59 ` [RFC v3 2/9] backports: add eth_prepare_mac_addr_change() and eth_commit_mac_addr_change() Patrick Ziegler
2013-08-01 17:00 ` Luis R. Rodriguez
2013-08-01 15:59 ` [RFC v3 3/9] backports: define PM_EVENT_AUTO Patrick Ziegler
2013-08-01 15:59 ` [RFC v3 4/9] backports: add usb_translate_errors() Patrick Ziegler
2013-08-01 15:59 ` [RFC v3 5/9] backports: add usb_endpoint_maxp() Patrick Ziegler
2013-08-01 15:59 ` [RFC v3 7/9] backports: include headers directly if math64 header is missing Patrick Ziegler
2013-08-01 16:00 ` [RFC v3 8/9] backports: define phys_addr_t for ARM on kernel version < 2.6.25 Patrick Ziegler
2013-08-01 16:00 ` [RFC v3 9/9] backports: add wwan device drivers Patrick Ziegler
2013-08-01 16:00 ` Patrick Ziegler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51FA8625.9050705@fh-kl.de \
--to=patrick.ziegler@fh-kl.de \
--cc=backports@vger.kernel.org \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).