[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 11/13] cuda.c: rename get_counter() state variable
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-ppc] [PATCH v2 11/13] cuda.c: rename get_counter() state variable from s to ti for consistency |
Date: |
Wed, 11 Nov 2015 22:49:49 +0000 |
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: David Gibson <address@hidden>
---
hw/misc/macio/cuda.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index e61a3c5..b6da434 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -148,7 +148,7 @@ static uint64_t get_tb(uint64_t time, uint64_t freq)
return muldiv64(time, freq, get_ticks_per_sec());
}
-static unsigned int get_counter(CUDATimer *s)
+static unsigned int get_counter(CUDATimer *ti)
{
int64_t d;
unsigned int counter;
@@ -156,19 +156,19 @@ static unsigned int get_counter(CUDATimer *s)
uint64_t current_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
/* Reverse of the tb calculation algorithm that Mac OS X uses on bootup. */
- tb_diff = get_tb(current_time, s->frequency) - s->load_time;
- d = (tb_diff * 0xBF401675E5DULL) / (s->frequency << 24);
+ tb_diff = get_tb(current_time, ti->frequency) - ti->load_time;
+ d = (tb_diff * 0xBF401675E5DULL) / (ti->frequency << 24);
- if (s->index == 0) {
+ if (ti->index == 0) {
/* the timer goes down from latch to -1 (period of latch + 2) */
- if (d <= (s->counter_value + 1)) {
- counter = (s->counter_value - d) & 0xffff;
+ if (d <= (ti->counter_value + 1)) {
+ counter = (ti->counter_value - d) & 0xffff;
} else {
- counter = (d - (s->counter_value + 1)) % (s->latch + 2);
- counter = (s->latch - counter) & 0xffff;
+ counter = (d - (ti->counter_value + 1)) % (ti->latch + 2);
+ counter = (ti->latch - counter) & 0xffff;
}
} else {
- counter = (s->counter_value - d) & 0xffff;
+ counter = (ti->counter_value - d) & 0xffff;
}
return counter;
}
--
1.7.10.4
- [Qemu-ppc] [PATCH v2 02/13] PPC: Fix lswx bounds checks, (continued)
- [Qemu-ppc] [PATCH v2 02/13] PPC: Fix lswx bounds checks, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 04/13] cuda.c: fix CUDA ADB error packet format, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 03/13] PPC: mac99: Always add USB controller, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 05/13] cuda.c: fix CUDA_PACKET response packet format, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 06/13] cuda.c: implement simple CUDA_GET_6805_ADDR command, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 07/13] cuda.c: implement dummy IIC access commands, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 08/13] cuda.c: fix CUDA SR interrupt clearing, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 09/13] cuda.c: add defines for CUDA registers, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 13/13] cuda.c: add delay to setting of SR_INT bit, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 10/13] cuda.c: refactor get_tb() so that the time can be passed in, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 11/13] cuda.c: rename get_counter() state variable from s to ti for consistency,
Mark Cave-Ayland <=
- [Qemu-ppc] [PATCH v2 12/13] cuda.c: fix T2 timer and enable its interrupt, Mark Cave-Ayland, 2015/11/11
- Re: [Qemu-ppc] [PATCH v2 00/13] Mac OS 9 compatibility improvements (upstream rework), David Gibson, 2015/11/11