diff --git a/grub-core/term/ns8250-spcr.c b/grub-core/term/ns8250-spcr.c index d52b52c26..4efaaf768 100644 --- a/grub-core/term/ns8250-spcr.c +++ b/grub-core/term/ns8250-spcr.c @@ -38,7 +38,8 @@ grub_ns8250_spcr_init (void) grub_dprintf ("serial", "SPCR table revision %d < 2, continuing anyway\n", (int) spcr->hdr.revision); if (spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550 && - spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550X) + spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550_DBGP && + spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550_DBG2) return NULL; /* For now, we only support byte accesses. */ if (spcr->base_addr.access_size != GRUB_ACPI_GENADDR_SIZE_BYTE && diff --git a/include/grub/acpi.h b/include/grub/acpi.h index f2862da74..1046f22d7 100644 --- a/include/grub/acpi.h +++ b/include/grub/acpi.h @@ -200,8 +200,9 @@ struct grub_acpi_genaddr { struct grub_acpi_spcr { struct grub_acpi_table_header hdr; grub_uint8_t intf_type; -#define GRUB_ACPI_SPCR_INTF_TYPE_16550 0x00 -#define GRUB_ACPI_SPCR_INTF_TYPE_16550X 0x01 +#define GRUB_ACPI_SPCR_INTF_TYPE_16550 0x00 +#define GRUB_ACPI_SPCR_INTF_TYPE_16550_DBGP 0x01 +#define GRUB_ACPI_SPCR_INTF_TYPE_16550_DBG2 0x12 grub_uint8_t reserved_0[3]; struct grub_acpi_genaddr base_addr; grub_uint8_t interrupt_type;