From patchwork Wed Nov 11 00:24: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: 38119 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 24300B6EDF for ; Wed, 11 Nov 2009 11:59:32 +1100 (EST) Received: from localhost ([127.0.0.1]:40795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N81YX-0001UB-Aj for incoming@patchwork.ozlabs.org; Tue, 10 Nov 2009 19:59:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N813O-000637-S3 for qemu-devel@nongnu.org; Tue, 10 Nov 2009 19:27:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N813I-0005vL-UY for qemu-devel@nongnu.org; Tue, 10 Nov 2009 19:27:17 -0500 Received: from [199.232.76.173] (port=57571 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N813I-0005ub-7r for qemu-devel@nongnu.org; Tue, 10 Nov 2009 19:27:12 -0500 Received: from ey-out-1920.google.com ([74.125.78.150]:13922) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N813H-0001mB-P0 for qemu-devel@nongnu.org; Tue, 10 Nov 2009 19:27:12 -0500 Received: by ey-out-1920.google.com with SMTP id 3so397611eyh.14 for ; Tue, 10 Nov 2009 16:27:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=JeT/uPLS8ONGza9DgfzX7NcYBx3xZ2AA1kn1pstkC9o=; b=dc1ehyjWfRGm5UuuCDJQT8Tijozm0+Of0MW3OEM1bJ8r4xSXTx89jKe8eQfj7sl1XF bmInWlLmVYbVUqcL25+u5VmcBsnVgoGtsZlR7C1RN2U5Utm+JoMxWQF8FxidBYBWphUW qhwmsxhdE1bMclragqfl52KevFENukPlgxclM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=iDdcQSMtbnJLdT78NnfcbxQRx4rYquS884+GPMowCH1vFtM3r/9GlCsNRnbtgLemso uUBk9fQi1ffc+zUytRzKcDKVB3i8tKFImih7KS2EcetnWwI0idNRnNkAJ0zQxx58cJv7 Ooi4ZA8U06jhb9mmXOCaKagHgTYrHMTudYtIY= Received: by 10.216.93.77 with SMTP id k55mr241128wef.196.1257899230890; Tue, 10 Nov 2009 16:27:10 -0800 (PST) Received: from localhost (220-136-191-52.dynamic.hinet.net [220.136.191.52]) by mx.google.com with ESMTPS id i34sm668806gve.23.2009.11.10.16.27.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 10 Nov 2009 16:27:09 -0800 (PST) From: Scott Tsai To: qemu-devel@nongnu.org Date: Wed, 11 Nov 2009 08:24:01 +0800 Message-Id: <1257899043-28415-2-git-send-email-scottt.tw@gmail.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1257899043-28415-1-git-send-email-scottt.tw@gmail.com> References: <1257899043-28415-1-git-send-email-scottt.tw@gmail.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Scott Tsai Subject: [Qemu-devel] [PATCH V3 1/3] usb: move HID request defines to hw/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 f4a2a48..e263fc0 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 351c466..7d46931 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