From patchwork Sat May 8 14:10:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 51966 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 DB512B7D64 for ; Sun, 9 May 2010 00:12:11 +1000 (EST) Received: from localhost ([127.0.0.1]:51177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAklF-0003cP-06 for incoming@patchwork.ozlabs.org; Sat, 08 May 2010 10:12:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OAkjb-0003Xu-T6 for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:28 -0400 Received: from [140.186.70.92] (port=56646 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAkjY-0003Vf-Qz for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OAkjT-0008IH-SH for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:24 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:53349) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OAkjT-0008Hw-N0 for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:19 -0400 Received: by fxm12 with SMTP id 12so1349588fxm.4 for ; Sat, 08 May 2010 07:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=W+QcFU49/geQdggy/wbQMF7OWpVb6GZ7yn4RnxwfXbk=; b=s/wOxVOiK0/ZrrYTxNAUV3p6phxP1+iy+26mChtYqPpyD4q8WNFOgfxJt3yvoJxykd GMbvy6fGC28DrLThAvXEUOTZrq5W+gdCHBmcP34JLovNs3Qw3xwr4tFWgRBETrfW1orP OQCzFUtKQ6IozG7opQTOVW7quPwTelDq4nEUk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=km3jUf0LWxPCiF20vL9RljDQsGrOOyRXXF/dBVP3cwn5YSIEpJK5eLAZ/tCM3ye+6u tps7asCTkhBmOx+Mvbl8zM056aLx9ohfLg/X67CnpHwBdtOXNJtGwNY/2rAUgcAwmhW8 wdRuRoQPplsAVTRFtL/Bji0jtZCOPfl1csx7I= Received: by 10.87.69.29 with SMTP id w29mr5922293fgk.35.1273327818722; Sat, 08 May 2010 07:10:18 -0700 (PDT) Received: from localhost (e181211204.adsl.alicedsl.de [85.181.211.204]) by mx.google.com with ESMTPS id b17sm6101723fka.43.2010.05.08.07.10.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 08 May 2010 07:10:17 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Sat, 8 May 2010 16:10:15 +0200 Message-Id: <1273327815-21408-2-git-send-email-atar4qemu@gmail.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1273327815-21408-1-git-send-email-atar4qemu@gmail.com> References: <1273327815-21408-1-git-send-email-atar4qemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH 2/2] reformatted SS-5 and LX definitions 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 --- hw/sun4m.c | 66 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/hw/sun4m.c b/hw/sun4m.c index e31d039..7917f46 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -968,26 +968,26 @@ enum { static const struct sun4m_hwdef sun4m_hwdefs[] = { /* SS-5 */ { - .iommu_base = 0x10000000, + .iommu_base = 0x10000000, .iommu_pad_base = 0x10004000, .iommu_pad_len = 0x0fffb000, - .tcx_base = 0x50000000, - .cs_base = 0x6c000000, - .slavio_base = 0x70000000, - .ms_kb_base = 0x71000000, - .serial_base = 0x71100000, - .nvram_base = 0x71200000, - .fd_base = 0x71400000, - .counter_base = 0x71d00000, - .intctl_base = 0x71e00000, - .idreg_base = 0x78000000, - .dma_base = 0x78400000, - .esp_base = 0x78800000, - .le_base = 0x78c00000, - .apc_base = 0x6a000000, - .afx_base = 0x6e000000, - .aux1_base = 0x71900000, - .aux2_base = 0x71910000, + .tcx_base = 0x50000000, + .cs_base = 0x6c000000, + .slavio_base = 0x70000000, + .ms_kb_base = 0x71000000, + .serial_base = 0x71100000, + .nvram_base = 0x71200000, + .fd_base = 0x71400000, + .counter_base = 0x71d00000, + .intctl_base = 0x71e00000, + .idreg_base = 0x78000000, + .dma_base = 0x78400000, + .esp_base = 0x78800000, + .le_base = 0x78c00000, + .apc_base = 0x6a000000, + .afx_base = 0x6e000000, + .aux1_base = 0x71900000, + .aux2_base = 0x71910000, .nvram_machine_id = 0x80, .machine_id = ss5_id, .iommu_version = 0x05000000, @@ -1096,23 +1096,23 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = { }, /* LX */ { - .iommu_base = 0x10000000, + .iommu_base = 0x10000000, .iommu_pad_base = 0x10004000, .iommu_pad_len = 0x0fffb000, - .tcx_base = 0x50000000, - .slavio_base = 0x70000000, - .ms_kb_base = 0x71000000, - .serial_base = 0x71100000, - .nvram_base = 0x71200000, - .fd_base = 0x71400000, - .counter_base = 0x71d00000, - .intctl_base = 0x71e00000, - .idreg_base = 0x78000000, - .dma_base = 0x78400000, - .esp_base = 0x78800000, - .le_base = 0x78c00000, - .aux1_base = 0x71900000, - .aux2_base = 0x71910000, + .tcx_base = 0x50000000, + .slavio_base = 0x70000000, + .ms_kb_base = 0x71000000, + .serial_base = 0x71100000, + .nvram_base = 0x71200000, + .fd_base = 0x71400000, + .counter_base = 0x71d00000, + .intctl_base = 0x71e00000, + .idreg_base = 0x78000000, + .dma_base = 0x78400000, + .esp_base = 0x78800000, + .le_base = 0x78c00000, + .aux1_base = 0x71900000, + .aux2_base = 0x71910000, .nvram_machine_id = 0x80, .machine_id = lx_id, .iommu_version = 0x04000000,