May 2012 - SeaBIOS - mail.coreboot.org

[PATCH 1/3] Fix aml_name_string() to recognize block name modifiers.

by Gleb Natapov

Signed-off-by: Gleb Natapov <gleb(a)redhat.com> --- tools/acpi_extract.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py index 5f613e4..8038269 100755 --- a/tools/acpi_extract.py +++ b/tools/acpi_extract.py @@ -121,7 +121,11 @@ def aml_name_string(offset): if (aml[offset] != 0x08): die( "Name offset 0x%x: expected 0x08 actual 0x%x" % (offset, aml[offset])); - return offset + 1; + offset += 1 + # Block Name Modifier. Skip it. + if (aml[offset] == 0x5c or aml[offset] == 0x5e): + offset += 1 + return offset; # Given data offset, find dword const offset def aml_data_dword_const(offset): -- 1.7.7.3

6 years, 11 months

4
24
0 / 0

[PATCH] remove iasl-generated hex files from git repo

by Gerd Hoffmann

Almost every linux distro has iasl packaged these days. Lets make it a build dependency and stop the hassle we have with updating the *.hex files in the git repo. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- Makefile | 14 +- src/.gitignore | 1 + src/acpi-dsdt.hex | 4387 ---------------------------------------------------- src/ssdt-pcihp.hex | 1672 -------------------- src/ssdt-proc.hex | 134 -- 5 files changed, 12 insertions(+), 6196 deletions(-) create mode 100644 src/.gitignore delete mode 100644 src/acpi-dsdt.hex delete mode 100644 src/ssdt-pcihp.hex delete mode 100644 src/ssdt-proc.hex diff --git a/Makefile b/Makefile index 7d01652..69b068f 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,15 @@ OBJCOPY=objcopy OBJDUMP=objdump STRIP=strip PYTHON=python -IASL:=iasl +IASL:=$(shell which iasl 2>/dev/null) + +ifeq "$(IASL)" "" +iasl-not-found: + @echo "You need 'iasl' to compile seabios." + @echo "Most likely your distro has packages for you," + @echo "try asking the package manager to install it." + @false +endif # Default targets -include $(KCONFIG_CONFIG) @@ -220,7 +228,7 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py ################ DSDT build rules -src/%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py +$(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py @echo "Compiling DSDT" $(Q)cpp -P $< > $(OUT)$*.dsl.i.orig $(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i @@ -228,7 +236,7 @@ src/%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off $(Q)cat $(OUT)$*.off > $@ -$(OUT)ccode32flat.o: src/acpi-dsdt.hex src/ssdt-proc.hex src/ssdt-pcihp.hex +$(OUT)ccode32flat.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex ################ Kconfig rules diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..eee4db0 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1 @@ +*.hex diff --git a/src/acpi-dsdt.hex b/src/acpi-dsdt.hex deleted file mode 100644 index a4af597..0000000 --- a/src/acpi-dsdt.hex +++ /dev/null @@ -1,4387 +0,0 @@ -static unsigned char AmlCode[] = { -0x44, -0x53, -0x44, -0x54, -0x21, -0x11, -0x0, -0x0, -0x1, -0xe8, -0x42, -0x58, -0x50, -0x43, -0x0, -0x0, -0x42, -0x58, -0x44, -0x53, -0x44, -0x54, -0x0, -0x0, -0x1, -0x0, -0x0, -0x0, -0x49, -0x4e, -0x54, -0x4c, -0x28, -0x5, -0x10, -0x20, -0x10, -0x49, -0x4, -0x5c, -0x0, -0x5b, -0x80, -0x44, -0x42, -0x47, -0x5f, -0x1, -0xb, -0x2, -0x4, -0x1, -0x5b, -0x81, -0xb, -0x44, -0x42, -0x47, -0x5f, -0x1, -0x44, -0x42, -0x47, -0x42, -0x8, -0x14, -0x2c, -0x44, -0x42, -0x55, -0x47, -0x1, -0x98, -0x68, -0x60, -0x96, -0x60, -0x60, -0x74, -0x87, -0x60, -0x1, -0x61, -0x70, -0x0, -0x62, -0xa2, -0x10, -0x95, -0x62, -0x61, -0x70, -0x83, -0x88, -0x60, -0x62, -0x0, -0x44, -0x42, -0x47, -0x42, -0x75, -0x62, -0x70, -0xa, -0xa, -0x44, -0x42, -0x47, -0x42, -0x10, -0x44, -0x81, -0x5f, -0x53, -0x42, -0x5f, -0x5b, -0x82, -0x4c, -0x80, -0x50, -0x43, -0x49, -0x30, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xa, -0x3, -0x8, -0x5f, -0x41, -0x44, -0x52, -0x0, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x1, -0x8, -0x5f, -0x50, -0x52, -0x54, -0x12, -0x4b, -0x73, -0x80, -0x12, -0xb, -0x4, -0xb, -0xff, -0xff, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xb, -0x4, -0xb, -0xff, -0xff, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xc, -0x4, -0xb, -0xff, -0xff, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xc, -0x4, -0xb, -0xff, -0xff, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x53, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x2, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x2, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x2, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x2, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x3, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x3, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x3, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x3, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x4, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x4, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x4, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x4, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x5, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x5, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x5, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x5, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x6, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x6, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x6, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x6, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x7, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x7, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x7, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x7, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x8, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x8, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x8, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x8, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x9, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xa, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xb, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xc, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xc, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xc, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xc, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xd, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xd, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xd, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xd, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xe, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xe, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xe, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xe, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xf, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0xf, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xf, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0xf, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x10, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x10, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x10, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x10, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x11, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x11, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x11, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x11, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x12, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x12, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x12, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x12, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x13, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x13, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x13, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x13, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x14, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x14, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x14, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x14, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x15, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x15, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x15, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x15, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x16, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x16, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x16, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x16, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x17, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x17, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x17, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x17, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x18, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x18, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x18, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x18, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x19, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x19, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x19, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x19, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1a, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1a, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1a, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1a, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1b, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1b, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1b, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1b, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1c, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1c, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1c, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1c, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1d, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1d, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1d, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1d, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1e, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1e, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1e, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1e, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1f, -0x0, -0x0, -0x4c, -0x4e, -0x4b, -0x43, -0x0, -0x12, -0xd, -0x4, -0xc, -0xff, -0xff, -0x1f, -0x0, -0x1, -0x4c, -0x4e, -0x4b, -0x44, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1f, -0x0, -0xa, -0x2, -0x4c, -0x4e, -0x4b, -0x41, -0x0, -0x12, -0xe, -0x4, -0xc, -0xff, -0xff, -0x1f, -0x0, -0xa, -0x3, -0x4c, -0x4e, -0x4b, -0x42, -0x0, -0x5b, -0x80, -0x50, -0x43, -0x53, -0x54, -0x1, -0xb, -0x0, -0xae, -0xa, -0x8, -0x5b, -0x81, -0x10, -0x50, -0x43, -0x53, -0x54, -0x43, -0x50, -0x43, -0x49, -0x55, -0x20, -0x50, -0x43, -0x49, -0x44, -0x20, -0x5b, -0x80, -0x53, -0x45, -0x4a, -0x5f, -0x1, -0xb, -0x8, -0xae, -0xa, -0x4, -0x5b, -0x81, -0xb, -0x53, -0x45, -0x4a, -0x5f, -0x43, -0x42, -0x30, -0x45, -0x4a, -0x20, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x42, -0x7, -0xa, -0x6e, -0x88, -0xd, -0x0, -0x2, -0xc, -0x0, -0x0, -0x0, -0x0, -0x0, -0xff, -0x0, -0x0, -0x0, -0x0, -0x1, -0x47, -0x1, -0xf8, -0xc, -0xf8, -0xc, -0x1, -0x8, -0x88, -0xd, -0x0, -0x1, -0xc, -0x3, -0x0, -0x0, -0x0, -0x0, -0xf7, -0xc, -0x0, -0x0, -0xf8, -0xc, -0x88, -0xd, -0x0, -0x1, -0xc, -0x3, -0x0, -0x0, -0x0, -0xd, -0xff, -0xff, -0x0, -0x0, -0x0, -0xf3, -0x87, -0x17, -0x0, -0x0, -0xc, -0x3, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xa, -0x0, -0xff, -0xff, -0xb, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x2, -0x0, -0x87, -0x17, -0x0, -0x0, -0xc, -0x1, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xe0, -0xff, -0xff, -0xbf, -0xfe, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xc0, -0x1e, -0x79, -0x0, -0x10, -0x4b, -0x9, -0x5f, -0x53, -0x42, -0x5f, -0x5b, -0x82, -0x43, -0x9, -0x48, -0x50, -0x45, -0x54, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x1, -0x3, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x0, -0x5b, -0x80, -0x48, -0x50, -0x54, -0x4d, -0x0, -0xc, -0x0, -0x0, -0xd0, -0xfe, -0xb, -0x0, -0x4, -0x5b, -0x81, -0x10, -0x48, -0x50, -0x54, -0x4d, -0x13, -0x56, -0x45, -0x4e, -0x44, -0x20, -0x50, -0x52, -0x44, -0x5f, -0x20, -0x14, -0x36, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x56, -0x45, -0x4e, -0x44, -0x60, -0x70, -0x50, -0x52, -0x44, -0x5f, -0x61, -0x7a, -0x60, -0xa, -0x10, -0x60, -0xa0, -0xc, -0x91, -0x93, -0x60, -0x0, -0x93, -0x60, -0xb, -0xff, -0xff, -0xa4, -0x0, -0xa0, -0xe, -0x91, -0x93, -0x61, -0x0, -0x94, -0x61, -0xc, -0x0, -0xe1, -0xf5, -0x5, -0xa4, -0x0, -0xa4, -0xa, -0xf, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x1f, -0xa, -0x1c, -0x87, -0x17, -0x0, -0x0, -0xd, -0x1, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0xd0, -0xfe, -0xff, -0x3, -0xd0, -0xfe, -0x0, -0x0, -0x0, -0x0, -0x0, -0x4, -0x0, -0x0, -0x79, -0x0, -0x10, -0x40, -0x6, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x5b, -0x82, -0x43, -0x5, -0x56, -0x47, -0x41, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x2, -0x0, -0x5b, -0x80, -0x50, -0x43, -0x49, -0x43, -0x2, -0x0, -0xa, -0x4, -0x5b, -0x81, -0xb, -0x50, -0x43, -0x49, -0x43, -0x3, -0x56, -0x45, -0x4e, -0x44, -0x20, -0x14, -0x8, -0x5f, -0x53, -0x31, -0x44, -0x0, -0xa4, -0x0, -0x14, -0x8, -0x5f, -0x53, -0x32, -0x44, -0x0, -0xa4, -0x0, -0x14, -0x19, -0x5f, -0x53, -0x33, -0x44, -0x0, -0xa0, -0xe, -0x93, -0x56, -0x45, -0x4e, -0x44, -0xc, -0x36, -0x1b, -0x0, -0x1, -0xa4, -0xa, -0x3, -0xa1, -0x3, -0xa4, -0x0, -0x10, -0x26, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x5b, -0x82, -0x1a, -0x49, -0x53, -0x41, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1, -0x0, -0x5b, -0x80, -0x50, -0x34, -0x30, -0x43, -0x2, -0xa, -0x60, -0xa, -0x4, -0x10, -0x47, -0x22, -0x2f, -0x3, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x49, -0x53, -0x41, -0x5f, -0x5b, -0x82, -0x2d, -0x52, -0x54, -0x43, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xb, -0x0, -0x8, -0x5f, -0x43, -0x52, -0x53, -0x11, -0x18, -0xa, -0x15, -0x47, -0x1, -0x70, -0x0, -0x70, -0x0, -0x10, -0x2, -0x22, -0x0, -0x1, -0x47, -0x1, -0x72, -0x0, -0x72, -0x0, -0x2, -0x6, -0x79, -0x0, -0x5b, -0x82, -0x44, -0x4, -0x4b, -0x42, -0x44, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x3, -0x3, -0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0xa, -0xf, -0x14, -0x29, -0x5f, -0x43, -0x52, -0x53, -0x0, -0x8, -0x54, -0x4d, -0x50, -0x5f, -0x11, -0x18, -0xa, -0x15, -0x47, -0x1, -0x60, -0x0, -0x60, -0x0, -0x1, -0x1, -0x47, -0x1, -0x64, -0x0, -0x64, -0x0, -0x1, -0x1, -0x22, -0x2, -0x0, -0x79, -0x0, -0xa4, -0x54, -0x4d, -0x50, -0x5f, -0x5b, -0x82, -0x33, -0x4d, -0x4f, -0x55, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xf, -0x13, -0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0xa, -0xf, -0x14, -0x19, -0x5f, -0x43, -0x52, -0x53, -0x0, -0x8, -0x54, -0x4d, -0x50, -0x5f, -0x11, -0x8, -0xa, -0x5, -0x22, -0x0, -0x10, -0x79, -0x0, -0xa4, -0x54, -0x4d, -0x50, -0x5f, -0x5b, -0x82, -0x47, -0x4, -0x46, -0x44, -0x43, -0x30, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x7, -0x0, -0x14, -0x9, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0xa, -0xf, -0x14, -0x2c, -0x5f, -0x43, -0x52, -0x53, -0x0, -0x8, -0x42, -0x55, -0x46, -0x30, -0x11, -0x1b, -0xa, -0x18, -0x47, -0x1, -0xf2, -0x3, -0xf2, -0x3, -0x0, -0x4, -0x47, -0x1, -0xf7, -0x3, -0xf7, -0x3, -0x0, -0x1, -0x22, -0x40, -0x0, -0x2a, -0x4, -0x0, -0x79, -0x0, -0xa4, -0x42, -0x55, -0x46, -0x30, -0x5b, -0x82, -0x4b, -0x5, -0x4c, -0x50, -0x54, -0x5f, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x4, -0x0, -0x14, -0x28, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x5e, -0x5e, -0x5e, -0x2e, -0x50, -0x58, -0x31, -0x33, -0x44, -0x52, -0x53, -0x41, -0x60, -0x7b, -0x60, -0xc, -0x0, -0x0, -0x0, -0x80, -0x60, -0xa0, -0x6, -0x93, -0x60, -0x0, -0xa4, -0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, -0x14, -0x21, -0x5f, -0x43, -0x52, -0x53, -0x0, -0x8, -0x42, -0x55, -0x46, -0x30, -0x11, -0x10, -0xa, -0xd, -0x47, -0x1, -0x78, -0x3, -0x78, -0x3, -0x8, -0x8, -0x22, -0x80, -0x0, -0x79, -0x0, -0xa4, -0x42, -0x55, -0x46, -0x30, -0x5b, -0x82, -0x41, -0x6, -0x43, -0x4f, -0x4d, -0x31, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x5, -0x1, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x1, -0x14, -0x28, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x5e, -0x5e, -0x5e, -0x2e, -0x50, -0x58, -0x31, -0x33, -0x44, -0x52, -0x53, -0x43, -0x60, -0x7b, -0x60, -0xc, -0x0, -0x0, -0x0, -0x8, -0x60, -0xa0, -0x6, -0x93, -0x60, -0x0, -0xa4, -0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, -0x14, -0x21, -0x5f, -0x43, -0x52, -0x53, -0x0, -0x8, -0x42, -0x55, -0x46, -0x30, -0x11, -0x10, -0xa, -0xd, -0x47, -0x1, -0xf8, -0x3, -0xf8, -0x3, -0x0, -0x8, -0x22, -0x10, -0x0, -0x79, -0x0, -0xa4, -0x42, -0x55, -0x46, -0x30, -0x5b, -0x82, -0x42, -0x6, -0x43, -0x4f, -0x4d, -0x32, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0x5, -0x1, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x2, -0x14, -0x28, -0x5f, -0x53, -0x54, -0x41, -0x0, -0x70, -0x5e, -0x5e, -0x5e, -0x2e, -0x50, -0x58, -0x31, -0x33, -0x44, -0x52, -0x53, -0x43, -0x60, -0x7b, -0x60, -0xc, -0x0, -0x0, -0x0, -0x80, -0x60, -0xa0, -0x6, -0x93, -0x60, -0x0, -0xa4, -0x0, -0xa1, -0x4, -0xa4, -0xa, -0xf, -0x14, -0x21, -0x5f, -0x43, -0x52, -0x53, -0x0, -0x8, -0x42, -0x55, -0x46, -0x30, -0x11, -0x10, -0xa, -0xd, -0x47, -0x1, -0xf8, -0x2, -0xf8, -0x2, -0x0, -0x8, -0x22, -0x8, -0x0, -0x79, -0x0, -0xa4, -0x42, -0x55, -0x46, -0x30, -0x10, -0x4d, -0x5, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x5b, -0x82, -0x40, -0x5, -0x50, -0x58, -0x31, -0x33, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x3, -0x0, -0x1, -0x0, -0x5b, -0x80, -0x50, -0x31, -0x33, -0x43, -0x2, -0xa, -0x5c, -0xa, -0x24, -0x5b, -0x81, -0x33, -0x50, -0x31, -0x33, -0x43, -0x3, -0x44, -0x52, -0x53, -0x41, -0x20, -0x44, -0x52, -0x53, -0x42, -0x20, -0x44, -0x52, -0x53, -0x43, -0x20, -0x44, -0x52, -0x53, -0x45, -0x20, -0x44, -0x52, -0x53, -0x46, -0x20, -0x44, -0x52, -0x53, -0x47, -0x20, -0x44, -0x52, -0x53, -0x48, -0x20, -0x44, -0x52, -0x53, -0x49, -0x20, -0x44, -0x52, -0x53, -0x4a, -0x20, -0x10, -0x46, -0x5, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x14, -0x11, -0x50, -0x43, -0x45, -0x4a, -0x1, -0x70, -0x79, -0x1, -0x68, -0x0, -0x42, -0x30, -0x45, -0x4a, -0xa4, -0x0, -0x14, -0x38, -0x50, -0x43, -0x4e, -0x46, -0x0, -0x70, -0x0, -0x60, -0xa2, -0x2c, -0x95, -0x60, -0xa, -0x1f, -0x75, -0x60, -0xa0, -0x11, -0x7b, -0x50, -0x43, -0x49, -0x55, -0x79, -0x1, -0x60, -0x0, -0x0, -0x50, -0x43, -0x4e, -0x54, -0x60, -0x1, -0xa0, -0x12, -0x7b, -0x50, -0x43, -0x49, -0x44, -0x79, -0x1, -0x60, -0x0, -0x0, -0x50, -0x43, -0x4e, -0x54, -0x60, -0xa, -0x3, -0xa4, -0x1, -0x10, -0x41, -0x2d, -0x5f, -0x53, -0x42, -0x5f, -0x5b, -0x81, -0x24, -0x2f, -0x3, -0x50, -0x43, -0x49, -0x30, -0x49, -0x53, -0x41, -0x5f, -0x50, -0x34, -0x30, -0x43, -0x1, -0x50, -0x52, -0x51, -0x30, -0x8, -0x50, -0x52, -0x51, -0x31, -0x8, -0x50, -0x52, -0x51, -0x32, -0x8, -0x50, -0x52, -0x51, -0x33, -0x8, -0x14, -0x13, -0x49, -0x51, -0x53, -0x54, -0x1, -0xa0, -0x9, -0x7b, -0xa, -0x80, -0x68, -0x0, -0xa4, -0xa, -0x9, -0xa4, -0xa, -0xb, -0x14, -0x36, -0x49, -0x51, -0x43, -0x52, -0x1, -0x8, -0x50, -0x52, -0x52, -0x30, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, -0x1, -0x0, -0x0, -0x0, -0x0, -0x79, -0x0, -0x8a, -0x50, -0x52, -0x52, -0x30, -0xa, -0x5, -0x50, -0x52, -0x52, -0x49, -0xa0, -0xb, -0x95, -0x68, -0xa, -0x80, -0x70, -0x68, -0x50, -0x52, -0x52, -0x49, -0xa4, -0x50, -0x52, -0x52, -0x30, -0x5b, -0x82, -0x4c, -0x7, -0x4c, -0x4e, -0x4b, -0x41, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0x1, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0x16, -0xa, -0x13, -0x89, -0xe, -0x0, -0x9, -0x3, -0x5, -0x0, -0x0, -0x0, -0xa, -0x0, -0x0, -0x0, -0xb, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0xf, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x30, -0x14, -0x11, -0x5f, -0x44, -0x49, -0x53, -0x0, -0x7d, -0x50, -0x52, -0x51, -0x30, -0xa, -0x80, -0x50, -0x52, -0x51, -0x30, -0x14, -0xf, -0x5f, -0x43, -0x52, -0x53, -0x0, -0xa4, -0x49, -0x51, -0x43, -0x52, -0x50, -0x52, -0x51, -0x30, -0x14, -0x17, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x8a, -0x68, -0xa, -0x5, -0x50, -0x52, -0x52, -0x49, -0x70, -0x50, -0x52, -0x52, -0x49, -0x50, -0x52, -0x51, -0x30, -0x5b, -0x82, -0x4d, -0x7, -0x4c, -0x4e, -0x4b, -0x42, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x2, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0x16, -0xa, -0x13, -0x89, -0xe, -0x0, -0x9, -0x3, -0x5, -0x0, -0x0, -0x0, -0xa, -0x0, -0x0, -0x0, -0xb, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0xf, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x31, -0x14, -0x11, -0x5f, -0x44, -0x49, -0x53, -0x0, -0x7d, -0x50, -0x52, -0x51, -0x31, -0xa, -0x80, -0x50, -0x52, -0x51, -0x31, -0x14, -0xf, -0x5f, -0x43, -0x52, -0x53, -0x0, -0xa4, -0x49, -0x51, -0x43, -0x52, -0x50, -0x52, -0x51, -0x31, -0x14, -0x17, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x8a, -0x68, -0xa, -0x5, -0x50, -0x52, -0x52, -0x49, -0x70, -0x50, -0x52, -0x52, -0x49, -0x50, -0x52, -0x51, -0x31, -0x5b, -0x82, -0x4d, -0x7, -0x4c, -0x4e, -0x4b, -0x43, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x3, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0x16, -0xa, -0x13, -0x89, -0xe, -0x0, -0x9, -0x3, -0x5, -0x0, -0x0, -0x0, -0xa, -0x0, -0x0, -0x0, -0xb, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0xf, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x32, -0x14, -0x11, -0x5f, -0x44, -0x49, -0x53, -0x0, -0x7d, -0x50, -0x52, -0x51, -0x32, -0xa, -0x80, -0x50, -0x52, -0x51, -0x32, -0x14, -0xf, -0x5f, -0x43, -0x52, -0x53, -0x0, -0xa4, -0x49, -0x51, -0x43, -0x52, -0x50, -0x52, -0x51, -0x32, -0x14, -0x17, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x8a, -0x68, -0xa, -0x5, -0x50, -0x52, -0x52, -0x49, -0x70, -0x50, -0x52, -0x52, -0x49, -0x50, -0x52, -0x51, -0x32, -0x5b, -0x82, -0x4d, -0x7, -0x4c, -0x4e, -0x4b, -0x44, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x4, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0x16, -0xa, -0x13, -0x89, -0xe, -0x0, -0x9, -0x3, -0x5, -0x0, -0x0, -0x0, -0xa, -0x0, -0x0, -0x0, -0xb, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0xf, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x33, -0x14, -0x11, -0x5f, -0x44, -0x49, -0x53, -0x0, -0x7d, -0x50, -0x52, -0x51, -0x33, -0xa, -0x80, -0x50, -0x52, -0x51, -0x33, -0x14, -0xf, -0x5f, -0x43, -0x52, -0x53, -0x0, -0xa4, -0x49, -0x51, -0x43, -0x52, -0x50, -0x52, -0x51, -0x33, -0x14, -0x17, -0x5f, -0x53, -0x52, -0x53, -0x1, -0x8a, -0x68, -0xa, -0x5, -0x50, -0x52, -0x52, -0x49, -0x70, -0x50, -0x52, -0x52, -0x49, -0x50, -0x52, -0x51, -0x33, -0x5b, -0x82, -0x4d, -0x5, -0x4c, -0x4e, -0x4b, -0x53, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xc, -0x41, -0xd0, -0xc, -0xf, -0x8, -0x5f, -0x55, -0x49, -0x44, -0xa, -0x5, -0x8, -0x5f, -0x50, -0x52, -0x53, -0x11, -0xe, -0xa, -0xb, -0x89, -0x6, -0x0, -0x9, -0x1, -0x9, -0x0, -0x0, -0x0, -0x79, -0x0, -0x14, -0xf, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0x49, -0x51, -0x53, -0x54, -0x50, -0x52, -0x51, -0x30, -0x14, -0x11, -0x5f, -0x44, -0x49, -0x53, -0x0, -0x7d, -0x50, -0x52, -0x51, -0x30, -0xa, -0x80, -0x50, -0x52, -0x51, -0x30, -0x14, -0xf, -0x5f, -0x43, -0x52, -0x53, -0x0, -0xa4, -0x49, -0x51, -0x43, -0x52, -0x50, -0x52, -0x51, -0x30, -0x8, -0x5f, -0x53, -0x33, -0x5f, -0x12, -0x6, -0x4, -0x1, -0x1, -0x0, -0x0, -0x8, -0x5f, -0x53, -0x34, -0x5f, -0x12, -0x6, -0x4, -0x0, -0x0, -0x0, -0x0, -0x8, -0x5f, -0x53, -0x35, -0x5f, -0x12, -0x6, -0x4, -0x0, -0x0, -0x0, -0x0, -0x10, -0x49, -0xe, -0x5f, -0x53, -0x42, -0x5f, -0x14, -0x35, -0x43, -0x50, -0x4d, -0x41, -0x1, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x68, -0x0, -0x60, -0x70, -0x11, -0xb, -0xa, -0x8, -0x0, -0x8, -0x0, -0x0, -0x0, -0x0, -0x0, -0x0, -0x61, -0x70, -0x68, -0x88, -0x61, -0xa, -0x2, -0x0, -0x70, -0x68, -0x88, -0x61, -0xa, -0x3, -0x0, -0x70, -0x60, -0x88, -0x61, -0xa, -0x4, -0x0, -0xa4, -0x61, -0x14, -0x1a, -0x43, -0x50, -0x53, -0x54, -0x1, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x68, -0x0, -0x60, -0xa0, -0x5, -0x60, -0xa4, -0xa, -0xf, -0xa1, -0x3, -0xa4, -0x0, -0x14, -0xa, -0x43, -0x50, -0x45, -0x4a, -0x2, -0x5b, -0x22, -0xa, -0xc8, -0x5b, -0x80, -0x50, -0x52, -0x53, -0x54, -0x1, -0xb, -0x0, -0xaf, -0xa, -0x20, -0x5b, -0x81, -0xc, -0x50, -0x52, -0x53, -0x54, -0x1, -0x50, -0x52, -0x53, -0x5f, -0x40, -0x10, -0x14, -0x4c, -0x6, -0x50, -0x52, -0x53, -0x43, -0x0, -0x70, -0x50, -0x52, -0x53, -0x5f, -0x65, -0x70, -0x0, -0x62, -0x70, -0x0, -0x60, -0xa2, -0x46, -0x5, -0x95, -0x60, -0x87, -0x43, -0x50, -0x4f, -0x4e, -0x70, -0x83, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x60, -0x0, -0x61, -0xa0, -0xa, -0x7b, -0x60, -0xa, -0x7, -0x0, -0x7a, -0x62, -0x1, -0x62, -0xa1, -0xc, -0x70, -0x83, -0x88, -0x65, -0x7a, -0x60, -0xa, -0x3, -0x0, -0x0, -0x62, -0x70, -0x7b, -0x62, -0x1, -0x0, -0x63, -0xa0, -0x22, -0x92, -0x93, -0x61, -0x63, -0x70, -0x63, -0x88, -0x43, -0x50, -0x4f, -0x4e, -0x60, -0x0, -0xa0, -0xa, -0x93, -0x63, -0x1, -0x4e, -0x54, -0x46, -0x59, -0x60, -0x1, -0xa1, -0x8, -0x4e, -0x54, -0x46, -0x59, -0x60, -0xa, -0x3, -0x75, -0x60, -0xa4, -0x1, -0x10, -0x4c, -0xb, -0x5f, -0x47, -0x50, -0x45, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xd, -0x41, -0x43, -0x50, -0x49, -0x30, -0x30, -0x30, -0x36, -0x0, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x30, -0x0, -0xa4, -0x1, -0x14, -0x16, -0x5f, -0x45, -0x30, -0x31, -0x0, -0xa4, -0x5c, -0x2f, -0x3, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x50, -0x43, -0x4e, -0x46, -0x14, -0x11, -0x5f, -0x45, -0x30, -0x32, -0x0, -0xa4, -0x5c, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x52, -0x53, -0x43, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x33, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x34, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x35, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x36, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x37, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x38, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x39, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x41, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x42, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x43, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x44, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x45, -0x0, -0xa4, -0x1, -0x14, -0x8, -0x5f, -0x4c, -0x30, -0x46, -0x0, -0xa4, -0x1 -}; diff --git a/src/ssdt-pcihp.hex b/src/ssdt-pcihp.hex deleted file mode 100644 index b15ad5a..0000000 --- a/src/ssdt-pcihp.hex +++ /dev/null @@ -1,1672 +0,0 @@ -static unsigned short aml_adr_dword[] = { -0x3e, -0x62, -0x88, -0xae, -0xd4, -0xfa, -0x120, -0x146, -0x16c, -0x192, -0x1b8, -0x1de, -0x204, -0x22a, -0x250, -0x276, -0x29c, -0x2c2, -0x2e8, -0x30e, -0x334, -0x35a, -0x380, -0x3a6, -0x3cc, -0x3f2, -0x418, -0x43e, -0x464, -0x48a, -0x4b0 -}; -static unsigned short aml_ej0_name[] = { -0x44, -0x68, -0x8e, -0xb4, -0xda, -0x100, -0x126, -0x14c, -0x172, -0x198, -0x1be, -0x1e4, -0x20a, -0x230, -0x256, -0x27c, -0x2a2, -0x2c8, -0x2ee, -0x314, -0x33a, -0x360, -0x386, -0x3ac, -0x3d2, -0x3f8, -0x41e, -0x444, -0x46a, -0x490, -0x4b6 -}; -static unsigned char ssdp_pcihp_aml[] = { -0x53, -0x53, -0x44, -0x54, -0x44, -0x6, -0x0, -0x0, -0x1, -0x94, -0x42, -0x58, -0x50, -0x43, -0x0, -0x0, -0x42, -0x58, -0x53, -0x53, -0x44, -0x54, -0x50, -0x43, -0x1, -0x0, -0x0, -0x0, -0x49, -0x4e, -0x54, -0x4c, -0x28, -0x5, -0x10, -0x20, -0x10, -0x4f, -0x61, -0x5c, -0x2e, -0x5f, -0x53, -0x42, -0x5f, -0x50, -0x43, -0x49, -0x30, -0x5b, -0x82, -0x22, -0x53, -0x30, -0x31, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1, -0x0, -0x14, -0xc, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0x1, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0x1, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x32, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x2, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x2, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x2, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x33, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x3, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x3, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x3, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x34, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x4, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x4, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x4, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x35, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x5, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x5, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x5, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x36, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x6, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x6, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x6, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x37, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x7, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x7, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x7, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x38, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x8, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x8, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x8, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x39, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x9, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x9, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x9, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x41, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0xa, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0xa, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0xa, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x42, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0xb, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0xb, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0xb, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x43, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0xc, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0xc, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0xc, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x44, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0xd, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0xd, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0xd, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x45, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0xe, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0xe, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0xe, -0x5b, -0x82, -0x24, -0x53, -0x30, -0x46, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0xf, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0xf, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0xf, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x30, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x10, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x10, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x10, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x31, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x11, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x11, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x11, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x32, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x12, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x12, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x12, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x33, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x13, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x13, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x13, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x34, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x14, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x14, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x14, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x35, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x15, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x15, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x15, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x36, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x16, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x16, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x16, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x37, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x17, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x17, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x17, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x38, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x18, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x18, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x18, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x39, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x19, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x19, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x19, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x41, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1a, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x1a, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x1a, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x42, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1b, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x1b, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x1b, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x43, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1c, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x1c, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x1c, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x44, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1d, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x1d, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x1d, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x45, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1e, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x1e, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x1e, -0x5b, -0x82, -0x24, -0x53, -0x31, -0x46, -0x5f, -0x8, -0x5f, -0x41, -0x44, -0x52, -0xc, -0x0, -0x0, -0x1f, -0x0, -0x14, -0xd, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0xa4, -0x50, -0x43, -0x45, -0x4a, -0xa, -0x1f, -0x8, -0x5f, -0x53, -0x55, -0x4e, -0xa, -0x1f, -0x14, -0x4a, -0x17, -0x50, -0x43, -0x4e, -0x54, -0x2, -0xa0, -0xa, -0x93, -0x68, -0x1, -0x86, -0x53, -0x30, -0x31, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x2, -0x86, -0x53, -0x30, -0x32, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x3, -0x86, -0x53, -0x30, -0x33, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x4, -0x86, -0x53, -0x30, -0x34, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x5, -0x86, -0x53, -0x30, -0x35, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x6, -0x86, -0x53, -0x30, -0x36, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x7, -0x86, -0x53, -0x30, -0x37, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x8, -0x86, -0x53, -0x30, -0x38, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x9, -0x86, -0x53, -0x30, -0x39, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0xa, -0x86, -0x53, -0x30, -0x41, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0xb, -0x86, -0x53, -0x30, -0x42, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0xc, -0x86, -0x53, -0x30, -0x43, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0xd, -0x86, -0x53, -0x30, -0x44, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0xe, -0x86, -0x53, -0x30, -0x45, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0xf, -0x86, -0x53, -0x30, -0x46, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x10, -0x86, -0x53, -0x31, -0x30, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x11, -0x86, -0x53, -0x31, -0x31, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x12, -0x86, -0x53, -0x31, -0x32, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x13, -0x86, -0x53, -0x31, -0x33, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x14, -0x86, -0x53, -0x31, -0x34, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x15, -0x86, -0x53, -0x31, -0x35, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x16, -0x86, -0x53, -0x31, -0x36, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x17, -0x86, -0x53, -0x31, -0x37, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x18, -0x86, -0x53, -0x31, -0x38, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x19, -0x86, -0x53, -0x31, -0x39, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x1a, -0x86, -0x53, -0x31, -0x41, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x1b, -0x86, -0x53, -0x31, -0x42, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x1c, -0x86, -0x53, -0x31, -0x43, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x1d, -0x86, -0x53, -0x31, -0x44, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x1e, -0x86, -0x53, -0x31, -0x45, -0x5f, -0x69, -0xa0, -0xb, -0x93, -0x68, -0xa, -0x1f, -0x86, -0x53, -0x31, -0x46, -0x5f, -0x69 -}; diff --git a/src/ssdt-proc.hex b/src/ssdt-proc.hex deleted file mode 100644 index a28172e..0000000 --- a/src/ssdt-proc.hex +++ /dev/null @@ -1,134 +0,0 @@ -static unsigned char ssdt_proc_name[] = { -0x28 -}; -static unsigned char ssdp_proc_aml[] = { -0x53, -0x53, -0x44, -0x54, -0x78, -0x0, -0x0, -0x0, -0x1, -0xb3, -0x42, -0x58, -0x50, -0x43, -0x0, -0x0, -0x42, -0x58, -0x53, -0x53, -0x44, -0x54, -0x0, -0x0, -0x1, -0x0, -0x0, -0x0, -0x49, -0x4e, -0x54, -0x4c, -0x28, -0x5, -0x10, -0x20, -0x5b, -0x83, -0x42, -0x5, -0x43, -0x50, -0x41, -0x41, -0xaa, -0x10, -0xb0, -0x0, -0x0, -0x6, -0x8, -0x49, -0x44, -0x5f, -0x5f, -0xa, -0xaa, -0x8, -0x5f, -0x48, -0x49, -0x44, -0xd, -0x41, -0x43, -0x50, -0x49, -0x30, -0x30, -0x30, -0x37, -0x0, -0x14, -0xf, -0x5f, -0x4d, -0x41, -0x54, -0x0, -0xa4, -0x43, -0x50, -0x4d, -0x41, -0x49, -0x44, -0x5f, -0x5f, -0x14, -0xf, -0x5f, -0x53, -0x54, -0x41, -0x0, -0xa4, -0x43, -0x50, -0x53, -0x54, -0x49, -0x44, -0x5f, -0x5f, -0x14, -0xf, -0x5f, -0x45, -0x4a, -0x30, -0x1, -0x43, -0x50, -0x45, -0x4a, -0x49, -0x44, -0x5f, -0x5f, -0x68 -}; -static unsigned char ssdt_proc_id[] = { -0x38 -}; -static unsigned char ssdt_proc_end[] = { -0x78 -}; -static unsigned char ssdt_proc_start[] = { -0x24 -}; -- 1.7.1

6 years, 11 months

2
2
0 / 0

[PATCH] Cache romfile entries.

by Kevin O'Connor

Create a 'struct romfile_s' and populate a list of all romfiles at start of init. Caching the romfiles both simplifies the code and makes it more efficient. Also, convert the ramdisk code to use romfile helpers instead of directly accessing cbfs. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- Makefile | 2 +- src/boot.c | 4 +- src/bootsplash.c | 1 - src/coreboot.c | 208 +++++++++++++++++------------------------------------- src/optionroms.c | 16 ++-- src/paravirt.c | 138 +++++++---------------------------- src/paravirt.h | 45 +------------ src/pci.c | 2 +- src/post.c | 4 + src/ps2port.c | 1 - src/ramdisk.c | 12 ++-- src/romfile.c | 96 +++++++++++++++++++++++++ src/util.h | 24 +++++-- 13 files changed, 232 insertions(+), 321 deletions(-) create mode 100644 src/romfile.c diff --git a/Makefile b/Makefile index 5f3740d..fe974f7 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \ - biostables.c xen.c bmp.c + biostables.c xen.c bmp.c romfile.c SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c # Default compiler flags diff --git a/src/boot.c b/src/boot.c index 3f6375b..6949490 100644 --- a/src/boot.c +++ b/src/boot.c @@ -11,8 +11,8 @@ #include "bregs.h" // struct bregs #include "boot.h" // func defs #include "cmos.h" // inb_cmos -#include "paravirt.h" // romfile_loadfile -#include "pci.h" //pci_bdf_to_* +#include "paravirt.h" // qemu_cfg_show_boot_menu +#include "pci.h" // pci_bdf_to_* #include "usb.h" // struct usbdevice_s diff --git a/src/bootsplash.c b/src/bootsplash.c index f85f734..a85e2b2 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -10,7 +10,6 @@ #include "config.h" // CONFIG_* #include "util.h" // dprintf #include "jpeg.h" // splash -#include "paravirt.h" // romfile_find #include "vbe.h" // struct vbe_info #include "bmp.h" diff --git a/src/coreboot.c b/src/coreboot.c index e116a14..d93196f 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -121,8 +121,8 @@ static struct cb_memory *CBMemTable; const char *CBvendor = "", *CBpart = ""; // Populate max ram and e820 map info by scanning for a coreboot table. -static void -coreboot_fill_map(void) +void +coreboot_setup(void) { dprintf(3, "Attempting to find coreboot table\n"); @@ -286,25 +286,6 @@ struct cbfs_header { u32 pad[2]; } PACKED; -static struct cbfs_header *CBHDR; - -static void -cbfs_setup(void) -{ - if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH) - return; - - CBHDR = *(void **)CBFS_HEADPTR_ADDR; - if (CBHDR->magic != htonl(CBFS_HEADER_MAGIC)) { - dprintf(1, "Unable to find CBFS (ptr=%p; got %x not %x)\n" - , CBHDR, CBHDR->magic, htonl(CBFS_HEADER_MAGIC)); - CBHDR = NULL; - return; - } - - dprintf(1, "Found CBFS header at %p\n", CBHDR); -} - #define CBFS_FILE_MAGIC 0x455649484352414cLL // LARCHIVE struct cbfs_file { @@ -316,124 +297,22 @@ struct cbfs_file { char filename[0]; } PACKED; -// Verify a cbfs entry looks valid. -static struct cbfs_file * -cbfs_verify(struct cbfs_file *file) -{ - if (file < (struct cbfs_file *)(0xFFFFFFFF - ntohl(CBHDR->romsize))) - return NULL; - u64 magic = file->magic; - if (magic == CBFS_FILE_MAGIC) { - dprintf(8, "Found CBFS file %s\n", file->filename); - return file; - } - return NULL; -} - -// Return the first file in the CBFS archive -static struct cbfs_file * -cbfs_getfirst(void) -{ - if (! CBHDR) - return NULL; - return cbfs_verify((void *)(0 - ntohl(CBHDR->romsize) + ntohl(CBHDR->offset))); -} - -// Return the file after the given file. -static struct cbfs_file * -cbfs_getnext(struct cbfs_file *file) -{ - file = (void*)file + ALIGN(ntohl(file->len) + ntohl(file->offset), ntohl(CBHDR->align)); - return cbfs_verify(file); -} - -// Find the file with the given filename. -struct cbfs_file * -cbfs_findfile(const char *fname) -{ - dprintf(7, "Searching CBFS for %s\n", fname); - struct cbfs_file *file; - for (file = cbfs_getfirst(); file; file = cbfs_getnext(file)) - if (strcmp(fname, file->filename) == 0) - return file; - return NULL; -} - -// Find next file with the given filename prefix. -struct cbfs_file * -cbfs_findprefix(const char *prefix, struct cbfs_file *last) -{ - if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH) - return NULL; - - dprintf(7, "Searching CBFS for prefix %s\n", prefix); - int len = strlen(prefix); - struct cbfs_file *file; - if (! last) - file = cbfs_getfirst(); - else - file = cbfs_getnext(last); - for (; file; file = cbfs_getnext(file)) - if (memcmp(prefix, file->filename, len) == 0) - return file; - return NULL; -} - -// Find a file with the given filename (possibly with ".lzma" extension). -struct cbfs_file * -cbfs_finddatafile(const char *fname) -{ - int fnlen = strlen(fname); - struct cbfs_file *file = NULL; - for (;;) { - file = cbfs_findprefix(fname, file); - if (!file) - return NULL; - if (file->filename[fnlen] == '\0' - || strcmp(&file->filename[fnlen], ".lzma") == 0) - return file; - } -} - -// Determine whether the file has a ".lzma" extension. -static int -cbfs_iscomp(struct cbfs_file *file) -{ - int fnamelen = strlen(file->filename); - return fnamelen > 5 && strcmp(&file->filename[fnamelen-5], ".lzma") == 0; -} - -// Return the filename of a given file. -const char * -cbfs_filename(struct cbfs_file *file) -{ - return file->filename; -} - -// Determine the uncompressed size of a datafile. -u32 -cbfs_datasize(struct cbfs_file *file) -{ - void *src = (void*)file + ntohl(file->offset); - if (cbfs_iscomp(file)) - return *(u32*)(src + LZMA_PROPERTIES_SIZE); - return ntohl(file->len); -} - // Copy a file to memory (uncompressing if necessary) -int -cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen) +static int +cbfs_copyfile(struct romfile_s *file, void *dst, u32 maxlen) { - if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !file) + if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH) return -1; - u32 size = ntohl(file->len); - void *src = (void*)file + ntohl(file->offset); - if (cbfs_iscomp(file)) { + u32 size = file->rawsize; + void *src = file->data; + if (file->flags) { // Compressed - copy to temp ram and uncompress it. void *temp = malloc_tmphigh(size); - if (!temp) + if (!temp) { + warn_noalloc(); return -1; + } iomemcpy(temp, src, size); int ret = ulzma(dst, maxlen, temp, size); yield(); @@ -451,6 +330,53 @@ cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen) return size; } +void +coreboot_cbfs_setup(void) +{ + if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH) + return; + + struct cbfs_header *hdr = *(void **)CBFS_HEADPTR_ADDR; + if (hdr->magic != htonl(CBFS_HEADER_MAGIC)) { + dprintf(1, "Unable to find CBFS (ptr=%p; got %x not %x)\n" + , hdr, hdr->magic, htonl(CBFS_HEADER_MAGIC)); + return; + } + dprintf(1, "Found CBFS header at %p\n", hdr); + + struct cbfs_file *cfile = (void *)(0 - ntohl(hdr->romsize) + + ntohl(hdr->offset)); + for (;;) { + if (cfile < (struct cbfs_file *)(0xFFFFFFFF - ntohl(hdr->romsize))) + break; + u64 magic = cfile->magic; + if (magic != CBFS_FILE_MAGIC) + break; + struct romfile_s *file = malloc_tmp(sizeof(*file)); + if (!file) { + warn_noalloc(); + break; + } + memset(file, 0, sizeof(*file)); + strtcpy(file->name, cfile->filename, sizeof(file->name)); + dprintf(3, "Found CBFS file: %s\n", file->name); + file->size = file->rawsize = ntohl(cfile->len); + file->id = (u32)cfile; + file->copy = cbfs_copyfile; + file->data = (void*)cfile + ntohl(cfile->offset); + int len = strlen(file->name); + if (len > 5 && strcmp(&file->name[len-5], ".lzma") == 0) { + // Using compression. + file->flags = 1; + file->name[len-5] = '\0'; + file->size = *(u32*)(file->data + LZMA_PROPERTIES_SIZE); + } + romfile_add(file); + + cfile = (void*)ALIGN((u32)file->data + file->size, ntohl(hdr->align)); + } +} + struct cbfs_payload_segment { u32 type; u32 compression; @@ -524,20 +450,16 @@ cbfs_run_payload(struct cbfs_file *file) void cbfs_payload_setup(void) { - struct cbfs_file *file = NULL; + if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH) + return; + struct romfile_s *file = NULL; for (;;) { - file = cbfs_findprefix("img/", file); + file = romfile_findprefix("img/", file); if (!file) break; - const char *filename = cbfs_filename(file); + const char *filename = file->name; char *desc = znprintf(MAXDESCSIZE, "Payload [%s]", &filename[4]); - boot_add_cbfs(file, desc, bootprio_find_named_rom(filename, 0)); + boot_add_cbfs((void*)file->id, desc + , bootprio_find_named_rom(filename, 0)); } } - -void -coreboot_setup(void) -{ - coreboot_fill_map(); - cbfs_setup(); -} diff --git a/src/optionroms.c b/src/optionroms.c index bd2f977..00697b2 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -13,7 +13,6 @@ #include "pci_regs.h" // PCI_ROM_ADDRESS #include "pci_ids.h" // PCI_CLASS_DISPLAY_VGA #include "boot.h" // IPL -#include "paravirt.h" // qemu_cfg_* #include "optionroms.h" // struct rom_header @@ -151,7 +150,8 @@ getRomPriority(u64 *sources, struct rom_header *rom, int instance) return -1; if (source & RS_PCIROM) return bootprio_find_pci_rom((void*)(u32)source, instance); - return bootprio_find_named_rom(romfile_name(source), instance); + struct romfile_s *file = (void*)(u32)source; + return bootprio_find_named_rom(file->name, instance); } @@ -160,15 +160,15 @@ getRomPriority(u64 *sources, struct rom_header *rom, int instance) ****************************************************************/ static struct rom_header * -deploy_romfile(u32 file) +deploy_romfile(struct romfile_s *file) { - u32 size = romfile_size(file); + u32 size = file->size; struct rom_header *rom = rom_reserve(size); if (!rom) { warn_noalloc(); return NULL; } - int ret = romfile_copy(file, rom, size); + int ret = file->copy(file, rom, size); if (ret <= 0) return NULL; return rom; @@ -181,7 +181,7 @@ lookup_hardcode(struct pci_device *pci) char fname[17]; snprintf(fname, sizeof(fname), "pci%04x,%04x.rom" , pci->vendor, pci->device); - u32 file = romfile_find(fname); + struct romfile_s *file = romfile_find(fname); if (file) return deploy_romfile(file); return NULL; @@ -191,14 +191,14 @@ lookup_hardcode(struct pci_device *pci) static void run_file_roms(const char *prefix, int isvga, u64 *sources) { - u32 file = 0; + struct romfile_s *file = NULL; for (;;) { file = romfile_findprefix(prefix, file); if (!file) break; struct rom_header *rom = deploy_romfile(file); if (rom) { - setRomSource(sources, rom, file); + setRomSource(sources, rom, (u32)file); init_optionrom(rom, 0, isvga); } } diff --git a/src/paravirt.c b/src/paravirt.c index 9cf77de..31759e8 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -305,126 +305,44 @@ u16 qemu_cfg_get_max_cpus(void) return cnt; } -static QemuCfgFile LastFile; - -static u32 -__cfg_next_prefix_file(const char *prefix, int prefixlen, u32 prevselect) -{ - if (!qemu_cfg_present) - return 0; - - u32 count; - qemu_cfg_read_entry(&count, QEMU_CFG_FILE_DIR, sizeof(count)); - count = ntohl(count); - u32 e; - for (e = 0; e < count; e++) { - qemu_cfg_read((void*)&LastFile, sizeof(LastFile)); - u32 select = ntohs(LastFile.select); - if (select <= prevselect) - continue; - if (memcmp(prefix, LastFile.name, prefixlen) == 0) - return select; - } - return 0; -} - -u32 qemu_cfg_next_prefix_file(const char *prefix, u32 prevselect) +int qemu_cfg_read_file(struct romfile_s *file, void *dst, u32 maxlen) { - return __cfg_next_prefix_file(prefix, strlen(prefix), prevselect); + if (file->size > maxlen) + return -1; + qemu_cfg_read_entry(dst, file->id, file->size); + return file->size; } -u32 qemu_cfg_find_file(const char *name) -{ - return __cfg_next_prefix_file(name, strlen(name) + 1, 0); -} +struct QemuCfgFile { + u32 size; /* file size */ + u16 select; /* write this to 0x510 to read it */ + u16 reserved; + char name[56]; +}; -static int -__qemu_cfg_set_file(u32 select) +void qemu_cfg_romfile_setup(void) { - if (!qemu_cfg_present || !select) - return -1; - if (select == ntohs(LastFile.select)) - return 0; + if (CONFIG_COREBOOT || !qemu_cfg_present) + return; u32 count; qemu_cfg_read_entry(&count, QEMU_CFG_FILE_DIR, sizeof(count)); count = ntohl(count); u32 e; for (e = 0; e < count; e++) { - qemu_cfg_read((void*)&LastFile, sizeof(LastFile)); - if (select == ntohs(LastFile.select)) - return 0; - } - return -1; -} - -int qemu_cfg_size_file(u32 select) -{ - if (__qemu_cfg_set_file(select)) - return -1; - return ntohl(LastFile.size); -} - -const char* qemu_cfg_name_file(u32 select) -{ - if (__qemu_cfg_set_file(select)) - return NULL; - return LastFile.name; -} - -int qemu_cfg_read_file(u32 select, void *dst, u32 maxlen) -{ - if (__qemu_cfg_set_file(select)) - return -1; - int len = qemu_cfg_size_file(select); - if (len < 0 || len > maxlen) - return -1; - qemu_cfg_read_entry(dst, select, len); - return len; -} - -// Helper function to find, malloc_tmphigh, and copy a romfile. This -// function adds a trailing zero to the malloc'd copy. -void * -romfile_loadfile(const char *name, int *psize) -{ - u32 file = romfile_find(name); - if (!file) - return NULL; - - int filesize = romfile_size(file); - if (!filesize) - return NULL; - - char *data = malloc_tmphigh(filesize+1); - if (!data) { - warn_noalloc(); - return NULL; + struct QemuCfgFile qfile; + qemu_cfg_read((void*)&qfile, sizeof(qfile)); + struct romfile_s *file = malloc_tmp(sizeof(*file)); + if (!file) { + warn_noalloc(); + return; + } + memset(file, 0, sizeof(*file)); + strtcpy(file->name, qfile.name, sizeof(file->name)); + file->size = qfile.size; + file->id = qfile.select; + file->copy = qemu_cfg_read_file; + romfile_add(file); + dprintf(3, "Found fw_cfg file: %s\n", file->name); } - - dprintf(5, "Copying romfile '%s' (len %d)\n", name, filesize); - romfile_copy(file, data, filesize); - if (psize) - *psize = filesize; - data[filesize] = '\0'; - return data; -} - -// Attempt to load an integer from the given file - return 'defval' -// if unsuccesful. -u64 -romfile_loadint(const char *name, u64 defval) -{ - u32 file = romfile_find(name); - if (!file) - return defval; - - int filesize = romfile_size(file); - if (!filesize || filesize > sizeof(u64) || (filesize & (filesize-1))) - // Doesn't look like a valid integer. - return defval; - - u64 val = 0; - romfile_copy(file, &val, sizeof(val)); - return val; } diff --git a/src/paravirt.h b/src/paravirt.h index f39e226..a284c41 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -57,56 +57,13 @@ int qemu_cfg_smbios_load_external(int type, char **p, unsigned *nr_structs, int qemu_cfg_get_numa_nodes(void); void qemu_cfg_get_numa_data(u64 *data, int n); u16 qemu_cfg_get_max_cpus(void); - -typedef struct QemuCfgFile { - u32 size; /* file size */ - u16 select; /* write this to 0x510 to read it */ - u16 reserved; - char name[56]; -} QemuCfgFile; - struct e820_reservation { u64 address; u64 length; u32 type; }; - -u32 qemu_cfg_next_prefix_file(const char *prefix, u32 prevselect); -u32 qemu_cfg_find_file(const char *name); -int qemu_cfg_size_file(u32 select); -const char* qemu_cfg_name_file(u32 select); -int qemu_cfg_read_file(u32 select, void *dst, u32 maxlen); - -// Wrappers that select cbfs or qemu_cfg file interface. -static inline u32 romfile_findprefix(const char *prefix, u32 previd) { - if (CONFIG_COREBOOT) - return (u32)cbfs_findprefix(prefix, (void*)previd); - return qemu_cfg_next_prefix_file(prefix, previd); -} -static inline u32 romfile_find(const char *name) { - if (CONFIG_COREBOOT) - return (u32)cbfs_finddatafile(name); - return qemu_cfg_find_file(name); -} -static inline u32 romfile_size(u32 fileid) { - if (CONFIG_COREBOOT) - return cbfs_datasize((void*)fileid); - return qemu_cfg_size_file(fileid); -} -static inline int romfile_copy(u32 fileid, void *dst, u32 maxlen) { - if (CONFIG_COREBOOT) - return cbfs_copyfile((void*)fileid, dst, maxlen); - return qemu_cfg_read_file(fileid, dst, maxlen); -} -static inline const char* romfile_name(u32 fileid) { - if (CONFIG_COREBOOT) - return cbfs_filename((void*)fileid); - return qemu_cfg_name_file(fileid); -} -void *romfile_loadfile(const char *name, int *psize); -u64 romfile_loadint(const char *name, u64 defval); - u32 qemu_cfg_e820_entries(void); void* qemu_cfg_e820_load_next(void *addr); +void qemu_cfg_romfile_setup(void); #endif diff --git a/src/pci.c b/src/pci.c index 49bc34e..071c302 100644 --- a/src/pci.c +++ b/src/pci.c @@ -5,10 +5,10 @@ // // This file may be distributed under the terms of the GNU LGPLv3 license. +#include "config.h" // CONFIG_* #include "pci.h" // pci_config_writel #include "ioport.h" // outl #include "util.h" // dprintf -#include "paravirt.h" // romfile_loadint #include "farptr.h" // MAKE_FLATPTR #include "pci_regs.h" // PCI_VENDOR_ID #include "pci_ids.h" // PCI_CLASS_DISPLAY_VGA diff --git a/src/post.c b/src/post.c index d2f40f4..1d0d35a 100644 --- a/src/post.c +++ b/src/post.c @@ -214,6 +214,10 @@ startBoot(void) static void maininit(void) { + // Setup romfile items. + qemu_cfg_romfile_setup(); + coreboot_cbfs_setup(); + // Setup ivt/bda/ebda init_ivt(); init_bda(); diff --git a/src/ps2port.c b/src/ps2port.c index c835e14..601e40d 100644 --- a/src/ps2port.c +++ b/src/ps2port.c @@ -7,7 +7,6 @@ #include "ioport.h" // inb #include "util.h" // dprintf -#include "paravirt.h" // romfile_loadint #include "biosvar.h" // GET_LOW #include "ps2port.h" // ps2_kbd_command #include "pic.h" // eoi_pic1 diff --git a/src/ramdisk.c b/src/ramdisk.c index bae30e2..9249a49 100644 --- a/src/ramdisk.c +++ b/src/ramdisk.c @@ -14,15 +14,15 @@ void ramdisk_setup(void) { - if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY) + if (!CONFIG_FLASH_FLOPPY) return; // Find image. - struct cbfs_file *file = cbfs_findprefix("floppyimg/", NULL); + struct romfile_s *file = romfile_findprefix("floppyimg/", NULL); if (!file) return; - const char *filename = cbfs_filename(file); - u32 size = cbfs_datasize(file); + const char *filename = file->name; + u32 size = file->size; dprintf(3, "Found floppy file %s of size %d\n", filename, size); int ftype = find_floppy_type(size); if (ftype < 0) { @@ -39,7 +39,9 @@ ramdisk_setup(void) add_e820((u32)pos, size, E820_RESERVED); // Copy image into ram. - cbfs_copyfile(file, pos, size); + int ret = file->copy(file, pos, size); + if (ret < 0) + return; // Setup driver. struct drive_s *drive_g = init_floppy((u32)pos, ftype); diff --git a/src/romfile.c b/src/romfile.c new file mode 100644 index 0000000..b732e29 --- /dev/null +++ b/src/romfile.c @@ -0,0 +1,96 @@ +// Access to pseudo "file" interface for configuration information. +// +// Copyright (C) 2012 Kevin O'Connor <kevin(a)koconnor.net> +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "config.h" // CONFIG_* +#include "util.h" // dprintf + +static struct romfile_s *RomfileRoot; + +void +romfile_add(struct romfile_s *file) +{ + file->next = RomfileRoot; + RomfileRoot = file; +} + +// Search for the specified file. +static struct romfile_s * +__romfile_findprefix(const char *prefix, int prefixlen, struct romfile_s *prev) +{ + struct romfile_s *cur = RomfileRoot; + if (prev) + cur = prev->next; + while (cur) { + if (memcmp(prefix, cur->name, prefixlen) == 0) + return cur; + cur = cur->next; + } + return NULL; +} + +struct romfile_s * +romfile_findprefix(const char *prefix, struct romfile_s *prev) +{ + return __romfile_findprefix(prefix, strlen(prefix), prev); +} + +struct romfile_s * +romfile_find(const char *name) +{ + return __romfile_findprefix(name, strlen(name) + 1, NULL); +} + +// Helper function to find, malloc_tmphigh, and copy a romfile. This +// function adds a trailing zero to the malloc'd copy. +void * +romfile_loadfile(const char *name, int *psize) +{ + struct romfile_s *file = romfile_find(name); + if (!file) + return NULL; + + int filesize = file->size; + if (!filesize) + return NULL; + + char *data = malloc_tmphigh(filesize+1); + if (!data) { + warn_noalloc(); + return NULL; + } + + dprintf(5, "Copying romfile '%s' (len %d)\n", name, filesize); + int ret = file->copy(file, data, filesize); + if (ret < 0) { + free(data); + return NULL; + } + if (psize) + *psize = filesize; + data[filesize] = '\0'; + return data; +} + +// Attempt to load an integer from the given file - return 'defval' +// if unsuccesful. +u64 +romfile_loadint(const char *name, u64 defval) +{ + struct romfile_s *file = romfile_find(name); + if (!file) + return defval; + + int filesize = file->size; + if (!filesize || filesize > sizeof(u64) || (filesize & (filesize-1))) + // Doesn't look like a valid integer. + return defval; + + u64 val = 0; + int ret = file->copy(file, &val, sizeof(val)); + if (ret < 0) + return defval; + return val; +} diff --git a/src/util.h b/src/util.h index e5d494e..39350cc 100644 --- a/src/util.h +++ b/src/util.h @@ -353,15 +353,11 @@ void smp_probe(void); // coreboot.c extern const char *CBvendor, *CBpart; struct cbfs_file; -struct cbfs_file *cbfs_finddatafile(const char *fname); -struct cbfs_file *cbfs_findprefix(const char *prefix, struct cbfs_file *last); -u32 cbfs_datasize(struct cbfs_file *file); -const char *cbfs_filename(struct cbfs_file *file); -int cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen); void cbfs_run_payload(struct cbfs_file *file); void coreboot_copy_biostable(void); void cbfs_payload_setup(void); void coreboot_setup(void); +void coreboot_cbfs_setup(void); // biostable.c void copy_pir(void *pos); @@ -458,6 +454,24 @@ static inline void free(void *data) { // mtrr.c void mtrr_setup(void); +// romfile.c +struct romfile_s { + struct romfile_s *next; + char name[128]; + u32 size; + int (*copy)(struct romfile_s *file, void *dest, u32 maxlen); + + u32 id; + u32 rawsize; + u32 flags; + void *data; +}; +void romfile_add(struct romfile_s *file); +struct romfile_s *romfile_findprefix(const char *prefix, struct romfile_s *prev); +struct romfile_s *romfile_find(const char *name); +void *romfile_loadfile(const char *name, int *psize); +u64 romfile_loadint(const char *name, u64 defval); + // romlayout.S void reset_vector(void) __noreturn; -- 1.7.6.5

6 years, 12 months

1
0
0 / 0

[PATCH] Remove CanPreempt check from pmm code.

by Kevin O'Connor

The CanPreempt check in pmm is a leftover from when memory could be allocated from the 9-segment. It is no longer needed. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/pmm.c | 10 ---------- src/util.h | 1 - 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/pmm.c b/src/pmm.c index 4cee401..5d43645 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -537,13 +537,6 @@ handle_pmm(u16 *args) u16 arg1 = args[0]; dprintf(DEBUG_HDL_pmm, "pmm call arg1=%x\n", arg1); - int oldpreempt; - if (CONFIG_THREAD_OPTIONROMS) { - // Not a preemption event - don't wait in wait_preempt() - oldpreempt = CanPreempt; - CanPreempt = 0; - } - u32 ret; switch (arg1) { case 0x00: ret = handle_pmm00(args); break; @@ -552,9 +545,6 @@ handle_pmm(u16 *args) default: ret = handle_pmmXX(args); break; } - if (CONFIG_THREAD_OPTIONROMS) - CanPreempt = oldpreempt; - return ret; } diff --git a/src/util.h b/src/util.h index 0d41785..e5d494e 100644 --- a/src/util.h +++ b/src/util.h @@ -225,7 +225,6 @@ void wait_threads(void); struct mutex_s { u32 isLocked; }; void mutex_lock(struct mutex_s *mutex); void mutex_unlock(struct mutex_s *mutex); -extern int CanPreempt; void start_preempt(void); void finish_preempt(void); int wait_preempt(void); -- 1.7.6.5

6 years, 12 months

1
0
0 / 0

Re: [SeaBIOS] [PATCH 0/6] pci patches

by Sebastian Herbszt

ron minnich wrote: > Ah,the A5 BSOD, the bane of my life. > > This is an ACPI issue. > > That last paramter, 494e495f, is a *CLUE*. It is ASCII. It is _INI. No > idea if that helps. > > There is more info available ... just google Windows A5 Stop. > > thanks > > ron Excerpt from KB 314830 [1]: (0x00000003, Parameter2, Parameter3, Parameter4): This error is defined as "ACPI failed must succeed method." This error occurs if ACPI cannot build a control method to reference the ACPI namespace. Other arguments for this error reference the ACPI object that was being run and the name of the control method. One greatly simplified explanation (which might not be completely accurate) is that the system cannot find a way to get to the ACPI tables that define the Plug and Play and Power Management capabilities of the system. [1] http://support.microsoft.com/kb/314830/en-us Sebastian

6 years, 12 months

3
3
0 / 0

[PATCH 00/13] Enhance extra stack and reduce overall 16bit stack usage

by Kevin O'Connor

This patch series reduces the overall stack usage of the 16bit code. The biggest change is the enhancment of the "extra stack" in the e-segment to be re-entrant. The "extra stack" was previously used only by the resume code and disk code. It has been made more flexible so that it can be used by other callers. After this series, SeaBIOS will never expose the extra stack to any external code - on any irq enable or external call point SeaBIOS will jump back to the original stack first. Because the extra stack is only used by SeaBIOS code now, the stack space in use can be tracked and re-entrant callers can be handled safely. All of the hardware irq handlers have been updated to jump into the extra stack upon being called. This makes the stack space used by SeaBIOS based hardware irq handlers virtually zero. -Kevin Kevin O'Connor (13): Rename wait_irq to yield_toirq. Don't restrict VISIBLEx C functions to only x mode. Rename call16 to farcall16. Move farcall16 code from util.c to stacks.c and reorg stacks.c. Replace 32bit->16bit farcall system with regular calls. Make the extra stack re-entrant and "hop back" to check for irqs. Automatically hop off the extra stack when far calling 16bit code. Run all hardware irq handlers on the extra stack. Use the extra stack for 16bit USB and PS2 keyboard/mouse commands. Remove "noinline" declarations from keyboard/mouse driver code. Set noinline on kbd.c interface functions that take stack variable pointers. Make sure to set dependency to segment registers in inline asm. Rework disk.c:fillLCHS to avoid using pointer parameters. src/apm.c | 15 +-- src/asm-offsets.c | 1 + src/boot.c | 6 +- src/clock.c | 22 +++-- src/disk.c | 40 ++++---- src/disk.h | 1 + src/floppy.c | 8 +- src/kbd.c | 30 +++--- src/misc.c | 14 ++- src/mouse.c | 63 ++++++----- src/optionroms.c | 2 +- src/output.c | 9 -- src/post.c | 3 + src/ps2port.c | 8 +- src/resume.c | 2 +- src/romlayout.S | 153 ++++++++++++++++++--------- src/stacks.c | 285 ++++++++++++++++++++++++++++++++++----------------- src/system.c | 6 +- src/types.h | 16 ++-- src/usb-hid.c | 2 +- src/usb.c | 2 +- src/util.c | 62 ++---------- src/util.h | 47 +++------ tools/checkstack.py | 2 +- 24 files changed, 439 insertions(+), 360 deletions(-) -- 1.7.6.5

6 years, 12 months

1
13
0 / 0

Re: [SeaBIOS] OS that don't work?

by Peter Stuge

Fred . wrote: > Why does not Windows 98 work with SeaBIOS? You could contribute significantly to the project by doing the debugging. Asking the question doesn't help much on the other hand. //Peter

6 years, 12 months

1
0
0 / 0

Re: [SeaBIOS] OS that don't work?

by nap

Le 26/05/2012 14:06, Fred . a écrit : > Is there any x86 operating system that SeaBIOS can not boot? > Why? > > _______________________________________________ > SeaBIOS mailing list > SeaBIOS(a)seabios.org > http://www.seabios.org/mailman/listinfo/seabios > SeaBIOS is not currently (1.6.3) fully able to boot W98SE. That is just for information, I am in fact quite happy to be able to use a new box with W98SE. I am currently upgrading from a quite old and deceased box with W98SE on it to a QEMU/SeaBIOS brand new box. After some expected difficulties mostly linked to get proper information, I am now trying to assess the interaction between QEMU/Seabios and W98SE. I can say that during the upgrade process, W98SE recognize SeaBIOS as "BIOS Plug-and-Play", something new to install but W98SE consider it as not functioning properly. If you let W98SE try to install it, it crash with no progress at reboot. If you don't let it install it, it does not crash and at the end of the upgrade it is able to reboot, but not exactly normally, even if you are able to use it. I will commit a full report. So, for me, SeaBIOS is not currently (1.6.3) fully able to boot W98SE.

6 years, 12 months

3
2
0 / 0

OS that don't work?

by Fred .

Is there any x86 operating system that SeaBIOS can not boot? Why?

7 years

1
0
0 / 0

VirtualBox BIOS

by Fred .

Can SeaBIOS be used with VirtualBox? Why isn't SeaBIOS the default BIOS in VirtualBox? Since VirtualBox is open source, can or does the SeaBIOS project look at the source code of the BIOS implementation in VirtualBox for hints how things are done? Can SeaBIOS be used with VMware?

7 years

1
0
0 / 0

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS May 2012