| 1 | Index: ioemu/hw/piix4acpi.c |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- ioemu.orig/hw/piix4acpi.c 2007-05-02 15:59:22.000000000 +0100 |
|---|
| 4 | +++ ioemu/hw/piix4acpi.c 2007-05-02 15:59:27.000000000 +0100 |
|---|
| 5 | @@ -24,26 +24,26 @@ |
|---|
| 6 | */ |
|---|
| 7 | |
|---|
| 8 | #include "vl.h" |
|---|
| 9 | -#define FREQUENCE_PMTIMER 3753425 |
|---|
| 10 | +#define FREQUENCE_PMTIMER 3579545 |
|---|
| 11 | /* acpi register bit define here */ |
|---|
| 12 | |
|---|
| 13 | -/* PM1_STS */ |
|---|
| 14 | -#define TMROF_STS (1 << 0) |
|---|
| 15 | -#define BM_STS (1 << 4) |
|---|
| 16 | -#define GBL_STS (1 << 5) |
|---|
| 17 | -#define PWRBTN_STS (1 << 8) |
|---|
| 18 | -#define RTC_STS (1 << 10) |
|---|
| 19 | +/* PM1_STS */ |
|---|
| 20 | +#define TMROF_STS (1 << 0) |
|---|
| 21 | +#define BM_STS (1 << 4) |
|---|
| 22 | +#define GBL_STS (1 << 5) |
|---|
| 23 | +#define PWRBTN_STS (1 << 8) |
|---|
| 24 | +#define RTC_STS (1 << 10) |
|---|
| 25 | #define PRBTNOR_STS (1 << 11) |
|---|
| 26 | -#define WAK_STS (1 << 15) |
|---|
| 27 | -/* PM1_EN */ |
|---|
| 28 | +#define WAK_STS (1 << 15) |
|---|
| 29 | +/* PM1_EN */ |
|---|
| 30 | #define TMROF_EN (1 << 0) |
|---|
| 31 | #define GBL_EN (1 << 5) |
|---|
| 32 | #define PWRBTN_EN (1 << 8) |
|---|
| 33 | -#define RTC_EN (1 << 10) |
|---|
| 34 | -/* PM1_CNT */ |
|---|
| 35 | +#define RTC_EN (1 << 10) |
|---|
| 36 | +/* PM1_CNT */ |
|---|
| 37 | #define SCI_EN (1 << 0) |
|---|
| 38 | #define GBL_RLS (1 << 2) |
|---|
| 39 | -#define SLP_EN (1 << 13) |
|---|
| 40 | +#define SLP_EN (1 << 13) |
|---|
| 41 | |
|---|
| 42 | typedef struct AcpiDeviceState AcpiDeviceState; |
|---|
| 43 | AcpiDeviceState *acpi_device_table; |
|---|
| 44 | @@ -53,13 +53,6 @@ |
|---|
| 45 | uint16_t pm1_control; /* pm1a_ECNT_BLK */ |
|---|
| 46 | } PCIAcpiState; |
|---|
| 47 | |
|---|
| 48 | -static inline void acpi_set_irq(PCIAcpiState *s) |
|---|
| 49 | -{ |
|---|
| 50 | -/* no real SCI event need for now, so comment the following line out */ |
|---|
| 51 | -/* pic_set_irq(s->irq, 1); */ |
|---|
| 52 | - printf("acpi_set_irq: s->irq %x \n",s->irq); |
|---|
| 53 | -} |
|---|
| 54 | - |
|---|
| 55 | static void acpiPm1Control_writeb(void *opaque, uint32_t addr, uint32_t val) |
|---|
| 56 | { |
|---|
| 57 | PCIAcpiState *s = opaque; |
|---|
| 58 | @@ -132,7 +125,7 @@ |
|---|
| 59 | { |
|---|
| 60 | PCIAcpiState *d = (PCIAcpiState *)pci_dev; |
|---|
| 61 | |
|---|
| 62 | - printf("register acpi io \n"); |
|---|
| 63 | + printf("register acpi io\n"); |
|---|
| 64 | |
|---|
| 65 | /* Byte access */ |
|---|
| 66 | register_ioport_write(addr + 4, 1, 1, acpiPm1Control_writeb, d); |
|---|
