[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] cuda: introduce CUDAState parameter to get_co
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH 04/10] cuda: introduce CUDAState parameter to get_counter() |
Date: |
Sat, 3 Feb 2018 10:37:21 +0000 |
This will be required shortly and also happens to match nicely with the
corresponding signature for set_counter().
Signed-off-by: Mark Cave-Ayland <address@hidden>
---
hw/misc/macio/cuda.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index ba14dbeacd..f036e8d7e1 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -150,7 +150,7 @@ static uint64_t get_tb(uint64_t time, uint64_t freq)
return muldiv64(time, freq, NANOSECONDS_PER_SECOND);
}
-static unsigned int get_counter(CUDATimer *ti)
+static unsigned int get_counter(CUDAState *s, CUDATimer *ti)
{
int64_t d;
unsigned int counter;
@@ -295,12 +295,12 @@ static uint64_t cuda_read(void *opaque, hwaddr addr,
unsigned size)
val = s->dira;
break;
case CUDA_REG_T1CL:
- val = get_counter(&s->timers[0]) & 0xff;
+ val = get_counter(s, &s->timers[0]) & 0xff;
s->ifr &= ~T1_INT;
cuda_update_irq(s);
break;
case CUDA_REG_T1CH:
- val = get_counter(&s->timers[0]) >> 8;
+ val = get_counter(s, &s->timers[0]) >> 8;
cuda_update_irq(s);
break;
case CUDA_REG_T1LL:
@@ -311,12 +311,12 @@ static uint64_t cuda_read(void *opaque, hwaddr addr,
unsigned size)
val = (s->timers[0].latch >> 8) & 0xff;
break;
case CUDA_REG_T2CL:
- val = get_counter(&s->timers[1]) & 0xff;
+ val = get_counter(s, &s->timers[1]) & 0xff;
s->ifr &= ~T2_INT;
cuda_update_irq(s);
break;
case CUDA_REG_T2CH:
- val = get_counter(&s->timers[1]) >> 8;
+ val = get_counter(s, &s->timers[1]) >> 8;
break;
case CUDA_REG_SR:
val = s->sr;
--
2.11.0
- [Qemu-devel] [PATCH 07/10] cuda: set timer 1 frequency property to CUDA_TIMER_FREQ, (continued)
- [Qemu-devel] [PATCH 07/10] cuda: set timer 1 frequency property to CUDA_TIMER_FREQ, Mark Cave-Ayland, 2018/02/03
- [Qemu-devel] [PATCH 01/10] cuda: do not use old_mmio accesses, Mark Cave-Ayland, 2018/02/03
- [Qemu-devel] [PATCH 02/10] cuda: don't allow writes to port output pins, Mark Cave-Ayland, 2018/02/03
- [Qemu-devel] [PATCH 08/10] cuda: factor out timebase-derived counter value and load time, Mark Cave-Ayland, 2018/02/03
- [Qemu-devel] [PATCH 04/10] cuda: introduce CUDAState parameter to get_counter(),
Mark Cave-Ayland <=
- [Qemu-devel] [PATCH 06/10] cuda: minor cosmetic tidy-ups to get_next_irq_time(), Mark Cave-Ayland, 2018/02/03
- [Qemu-devel] [PATCH 05/10] cuda: rename frequency property to tb_frequency, Mark Cave-Ayland, 2018/02/03
- [Qemu-devel] [PATCH 09/10] misc: introduce new mos6522 VIA device and enable it for ppc builds, Mark Cave-Ayland, 2018/02/03
- [Qemu-devel] [PATCH 10/10] cuda: convert to use the shared mos6522 device, Mark Cave-Ayland, 2018/02/03
- Re: [Qemu-devel] [PATCH 00/10] cuda: various fixes, and move 6522 to separate device, no-reply, 2018/02/03