On Tue, Nov 27, 2012 at 10:21:09AM +0100, Gerd Hoffmann wrote:
Stuff them parameterized into #defines, so we can (a) reuse them for q35 and (b) don't duplicate the serial line.
Signed-off-by: Gerd Hoffmann kraxel@redhat.com
src/acpi-dsdt-isa.dsl | 113 ++++++++++++++++++++++++++++++++ src/acpi-dsdt.dsl | 171 +++---------------------------------------------- 2 files changed, 122 insertions(+), 162 deletions(-) create mode 100644 src/acpi-dsdt-isa.dsl
diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl new file mode 100644 index 0000000..ee8194d --- /dev/null +++ b/src/acpi-dsdt-isa.dsl @@ -0,0 +1,113 @@ +#define ISA_DEVICE_RTC(_name) \
- Device (_name) \
[...]
I'm not a big fan of complex macros in the iasl code.
[...]
ISA_DEVICE_RTC(RTC)ISA_DEVICE_PS2_KBD(KBD)ISA_DEVICE_PS2_MOUSE(MOU)ISA_DEVICE_FLOPPY(FDC0, \_SB.PCI0.PX13.FDEN)ISA_DEVICE_PARALLEL(LPT, \_SB.PCI0.PX13.LPEN, 0x0378, 7)ISA_DEVICE_SERIAL(COM1, \_SB.PCI0.PX13.CAEN, 0x03F8, 4)ISA_DEVICE_SERIAL(COM2, \_SB.PCI0.PX13.CBEN, 0x02F8, 3)
The only difference I see between the above and the q35 code is _SB.PCI0.PX13 vs _SB.PCI0.LPC. However, as I understand it, the choice of PX13 or LPC is arbitrary - so I think we should just be able to choose a consistent name between the two dsdt codes. That way we shouldn't need the macros.
-Kevin