From patchwork Thu Jan 27 19:07:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Olivier DANET X-Patchwork-Id: 80719 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 4E5EAB70E0 for ; Fri, 28 Jan 2011 06:10:45 +1100 (EST) Received: from localhost ([127.0.0.1]:45261 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiXEw-000141-UB for incoming@patchwork.ozlabs.org; Thu, 27 Jan 2011 14:10:42 -0500 Received: from [140.186.70.92] (port=33435 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiXCA-0007yn-L7 for qemu-devel@nongnu.org; Thu, 27 Jan 2011 14:07:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiXC9-0003bE-CA for qemu-devel@nongnu.org; Thu, 27 Jan 2011 14:07:50 -0500 Received: from mailout-eu.gmx.com ([213.165.64.42]:48125) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1PiXC8-0003b7-W6 for qemu-devel@nongnu.org; Thu, 27 Jan 2011 14:07:49 -0500 Received: (qmail 12664 invoked by uid 0); 27 Jan 2011 19:07:47 -0000 Received: from 82.241.250.68 by rms-eu014.v300.gmx.net with HTTP Date: Thu, 27 Jan 2011 20:07:44 +0100 From: "Olivier DANET" Message-ID: <20110127190744.245670@gmx.com> MIME-Version: 1.0 To: qemu-devel@nongnu.org X-Authenticated: #53979548 X-Flags: 0001 X-Mailer: GMX.com Web Mailer x-registered: 0 X-GMX-UID: srh0JZw1ZDIrc/KaTWU2lwp5emhmY4F6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.165.64.42 Subject: [Qemu-devel] [PATCH] Sun4m / Sun4u : Uppercase RAM_size 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 Signed-off-by: Olivier Danet ---  hw/sun4m.c     6 +++---  hw/sun4u.c     4 ++--  2 files changed, 5 insertions(+), 5 deletions(-) -- 1.6.2.4 diff --git a/hw/sun4m.c b/hw/sun4m.c index 30e8a21..8076f25 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -962,7 +962,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,        fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1); -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);      fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR); @@ -1573,7 +1573,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,        fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1); -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);      fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR); @@ -1765,7 +1765,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,        fw_cfg = fw_cfg_init(0, 0, CFG_ADDR, CFG_ADDR + 2);      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1); -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);      fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR); diff --git a/hw/sun4u.c b/hw/sun4u.c index 90b1ce2..23df953 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -813,7 +813,7 @@ static void sun4uv_init(ram_addr_t RAM_size,        initrd_size = 0;      kernel_size = sun4u_load_kernel(kernel_filename, initrd_filename, -                                    ram_size, &initrd_size); +                                    RAM_size, &initrd_size);        sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", RAM_size, boot_devices,                             KERNEL_LOAD_ADDR, kernel_size, @@ -826,7 +826,7 @@ static void sun4uv_init(ram_addr_t RAM_size,        fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);      fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1); -    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); +    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)RAM_size);      fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);      fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);