xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Fix data types and rename some fields to avoid confusion
All checks were successful
Builds / ExectOS (i686) (push) Successful in 36s
Details
Builds / ExectOS (amd64) (push) Successful in 36s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2024-07-16 16:28:12 +02:00
parent 7abd0f3017
commit 088940424d
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sdk/xtdk/hltypes.h
View File

@ -318,9 +318,9 @@ typedef struct _ACPI_MADT
typedef struct _ACPI_MADT_LOCAL_APIC typedef struct _ACPI_MADT_LOCAL_APIC
{ {
ACPI_SUBTABLE_HEADER Header; ACPI_SUBTABLE_HEADER Header;
UCHAR ProcessorId; UCHAR AcpiId;
UCHAR Id; UCHAR ApicId;
ULONG LapicFlags; ULONG Flags;
} PACKED ACPI_MADT_LOCAL_APIC, *PACPI_MADT_LOCAL_APIC; } PACKED ACPI_MADT_LOCAL_APIC, *PACPI_MADT_LOCAL_APIC;
/* ACPI Local X2APIC MADT subtable structure */ /* ACPI Local X2APIC MADT subtable structure */
@ -328,9 +328,9 @@ typedef struct _ACPI_MADT_LOCAL_X2APIC
{ {
ACPI_SUBTABLE_HEADER Header; ACPI_SUBTABLE_HEADER Header;
USHORT Reserved; USHORT Reserved;
ULONG Id; ULONG ApicId;
ULONG LapicFlags; ULONG Flags;
ULONG ProcessorId; ULONG AcpiId;
} PACKED ACPI_MADT_LOCAL_X2APIC, *PACPI_MADT_LOCAL_X2APIC; } PACKED ACPI_MADT_LOCAL_X2APIC, *PACPI_MADT_LOCAL_X2APIC;
/* ACPI System Information structure */ /* ACPI System Information structure */
@ -342,12 +342,12 @@ typedef struct _ACPI_SYSTEM_INFO
ULONG IoApicCount; ULONG IoApicCount;
ULONG IntiCount; ULONG IntiCount;
ULONG LintiCount; ULONG LintiCount;
ULONG ImcrPresent; BOOLEAN ImcrPresent;
ULONG ApicBase; ULONG ApicBase;
PPROCESSOR_IDENTITY CpuInfo; PPROCESSOR_IDENTITY CpuInfo;
ULONG IoApicPhysicalBase[APIC_MAX_IOAPICS]; ULONG IoApicPhysicalBase[APIC_MAX_IOAPICS];
PULONG IoApicVirtualBase[APIC_MAX_IOAPICS]; ULONG IoApicVirtualBase[APIC_MAX_IOAPICS];
ULONG IoApicIntiBase[APIC_MAX_IOAPICS]; ULONG IoApicVectorBase[APIC_MAX_IOAPICS];
} ACPI_SYSTEM_INFO, *PACPI_SYSTEM_INFO; } ACPI_SYSTEM_INFO, *PACPI_SYSTEM_INFO;
/* ACPI Timer information structure */ /* ACPI Timer information structure */
@ -393,9 +393,9 @@ typedef struct _HAL_FRAMEBUFFER_DATA
/* Processor identity structure */ /* Processor identity structure */
typedef struct _PROCESSOR_IDENTITY typedef struct _PROCESSOR_IDENTITY
{ {
UCHAR Id; ULONG AcpiId;
UCHAR CpuId; ULONG ApicId;
UCHAR CpuNumber; USHORT CpuNumber;
BOOLEAN Bsp; BOOLEAN Bsp;
BOOLEAN Started; BOOLEAN Started;
} PROCESSOR_IDENTITY, *PPROCESSOR_IDENTITY; } PROCESSOR_IDENTITY, *PPROCESSOR_IDENTITY;

18
xtoskrnl/hl/acpi.c
View File

@ -270,7 +270,7 @@ HlpInitializeAcpiSystemInformation(VOID)
ULONG_PTR MadtTable; ULONG_PTR MadtTable;
PACPI_MADT Madt; PACPI_MADT Madt;
XTSTATUS Status; XTSTATUS Status;
ULONG CpuCount; USHORT CpuCount;
/* Allocate memory for ACPI system information structure */ /* Allocate memory for ACPI system information structure */
Status = HlpInitializeAcpiSystemStructure(); Status = HlpInitializeAcpiSystemStructure();
@ -303,12 +303,12 @@ HlpInitializeAcpiSystemInformation(VOID)
LocalApic = (PACPI_MADT_LOCAL_APIC)MadtTable; LocalApic = (PACPI_MADT_LOCAL_APIC)MadtTable;
/* Make sure, this CPU can be enabled */ /* Make sure, this CPU can be enabled */
if(LocalApic->LapicFlags & ACPI_MADT_PLAOC_ENABLED) if(LocalApic->Flags & ACPI_MADT_PLAOC_ENABLED)
{ {
/* Store CPU number, APIC ID and CPU ID */ /* Store CPU number, APIC ID and CPU ID */
HlpSystemInfo.CpuInfo[CpuCount].AcpiId = LocalApic->AcpiId;
HlpSystemInfo.CpuInfo[CpuCount].ApicId = LocalApic->ApicId;
HlpSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount; HlpSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount;
HlpSystemInfo.CpuInfo[CpuCount].CpuId = LocalApic->ProcessorId;
HlpSystemInfo.CpuInfo[CpuCount].Id = LocalApic->Id;
/* Increment number of CPUs */ /* Increment number of CPUs */
CpuCount++; CpuCount++;
@ -324,12 +324,12 @@ HlpInitializeAcpiSystemInformation(VOID)
LocalX2Apic = (PACPI_MADT_LOCAL_X2APIC)MadtTable; LocalX2Apic = (PACPI_MADT_LOCAL_X2APIC)MadtTable;
/* Make sure, this CPU can be enabled */ /* Make sure, this CPU can be enabled */
if(LocalX2Apic->LapicFlags & ACPI_MADT_PLAOC_ENABLED) if(LocalX2Apic->Flags & ACPI_MADT_PLAOC_ENABLED)
{ {
/* Store CPU number, APIC ID and CPU ID */ /* Store CPU number, APIC ID and CPU ID */
HlpSystemInfo.CpuInfo[CpuCount].AcpiId = LocalX2Apic->AcpiId;
HlpSystemInfo.CpuInfo[CpuCount].ApicId = LocalX2Apic->ApicId;
HlpSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount; HlpSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount;
HlpSystemInfo.CpuInfo[CpuCount].CpuId = LocalX2Apic->ProcessorId;
HlpSystemInfo.CpuInfo[CpuCount].Id = LocalX2Apic->Id;
/* Increment number of CPUs */ /* Increment number of CPUs */
CpuCount++; CpuCount++;
@ -390,7 +390,7 @@ HlpInitializeAcpiSystemStructure(VOID)
(((PACPI_SUBTABLE_HEADER)MadtTable)->Length == sizeof(ACPI_MADT_LOCAL_APIC))) (((PACPI_SUBTABLE_HEADER)MadtTable)->Length == sizeof(ACPI_MADT_LOCAL_APIC)))
{ {
/* Make sure, this CPU can be enabled */ /* Make sure, this CPU can be enabled */
if(((PACPI_MADT_LOCAL_APIC)MadtTable)->LapicFlags & ACPI_MADT_PLAOC_ENABLED) if(((PACPI_MADT_LOCAL_APIC)MadtTable)->Flags & ACPI_MADT_PLAOC_ENABLED)
{ {
/* Increment number of CPUs */ /* Increment number of CPUs */
CpuCount++; CpuCount++;
@ -403,7 +403,7 @@ HlpInitializeAcpiSystemStructure(VOID)
(((PACPI_SUBTABLE_HEADER)MadtTable)->Length == sizeof(ACPI_MADT_LOCAL_X2APIC))) (((PACPI_SUBTABLE_HEADER)MadtTable)->Length == sizeof(ACPI_MADT_LOCAL_X2APIC)))
{ {
/* Make sure, this CPU can be enabled */ /* Make sure, this CPU can be enabled */
if(((PACPI_MADT_LOCAL_X2APIC)MadtTable)->LapicFlags & ACPI_MADT_PLAOC_ENABLED) if(((PACPI_MADT_LOCAL_X2APIC)MadtTable)->Flags & ACPI_MADT_PLAOC_ENABLED)
{ {
/* Increment number of CPUs */ /* Increment number of CPUs */
CpuCount++; CpuCount++;