[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 2/6] Initial support of vt82686b south bridge
|
From: |
Isaku Yamahata |
|
Subject: |
Re: [Qemu-devel] [PATCH v6 2/6] Initial support of vt82686b south bridge used by fulong mini pc |
|
Date: |
Wed, 30 Jun 2010 14:42:32 +0900 |
|
User-agent: |
Mutt/1.5.19 (2009-01-05) |
VT686PMState related code seems copy from acpi_piix4.c.
pmsts, pmen, pmcntrl, ...
Can it be consolidated?
On Tue, Jun 29, 2010 at 10:49:29AM +0800, Huacai Chen wrote:
> Signed-off-by: Huacai Chen <address@hidden>
> ---
> Makefile.target | 2 +-
> hw/pci_ids.h | 8 +
> hw/vt82c686.c | 597
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> hw/vt82c686.h | 11 +
> 4 files changed, 617 insertions(+), 1 deletions(-)
> create mode 100644 hw/vt82c686.c
> create mode 100644 hw/vt82c686.h
>
> diff --git a/Makefile.target b/Makefile.target
> index eb852d4..caabacd 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -221,7 +221,7 @@ obj-mips-y += vga.o i8259.o
> obj-mips-y += g364fb.o jazz_led.o
> obj-mips-y += gt64xxx.o mc146818rtc.o
> obj-mips-y += piix4.o cirrus_vga.o
> -obj-mips-$(CONFIG_FULONG) += bonito.o
> +obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o
>
> obj-microblaze-y = petalogix_s3adsp1800_mmu.o
>
> diff --git a/hw/pci_ids.h b/hw/pci_ids.h
> index fe7a121..39e9f1d 100644
> --- a/hw/pci_ids.h
> +++ b/hw/pci_ids.h
> @@ -78,6 +78,14 @@
>
> #define PCI_VENDOR_ID_XILINX 0x10ee
>
> +#define PCI_VENDOR_ID_VIA 0x1106
> +#define PCI_DEVICE_ID_VIA_ISA_BRIDGE 0x0686
> +#define PCI_DEVICE_ID_VIA_IDE 0x0571
> +#define PCI_DEVICE_ID_VIA_UHCI 0x3038
> +#define PCI_DEVICE_ID_VIA_ACPI 0x3057
> +#define PCI_DEVICE_ID_VIA_AC97 0x3058
> +#define PCI_DEVICE_ID_VIA_MC97 0x3068
> +
> #define PCI_VENDOR_ID_MARVELL 0x11ab
>
> #define PCI_VENDOR_ID_ENSONIQ 0x1274
> diff --git a/hw/vt82c686.c b/hw/vt82c686.c
> new file mode 100644
> index 0000000..a0c5747
> --- /dev/null
> +++ b/hw/vt82c686.c
> @@ -0,0 +1,597 @@
> +/*
> + * VT82C686B south bridge support
> + *
> + * Copyright (c) 2008 yajin (address@hidden)
> + * Copyright (c) 2009 chenming (address@hidden)
> + * Copyright (c) 2010 Huacai Chen (address@hidden)
> + * This code is licensed under the GNU GPL v2.
> + */
> +
> +#include "hw.h"
> +#include "pc.h"
> +#include "vt82c686.h"
> +#include "i2c.h"
> +#include "smbus.h"
> +#include "pci.h"
> +#include "isa.h"
> +#include "sysbus.h"
> +#include "mips.h"
> +#include "apm.h"
> +#include "acpi.h"
> +#include "pm_smbus.h"
> +#include "sysemu.h"
> +#include "qemu-timer.h"
> +
> +typedef uint32_t pci_addr_t;
> +#include "pci_host.h"
> +//#define DEBUG_VT82C686B
> +
> +#ifdef DEBUG_VT82C686B
> +#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__,
> ##__VA_ARGS__)
> +#else
> +#define DPRINTF(fmt, ...)
> +#endif
> +
> +typedef struct SuperIOConfig
> +{
> + uint8_t config[0xff];
> + uint8_t index;
> + uint8_t data;
> +} SuperIOConfig;
> +
> +typedef struct VT82C686BState {
> + PCIDevice dev;
> + SuperIOConfig superio_conf;
> +} VT82C686BState;
> +
> +static void superio_ioport_writeb(void *opaque, uint32_t addr, uint32_t data)
> +{
> + int can_write;
> + SuperIOConfig *superio_conf = opaque;
> +
> + DPRINTF("superio_ioport_writeb address 0x%x val 0x%x \n", addr, data);
> + if (addr == 0x3f0) {
> + superio_conf->index = data & 0xff;
> + } else {
> + /* 0x3f1 */
> + switch (superio_conf->index) {
> + case 0x00 ... 0xdf:
> + case 0xe4:
> + case 0xe5:
> + case 0xe9 ... 0xed:
> + case 0xf3:
> + case 0xf5:
> + case 0xf7:
> + case 0xf9 ... 0xfb:
> + case 0xfd ... 0xff:
> + can_write = 0;
> + break;
> + default:
> + can_write = 1;
> +
> + if (can_write) {
> + switch (superio_conf->index) {
> + case 0xe7:
> + if ((data & 0xff) != 0xfe) {
> + DPRINTF("chage uart 1 base. unsupported yet \n");
> + }
> + break;
> + case 0xe8:
> + if ((data & 0xff) != 0xbe) {
> + DPRINTF("chage uart 2 base. unsupported yet \n");
> + }
> + break;
> +
> + default:
> + superio_conf->config[superio_conf->index] = data & 0xff;
> + }
> + }
> + }
> + superio_conf->config[superio_conf->index] = data & 0xff;
> + }
> +}
> +
> +static uint32_t superio_ioport_readb(void *opaque, uint32_t addr)
> +{
> + SuperIOConfig *superio_conf = opaque;
> +
> + DPRINTF("superio_ioport_readb address 0x%x \n", addr);
> + return (superio_conf->config[superio_conf->index]);
> +}
> +
> +static void vt82c686b_reset(void * opaque)
> +{
> + PCIDevice *d = opaque;
> + uint8_t *pci_conf = d->config;
> + VT82C686BState *vt82c = DO_UPCAST(VT82C686BState, dev, d);
> +
> + pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);
> + pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY
> |
> + PCI_COMMAND_MASTER | PCI_COMMAND_SPECIAL);
> + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM);
> +
> + pci_conf[0x48] = 0x01; /* Miscellaneous Control 3 */
> + pci_conf[0x4a] = 0x04; /* IDE interrupt Routing */
> + pci_conf[0x4f] = 0x03; /* DMA/Master Mem Access Control 3 */
> + pci_conf[0x50] = 0x2d; /* PnP DMA Request Control */
> + pci_conf[0x59] = 0x04;
> + pci_conf[0x5a] = 0x04; /* KBC/RTC Control*/
> + pci_conf[0x5f] = 0x04;
> + pci_conf[0x77] = 0x10; /* GPIO Control 1/2/3/4 */
> +
> + vt82c->superio_conf.config[0xe0] = 0x3c;
> + vt82c->superio_conf.config[0xe2] = 0x03;
> + vt82c->superio_conf.config[0xe3] = 0xfc;
> + vt82c->superio_conf.config[0xe6] = 0xde;
> + vt82c->superio_conf.config[0xe7] = 0xfe;
> + vt82c->superio_conf.config[0xe8] = 0xbe;
> +}
> +
> +/* write config pci function0 registers. PCI-ISA bridge */
> +static void vt82c686b_write_config(PCIDevice * d, uint32_t address,
> + uint32_t val, int len)
> +{
> + VT82C686BState *vt686 = DO_UPCAST(VT82C686BState, dev, d);
> +
> + DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x \n",
> + address, val, len);
> +
> + pci_default_write_config(d, address, val, len);
> + if (address == 0x85) { /* enable or disable super IO configure */
> + if (val & 0x2) {
> + /* floppy also uses 0x3f0 and 0x3f1.
> + * But we do not emulate flopy,so just set it here. */
> + isa_unassign_ioport(0x3f0, 2);
> + register_ioport_read(0x3f0, 2, 1, superio_ioport_readb,
> + &vt686->superio_conf);
> + register_ioport_write(0x3f0, 2, 1, superio_ioport_writeb,
> + &vt686->superio_conf);
> + } else {
> + isa_unassign_ioport(0x3f0, 2);
> + }
> + }
> +}
> +
> +#define ACPI_DBG_IO_ADDR 0xb044
> +
> +typedef struct VT686PMState {
> + PCIDevice dev;
> + uint16_t pmsts;
> + uint16_t pmen;
> + uint16_t pmcntrl;
> + APMState apm;
> + QEMUTimer *tmr_timer;
> + int64_t tmr_overflow_time;
> + PMSMBus smb;
> + uint32_t smb_io_base;
> +} VT686PMState;
> +
> +typedef struct VT686AC97State {
> + PCIDevice dev;
> +} VT686AC97State;
> +
> +typedef struct VT686MC97State {
> + PCIDevice dev;
> +} VT686MC97State;
> +
> +#define RTC_EN (1 << 10)
> +#define PWRBTN_EN (1 << 8)
> +#define GBL_EN (1 << 5)
> +#define TMROF_EN (1 << 0)
> +#define SUS_EN (1 << 13)
> +
> +#define ACPI_ENABLE 0xf1
> +#define ACPI_DISABLE 0xf0
> +
> +static uint32_t get_pmtmr(VT686PMState *s)
> +{
> + uint32_t d;
> + d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY,
> get_ticks_per_sec());
> + return d & 0xffffff;
> +}
> +
> +static int get_pmsts(VT686PMState *s)
> +{
> + int64_t d;
> + int pmsts;
> + pmsts = s->pmsts;
> + d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY,
> get_ticks_per_sec());
> + if (d >= s->tmr_overflow_time)
> + s->pmsts |= TMROF_EN;
> + return pmsts;
> +}
> +
> +static void pm_update_sci(VT686PMState *s)
> +{
> + int sci_level, pmsts;
> + int64_t expire_time;
> +
> + pmsts = get_pmsts(s);
> + sci_level = (((pmsts & s->pmen) &
> + (RTC_EN | PWRBTN_EN | GBL_EN | TMROF_EN)) != 0);
> + qemu_set_irq(s->dev.irq[0], sci_level);
> + /* schedule a timer interruption if needed */
> + if ((s->pmen & TMROF_EN) && !(pmsts & TMROF_EN)) {
> + expire_time = muldiv64(s->tmr_overflow_time, get_ticks_per_sec(),
> PM_TIMER_FREQUENCY);
> + qemu_mod_timer(s->tmr_timer, expire_time);
> + } else {
> + qemu_del_timer(s->tmr_timer);
> + }
> +}
> +
> +static void pm_tmr_timer(void *opaque)
> +{
> + VT686PMState *s = opaque;
> + pm_update_sci(s);
> +}
> +
> +static void pm_ioport_writew(void *opaque, uint32_t addr, uint32_t val)
> +{
> + VT686PMState *s = opaque;
> +
> + addr &= 0x0f;
> + switch (addr) {
> + case 0x00:
> + {
> + int64_t d;
> + int pmsts;
> + pmsts = get_pmsts(s);
> + if (pmsts & val & TMROF_EN) {
> + /* if TMRSTS is reset, then compute the new overflow time */
> + d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY,
> get_ticks_per_sec());
> + s->tmr_overflow_time = (d + 0x800000LL) & ~0x7fffffLL;
> + }
> + s->pmsts &= ~val;
> + pm_update_sci(s);
> + }
> + break;
> + case 0x02:
> + s->pmen = val;
> + pm_update_sci(s);
> + break;
> + case 0x04:
> + {
> + int sus_typ;
> + s->pmcntrl = val & ~(SUS_EN);
> + if (val & SUS_EN) {
> + /* change suspend type */
> + sus_typ = (val >> 10) & 3;
> + switch (sus_typ) {
> + case 0: /* soft power off */
> + qemu_system_shutdown_request();
> + break;
> + default:
> + break;
> + }
> + }
> + }
> + break;
> + default:
> + break;
> + }
> + DPRINTF("PM writew port=0x%04x val=0x%02x\n", addr, val);
> +}
> +
> +static uint32_t pm_ioport_readw(void *opaque, uint32_t addr)
> +{
> + VT686PMState *s = opaque;
> + uint32_t val;
> +
> + addr &= 0x0f;
> + switch (addr) {
> + case 0x00:
> + val = get_pmsts(s);
> + break;
> + case 0x02:
> + val = s->pmen;
> + break;
> + case 0x04:
> + val = s->pmcntrl;
> + break;
> + default:
> + val = 0;
> + break;
> + }
> + DPRINTF("PM readw port=0x%04x val=0x%02x\n", addr, val);
> + return val;
> +}
> +
> +static void pm_ioport_writel(void *opaque, uint32_t addr, uint32_t val)
> +{
> + addr &= 0x0f;
> + DPRINTF("PM writel port=0x%04x val=0x%08x\n", addr, val);
> +}
> +
> +static uint32_t pm_ioport_readl(void *opaque, uint32_t addr)
> +{
> + VT686PMState *s = opaque;
> + uint32_t val;
> +
> + addr &= 0x0f;
> + switch (addr) {
> + case 0x08:
> + val = get_pmtmr(s);
> + break;
> + default:
> + val = 0;
> + break;
> + }
> + DPRINTF("PM readl port=0x%04x val=0x%08x\n", addr, val);
> + return val;
> +}
> +
> +static void pm_io_space_update(VT686PMState *s)
> +{
> + uint32_t pm_io_base;
> +
> + if (s->dev.config[0x80] & 1) {
> + pm_io_base = pci_get_long(s->dev.config + 0x40);
> + pm_io_base &= 0xffc0;
> +
> + /* XXX: need to improve memory and ioport allocation */
> + DPRINTF("PM: mapping to 0x%x\n", pm_io_base);
> + register_ioport_write(pm_io_base, 64, 2, pm_ioport_writew, s);
> + register_ioport_read(pm_io_base, 64, 2, pm_ioport_readw, s);
> + register_ioport_write(pm_io_base, 64, 4, pm_ioport_writel, s);
> + register_ioport_read(pm_io_base, 64, 4, pm_ioport_readl, s);
> + }
> +}
> +
> +static void pm_write_config(PCIDevice *d,
> + uint32_t address, uint32_t val, int len)
> +{
> + DPRINTF("pm_write_config address 0x%x val 0x%x len 0x%x \n",
> + address, val, len);
> + pci_default_write_config(d, address, val, len);
> +}
> +
> +static int vmstate_acpi_post_load(void *opaque, int version_id)
> +{
> + VT686PMState *s = opaque;
> +
> + pm_io_space_update(s);
> + return 0;
> +}
> +
> +static const VMStateDescription vmstate_acpi = {
> + .name = "vt82c686b_pm",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
> + .post_load = vmstate_acpi_post_load,
> + .fields = (VMStateField []) {
> + VMSTATE_PCI_DEVICE(dev, VT686PMState),
> + VMSTATE_UINT16(pmsts, VT686PMState),
> + VMSTATE_UINT16(pmen, VT686PMState),
> + VMSTATE_UINT16(pmcntrl, VT686PMState),
> + VMSTATE_STRUCT(apm, VT686PMState, 0, vmstate_apm, APMState),
> + VMSTATE_TIMER(tmr_timer, VT686PMState),
> + VMSTATE_INT64(tmr_overflow_time, VT686PMState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> +/*
> + * TODO: vt82c686b_ac97_init() and vt82c686b_mc97_init()
> + * just register a PCI device now, functionalities will be implemented later.
> + */
> +
> +static int vt82c686b_ac97_initfn(PCIDevice *dev)
> +{
> + VT686AC97State *s = DO_UPCAST(VT686AC97State, dev, dev);
> + uint8_t *pci_conf = s->dev.config;
> +
> + pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
> + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_AC97);
> + pci_config_set_class(pci_conf, PCI_CLASS_MULTIMEDIA_AUDIO);
> + pci_config_set_revision(pci_conf, 0x50);
> +
> + pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
> + PCI_COMMAND_PARITY);
> + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST |
> + PCI_STATUS_DEVSEL_MEDIUM);
> + pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03);
> +
> + return 0;
> +}
> +
> +void vt82c686b_ac97_init(PCIBus *bus, int devfn)
> +{
> + PCIDevice *dev;
> +
> + dev = pci_create(bus, devfn, "VT82C686B_AC97");
> + qdev_init_nofail(&dev->qdev);
> +}
> +
> +static PCIDeviceInfo via_ac97_info = {
> + .qdev.name = "VT82C686B_AC97",
> + .qdev.desc = "AC97",
> + .qdev.size = sizeof(VT686AC97State),
> + .init = vt82c686b_ac97_initfn,
> +};
> +
> +static void vt82c686b_ac97_register(void)
> +{
> + pci_qdev_register(&via_ac97_info);
> +}
> +
> +device_init(vt82c686b_ac97_register);
> +
> +static int vt82c686b_mc97_initfn(PCIDevice *dev)
> +{
> + VT686MC97State *s = DO_UPCAST(VT686MC97State, dev, dev);
> + uint8_t *pci_conf = s->dev.config;
> +
> + pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
> + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_MC97);
> + pci_config_set_class(pci_conf, PCI_CLASS_COMMUNICATION_OTHER);
> + pci_config_set_revision(pci_conf, 0x30);
> +
> + pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
> + PCI_COMMAND_VGA_PALETTE);
> + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM);
> + pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03);
> +
> + return 0;
> +}
> +
> +void vt82c686b_mc97_init(PCIBus *bus, int devfn)
> +{
> + PCIDevice *dev;
> +
> + dev = pci_create(bus, devfn, "VT82C686B_MC97");
> + qdev_init_nofail(&dev->qdev);
> +}
> +
> +static PCIDeviceInfo via_mc97_info = {
> + .qdev.name = "VT82C686B_MC97",
> + .qdev.desc = "MC97",
> + .qdev.size = sizeof(VT686MC97State),
> + .init = vt82c686b_mc97_initfn,
> +};
> +
> +static void vt82c686b_mc97_register(void)
> +{
> + pci_qdev_register(&via_mc97_info);
> +}
> +
> +device_init(vt82c686b_mc97_register);
> +
> +/* vt82c686 pm init */
> +static int vt82c686b_pm_initfn(PCIDevice *dev)
> +{
> + VT686PMState *s = DO_UPCAST(VT686PMState, dev, dev);
> + uint8_t *pci_conf;
> +
> + pci_conf = s->dev.config;
> + pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
> + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_ACPI);
> + pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_OTHER);
> + pci_config_set_revision(pci_conf, 0x40);
> + pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
> +
> + pci_set_word(pci_conf + PCI_COMMAND, 0);
> + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_FAST_BACK |
> + PCI_STATUS_DEVSEL_MEDIUM);
> +
> + /* 0x48-0x4B is Power Management I/O Base */
> + pci_set_long(pci_conf + 0x48, 0x00000001);
> +
> + /* SMB ports:0xeee0~0xeeef */
> + s->smb_io_base =((s->smb_io_base & 0xfff0) + 0x0);
> + pci_conf[0x90] = s->smb_io_base | 1;
> + pci_conf[0x91] = s->smb_io_base >> 8;
> + pci_conf[0xd2] = 0x90;
> + register_ioport_write(s->smb_io_base, 0xf, 1, smb_ioport_writeb,
> &s->smb);
> + register_ioport_read(s->smb_io_base, 0xf, 1, smb_ioport_readb, &s->smb);
> +
> + apm_init(&s->apm, NULL, s);
> +
> + s->tmr_timer = qemu_new_timer(vm_clock, pm_tmr_timer, s);
> +
> + pm_smbus_init(&s->dev.qdev, &s->smb);
> +
> + return 0;
> +}
> +
> +i2c_bus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> + qemu_irq sci_irq)
> +{
> + PCIDevice *dev;
> + VT686PMState *s;
> +
> + dev = pci_create(bus, devfn, "VT82C686B_PM");
> + qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base);
> +
> + s = DO_UPCAST(VT686PMState, dev, dev);
> +
> + qdev_init_nofail(&dev->qdev);
> +
> + return s->smb.smbus;
> +}
> +
> +static PCIDeviceInfo via_pm_info = {
> + .qdev.name = "VT82C686B_PM",
> + .qdev.desc = "PM",
> + .qdev.size = sizeof(VT686PMState),
> + .qdev.vmsd = &vmstate_acpi,
> + .init = vt82c686b_pm_initfn,
> + .config_write = pm_write_config,
> + .qdev.props = (Property[]) {
> + DEFINE_PROP_UINT32("smb_io_base", VT686PMState, smb_io_base, 0),
> + DEFINE_PROP_END_OF_LIST(),
> + }
> +};
> +
> +static void vt82c686b_pm_register(void)
> +{
> + pci_qdev_register(&via_pm_info);
> +}
> +
> +device_init(vt82c686b_pm_register);
> +
> +static const VMStateDescription vmstate_via = {
> + .name = "vt82c686b",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
> + .fields = (VMStateField []) {
> + VMSTATE_PCI_DEVICE(dev, VT82C686BState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> +/* init the PCI-to-ISA bridge */
> +static int vt82c686b_initfn(PCIDevice *d)
> +{
> + uint8_t *pci_conf;
> + uint8_t *wmask;
> + int i;
> +
> + isa_bus_new(&d->qdev);
> +
> + pci_conf = d->config;
> + pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
> + pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_ISA_BRIDGE);
> + pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_ISA);
> + pci_config_set_prog_interface(pci_conf, 0x0);
> + pci_config_set_revision(pci_conf,0x40); /* Revision 4.0 */
> + pci_conf[PCI_HEADER_TYPE] =
> + PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION;
> +
> + wmask = d->wmask;
> + for (i = 0x00; i < 0xff; i++) {
> + if (i<=0x03 || (i>=0x08 && i<=0x3f)) {
> + wmask[i] = 0x00;
> + }
> + }
> +
> + qemu_register_reset(vt82c686b_reset, d);
> +
> + return 0;
> +}
> +
> +int vt82c686b_init(PCIBus *bus, int devfn)
> +{
> + PCIDevice *d;
> +
> + d = pci_create_simple(bus, devfn, "VT82C686B");
> +
> + return d->devfn;
> +}
> +
> +static PCIDeviceInfo via_info = {
> + .qdev.name = "VT82C686B",
> + .qdev.desc = "ISA bridge",
> + .qdev.size = sizeof(VT82C686BState),
> + .qdev.vmsd = &vmstate_via,
> + .qdev.no_user = 1,
> + .init = vt82c686b_initfn,
> + .config_write = vt82c686b_write_config,
> +};
> +
> +static void vt82c686b_register(void)
> +{
> + pci_qdev_register(&via_info);
> +}
> +device_init(vt82c686b_register);
> diff --git a/hw/vt82c686.h b/hw/vt82c686.h
> new file mode 100644
> index 0000000..e3270ca
> --- /dev/null
> +++ b/hw/vt82c686.h
> @@ -0,0 +1,11 @@
> +#ifndef HW_VT82C686_H
> +#define HW_VT82C686_H
> +
> +/* vt82c686.c */
> +int vt82c686b_init(PCIBus * bus, int devfn);
> +void vt82c686b_ac97_init(PCIBus *bus, int devfn);
> +void vt82c686b_mc97_init(PCIBus *bus, int devfn);
> +i2c_bus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> + qemu_irq sci_irq);
> +
> +#endif
> --
> 1.7.0.4
>
>
--
yamahata