From patchwork Sun Dec 23 15:32:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 207980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 48AEC2C0085 for ; Mon, 24 Dec 2012 02:32:30 +1100 (EST) Received: from localhost ([::1]:37806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnXQ-0007gQ-0g for incoming@patchwork.ozlabs.org; Sun, 23 Dec 2012 10:32:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnXG-0007fD-75 for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TmnXE-0007RD-1X for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:18 -0500 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:43016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnXD-0007Qx-FG for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:15 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id ED8B894012A; Sun, 23 Dec 2012 16:32:09 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 23 Dec 2012 16:32:43 +0100 Message-Id: <1356276769-7357-4-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356276769-7357-1-git-send-email-hpoussin@reactos.org> References: <1356276769-7357-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:e0c:1:1599::10 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann Subject: [Qemu-devel] [RFC 3/8] uhci: do not use old_portio-style callbacks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hervé Poussineau --- hw/usb/hcd-uhci.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index d053791..cc47635 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -1213,18 +1213,41 @@ static void uhci_frame_timer(void *opaque) qemu_mod_timer(s->frame_timer, s->expire_time); } -static const MemoryRegionPortio uhci_portio[] = { - { 0, 32, 2, .write = uhci_ioport_writew, }, - { 0, 32, 2, .read = uhci_ioport_readw, }, - { 0, 32, 4, .write = uhci_ioport_writel, }, - { 0, 32, 4, .read = uhci_ioport_readl, }, - { 0, 32, 1, .write = uhci_ioport_writeb, }, - { 0, 32, 1, .read = uhci_ioport_readb, }, - PORTIO_END_OF_LIST() -}; +static uint64_t uhci_ioport_read(void *opaque, hwaddr addr, unsigned int size) +{ + switch (size) { + case 1: + return uhci_ioport_readb(opaque, (uint32_t)addr); + case 2: + return uhci_ioport_readw(opaque, (uint32_t)addr); + case 4: + return uhci_ioport_readl(opaque, (uint32_t)addr); + default: + return ~0UL; + } +} + +static void uhci_ioport_write(void *opaque, hwaddr addr, uint64_t data, + unsigned int size) +{ + switch (size) { + case 1: + uhci_ioport_writeb(opaque, (uint32_t)addr, (uint32_t)data); + break; + case 2: + uhci_ioport_writew(opaque, (uint32_t)addr, (uint32_t)data); + break; + case 4: + uhci_ioport_writel(opaque, (uint32_t)addr, (uint32_t)data); + break; + default: + break; + } +} static const MemoryRegionOps uhci_ioport_ops = { - .old_portio = uhci_portio, + .read = uhci_ioport_read, + .write = uhci_ioport_write, }; static USBPortOps uhci_port_ops = {