From patchwork Tue Nov 3 10:22:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Tsai X-Patchwork-Id: 37500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 89F46B7BD0 for ; Tue, 3 Nov 2009 21:26:30 +1100 (EST) Received: from localhost ([127.0.0.1]:51862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N5Gap-00050u-MD for incoming@patchwork.ozlabs.org; Tue, 03 Nov 2009 05:26:27 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N5GY4-0004KK-JB for qemu-devel@nongnu.org; Tue, 03 Nov 2009 05:23:36 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N5GXz-0004Jn-BE for qemu-devel@nongnu.org; Tue, 03 Nov 2009 05:23:36 -0500 Received: from [199.232.76.173] (port=43050 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N5GXy-0004Jf-Mg for qemu-devel@nongnu.org; Tue, 03 Nov 2009 05:23:30 -0500 Received: from mail-yx0-f188.google.com ([209.85.210.188]:50422) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N5GXx-0002rT-La for qemu-devel@nongnu.org; Tue, 03 Nov 2009 05:23:30 -0500 Received: by yxe26 with SMTP id 26so5216534yxe.4 for ; Tue, 03 Nov 2009 02:23:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:content-type:subject:from:to :date:message-id:user-agent:content-transfer-encoding; bh=VQUWcvDjmjFZ7aaKGdaJXfnFnAq7I4BJ2GMjcoo5Yyw=; b=bZjH5IlsP3uU9y2C9J4sJftww+ewzt1SJy//XuR2ODAJfBB1wWG+98jvnJqnvlEtef l+ewOg+wtFA7r4VYWljcfiknEo/aXUwtqnUXr+ppOMgfE/BPW4ihXCyDVyYKnV4sVIOm OWL4QyDiZF1XLBT0y7kG27G5H8XH+7h6U9LXs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=content-type:subject:from:to:date:message-id:user-agent :content-transfer-encoding; b=XFfl19/Rg5O2vaxfMeosfJhmZJ9J/poFCyg8ibmEuS2Gcfqdq1Aeew2+rO6/gXw8wq NLpK1OVb1eF6ELoYT/cwGpgubuMmntsPCyRMkErP05XsMTjtGJh5xRyW8Mw7E3z/Cqv9 mkzUsYnCS1gu1pr+mFE1JeoOB14st29T8xj7Y= Received: by 10.101.27.20 with SMTP id e20mr3500798anj.137.1257243808886; Tue, 03 Nov 2009 02:23:28 -0800 (PST) Received: from localhost (220-136-185-2.dynamic.hinet.net [220.136.185.2]) by mx.google.com with ESMTPS id 9sm2926641yxf.41.2009.11.03.02.23.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 03 Nov 2009 02:23:28 -0800 (PST) From: Scott Tsai To: qemu-devel Date: Tue, 03 Nov 2009 18:22:01 +0800 Message-Id: <1257243646-sup-1528@xpc65.scottt> User-Agent: Sup/0.9 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 1/3] usb-gotemp: expose HID request defines in usb.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move USB HID request constants from hw/usb-hid.c to hw/usb.h to allow other modules to use them. Signed-off-by: Scott Tsai --- hw/usb-hid.c | 20 ++++++-------------- hw/usb.h | 8 ++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/usb-hid.c b/hw/usb-hid.c index d1cc45e..4f22ce9 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -26,14 +26,6 @@ #include "console.h" #include "usb.h" -/* HID interface requests */ -#define GET_REPORT 0xa101 -#define GET_IDLE 0xa102 -#define GET_PROTOCOL 0xa103 -#define SET_REPORT 0x2109 -#define SET_IDLE 0x210a -#define SET_PROTOCOL 0x210b - /* HID descriptor types */ #define USB_DT_HID 0x21 #define USB_DT_REPORT 0x22 @@ -763,7 +755,7 @@ static int usb_hid_handle_control(USBDevice *dev, int request, int value, goto fail; } break; - case GET_REPORT: + case USB_REQ_HID_GET_REPORT: if (s->kind == USB_MOUSE) ret = usb_mouse_poll(s, data, length); else if (s->kind == USB_TABLET) @@ -771,29 +763,29 @@ static int usb_hid_handle_control(USBDevice *dev, int request, int value, else if (s->kind == USB_KEYBOARD) ret = usb_keyboard_poll(&s->kbd, data, length); break; - case SET_REPORT: + case USB_REQ_HID_SET_REPORT: if (s->kind == USB_KEYBOARD) ret = usb_keyboard_write(&s->kbd, data, length); else goto fail; break; - case GET_PROTOCOL: + case USB_REQ_HID_GET_PROTOCOL: if (s->kind != USB_KEYBOARD) goto fail; ret = 1; data[0] = s->protocol; break; - case SET_PROTOCOL: + case USB_REQ_HID_SET_PROTOCOL: if (s->kind != USB_KEYBOARD) goto fail; ret = 0; s->protocol = value; break; - case GET_IDLE: + case USB_REQ_HID_GET_IDLE: ret = 1; data[0] = s->idle; break; - case SET_IDLE: + case USB_REQ_HID_SET_IDLE: s->idle = (uint8_t) (value >> 8); ret = 0; break; diff --git a/hw/usb.h b/hw/usb.h index be4fcf6..1d006a7 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -104,6 +104,14 @@ #define USB_REQ_SET_INTERFACE 0x0B #define USB_REQ_SYNCH_FRAME 0x0C +/* HID interface requests */ +#define USB_REQ_HID_GET_REPORT 0xa101 +#define USB_REQ_HID_GET_IDLE 0xa102 +#define USB_REQ_HID_GET_PROTOCOL 0xa103 +#define USB_REQ_HID_SET_REPORT 0x2109 +#define USB_REQ_HID_SET_IDLE 0x210a +#define USB_REQ_HID_SET_PROTOCOL 0x210b + #define USB_DEVICE_SELF_POWERED 0 #define USB_DEVICE_REMOTE_WAKEUP 1