From nobody Tue Oct 7 01:35:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1568115757; cv=none; d=zoho.com; s=zohoarc; b=FXEZvhOMRHMtjia+orxPhkynrBrPRg7CpCcjUpMJR2j65Mb0Kn7Z1SQf8AnZ7zzLw9sK5XGsnCRa/3jdbuBrQ8g4k0KVNzUftiNzOAsBcFWCpeg3vNwa0NETvKYqB4PIpcguHW4oB2vn3XdBlfw30S9xm2tZwm+M3cRn505xl+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568115757; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=LL9SXAMsmbeGQplqwejgODiV4M0SQAIyuMnGLyjDXvw=; b=KM1jH4dvTnN3OeEgip2ul8gUJQpmISaQiE0AFWpUwYw2/r3XkXu7/MqWGCC2yh4KdwOPRW50wDC5oRrMXv6Qk3TO1bUuHxMjzpN9+irz0xxwUYSGHso+yxtIkhoZvTUybdu0L7zE9N9FziPaNo0uR7LdzQyiG0aCS3yWL6z+D4c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568115757735259.4488904282531; Tue, 10 Sep 2019 04:42:37 -0700 (PDT) Received: from localhost ([::1]:38312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7eXc-0005Ws-9e for importer@patchew.org; Tue, 10 Sep 2019 07:42:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46148) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7ePK-0007Oz-48 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 07:34:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7ePI-0003d6-Df for qemu-devel@nongnu.org; Tue, 10 Sep 2019 07:34:02 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:54011) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7ePI-0003cE-3w; Tue, 10 Sep 2019 07:34:00 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MatZr-1ii4oO1rJb-00cSxw; Tue, 10 Sep 2019 13:33:35 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 10 Sep 2019 13:33:18 +0200 Message-Id: <20190910113323.17324-5-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190910113323.17324-1-laurent@vivier.eu> References: <20190910113323.17324-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:6cre8o69XfTMJgHGlI/vH5ARJXQL8eHV8+fiv2KXf4D0SicAPd0 UZwMfA+B6Rf7fd7Jt+SOUAs5FRUUWvNrQRoaG61p+/wqfhJIpVWgcp7BqjfUThy9psR4ntZ XiM5F5oPFZ2hhZcJnd5TZpUeC8nkQAT9KTlyL9s7O0NCsJYbWE/y1vyytp2zjg1GoWr0+dk x9kxAh3++6fYsOlT8RHMA== X-UI-Out-Filterresults: notjunk:1;V03:K0:+s+gl6Dw214=:CaB4bZHa96++/1jur7zODR xvFm8CpkoSeX0mTRjecWygIJCVGC+muqwTh7TmAek17V9uMhbM0t5YZpqqbX/w95VNvHibZh9 cA2EIq+vOQq+2NJaHxGhPwvsHfpug3MKsj7LDTnK/RmGaNJqkU5nZ5VGh58IwH1ccdGkl+TOM wkKyo8UKy5tEKI22VjPzsgfLqC0iHky//AES4DYqpHhw4N/jcbxw9Jl57dAILyR+Wybx2ABFO 2NUo+j85oe9sCDwt8Rmg2RQPmkmlQ8iJshdyr6xW8TMwq11CA7Bc+dJoNnP4upg+jxQJhtE2b jtyOg3X0FVEIP1cvM3uIA05MkGdFNcesKxlqM2nZLb/UHMB4+NjjiAM4atIf1y9fY7n+JVwPu qni91b6Z7UNQbKPc9YclEu0vNAhTzBwQP4yi2EzVex/SFv8lYkwQKJftT7GlDpNNW92h9UZlO 4l2LGi+2y3Tmh4OZM4MkPz1jL1XptbpzwKdqu3ZaxwdUzuorMrFmw4DxAk8OzW4ta710PXTYN Zl9Pl8oEkauj7lk11HABWOHDRbXVdTxyxGy8UZcNz0geLO8XRwNwwFPBkImd6kVgysk1Es9JN Y28eY4o86S0d1BmKdDavOsK6YzxHZCgG4pBEU0jMJjtLnzgPtFe+SX6Nrn2XgyYF2xdjnbo2Y qXNim0FUwqK5M3dmOZhOarc+y3pkIthIElHofEGr9vytwPuY4p1i/spoCQPp0vOpq9NiXapkX BY3SH4rAxSlB504saz2GpexcxZzDvrU1O3MgnpLf28L4IRlV7pRlh6utCVhuSqf9BbtZLOHl2 yzomPsLt8UWbvB2ASjtpmwtuAH5PFtnLP87RhpERbusUiXKXdlUYuOdYseErxlVb2o9Coqb8t kHTK6z/QRV+riKND/V8K4FNXmMRtYkHD53BzrJbFM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH v10 4/9] hw/m68k: implement ADB bus support for via X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Thomas Huth , Jason Wang , Mark Cave-Ayland , Laurent Vivier , "Dr . David Alan Gilbert" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Max Reitz , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Co-developed-by: Mark Cave-Ayland Signed-off-by: Mark Cave-Ayland Signed-off-by: Laurent Vivier Reviewed-by: Herv=C3=A9 Poussineau Reviewed-by: Thomas Huth --- hw/misc/Kconfig | 1 + hw/misc/mac_via.c | 198 +++++++++++++++++++++++++++++++++++++- include/hw/misc/mac_via.h | 7 ++ 3 files changed, 205 insertions(+), 1 deletion(-) diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 18a5dc9c09..2164646553 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -123,5 +123,6 @@ config UNIMP config MAC_VIA bool select MOS6522 + select ADB =20 source macio/Kconfig diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index a052259613..2f54db9e1e 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -264,10 +264,16 @@ * Table 19-10 ADB transaction states */ =20 +#define ADB_STATE_NEW 0 +#define ADB_STATE_EVEN 1 +#define ADB_STATE_ODD 2 +#define ADB_STATE_IDLE 3 + #define VIA1B_vADB_StateMask (VIA1B_vADBS1 | VIA1B_vADBS2) #define VIA1B_vADB_StateShift 4 =20 #define VIA_TIMER_FREQ (783360) +#define VIA_ADB_POLL_FREQ 50 /* XXX: not real */ =20 /* VIA returns time offset from Jan 1, 1904, not 1970 */ #define RTC_OFFSET 2082844800 @@ -449,6 +455,181 @@ static void via1_rtc_update(MacVIAState *m) } } =20 +static int adb_via_poll(MacVIAState *s, int state, uint8_t *data) +{ + if (state !=3D ADB_STATE_IDLE) { + return 0; + } + + if (s->adb_data_in_size < s->adb_data_in_index) { + return 0; + } + + if (s->adb_data_out_index !=3D 0) { + return 0; + } + + s->adb_data_in_index =3D 0; + s->adb_data_out_index =3D 0; + s->adb_data_in_size =3D adb_poll(&s->adb_bus, s->adb_data_in, 0xffff); + + if (s->adb_data_in_size) { + *data =3D s->adb_data_in[s->adb_data_in_index++]; + qemu_irq_raise(s->adb_data_ready); + } + + return s->adb_data_in_size; +} + +static int adb_via_send(MacVIAState *s, int state, uint8_t data) +{ + switch (state) { + case ADB_STATE_NEW: + s->adb_data_out_index =3D 0; + break; + case ADB_STATE_EVEN: + if ((s->adb_data_out_index & 1) =3D=3D 0) { + return 0; + } + break; + case ADB_STATE_ODD: + if (s->adb_data_out_index & 1) { + return 0; + } + break; + case ADB_STATE_IDLE: + return 0; + } + + assert(s->adb_data_out_index < sizeof(s->adb_data_out) - 1); + + s->adb_data_out[s->adb_data_out_index++] =3D data; + qemu_irq_raise(s->adb_data_ready); + return 1; +} + +static int adb_via_receive(MacVIAState *s, int state, uint8_t *data) +{ + switch (state) { + case ADB_STATE_NEW: + return 0; + + case ADB_STATE_EVEN: + if (s->adb_data_in_size <=3D 0) { + qemu_irq_raise(s->adb_data_ready); + return 0; + } + + if (s->adb_data_in_index >=3D s->adb_data_in_size) { + *data =3D 0; + qemu_irq_raise(s->adb_data_ready); + return 1; + } + + if ((s->adb_data_in_index & 1) =3D=3D 0) { + return 0; + } + + break; + + case ADB_STATE_ODD: + if (s->adb_data_in_size <=3D 0) { + qemu_irq_raise(s->adb_data_ready); + return 0; + } + + if (s->adb_data_in_index >=3D s->adb_data_in_size) { + *data =3D 0; + qemu_irq_raise(s->adb_data_ready); + return 1; + } + + if (s->adb_data_in_index & 1) { + return 0; + } + + break; + + case ADB_STATE_IDLE: + if (s->adb_data_out_index =3D=3D 0) { + return 0; + } + + s->adb_data_in_size =3D adb_request(&s->adb_bus, s->adb_data_in, + s->adb_data_out, + s->adb_data_out_index); + s->adb_data_out_index =3D 0; + s->adb_data_in_index =3D 0; + if (s->adb_data_in_size < 0) { + *data =3D 0xff; + qemu_irq_raise(s->adb_data_ready); + return -1; + } + + if (s->adb_data_in_size =3D=3D 0) { + return 0; + } + + break; + } + + assert(s->adb_data_in_index < sizeof(s->adb_data_in) - 1); + + *data =3D s->adb_data_in[s->adb_data_in_index++]; + qemu_irq_raise(s->adb_data_ready); + if (*data =3D=3D 0xff || *data =3D=3D 0) { + return 0; + } + return 1; +} + +static void via1_adb_update(MacVIAState *m) +{ + MOS6522Q800VIA1State *v1s =3D MOS6522_Q800_VIA1(&m->mos6522_via1); + MOS6522State *s =3D MOS6522(v1s); + int state; + int ret; + + state =3D (s->b & VIA1B_vADB_StateMask) >> VIA1B_vADB_StateShift; + + if (s->acr & VIA1ACR_vShiftOut) { + /* output mode */ + ret =3D adb_via_send(m, state, s->sr); + if (ret > 0) { + s->b &=3D ~VIA1B_vADBInt; + } else { + s->b |=3D VIA1B_vADBInt; + } + } else { + /* input mode */ + ret =3D adb_via_receive(m, state, &s->sr); + if (ret > 0 && s->sr !=3D 0xff) { + s->b &=3D ~VIA1B_vADBInt; + } else { + s->b |=3D VIA1B_vADBInt; + } + } +} + +static void via_adb_poll(void *opaque) +{ + MacVIAState *m =3D opaque; + MOS6522Q800VIA1State *v1s =3D MOS6522_Q800_VIA1(&m->mos6522_via1); + MOS6522State *s =3D MOS6522(v1s); + int state; + + if (s->b & VIA1B_vADBInt) { + state =3D (s->b & VIA1B_vADB_StateMask) >> VIA1B_vADB_StateShift; + if (adb_via_poll(m, state, &s->sr)) { + s->b &=3D ~VIA1B_vADBInt; + } + } + + timer_mod(m->adb_poll_timer, + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + (NANOSECONDS_PER_SECOND / VIA_ADB_POLL_FREQ)); +} + static uint64_t mos6522_q800_via1_read(void *opaque, hwaddr addr, unsigned= size) { MOS6522Q800VIA1State *s =3D MOS6522_Q800_VIA1(opaque); @@ -511,6 +692,10 @@ static void mac_via_reset(DeviceState *dev) { MacVIAState *m =3D MAC_VIA(dev); =20 + timer_mod(m->adb_poll_timer, + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + (NANOSECONDS_PER_SECOND / VIA_ADB_POLL_FREQ)); + timer_mod(m->VBL_timer, (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 16630) / 16630 * 16630); =20 @@ -549,6 +734,10 @@ static void mac_via_realize(DeviceState *dev, Error **= errp) =20 qemu_get_timedate(&tm, 0); m->tick_offset =3D (uint32_t)mktimegm(&tm) + RTC_OFFSET; + + m->adb_poll_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, via_adb_poll, m= ); + m->adb_data_ready =3D qdev_get_gpio_in_named(dev, "via1-irq", + VIA1_IRQ_ADB_READY_BIT); } =20 static void mac_via_init(Object *obj) @@ -594,7 +783,13 @@ static const VMStateDescription vmstate_mac_via =3D { VMSTATE_UINT8(cmd, MacVIAState), VMSTATE_INT32(wprotect, MacVIAState), VMSTATE_INT32(alt, MacVIAState), - /* external timers */ + /* ADB */ + VMSTATE_TIMER_PTR(adb_poll_timer, MacVIAState), + VMSTATE_INT32(adb_data_in_size, MacVIAState), + VMSTATE_INT32(adb_data_in_index, MacVIAState), + VMSTATE_INT32(adb_data_out_index, MacVIAState), + VMSTATE_BUFFER(adb_data_in, MacVIAState), + VMSTATE_BUFFER(adb_data_out, MacVIAState), VMSTATE_TIMER_PTR(one_second_timer, MacVIAState), VMSTATE_TIMER_PTR(VBL_timer, MacVIAState), VMSTATE_END_OF_LIST() @@ -626,6 +821,7 @@ static void mos6522_q800_via1_portB_write(MOS6522State = *s) MacVIAState *m =3D container_of(v1s, MacVIAState, mos6522_via1); =20 via1_rtc_update(m); + via1_adb_update(m); =20 v1s->last_b =3D s->b; } diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 69bdecabb0..2181140293 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -97,6 +97,13 @@ typedef struct MacVIAState { =20 /* ADB */ ADBBusState adb_bus; + QEMUTimer *adb_poll_timer; + qemu_irq adb_data_ready; + int adb_data_in_size; + int adb_data_in_index; + int adb_data_out_index; + uint8_t adb_data_in[128]; + uint8_t adb_data_out[16]; =20 /* external timers */ QEMUTimer *one_second_timer; --=20 2.21.0