diff --git a/Architecture/amd64/MultipleAPICDescriptionTable.cpp b/Architecture/amd64/MultipleAPICDescriptionTable.cpp index b1d4e9f..51f922f 100644 --- a/Architecture/amd64/MultipleAPICDescriptionTable.cpp +++ b/Architecture/amd64/MultipleAPICDescriptionTable.cpp @@ -23,7 +23,7 @@ namespace ACPI if (ptr[4] & 1) { lapic.push_back((LocalAPIC *)ptr); - KPrint("Local APIC %d (APIC %d) found.", lapic.back()->ACPIProcessorId, lapic.back()->APICId); + KPrint("Local APIC \e8888FF%d\eCCCCCC (APIC \e8888FF%d\eCCCCCC) found.", lapic.back()->ACPIProcessorId, lapic.back()->APICId); CPUCores++; } break; @@ -31,29 +31,29 @@ namespace ACPI case 1: { ioapic.push_back((MADTIOApic *)ptr); - KPrint("I/O APIC %d (Address %#lx) found.", ioapic.back()->APICID, ioapic.back()->Address); + KPrint("I/O APIC \e8888FF%d\eCCCCCC (Address \e8888FF%#lx\eCCCCCC) found.", ioapic.back()->APICID, ioapic.back()->Address); Memory::Virtual().Map((void *)(uintptr_t)ioapic.back()->Address, (void *)(uintptr_t)ioapic.back()->Address, Memory::PTFlag::RW | Memory::PTFlag::PCD); // Make sure that the address is mapped. break; } case 2: { iso.push_back((MADTIso *)ptr); - KPrint("ISO (IRQ:%#lx, BUS:%#lx, GSI:%#lx, %s/%s) found.", + KPrint("ISO (IRQ:\e8888FF%#lx\eCCCCCC, BUS:\e8888FF%#lx\eCCCCCC, GSI:\e8888FF%#lx\eCCCCCC, %s\eCCCCCC/%s\eCCCCCC) found.", iso.back()->IRQSource, iso.back()->BuSSource, iso.back()->GSI, - iso.back()->Flags & 0x00000004 ? "Active High" : "Active Low", - iso.back()->Flags & 0x00000100 ? "Edge Triggered" : "Level Triggered"); + iso.back()->Flags & 0x00000004 ? "\e1770FFActive High" : "\e475EFFActive Low", + iso.back()->Flags & 0x00000100 ? "\e00962DEdge Triggered" : "\e008F58Level Triggered"); break; } case 4: { nmi.push_back((MADTNmi *)ptr); - KPrint("NMI %#lx (lint:%#lx) found.", nmi.back()->processor, nmi.back()->lint); + KPrint("NMI \e8888FF%#lx\eCCCCCC (lint:\e8888FF%#lx\eCCCCCC) found.", nmi.back()->processor, nmi.back()->lint); break; } case 5: { LAPICAddress = (LAPIC *)ptr; - KPrint("APIC found at %#lx", LAPICAddress); + KPrint("APIC found at \e8888FF%#lx\eCCCCCC", LAPICAddress); break; } } diff --git a/Kernel.cpp b/Kernel.cpp index a89f08d..32840ab 100644 --- a/Kernel.cpp +++ b/Kernel.cpp @@ -66,7 +66,7 @@ EXTERNC void Entry(BootInfo *Info) PCIManager = new PCI::PCI; foreach (auto hdr in PCIManager->GetDevices()) { - KPrint("Found PCI device: \e8888FF%s \eCCCCCC/ \e8888FF%s \eCCCCCC/ \e8888FF%s \eCCCCCC/ \e8888FF%s \eCCCCCC/ \e8888FF%s", + KPrint("PCI: \e8888FF%s \eCCCCCC/ \e8888FF%s \eCCCCCC/ \e8888FF%s \eCCCCCC/ \e8888FF%s \eCCCCCC/ \e8888FF%s", PCI::Descriptors::GetVendorName(hdr->VendorID), PCI::Descriptors::GetDeviceName(hdr->VendorID, hdr->DeviceID), PCI::Descriptors::DeviceClasses[hdr->Class],