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

Rename HlpAcpiSystemInfo global variable to HlpSystemInfo
Some checks failed
Builds / ExectOS (amd64) (push) Failing after 27s
Details
Builds / ExectOS (i686) (push) Failing after 27s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2024-07-14 12:11:39 +02:00
parent 3bda67be0a
commit f8519ec09d
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xtoskrnl/hl/acpi.c
View File

@ -267,6 +267,7 @@ HlpInitializeAcpiSystemInformation(VOID)
{
PACPI_MADT_LOCAL_X2APIC LocalX2Apic;
PACPI_MADT_LOCAL_APIC LocalApic;
PACPI_MADT_IOAPIC IoApic;
ULONG_PTR MadtTable;
PACPI_MADT Madt;
XTSTATUS Status;
@ -306,9 +307,9 @@ HlpInitializeAcpiSystemInformation(VOID)
if(LocalApic->LapicFlags & ACPI_MADT_PLAOC_ENABLED)
{
/* Store CPU number, APIC ID and CPU ID */
HlpAcpiSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount;
HlpAcpiSystemInfo.CpuInfo[CpuCount].CpuId = LocalApic->ProcessorId;
HlpAcpiSystemInfo.CpuInfo[CpuCount].Id = LocalApic->Id;
HlpSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount;
HlpSystemInfo.CpuInfo[CpuCount].CpuId = LocalApic->ProcessorId;
HlpSystemInfo.CpuInfo[CpuCount].Id = LocalApic->Id;
/* Increment number of CPUs */
CpuCount++;
@ -327,9 +328,9 @@ HlpInitializeAcpiSystemInformation(VOID)
if(LocalX2Apic->LapicFlags & ACPI_MADT_PLAOC_ENABLED)
{
/* Store CPU number, APIC ID and CPU ID */
HlpAcpiSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount;
HlpAcpiSystemInfo.CpuInfo[CpuCount].CpuId = LocalX2Apic->ProcessorId;
HlpAcpiSystemInfo.CpuInfo[CpuCount].Id = LocalX2Apic->Id;
HlpSystemInfo.CpuInfo[CpuCount].CpuNumber = CpuCount;
HlpSystemInfo.CpuInfo[CpuCount].CpuId = LocalX2Apic->ProcessorId;
HlpSystemInfo.CpuInfo[CpuCount].Id = LocalX2Apic->Id;
/* Increment number of CPUs */
CpuCount++;
@ -346,7 +347,7 @@ HlpInitializeAcpiSystemInformation(VOID)
}
/* Store number of CPUs */
HlpAcpiSystemInfo.CpuCount = CpuCount;
HlpSystemInfo.CpuCount = CpuCount;
/* Return success */
return STATUS_SUCCESS;
@ -420,7 +421,7 @@ HlpInitializeAcpiSystemStructure(VOID)
}
/* Zero the ACPI system information structure */
RtlZeroMemory(&HlpAcpiSystemInfo, sizeof(ACPI_SYSTEM_INFO));
RtlZeroMemory(&HlpSystemInfo, sizeof(ACPI_SYSTEM_INFO));
/* Calculate number of pages needed to store CPU information */
PageCount = SIZE_TO_PAGES(CpuCount * sizeof(PROCESSOR_IDENTITY));
@ -434,7 +435,7 @@ HlpInitializeAcpiSystemStructure(VOID)
}
/* Map physical address to the virtual memory area */
Status = MmMapHardwareMemory(PhysicalAddress, PageCount, TRUE, (PVOID *)&HlpAcpiSystemInfo.CpuInfo);
Status = MmMapHardwareMemory(PhysicalAddress, PageCount, TRUE, (PVOID *)&HlpSystemInfo.CpuInfo);
if(Status != STATUS_SUCCESS)
{
/* Failed to map memory, return error */
@ -442,7 +443,7 @@ HlpInitializeAcpiSystemStructure(VOID)
}
/* Zero the CPU information structure */
RtlZeroMemory(HlpAcpiSystemInfo.CpuInfo, PAGES_TO_SIZE(PageCount));
RtlZeroMemory(HlpSystemInfo.CpuInfo, PAGES_TO_SIZE(PageCount));
/* Return success */
return STATUS_SUCCESS;

6
xtoskrnl/hl/globals.c
View File

@ -15,9 +15,6 @@ LIST_ENTRY HlpAcpiCacheList;
/* ACPI Root System Description Pointer (RSDP) */
PACPI_RSDP HlpAcpiRsdp;
/* ACPI system information */
ACPI_SYSTEM_INFO HlpAcpiSystemInfo;
/* ACPI timer information */
ACPI_TIMER_INFO HlpAcpiTimerInfo;
@ -29,3 +26,6 @@ APIC_MODE HlpApicMode;
/* FrameBuffer information */
HAL_FRAMEBUFFER_DATA HlpFrameBufferData;
/* System information */
ACPI_SYSTEM_INFO HlpSystemInfo;

6
xtoskrnl/includes/globals.h
View File

@ -18,9 +18,6 @@ EXTERN LIST_ENTRY HlpAcpiCacheList;
/* ACPI Root System Description Pointer (RSDP) */
EXTERN PACPI_RSDP HlpAcpiRsdp;
/* ACPI system information */
EXTERN ACPI_SYSTEM_INFO HlpAcpiSystemInfo;
/* ACPI timer information */
EXTERN ACPI_TIMER_INFO HlpAcpiTimerInfo;
@ -33,6 +30,9 @@ EXTERN APIC_MODE HlpApicMode;
/* FrameBuffer information */
EXTERN HAL_FRAMEBUFFER_DATA HlpFrameBufferData;
/* System information */
EXTERN ACPI_SYSTEM_INFO HlpSystemInfo;
/* Pointer to boot loader provided DbgPrint() routine */
EXTERN VOID (*KeDbgPrint)(IN PWCHAR Format, IN ...);