diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-02 11:25:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-02 11:25:12 +0100 |
| commit | 25611aa12b4155937d076dbe7445daed62ee6043 (patch) | |
| tree | 16aabd7403882e8c99f51d1333b2c63862ab378a | |
| parent | ef99b3ee065d5c817fa0a50d95293e569bfb47fb (diff) | |
| parent | e63d114b8a81e22ff9295674ba64b21255d589ee (diff) | |
| download | focaccia-qemu-25611aa12b4155937d076dbe7445daed62ee6043.tar.gz focaccia-qemu-25611aa12b4155937d076dbe7445daed62ee6043.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150602-1' into staging
virtio-input: two small fixups # gpg: Signature made Tue Jun 2 09:32:51 2015 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-input-20150602-1: virtio-input: make virtio devices follow usual naming convention virtio-input: const_le16 and const_le32 not build time constant Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | include/hw/virtio/virtio-input.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virtio-input.h index a265519e1e..8134178bcd 100644 --- a/include/hw/virtio/virtio-input.h +++ b/include/hw/virtio/virtio-input.h @@ -14,8 +14,14 @@ typedef struct virtio_input_config virtio_input_config; typedef struct virtio_input_event virtio_input_event; #if defined(HOST_WORDS_BIGENDIAN) -# define const_le32(_x) bswap32(_x) -# define const_le16(_x) bswap32(_x) +# define const_le32(_x) \ + (((_x & 0x000000ffU) << 24) | \ + ((_x & 0x0000ff00U) << 8) | \ + ((_x & 0x00ff0000U) >> 8) | \ + ((_x & 0xff000000U) >> 24)) +# define const_le16(_x) \ + (((_x & 0x00ff) << 8) | \ + ((_x & 0xff00) >> 8)) #else # define const_le32(_x) (_x) # define const_le16(_x) (_x) @@ -34,10 +40,10 @@ typedef struct virtio_input_event virtio_input_event; #define VIRTIO_INPUT_CLASS(klass) \ OBJECT_CLASS_CHECK(VirtIOInputClass, klass, TYPE_VIRTIO_INPUT) -#define TYPE_VIRTIO_INPUT_HID "virtio-input-hid" -#define TYPE_VIRTIO_KEYBOARD "virtio-keyboard" -#define TYPE_VIRTIO_MOUSE "virtio-mouse" -#define TYPE_VIRTIO_TABLET "virtio-tablet" +#define TYPE_VIRTIO_INPUT_HID "virtio-input-hid-device" +#define TYPE_VIRTIO_KEYBOARD "virtio-keyboard-device" +#define TYPE_VIRTIO_MOUSE "virtio-mouse-device" +#define TYPE_VIRTIO_TABLET "virtio-tablet-device" #define VIRTIO_INPUT_HID(obj) \ OBJECT_CHECK(VirtIOInputHID, (obj), TYPE_VIRTIO_INPUT_HID) |