X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/287a5f7ae6a3bec3d679a5de394e915b56c7367d..313093773e81eb89ad3c44b048a79bbcd6e94099:/lunaix-os/includes/hal/acpi/madt.h?ds=sidebyside diff --git a/lunaix-os/includes/hal/acpi/madt.h b/lunaix-os/includes/hal/acpi/madt.h index 72aca46..1dd0bca 100644 --- a/lunaix-os/includes/hal/acpi/madt.h +++ b/lunaix-os/includes/hal/acpi/madt.h @@ -15,7 +15,7 @@ typedef struct { uint8_t type; uint8_t length; -} __attribute__((packed)) acpi_ics_hdr_t; +} ACPI_TABLE_PACKED acpi_ics_hdr_t; /** * @brief ACPI Processor Local APIC Structure (PLAS) @@ -28,8 +28,8 @@ typedef struct acpi_ics_hdr_t header; uint8_t processor_id; uint8_t apic_id; - uint32_t flags; -} __attribute__((packed)) acpi_apic_t; + u32_t flags; +} ACPI_TABLE_PACKED acpi_apic_t; /** * @brief ACPI IO APIC Structure (IOAS) @@ -43,10 +43,11 @@ typedef struct acpi_ics_hdr_t header; uint8_t ioapic_id; uint8_t reserved; - uint32_t ioapic_addr; - // The global system interrupt offset for this IOAPIC. (Kind of IRQ offset for a slave IOAPIC) - uint32_t gis_offset; -} __attribute__((packed)) acpi_ioapic_t; + u32_t ioapic_addr; + // The global system interrupt offset for this IOAPIC. (Kind of IRQ offset + // for a slave IOAPIC) + u32_t gis_offset; +} ACPI_TABLE_PACKED acpi_ioapic_t; /** * @brief ACPI Interrupt Source Override (INTSO) @@ -65,17 +66,17 @@ typedef struct // PIC uint8_t source; // global system interrupt. The override of source in APIC mode - uint32_t gsi; + u32_t gsi; uint16_t flags; -} __attribute__((packed)) acpi_intso_t; +} ACPI_TABLE_PACKED acpi_intso_t; typedef struct { acpi_sdthdr_t header; void* apic_addr; - uint32_t flags; + u32_t flags; // Here is a bunch of packed ICS reside here back-to-back. -} __attribute__((packed)) acpi_madt_t; +} ACPI_TABLE_PACKED acpi_madt_t; typedef struct { @@ -83,6 +84,6 @@ typedef struct acpi_apic_t* apic; acpi_ioapic_t* ioapic; acpi_intso_t** irq_exception; -} __attribute__((packed)) acpi_madt_toc_t; +} ACPI_TABLE_PACKED acpi_madt_toc_t; #endif /* __LUNAIX_ACPI_MADT_H */