From patchwork Wed Oct 28 16:52:06 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: 37161 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 C064FB7BB5 for ; Thu, 29 Oct 2009 08:56:08 +1100 (EST) Received: from localhost ([127.0.0.1]:46333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3D05-0005LM-8S for incoming@patchwork.ozlabs.org; Wed, 28 Oct 2009 14:12:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N3Bwk-0008Cq-Nb for qemu-devel@nongnu.org; Wed, 28 Oct 2009 13:04:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N3Bwd-00085Q-6e for qemu-devel@nongnu.org; Wed, 28 Oct 2009 13:04:28 -0400 Received: from [199.232.76.173] (port=52308 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3Bwd-000854-0z for qemu-devel@nongnu.org; Wed, 28 Oct 2009 13:04:23 -0400 Received: from mx20.gnu.org ([199.232.41.8]:33013) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N3Bwc-0004kw-Gw for qemu-devel@nongnu.org; Wed, 28 Oct 2009 13:04:22 -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 1N3Bwb-0006A1-8n for qemu-devel@nongnu.org; Wed, 28 Oct 2009 13:04:21 -0400 Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id n9SH4JLO019241 for qemu-devel@nongnu.org; Thu, 29 Oct 2009 02:04:19 +0900 (JST) Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id n9SGsIxS018844 for qemu-devel@nongnu.org; Thu, 29 Oct 2009 01:54:18 +0900 (JST) Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id n9SGs7HM018717 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 n9SGs5ZX018647 for ; (me101664 for with PLAIN) Thu, 29 Oct 2009 01:54:07 +0900 (JST) Message-Id: <200910281652.AA00175@YOUR-BD18D6DD63.m1.interq.or.jp> Date: Thu, 29 Oct 2009 01:52:06 +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 12/25] pcspk: add NEC PC-9821 family interface 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/pcspk.c b/qemu/hw/pcspk.c index 26a0ecb..4a21aae 100644 --- a/qemu/hw/pcspk.c +++ b/qemu/hw/pcspk.c @@ -38,6 +38,7 @@ typedef struct { QEMUSoundCard card; SWVoiceOut *voice; PITState *pit; + int pit_ch; unsigned int pit_count; unsigned int samples; unsigned int play_pos; @@ -72,10 +73,10 @@ static void pcspk_callback(void *opaque, int free) PCSpkState *s = opaque; unsigned int n; - if (pit_get_mode(s->pit, 2) != 3) + if (pit_get_mode(s->pit, s->pit_ch) != 3) return; - n = pit_get_initial_count(s->pit, 2); + n = pit_get_initial_count(s->pit, s->pit_ch); /* avoid frequencies that are not reproducible with sample rate */ if (n < PCSPK_MIN_COUNT) n = 0; @@ -118,9 +119,9 @@ static uint32_t pcspk_ioport_read(void *opaque, uint32_t addr) int out; s->dummy_refresh_clock ^= (1 << 4); - out = pit_get_out(s->pit, 2, qemu_get_clock(vm_clock)) << 5; + out = pit_get_out(s->pit, s->pit_ch, qemu_get_clock(vm_clock)) << 5; - return pit_get_gate(s->pit, 2) | (s->data_on << 1) | s->dummy_refresh_clock | out; + return pit_get_gate(s->pit, s->pit_ch) | (s->data_on << 1) | s->dummy_refresh_clock | out; } static void pcspk_ioport_write(void *opaque, uint32_t addr, uint32_t val) @@ -129,7 +130,7 @@ static void pcspk_ioport_write(void *opaque, uint32_t addr, uint32_t val) const int gate = val & 1; s->data_on = (val >> 1) & 1; - pit_set_gate(s->pit, 2, gate); + pit_set_gate(s->pit, s->pit_ch, gate); if (s->voice) { if (gate) /* restart */ s->play_pos = 0; @@ -142,6 +143,27 @@ void pcspk_init(PITState *pit) PCSpkState *s = &pcspk_state; s->pit = pit; + s->pit_ch = 2; register_ioport_read(0x61, 1, 1, pcspk_ioport_read, s); register_ioport_write(0x61, 1, 1, pcspk_ioport_write, s); } + +/* NEC PC-9821 */ + +void pc98_pcspk_write(uint32_t val) +{ + PCSpkState *s = &pcspk_state; + + s->data_on = ((val & 0x08) == 0); + if (s->voice) { + AUD_set_active_out(s->voice, s->data_on); + } +} + +void pc98_pcspk_init(PITState *pit) +{ + PCSpkState *s = &pcspk_state; + + s->pit = pit; + s->pit_ch = 1; +}