Skip to content

Commit

Permalink
update for seabios-1.7.5
Browse files Browse the repository at this point in the history
src/acpi.c was moved to src/fw/acpi.c
  • Loading branch information
jamescassell committed Dec 18, 2014
1 parent b0bed89 commit bb862fa
Showing 1 changed file with 23 additions and 19 deletions.
42 changes: 23 additions & 19 deletions seabios.patch
@@ -1,8 +1,8 @@
--- a/src/acpi.c 2013-01-19 06:44:54.000000000 +0600
+++ b/src/acpi.c 2013-05-07 01:16:30.000000000 +0600
@@ -214,6 +214,11 @@
--- a/src/fw/acpi.c
+++ b/src/fw/acpi.c
@@ -23,6 +23,11 @@ struct srat_memory_affinity

#include "acpi-dsdt.hex"
#include "src/fw/acpi-dsdt.hex"

+#define CONFIG_OEM_SLIC
+#ifdef CONFIG_OEM_SLIC
Expand All @@ -12,30 +12,34 @@
static void
build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev)
{
@@ -226,6 +231,10 @@
@@ -35,6 +40,10 @@ build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev)
h->oem_revision = cpu_to_le32(1);
memcpy(h->asl_compiler_id, CONFIG_APPNAME4, 4);
memcpy(h->asl_compiler_id, BUILD_APPNAME4, 4);
h->asl_compiler_revision = cpu_to_le32(1);
+ #ifdef CONFIG_OEM_SLIC
+ if (sig == RSDT_SIGNATURE) // only RSDT is checked by win7 & vista
+ memcpy(h->oem_id, ((struct acpi_table_header*)SLIC)->oem_id, 14);
+ memcpy(h->oem_id, ((struct acpi_table_header*)SLIC)->oem_id, 14);
+ #endif
h->checksum -= checksum(h, len);
}

@@ -827,6 +836,15 @@
ACPI_INIT_TABLE(build_srat());
@@ -624,6 +633,18 @@ acpi_bios_init(void)
if (pci->device == PCI_DEVICE_ID_INTEL_ICH9_LPC)
ACPI_INIT_TABLE(build_mcfg_q35());

+ #ifdef CONFIG_OEM_SLIC
+ void *buf = malloc_high(sizeof(SLIC));
+ if (!buf)
+ warn_noalloc();
+ else {
+ memcpy(buf, SLIC, sizeof(SLIC));
+ ACPI_INIT_TABLE(buf);
+ }
+ {
+ void *buf = malloc_high(sizeof(SLIC));
+ if (!buf)
+ warn_noalloc();
+ else {
+ memcpy(buf, SLIC, sizeof(SLIC));
+ ACPI_INIT_TABLE(buf);
+ }
+ }
+ #endif

u16 i, external_tables = qemu_cfg_acpi_additional_tables();

+
struct romfile_s *file = NULL;
for (;;) {
file = romfile_findprefix("acpi/", file);

0 comments on commit bb862fa

Please sign in to comment.