[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/22] mac_via: convert to use ADBBusState internal autopoll v
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 10/22] mac_via: convert to use ADBBusState internal autopoll variables |
Date: |
Tue, 23 Jun 2020 21:49:24 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Finn Thain <fthain@telegraphics.com.au>
---
hw/misc/mac_via.c | 22 ++++++++++------------
include/hw/misc/mac_via.h | 1 -
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index 9cd313c812..7a28bb37ac 100644
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -601,6 +601,8 @@ static void via1_rtc_update(MacVIAState *m)
static int adb_via_poll(MacVIAState *s, int state, uint8_t *data)
{
+ ADBBusState *adb_bus = &s->adb_bus;
+
if (state != ADB_STATE_IDLE) {
return 0;
}
@@ -615,7 +617,8 @@ static int adb_via_poll(MacVIAState *s, int state, uint8_t
*data)
s->adb_data_in_index = 0;
s->adb_data_out_index = 0;
- s->adb_data_in_size = adb_poll(&s->adb_bus, s->adb_data_in, 0xffff);
+ s->adb_data_in_size = adb_poll(adb_bus, s->adb_data_in,
+ adb_bus->autopoll_mask);
if (s->adb_data_in_size) {
*data = s->adb_data_in[s->adb_data_in_index++];
@@ -768,10 +771,6 @@ static void via_adb_poll(void *opaque)
s->b &= ~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)
@@ -854,10 +853,9 @@ static void mac_via_reset(DeviceState *dev)
{
MacVIAState *m = MAC_VIA(dev);
MOS6522Q800VIA1State *v1s = &m->mos6522_via1;
+ ADBBusState *adb_bus = &m->adb_bus;
- timer_mod(m->adb_poll_timer,
- qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
- (NANOSECONDS_PER_SECOND / VIA_ADB_POLL_FREQ));
+ adb_set_autopoll_enabled(adb_bus, true);
timer_del(v1s->VBL_timer);
v1s->next_VBL = 0;
@@ -872,6 +870,7 @@ static void mac_via_realize(DeviceState *dev, Error **errp)
{
MacVIAState *m = MAC_VIA(dev);
MOS6522State *ms;
+ ADBBusState *adb_bus = &m->adb_bus;
struct tm tm;
int ret;
@@ -907,7 +906,7 @@ static void mac_via_realize(DeviceState *dev, Error **errp)
qemu_get_timedate(&tm, 0);
m->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;
- m->adb_poll_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, via_adb_poll, m);
+ adb_register_autopoll_callback(adb_bus, via_adb_poll, m);
m->adb_data_ready = qdev_get_gpio_in_named(dev, "via1-irq",
VIA1_IRQ_ADB_READY_BIT);
@@ -980,8 +979,8 @@ static int mac_via_post_load(void *opaque, int version_id)
static const VMStateDescription vmstate_mac_via = {
.name = "mac-via",
- .version_id = 1,
- .minimum_version_id = 1,
+ .version_id = 2,
+ .minimum_version_id = 2,
.post_load = mac_via_post_load,
.fields = (VMStateField[]) {
/* VIAs */
@@ -1005,7 +1004,6 @@ static const VMStateDescription vmstate_mac_via = {
VMSTATE_INT32(wprotect, MacVIAState),
VMSTATE_INT32(alt, MacVIAState),
/* 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),
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h
index e74f85be0f..2aaf9e27bf 100644
--- a/include/hw/misc/mac_via.h
+++ b/include/hw/misc/mac_via.h
@@ -106,7 +106,6 @@ typedef struct MacVIAState {
/* ADB */
ADBBusState adb_bus;
- QEMUTimer *adb_poll_timer;
qemu_irq adb_data_ready;
int adb_data_in_size;
int adb_data_in_index;
--
2.20.1
- [PATCH v2 00/22] ADB: fix autopoll issues and rework mac_via state machine, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 01/22] adb: coding style update to fix checkpatch errors, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 02/22] adb: fix adb-mouse read length and revert disable-reg3-direct-writes workaround, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 03/22] cuda: convert ADB autopoll timer from ns to ms, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 04/22] pmu: fix duplicate autopoll mask variable, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 05/22] pmu: honour autopoll_rate_ms when rearming the ADB autopoll timer, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 06/22] adb: introduce realize/unrealize and VMStateDescription for ADB bus, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 07/22] adb: create autopoll variables directly within ADBBusState, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 08/22] cuda: convert to use ADBBusState internal autopoll variables, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 09/22] pmu: convert to use ADBBusState internal autopoll variables, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 10/22] mac_via: convert to use ADBBusState internal autopoll variables,
Mark Cave-Ayland <=
- [PATCH v2 11/22] adb: introduce new ADBDeviceHasData method to ADBDeviceClass, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 12/22] adb: keep track of devices with pending data, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 13/22] adb: add status field for holding information about the last ADB request, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 14/22] adb: use adb_request() only for explicit requests, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 15/22] adb: add autopoll_blocked variable to block autopoll, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 16/22] cuda: add adb_autopoll_block() and adb_autopoll_unblock() functions, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 17/22] pmu: add adb_autopoll_block() and adb_autopoll_unblock() functions, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 18/22] mac_via: move VIA1 portB write logic into mos6522_q800_via1_write(), Mark Cave-Ayland, 2020/06/23
- [PATCH v2 19/22] mac_via: rework ADB state machine to be compatible with both MacOS and Linux, Mark Cave-Ayland, 2020/06/23
- [PATCH v2 20/22] adb: only call autopoll callbacks when autopoll is not blocked, Mark Cave-Ayland, 2020/06/23