Skip to content

Commit

Permalink
pc: acpi: move MOU device from DSDT to SSDT
Browse files Browse the repository at this point in the history
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Igor Mammedov authored and mstsirkin committed Jan 9, 2016
1 parent f58190e commit c355cb2
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 10 deletions.
21 changes: 21 additions & 0 deletions hw/i386/acpi-build.c
Expand Up @@ -1236,12 +1236,33 @@ static Aml *build_kbd_device_aml(void)
return dev;
}

static Aml *build_mouse_device_aml(void)
{
Aml *dev;
Aml *crs;
Aml *method;

dev = aml_device("MOU");
aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0F13")));

method = aml_method("_STA", 0, AML_NOTSERIALIZED);
aml_append(method, aml_return(aml_int(0x0f)));
aml_append(dev, method);

crs = aml_resource_template();
aml_append(crs, aml_irq_no_flags(12));
aml_append(dev, aml_name_decl("_CRS", crs));

return dev;
}

static void build_isa_devices_aml(Aml *table)
{
Aml *scope = aml_scope("_SB.PCI0.ISA");

aml_append(scope, build_rtc_device_aml());
aml_append(scope, build_kbd_device_aml());
aml_append(scope, build_mouse_device_aml());

aml_append(table, scope);
}
Expand Down
10 changes: 0 additions & 10 deletions hw/i386/acpi-dsdt-isa.dsl
Expand Up @@ -16,16 +16,6 @@
/* Common legacy ISA style devices. */
Scope(\_SB.PCI0.ISA) {

Device(MOU) {
Name(_HID, EisaId("PNP0F13"))
Method(_STA, 0, NotSerialized) {
Return (0x0f)
}
Name(_CRS, ResourceTemplate() {
IRQNoFlags() { 12 }
})
}

Device(FDC0) {
Name(_HID, EisaId("PNP0700"))
Method(_STA, 0, NotSerialized) {
Expand Down

0 comments on commit c355cb2

Please sign in to comment.