//#define DEBUG_NVR
#ifdef DEBUG_NVR
-#define NVR_DPRINTF(fmt, args...) \
-do { printf("NVR: " fmt , ##args); } while (0)
+#define NVR_DPRINTF(fmt, ...) \
+ do { printf("NVR: " fmt , ## __VA_ARGS__); } while (0)
#else
-#define NVR_DPRINTF(fmt, args...)
+#define NVR_DPRINTF(fmt, ...)
#endif
struct MacIONVRAMState {
target_phys_addr_t size;
int mem_index;
+ unsigned int it_shift;
uint8_t *data;
};
{
MacIONVRAMState *s = opaque;
- addr = (addr >> 4) & (s->size - 1);
+ addr = (addr >> s->it_shift) & (s->size - 1);
s->data[addr] = value;
NVR_DPRINTF("writeb addr %04x val %x\n", (int)addr, value);
}
MacIONVRAMState *s = opaque;
uint32_t value;
- addr = (addr >> 4) & (s->size - 1);
+ addr = (addr >> s->it_shift) & (s->size - 1);
value = s->data[addr];
NVR_DPRINTF("readb addr %04x val %x\n", (int)addr, value);
&macio_nvram_readb,
};
-MacIONVRAMState *macio_nvram_init (int *mem_index, target_phys_addr_t size)
+static void macio_nvram_save(QEMUFile *f, void *opaque)
+{
+ MacIONVRAMState *s = (MacIONVRAMState *)opaque;
+
+ qemu_put_buffer(f, s->data, s->size);
+}
+
+static int macio_nvram_load(QEMUFile *f, void *opaque, int version_id)
+{
+ MacIONVRAMState *s = (MacIONVRAMState *)opaque;
+
+ if (version_id != 1)
+ return -EINVAL;
+
+ qemu_get_buffer(f, s->data, s->size);
+
+ return 0;
+}
+
+static void macio_nvram_reset(void *opaque)
+{
+}
+
+MacIONVRAMState *macio_nvram_init (int *mem_index, target_phys_addr_t size,
+ unsigned int it_shift)
{
MacIONVRAMState *s;
s = qemu_mallocz(sizeof(MacIONVRAMState));
- if (!s)
- return NULL;
s->data = qemu_mallocz(size);
- if (!s->data) {
- qemu_free(s);
- return NULL;
- }
s->size = size;
+ s->it_shift = it_shift;
- s->mem_index = cpu_register_io_memory(0, nvram_read, nvram_write, s);
+ s->mem_index = cpu_register_io_memory(nvram_read, nvram_write, s);
*mem_index = s->mem_index;
+ register_savevm("macio_nvram", -1, 1, macio_nvram_save, macio_nvram_load,
+ s);
+ qemu_register_reset(macio_nvram_reset, s);
+ macio_nvram_reset(s);
return s;
}
MacIONVRAMState *s;
s = opaque;
- cpu_register_physical_memory(mem_base, s->size << 4, s->mem_index);
+ cpu_register_physical_memory(mem_base, s->size << s->it_shift,
+ s->mem_index);
}
/* Set up a system OpenBIOS NVRAM partition */