From 897b4c6c4e63afebdd41de0f1a19e17ab1f4c2b8 Mon Sep 17 00:00:00 2001 From: j_mayer Date: Sun, 28 Oct 2007 23:33:05 +0000 Subject: Give an opaque to the m48t59 direct access routines to make it easier to use another NVRAM with the same API. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3474 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/m48t59.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'hw/m48t59.c') diff --git a/hw/m48t59.c b/hw/m48t59.c index da61313f1e..34979ad108 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -199,8 +199,9 @@ static void set_up_watchdog (m48t59_t *NVRAM, uint8_t value) } /* Direct access to NVRAM */ -void m48t59_write (m48t59_t *NVRAM, uint32_t addr, uint32_t val) +void m48t59_write (void *opaque, uint32_t addr, uint32_t val) { + m48t59_t *NVRAM = opaque; struct tm tm; int tmp; @@ -357,8 +358,9 @@ void m48t59_write (m48t59_t *NVRAM, uint32_t addr, uint32_t val) } } -uint32_t m48t59_read (m48t59_t *NVRAM, uint32_t addr) +uint32_t m48t59_read (void *opaque, uint32_t addr) { + m48t59_t *NVRAM = opaque; struct tm tm; uint32_t retval = 0xFF; @@ -451,13 +453,17 @@ uint32_t m48t59_read (m48t59_t *NVRAM, uint32_t addr) return retval; } -void m48t59_set_addr (m48t59_t *NVRAM, uint32_t addr) +void m48t59_set_addr (void *opaque, uint32_t addr) { + m48t59_t *NVRAM = opaque; + NVRAM->addr = addr; } -void m48t59_toggle_lock (m48t59_t *NVRAM, int lock) +void m48t59_toggle_lock (void *opaque, int lock) { + m48t59_t *NVRAM = opaque; + NVRAM->lock ^= 1 << lock; } -- cgit v1.2.3-55-g7522