|
 |
0a122b |
From f37a2871c57468d317739e21cc747066d9ed284f Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
0a122b |
Date: Mon, 3 Feb 2014 16:30:29 +0100
|
|
|
0a122b |
Subject: [PATCH 05/28] usb: move usb_{hi, lo} helpers to header file.
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
0a122b |
Message-id: <1391445032-5540-3-git-send-email-kraxel@redhat.com>
|
|
|
0a122b |
Patchwork-id: 57076
|
|
|
0a122b |
O-Subject: [RHEL-7 qemu-kvm PATCH 2/5] usb: move usb_{hi, lo} helpers to header file.
|
|
|
0a122b |
Bugzilla: 1039530
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
0a122b |
(cherry picked from commit 0b1fa34e1dd2764ee7ae2be849e1c5ba5e8724ca)
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/usb/desc.c | 10 ----------
|
|
|
0a122b |
hw/usb/desc.h | 11 +++++++++++
|
|
|
0a122b |
2 files changed, 11 insertions(+), 10 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/usb/desc.c | 10 ----------
|
|
|
0a122b |
hw/usb/desc.h | 11 +++++++++++
|
|
|
0a122b |
2 files changed, 11 insertions(+), 10 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/hw/usb/desc.c b/hw/usb/desc.c
|
|
|
0a122b |
index bf6c522..3e560cd 100644
|
|
|
0a122b |
--- a/hw/usb/desc.c
|
|
|
0a122b |
+++ b/hw/usb/desc.c
|
|
|
0a122b |
@@ -6,16 +6,6 @@
|
|
|
0a122b |
|
|
|
0a122b |
/* ------------------------------------------------------------------ */
|
|
|
0a122b |
|
|
|
0a122b |
-static uint8_t usb_lo(uint16_t val)
|
|
|
0a122b |
-{
|
|
|
0a122b |
- return val & 0xff;
|
|
|
0a122b |
-}
|
|
|
0a122b |
-
|
|
|
0a122b |
-static uint8_t usb_hi(uint16_t val)
|
|
|
0a122b |
-{
|
|
|
0a122b |
- return (val >> 8) & 0xff;
|
|
|
0a122b |
-}
|
|
|
0a122b |
-
|
|
|
0a122b |
int usb_desc_device(const USBDescID *id, const USBDescDevice *dev,
|
|
|
0a122b |
uint8_t *dest, size_t len)
|
|
|
0a122b |
{
|
|
|
0a122b |
diff --git a/hw/usb/desc.h b/hw/usb/desc.h
|
|
|
0a122b |
index ddd3e74..81327b0 100644
|
|
|
0a122b |
--- a/hw/usb/desc.h
|
|
|
0a122b |
+++ b/hw/usb/desc.h
|
|
|
0a122b |
@@ -194,6 +194,17 @@ struct USBDesc {
|
|
|
0a122b |
|
|
|
0a122b |
#define USB_DESC_FLAG_SUPER (1 << 1)
|
|
|
0a122b |
|
|
|
0a122b |
+/* little helpers */
|
|
|
0a122b |
+static inline uint8_t usb_lo(uint16_t val)
|
|
|
0a122b |
+{
|
|
|
0a122b |
+ return val & 0xff;
|
|
|
0a122b |
+}
|
|
|
0a122b |
+
|
|
|
0a122b |
+static inline uint8_t usb_hi(uint16_t val)
|
|
|
0a122b |
+{
|
|
|
0a122b |
+ return (val >> 8) & 0xff;
|
|
|
0a122b |
+}
|
|
|
0a122b |
+
|
|
|
0a122b |
/* generate usb packages from structs */
|
|
|
0a122b |
int usb_desc_device(const USBDescID *id, const USBDescDevice *dev,
|
|
|
0a122b |
uint8_t *dest, size_t len);
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|