aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/ppc_chrp.c18
-rw-r--r--hw/unin_pci.c37
2 files changed, 54 insertions, 1 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c
index 89019a8c7a..4860ebaae4 100644
--- a/hw/ppc_chrp.c
+++ b/hw/ppc_chrp.c
@@ -37,14 +37,30 @@
#define MAX_IDE_BUS 2
#define VGA_BIOS_SIZE 65536
+/* debug UniNorth */
+//#define DEBUG_UNIN
+
+#ifdef DEBUG_UNIN
+#define UNIN_DPRINTF(fmt, args...) \
+do { printf("UNIN: " fmt , ##args); } while (0)
+#else
+#define UNIN_DPRINTF(fmt, args...)
+#endif
+
/* UniN device */
static void unin_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
{
+ UNIN_DPRINTF("writel addr " TARGET_FMT_plx " val %x\n", addr, value);
}
static uint32_t unin_readl (void *opaque, target_phys_addr_t addr)
{
- return 0;
+ uint32_t value;
+
+ value = 0;
+ UNIN_DPRINTF("readl addr " TARGET_FMT_plx " val %x\n", addr, value);
+
+ return value;
}
static CPUWriteMemoryFunc *unin_write[] = {
diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index 3af2d5cee6..69aecb5f89 100644
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -25,6 +25,16 @@
#include "ppc_mac.h"
#include "pci.h"
+/* debug UniNorth */
+//#define DEBUG_UNIN
+
+#ifdef DEBUG_UNIN
+#define UNIN_DPRINTF(fmt, args...) \
+do { printf("UNIN: " fmt , ##args); } while (0)
+#else
+#define UNIN_DPRINTF(fmt, args...)
+#endif
+
typedef target_phys_addr_t pci_addr_t;
#include "pci_host.h"
@@ -36,6 +46,7 @@ static void pci_unin_main_config_writel (void *opaque, target_phys_addr_t addr,
UNINState *s = opaque;
int i;
+ UNIN_DPRINTF("config_writel addr " TARGET_FMT_plx " val %x\n", addr, val);
#ifdef TARGET_WORDS_BIGENDIAN
val = bswap32(val);
#endif
@@ -63,6 +74,7 @@ static uint32_t pci_unin_main_config_readl (void *opaque,
#ifdef TARGET_WORDS_BIGENDIAN
val = bswap32(val);
#endif
+ UNIN_DPRINTF("config_readl addr " TARGET_FMT_plx " val %x\n", addr, val);
return val;
}
@@ -154,6 +166,27 @@ static void pci_unin_set_irq(qemu_irq *pic, int irq_num, int level)
qemu_set_irq(pic[irq_num + 8], level);
}
+static void pci_unin_save(QEMUFile* f, void *opaque)
+{
+ PCIDevice *d = opaque;
+
+ pci_device_save(d, f);
+}
+
+static int pci_unin_load(QEMUFile* f, void *opaque, int version_id)
+{
+ PCIDevice *d = opaque;
+
+ if (version_id != 1)
+ return -EINVAL;
+
+ return pci_device_load(d, f);
+}
+
+static void pci_unin_reset(void *opaque)
+{
+}
+
PCIBus *pci_pmac_init(qemu_irq *pic)
{
UNINState *s;
@@ -254,5 +287,9 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
d->config[0x0E] = 0x00; // header_type
d->config[0x34] = 0x00; // capabilities_pointer
#endif
+ register_savevm("uninorth", 0, 1, pci_unin_save, pci_unin_load, d);
+ qemu_register_reset(pci_unin_reset, d);
+ pci_unin_reset(d);
+
return s->bus;
}