From patchwork Sun Dec 23 15:32:48 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: 207983 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 4A9722C0087 for ; Mon, 24 Dec 2012 02:33:47 +1100 (EST) Received: from localhost ([::1]:43023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnYf-00024a-DD for incoming@patchwork.ozlabs.org; Sun, 23 Dec 2012 10:33:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnXd-00008z-83 for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TmnXb-0007Te-D4 for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:41 -0500 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:44031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TmnXa-0007TX-Pu for qemu-devel@nongnu.org; Sun, 23 Dec 2012 10:32:39 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id 3F5C29401AC; Sun, 23 Dec 2012 16:32:33 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 23 Dec 2012 16:32:48 +0100 Message-Id: <1356276769-7357-9-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 8/8] memory: remove old_portio-style callbacks support 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 --- memory.c | 44 -------------------------------------------- memory.h | 4 ---- 2 files changed, 48 deletions(-) diff --git a/memory.c b/memory.c index 7419853..ea3bb8a 100644 --- a/memory.c +++ b/memory.c @@ -365,21 +365,6 @@ static void access_with_adjusted_size(hwaddr addr, } } -static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset, - unsigned width, bool write) -{ - const MemoryRegionPortio *mrp; - - for (mrp = mr->ops->old_portio; mrp->size; ++mrp) { - if (offset >= mrp->offset && offset < mrp->offset + mrp->len - && width == mrp->size - && (write ? (bool)mrp->write : (bool)mrp->read)) { - return mrp; - } - } - return NULL; -} - static void memory_region_iorange_read(IORange *iorange, uint64_t offset, unsigned width, @@ -390,21 +375,6 @@ static void memory_region_iorange_read(IORange *iorange, MemoryRegion *mr = mrio->mr; offset += mrio->offset; - if (mr->ops->old_portio) { - const MemoryRegionPortio *mrp = find_portio(mr, offset - mrio->offset, - width, false); - - *data = ((uint64_t)1 << (width * 8)) - 1; - if (mrp) { - *data = mrp->read(mr->opaque, offset); - } else if (width == 2) { - mrp = find_portio(mr, offset - mrio->offset, 1, false); - assert(mrp); - *data = mrp->read(mr->opaque, offset) | - (mrp->read(mr->opaque, offset + 1) << 8); - } - return; - } *data = 0; access_with_adjusted_size(offset, data, width, mr->ops->impl.min_access_size, @@ -422,20 +392,6 @@ static void memory_region_iorange_write(IORange *iorange, MemoryRegion *mr = mrio->mr; offset += mrio->offset; - if (mr->ops->old_portio) { - const MemoryRegionPortio *mrp = find_portio(mr, offset - mrio->offset, - width, true); - - if (mrp) { - mrp->write(mr->opaque, offset, data); - } else if (width == 2) { - mrp = find_portio(mr, offset - mrio->offset, 1, true); - assert(mrp); - mrp->write(mr->opaque, offset, data & 0xff); - mrp->write(mr->opaque, offset + 1, data >> 8); - } - return; - } access_with_adjusted_size(offset, &data, width, mr->ops->impl.min_access_size, mr->ops->impl.max_access_size, diff --git a/memory.h b/memory.h index 9462bfd..bdde0d0 100644 --- a/memory.h +++ b/memory.h @@ -103,10 +103,6 @@ struct MemoryRegionOps { bool unaligned; } impl; - /* If .read and .write are not present, old_portio may be used for - * backwards compatibility with old portio registration - */ - const MemoryRegionPortio *old_portio; /* If .read and .write are not present, old_mmio may be used for * backwards compatibility with old mmio registration */