From patchwork Wed Sep 9 15:42:25 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: 33208 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 2A070B6F34 for ; Thu, 10 Sep 2009 02:24:12 +1000 (EST) Received: from localhost ([127.0.0.1]:53323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlPxo-0004Xg-Uc for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 12:24:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlPJe-0008Nn-D4 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 11:42:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlPJZ-0008Ma-M5 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 11:42:38 -0400 Received: from [199.232.76.173] (port=40555 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlPJZ-0008MX-GA for qemu-devel@nongnu.org; Wed, 09 Sep 2009 11:42:33 -0400 Received: from smtp-vip.mem.interq.net ([210.157.1.50]:21973 helo=smtp02.mem.internal-gmo) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlPJY-0007ej-Ob for qemu-devel@nongnu.org; Wed, 09 Sep 2009 11:42:33 -0400 Received: (from root@localhost) by smtp02.mem.internal-gmo (8.13.8/8.12.6) id n89FgV0s026326 for qemu-devel@nongnu.org; Thu, 10 Sep 2009 00:42:31 +0900 (JST) Received: from YOUR-BD18D6DD63.m1.interq.or.jp (ntymns034018.ymns.nt.ftth.ppp.infoweb.ne.jp [211.2.27.18]) by smtp02.mem.internal-gmo with ESMTP id n89FgVDl026322 for ; (me101664 for with PLAIN) Thu, 10 Sep 2009 00:42:31 +0900 (JST) Message-Id: <200909091542.AA00091@YOUR-BD18D6DD63.m1.interq.or.jp> From: t-takeda@m1.interq.or.jp (=?ISO-2022-JP?B?GyRCSXBFRBsoQg==?= =?ISO-2022-JP?B?IBskQj1TTGkbKEI=?=) Date: Thu, 10 Sep 2009 00:42:25 +0900 To: qemu-devel MIME-Version: 1.0 X-Mailer: AL-Mail32 Version 1.13 X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) Subject: [Qemu-devel] [PATCH 08/14] i8259: support NEC PC-9821 family 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 This patch is to add NEC PC-9821 family i/o to i8259. diff -ur a/hw/i8259.c b/hw/i8259.c --- a/hw/i8259.c Tue Sep 8 21:26:50 2009 +++ b/hw/i8259.c Wed Sep 9 21:51:43 2009 @@ -69,6 +69,8 @@ static uint64_t irq_count[16]; #endif +static int irq_from_slave; + /* set irq level. If an edge is detected, then the IRR is set to 1 */ static inline void pic_set_irq1(PicState *s, int irq, int level) { @@ -124,7 +126,7 @@ if (s->special_mask) mask &= ~s->imr; if (s->special_fully_nested_mode && s == &s->pics_state->pics[0]) - mask &= ~(1 << 2); + mask &= ~(1 << irq_from_slave); cur_priority = get_priority(s, mask); if (priority < cur_priority) { /* higher priority found: an irq should be generated */ @@ -145,8 +147,8 @@ irq2 = pic_get_irq(&s->pics[1]); if (irq2 >= 0) { /* if irq request by slave pic, signal master PIC */ - pic_set_irq1(&s->pics[0], 2, 1); - pic_set_irq1(&s->pics[0], 2, 0); + pic_set_irq1(&s->pics[0], irq_from_slave, 1); + pic_set_irq1(&s->pics[0], irq_from_slave, 0); } /* look at requested irq */ irq = pic_get_irq(&s->pics[0]); @@ -171,6 +173,11 @@ else { qemu_irq_lower(s->parent_irq); } +#elif defined(TARGET_I386) + else if (irq_from_slave == 7) { + /* NEC PC-98x1 */ + qemu_irq_lower(s->parent_irq); + } #endif } @@ -224,7 +231,7 @@ irq = pic_get_irq(&s->pics[0]); if (irq >= 0) { pic_intack(&s->pics[0], irq); - if (irq == 2) { + if (irq == irq_from_slave) { irq2 = pic_get_irq(&s->pics[1]); if (irq2 >= 0) { pic_intack(&s->pics[1], irq2); @@ -376,12 +383,12 @@ ret = pic_get_irq(s); if (ret >= 0) { if (addr1 >> 7) { - s->pics_state->pics[0].isr &= ~(1 << 2); - s->pics_state->pics[0].irr &= ~(1 << 2); + s->pics_state->pics[0].isr &= ~(1 << irq_from_slave); + s->pics_state->pics[0].irr &= ~(1 << irq_from_slave); } s->irr &= ~(1 << ret); s->isr &= ~(1 << ret); - if (addr1 >> 7 || ret != 2) + if (addr1 >> 7 || ret != irq_from_slave) pic_update_irq(s->pics_state); } else { ret = 0x07; @@ -425,7 +432,7 @@ int ret; ret = pic_poll_read(&s->pics[0], 0x00); - if (ret == 2) + if (ret == irq_from_slave) ret = pic_poll_read(&s->pics[1], 0x80) + 8; /* Prepare for ISR read */ s->pics[0].read_reg_select = 1; @@ -545,11 +552,54 @@ { PicState2 *s; + irq_from_slave = 2; + s = qemu_mallocz(sizeof(PicState2)); pic_init1(0x20, 0x4d0, &s->pics[0]); pic_init1(0xa0, 0x4d1, &s->pics[1]); s->pics[0].elcr_mask = 0xf8; s->pics[1].elcr_mask = 0xde; + s->parent_irq = parent_irq; + s->pics[0].pics_state = s; + s->pics[1].pics_state = s; + isa_pic = s; + return qemu_allocate_irqs(i8259_set_irq, s, 16); +} + +/* NEC PC-98x1 */ + +static void pc98_pic_ioport_write(void *opaque, uint32_t addr, uint32_t val) +{ + pic_ioport_write(opaque, addr >> 1, val); +} + +static uint32_t pc98_pic_ioport_read(void *opaque, uint32_t addr) +{ + return pic_ioport_read(opaque, addr >> 1); +} + +static void pc98_pic_init1(int io_addr, PicState *s) +{ + int i; + for (i = 0; i < 2; i++) { + register_ioport_write(io_addr + (i << 1), 1, 1, pc98_pic_ioport_write, s); + register_ioport_read(io_addr + (i << 1), 1, 1, pc98_pic_ioport_read, s); + } + register_savevm("i8259", io_addr, 1, pic_save, pic_load, s); + qemu_register_reset(pic_reset, s); +} + +qemu_irq *pc98_i8259_init(qemu_irq parent_irq) +{ + PicState2 *s; + + irq_from_slave = 7; + + s = qemu_mallocz(sizeof(PicState2)); + pc98_pic_init1(0x00, &s->pics[0]); + pc98_pic_init1(0x08, &s->pics[1]); + s->pics[0].elcr_mask = 0; + s->pics[1].elcr_mask = 0; s->parent_irq = parent_irq; s->pics[0].pics_state = s; s->pics[1].pics_state = s;