From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41902 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd0F-000731-HX for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofd0E-0005zV-8Q for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:15 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43503) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofd0D-0005yu-IS for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:14 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 1 Aug 2010 19:37:12 +0200 Message-Id: <1280684242-19611-10-git-send-email-hpoussin@reactos.org> In-Reply-To: <4C5579DA.8050508@reactos.org> References: <4C5579DA.8050508@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/20] [MIPS] Jazz emulation: make video card optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/mips_jazz.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 8c3c956..b737cf3 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -202,16 +202,18 @@ void mips_jazz_init (ram_addr_t ram_size, =20 isa_mem_base =3D 0x11000000; =20 - /* Video card */ - switch (jazz_model) { - case JAZZ_MAGNUM: - g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]); - break; - case JAZZ_PICA61: - isa_vga_mm_init(0x40000000, 0x60000000, 0); - break; - default: - break; + /* Optional video card */ + if (vga_interface_type !=3D VGA_NONE) { + switch (jazz_model) { + case JAZZ_MAGNUM: + g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]); + break; + case JAZZ_PICA61: + isa_vga_mm_init(0x40000000, 0x60000000, 0); + break; + default: + break; + } } =20 /* Network controller */ --=20 1.7.1.GIT