cuda: convert to use ADBBusState internal autopoll variables
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Tested-by: Finn Thain <fthain@telegraphics.com.au> Acked-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20200623204936.24064-9-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
da52c083ac
commit
b12a0b164c
|
@ -201,18 +201,16 @@ static void cuda_send_packet_to_host(CUDAState *s,
|
|||
static void cuda_adb_poll(void *opaque)
|
||||
{
|
||||
CUDAState *s = opaque;
|
||||
ADBBusState *adb_bus = &s->adb_bus;
|
||||
uint8_t obuf[ADB_MAX_OUT_LEN + 2];
|
||||
int olen;
|
||||
|
||||
olen = adb_poll(&s->adb_bus, obuf + 2, s->adb_poll_mask);
|
||||
olen = adb_poll(adb_bus, obuf + 2, adb_bus->autopoll_mask);
|
||||
if (olen > 0) {
|
||||
obuf[0] = ADB_PACKET;
|
||||
obuf[1] = 0x40; /* polled data */
|
||||
cuda_send_packet_to_host(s, obuf, olen + 2);
|
||||
}
|
||||
|
||||
timer_mod(s->adb_poll_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +
|
||||
s->autopoll_rate_ms);
|
||||
}
|
||||
|
||||
/* description of commands */
|
||||
|
@ -228,23 +226,16 @@ static bool cuda_cmd_autopoll(CUDAState *s,
|
|||
const uint8_t *in_data, int in_len,
|
||||
uint8_t *out_data, int *out_len)
|
||||
{
|
||||
int autopoll;
|
||||
ADBBusState *adb_bus = &s->adb_bus;
|
||||
bool autopoll;
|
||||
|
||||
if (in_len != 1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
autopoll = (in_data[0] != 0);
|
||||
if (autopoll != s->autopoll) {
|
||||
s->autopoll = autopoll;
|
||||
if (autopoll) {
|
||||
timer_mod(s->adb_poll_timer,
|
||||
qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +
|
||||
s->autopoll_rate_ms);
|
||||
} else {
|
||||
timer_del(s->adb_poll_timer);
|
||||
}
|
||||
}
|
||||
autopoll = (in_data[0] != 0) ? true : false;
|
||||
|
||||
adb_set_autopoll_enabled(adb_bus, autopoll);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -252,6 +243,8 @@ static bool cuda_cmd_set_autorate(CUDAState *s,
|
|||
const uint8_t *in_data, int in_len,
|
||||
uint8_t *out_data, int *out_len)
|
||||
{
|
||||
ADBBusState *adb_bus = &s->adb_bus;
|
||||
|
||||
if (in_len != 1) {
|
||||
return false;
|
||||
}
|
||||
|
@ -262,12 +255,7 @@ static bool cuda_cmd_set_autorate(CUDAState *s,
|
|||
return false;
|
||||
}
|
||||
|
||||
s->autopoll_rate_ms = in_data[0];
|
||||
if (s->autopoll) {
|
||||
timer_mod(s->adb_poll_timer,
|
||||
qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +
|
||||
s->autopoll_rate_ms);
|
||||
}
|
||||
adb_set_autopoll_rate_ms(adb_bus, in_data[0]);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -275,11 +263,16 @@ static bool cuda_cmd_set_device_list(CUDAState *s,
|
|||
const uint8_t *in_data, int in_len,
|
||||
uint8_t *out_data, int *out_len)
|
||||
{
|
||||
ADBBusState *adb_bus = &s->adb_bus;
|
||||
uint16_t mask;
|
||||
|
||||
if (in_len != 2) {
|
||||
return false;
|
||||
}
|
||||
|
||||
s->adb_poll_mask = (((uint16_t)in_data[0]) << 8) | in_data[1];
|
||||
mask = (((uint16_t)in_data[0]) << 8) | in_data[1];
|
||||
|
||||
adb_set_autopoll_mask(adb_bus, mask);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -490,8 +483,8 @@ static const MemoryRegionOps mos6522_cuda_ops = {
|
|||
|
||||
static const VMStateDescription vmstate_cuda = {
|
||||
.name = "cuda",
|
||||
.version_id = 5,
|
||||
.minimum_version_id = 5,
|
||||
.version_id = 6,
|
||||
.minimum_version_id = 6,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_STRUCT(mos6522_cuda.parent_obj, CUDAState, 0, vmstate_mos6522,
|
||||
MOS6522State),
|
||||
|
@ -500,13 +493,9 @@ static const VMStateDescription vmstate_cuda = {
|
|||
VMSTATE_INT32(data_in_size, CUDAState),
|
||||
VMSTATE_INT32(data_in_index, CUDAState),
|
||||
VMSTATE_INT32(data_out_index, CUDAState),
|
||||
VMSTATE_UINT8(autopoll, CUDAState),
|
||||
VMSTATE_UINT8(autopoll_rate_ms, CUDAState),
|
||||
VMSTATE_UINT16(adb_poll_mask, CUDAState),
|
||||
VMSTATE_BUFFER(data_in, CUDAState),
|
||||
VMSTATE_BUFFER(data_out, CUDAState),
|
||||
VMSTATE_UINT32(tick_offset, CUDAState),
|
||||
VMSTATE_TIMER_PTR(adb_poll_timer, CUDAState),
|
||||
VMSTATE_TIMER_PTR(sr_delay_timer, CUDAState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
@ -515,11 +504,13 @@ static const VMStateDescription vmstate_cuda = {
|
|||
static void cuda_reset(DeviceState *dev)
|
||||
{
|
||||
CUDAState *s = CUDA(dev);
|
||||
ADBBusState *adb_bus = &s->adb_bus;
|
||||
|
||||
s->data_in_size = 0;
|
||||
s->data_in_index = 0;
|
||||
s->data_out_index = 0;
|
||||
s->autopoll = 0;
|
||||
|
||||
adb_set_autopoll_enabled(adb_bus, false);
|
||||
}
|
||||
|
||||
static void cuda_realize(DeviceState *dev, Error **errp)
|
||||
|
@ -527,6 +518,7 @@ static void cuda_realize(DeviceState *dev, Error **errp)
|
|||
CUDAState *s = CUDA(dev);
|
||||
Error *err = NULL;
|
||||
SysBusDevice *sbd;
|
||||
ADBBusState *adb_bus = &s->adb_bus;
|
||||
struct tm tm;
|
||||
|
||||
sysbus_realize(SYS_BUS_DEVICE(&s->mos6522_cuda), &err);
|
||||
|
@ -545,9 +537,7 @@ static void cuda_realize(DeviceState *dev, Error **errp)
|
|||
s->sr_delay_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_set_sr_int, s);
|
||||
s->sr_delay_ns = 20 * SCALE_US;
|
||||
|
||||
s->adb_poll_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, cuda_adb_poll, s);
|
||||
s->adb_poll_mask = 0xffff;
|
||||
s->autopoll_rate_ms = 20;
|
||||
adb_register_autopoll_callback(adb_bus, cuda_adb_poll, s);
|
||||
}
|
||||
|
||||
static void cuda_init(Object *obj)
|
||||
|
|
|
@ -95,12 +95,8 @@ typedef struct CUDAState {
|
|||
int data_out_index;
|
||||
|
||||
qemu_irq irq;
|
||||
uint16_t adb_poll_mask;
|
||||
uint8_t autopoll_rate_ms;
|
||||
uint8_t autopoll;
|
||||
uint8_t data_in[128];
|
||||
uint8_t data_out[16];
|
||||
QEMUTimer *adb_poll_timer;
|
||||
} CUDAState;
|
||||
|
||||
#endif /* CUDA_H */
|
||||
|
|
Loading…
Reference in a new issue