Install keymaps from new location

[qemu] / hw / slavio_timer.c

diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
index f091fbe..b5f9ec3 100644 (file)
--- a/hw/slavio_timer.c
+++ b/hw/slavio_timer.c
@@ -28,10 +28,10 @@
 //#define DEBUG_TIMER
 
 #ifdef DEBUG_TIMER
-#define DPRINTF(fmt, args...) \
-do { printf("TIMER: " fmt , ##args); } while (0)
+#define DPRINTF(fmt, ...)                                       \
+    do { printf("TIMER: " fmt , ## __VA_ARGS__); } while (0)
 #else
-#define DPRINTF(fmt, args...) do {} while (0)
+#define DPRINTF(fmt, ...) do {} while (0)
 #endif
 
 /*
@@ -66,7 +66,6 @@ typedef struct SLAVIO_TIMERState {
     uint32_t slave_mode;
 } SLAVIO_TIMERState;
 
-#define TIMER_MAXADDR 0x1f
 #define SYS_TIMER_SIZE 0x14
 #define CPU_TIMER_SIZE 0x10
 
@@ -132,7 +131,7 @@ static uint32_t slavio_timer_mem_readl(void *opaque, target_phys_addr_t addr)
     SLAVIO_TIMERState *s = opaque;
     uint32_t saddr, ret;
 
-    saddr = (addr & TIMER_MAXADDR) >> 2;
+    saddr = addr >> 2;
     switch (saddr) {
     case TIMER_LIMIT:
         // read limit (system counter mode) or read most signifying
@@ -185,7 +184,7 @@ static void slavio_timer_mem_writel(void *opaque, target_phys_addr_t addr,
     uint32_t saddr;
 
     DPRINTF("write " TARGET_FMT_plx " %08x\n", addr, val);
-    saddr = (addr & TIMER_MAXADDR) >> 2;
+    saddr = addr >> 2;
     switch (saddr) {
     case TIMER_LIMIT:
         if (slavio_timer_is_user(s)) {
@@ -373,8 +372,6 @@ static SLAVIO_TIMERState *slavio_timer_init(target_phys_addr_t addr,
     QEMUBH *bh;
 
     s = qemu_mallocz(sizeof(SLAVIO_TIMERState));
-    if (!s)
-        return s;
     s->irq = irq;
     s->master = master;
     s->slave_index = slave_index;
@@ -394,7 +391,7 @@ static SLAVIO_TIMERState *slavio_timer_init(target_phys_addr_t addr,
                                      slavio_timer_io_memory);
     register_savevm("slavio_timer", addr, 3, slavio_timer_save,
                     slavio_timer_load, s);
-    qemu_register_reset(slavio_timer_reset, s);
+    qemu_register_reset(slavio_timer_reset, 0, s);
     slavio_timer_reset(s);
 
     return s;