From patchwork Wed Oct 28 16:51:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5q2m55SwID0/SVNPLTIwMjItSlA/Qj9JQnNrUWoxVFRHa2JLRUk9Pz0=?= X-Patchwork-Id: 37139 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 4880610086B for ; Thu, 29 Oct 2009 08:54:10 +1100 (EST) Received: from localhost ([127.0.0.1]:54274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3CXd-0002c6-77 for incoming@patchwork.ozlabs.org; Wed, 28 Oct 2009 13:42:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N3Bn6-0007Zx-FD for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N3Bmz-0007QG-9k for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:28 -0400 Received: from [199.232.76.173] (port=45986 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3Bmy-0007Px-6u for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:24 -0400 Received: from mx20.gnu.org ([199.232.41.8]:32813) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N3Bmx-0002ob-Lr for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:23 -0400 Received: from smtp-vip.mem.interq.net ([210.157.1.50] helo=smtp01.mem.internal-gmo) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N3Bmw-0005eN-Au for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:22 -0400 Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id n9SGs7T0018711 for qemu-devel@nongnu.org; Thu, 29 Oct 2009 01:54:07 +0900 (JST) Received: from YOUR-BD18D6DD63.m1.interq.or.jp (ntymns039132.ymns.nt.ftth.ppp.infoweb.ne.jp [121.92.167.132]) by smtp01.mem.internal-gmo with ESMTP id n9SGs5ZW018647 for ; (me101664 for with PLAIN) Thu, 29 Oct 2009 01:54:07 +0900 (JST) Message-Id: <200910281651.AA00174@YOUR-BD18D6DD63.m1.interq.or.jp> Date: Thu, 29 Oct 2009 01:51:59 +0900 To: qemu-devel From: "TAKEDA, toshiya" MIME-Version: 1.0 X-Mailer: AL-Mail32 Version 1.13 X-detected-operating-system: by mx20.gnu.org: Solaris 10 (beta) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH v3 11/25] ne2000-isa: add NEC PC-9821 family interface (MELCO LGY-98) 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 diff --git a/qemu/hw/ne2000-isa.c b/qemu/hw/ne2000-isa.c index 729e8e2..7ec1f47 100644 --- a/qemu/hw/ne2000-isa.c +++ b/qemu/hw/ne2000-isa.c @@ -42,6 +42,23 @@ static void isa_ne2000_cleanup(VLANClientState *vc) s->vc = NULL; } +static void isa_ne2000_initfn_common(ISADevice *dev, + ISANE2000State *isa, NE2000State *s) +{ + isa_init_irq(dev, &s->irq, isa->isairq); + + qemu_macaddr_default_if_unset(&s->c.macaddr); + ne2000_reset(s); + + s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, s->c.vlan, s->c.peer, + dev->qdev.info->name, dev->qdev.id, + ne2000_can_receive, ne2000_receive, NULL, + NULL, isa_ne2000_cleanup, s); + qemu_format_nic_info_str(s->vc, s->c.macaddr.a); + + vmstate_register(-1, &vmstate_ne2000, s); +} + static int isa_ne2000_initfn(ISADevice *dev) { ISANE2000State *isa = DO_UPCAST(ISANE2000State, dev, dev); @@ -58,18 +75,8 @@ static int isa_ne2000_initfn(ISADevice *dev) register_ioport_write(isa->iobase + 0x1f, 1, 1, ne2000_reset_ioport_write, s); register_ioport_read(isa->iobase + 0x1f, 1, 1, ne2000_reset_ioport_read, s); - isa_init_irq(dev, &s->irq, isa->isairq); - - qemu_macaddr_default_if_unset(&s->c.macaddr); - ne2000_reset(s); - - s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, s->c.vlan, s->c.peer, - dev->qdev.info->name, dev->qdev.id, - ne2000_can_receive, ne2000_receive, NULL, - NULL, isa_ne2000_cleanup, s); - qemu_format_nic_info_str(s->vc, s->c.macaddr.a); + isa_ne2000_initfn_common(dev, isa, s); - vmstate_register(-1, &vmstate_ne2000, s); return 0; } @@ -98,9 +105,58 @@ static ISADeviceInfo ne2000_isa_info = { }, }; +/* NEC PC-9821 (MELCO LGY-98) */ + +static int pc98_ne2000_initfn(ISADevice *dev) +{ + ISANE2000State *isa = DO_UPCAST(ISANE2000State, dev, dev); + NE2000State *s = &isa->ne2000; + + register_ioport_write(isa->iobase, 16, 1, ne2000_ioport_write, s); + register_ioport_read(isa->iobase, 16, 1, ne2000_ioport_read, s); + + register_ioport_write(isa->iobase + 0x200, 1, 1, ne2000_asic_ioport_write, s); + register_ioport_read(isa->iobase + 0x200, 1, 1, ne2000_asic_ioport_read, s); + register_ioport_write(isa->iobase + 0x200, 2, 2, ne2000_asic_ioport_write, s); + register_ioport_read(isa->iobase + 0x200, 2, 2, ne2000_asic_ioport_read, s); + + register_ioport_write(isa->iobase + 0x18, 1, 1, ne2000_reset_ioport_write, s); + register_ioport_read(isa->iobase + 0x18, 1, 1, ne2000_reset_ioport_read, s); + + isa_ne2000_initfn_common(dev, isa, s); + + return 0; +} + +void pc98_ne2000_init(int base, int irq, NICInfo *nd) +{ + ISADevice *dev; + + qemu_check_nic_model(nd, "ne2k_isa"); + + dev = isa_create("pc98_ne2k"); + qdev_prop_set_uint32(&dev->qdev, "iobase", base); + qdev_prop_set_uint32(&dev->qdev, "irq", irq); + qdev_set_nic_properties(&dev->qdev, nd); + qdev_init_nofail(&dev->qdev); +} + +static ISADeviceInfo pc98_ne2000_info = { + .qdev.name = "pc98_ne2k", + .qdev.size = sizeof(ISANE2000State), + .init = pc98_ne2000_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0xd0), + DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 3), + DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), + DEFINE_PROP_END_OF_LIST(), + }, +}; + static void ne2000_isa_register_devices(void) { isa_qdev_register(&ne2000_isa_info); + isa_qdev_register(&pc98_ne2000_info); } device_init(ne2000_isa_register_devices)