1.1 --- a/tools/firmware/acpi/acpi_fadt.h	Wed Aug 09 20:08:20 2006 +0100
     1.2 +++ b/tools/firmware/acpi/acpi_fadt.h	Wed Aug 09 21:33:59 2006 +0100
     1.3 @@ -59,8 +59,7 @@
     1.4  #define ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID  ACPI_SYSTEM_IO
     1.5  #define ACPI_PM1A_EVT_BLK_BIT_WIDTH         0x20
     1.6  #define ACPI_PM1A_EVT_BLK_BIT_OFFSET        0x00
     1.7 -//#define ACPI_PM1A_EVT_BLK_ADDRESS           0x000000000000c010
     1.8 -#define ACPI_PM1A_EVT_BLK_ADDRESS           0x000000000000c040
     1.9 +#define ACPI_PM1A_EVT_BLK_ADDRESS           0x000000000000c010
    1.10  
    1.11  //
    1.12  // PM1B Event Register Block Generic Address Information

     2.1 --- a/tools/ioemu/hw/pc.c	Wed Aug 09 20:08:20 2006 +0100
     2.2 +++ b/tools/ioemu/hw/pc.c	Wed Aug 09 21:33:59 2006 +0100
     2.3 @@ -572,9 +572,6 @@ static int serial_irq[MAX_SERIAL_PORTS] 
     2.4  static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
     2.5  static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
     2.6  
     2.7 -/* PIIX4 acpi pci configuration space, func 3 */
     2.8 -extern void pci_piix4_acpi_init(PCIBus *bus, int devfn);
     2.9 -
    2.10  #ifdef HAS_AUDIO
    2.11  static void audio_init (PCIBus *pci_bus)
    2.12  {
    2.13 @@ -877,13 +874,13 @@ static void pc_init1(uint64_t ram_size, 
    2.14  
    2.15      cmos_init(ram_size, boot_device, bs_table, timeoffset);
    2.16  
    2.17 -    if (pci_enabled && usb_enabled) {
    2.18 -        usb_uhci_init(pci_bus, piix3_devfn + 2);
    2.19 -    }
    2.20 -
    2.21      /* using PIIX4 acpi model */
    2.22      if (pci_enabled && acpi_enabled)
    2.23 -        pci_piix4_acpi_init(pci_bus, piix3_devfn + (usb_enabled ? 3 : 2));
    2.24 +        pci_piix4_acpi_init(pci_bus, piix3_devfn + 2);
    2.25 +
    2.26 +    if (pci_enabled && usb_enabled) {
    2.27 +        usb_uhci_init(pci_bus, piix3_devfn + (acpi_enabled ? 3 : 2));
    2.28 +    }
    2.29  
    2.30  #ifndef CONFIG_DM
    2.31      if (pci_enabled && acpi_enabled) {

     3.1 --- a/tools/ioemu/hw/piix4acpi.c	Wed Aug 09 20:08:20 2006 +0100
     3.2 +++ b/tools/ioemu/hw/piix4acpi.c	Wed Aug 09 21:33:59 2006 +0100
     3.3 @@ -374,13 +374,13 @@ static void acpi_map(PCIDevice *pci_dev,
     3.4      register_ioport_read(addr + 8, 4, 4, acpiPm1Timer_readl, d);
     3.5  }
     3.6  
     3.7 -/* PIIX4 acpi pci configuration space, func 3 */
     3.8 +/* PIIX4 acpi pci configuration space, func 2 */
     3.9  void pci_piix4_acpi_init(PCIBus *bus, int devfn)
    3.10  {
    3.11      PCIAcpiState *d;
    3.12      uint8_t *pci_conf;
    3.13  
    3.14 -    /* register a function devfn of PIIX4 */
    3.15 +    /* register a function 2 of PIIX4 */
    3.16      d = (PCIAcpiState *)pci_register_device(
    3.17          bus, "PIIX4 ACPI", sizeof(PCIAcpiState),
    3.18          devfn, NULL, NULL);

     4.1 --- a/tools/ioemu/vl.h	Wed Aug 09 20:08:20 2006 +0100
     4.2 +++ b/tools/ioemu/vl.h	Wed Aug 09 21:33:59 2006 +0100
     4.3 @@ -925,6 +925,9 @@ extern int acpi_enabled;
     4.4  void piix4_pm_init(PCIBus *bus, int devfn);
     4.5  void acpi_bios_init(void);
     4.6  
     4.7 +/* piix4acpi.c */
     4.8 +extern void pci_piix4_acpi_init(PCIBus *bus, int devfn);
     4.9 +
    4.10  /* pc.c */
    4.11  extern QEMUMachine pc_machine;
    4.12  extern QEMUMachine isapc_machine;