Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better debug info

Browse Source
This commit is contained in:
Alex 2023-04-19 00:50:29 +03:00
parent ecc19f4df0
commit ad1bcdab47
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Core/Driver/DriverBinding/BindPCI.cpp
View File

@ -54,15 +54,8 @@ namespace Driver
debug("Type: %d; IOBase: %#lx; MemoryBase: %#lx", BAR_Type, BAR_IOBase, BAR_MemoryBase); debug("Type: %d; IOBase: %#lx; MemoryBase: %#lx", BAR_Type, BAR_IOBase, BAR_MemoryBase);
for (size_t i = 0; i < 6; i++)
{
if (BAR[i] == 0)
continue;
debug("BAR%d: %#lx", i, BAR[i]);
}
/* BARs Size */ /* BARs Size */
for (size_t i = 0; i < 6; i++) for (short i = 0; i < 6; i++)
{ {
if (BAR[i] == 0) if (BAR[i] == 0)
continue; continue;
@ -75,7 +68,7 @@ namespace Driver
BARsSize[i] = size & (~15); BARsSize[i] = size & (~15);
BARsSize[i] = ~BARsSize[i] + 1; BARsSize[i] = ~BARsSize[i] + 1;
BARsSize[i] = BARsSize[i] & 0xFFFFFFFF; BARsSize[i] = BARsSize[i] & 0xFFFFFFFF;
debug("BAR%dSize: %#lx", i, BARsSize[i]); debug("BAR%d %#lx size: %d", i, BAR[i], BARsSize[i]);
} }
else if ((BAR[i] & 1) == 1) // I/O Base else if ((BAR[i] & 1) == 1) // I/O Base
{ {
@ -85,12 +78,12 @@ namespace Driver
BARsSize[i] = size & (~3); BARsSize[i] = size & (~3);
BARsSize[i] = ~BARsSize[i] + 1; BARsSize[i] = ~BARsSize[i] + 1;
BARsSize[i] = BARsSize[i] & 0xFFFF; BARsSize[i] = BARsSize[i] & 0xFFFF;
debug("BAR%dSize: %#lx", i, BARsSize[i]); debug("BAR%d %#lx size: %d", i, BAR[i], BARsSize[i]);
} }
} }
/* Mapping the BARs */ /* Mapping the BARs */
for (size_t i = 0; i < 6; i++) for (short i = 0; i < 6; i++)
{ {
if (BAR[i] == 0) if (BAR[i] == 0)
continue; continue;
@ -100,15 +93,15 @@ namespace Driver
uintptr_t BARBase = BAR[i] & (~15); uintptr_t BARBase = BAR[i] & (~15);
size_t BARSize = BARsSize[i]; size_t BARSize = BARsSize[i];
debug("Mapping BAR%d from %#lx to %#lx", i, BARBase, BARBase + BARSize); debug("Mapping BAR%d %#lx-%#lx", i, BARBase, BARBase + BARSize);
Memory::Virtual().Map((void *)BARBase, (void *)BARBase, BARSize, Memory::PTFlag::RW | Memory::PTFlag::PWT); Memory::Virtual().Map((void *)BARBase, (void *)BARBase, BARSize, Memory::PTFlag::RW | Memory::PTFlag::PWT);
} }
else if ((BAR[i] & 1) == 1) // I/O Base else if ((BAR[i] & 1) == 1) // I/O Base
{ {
uintptr_t BARBase = BAR[i] & (~3); uintptr_t BARBase = BAR[i] & (~3);
uintptr_t BARSize = BARsSize[i]; size_t BARSize = BARsSize[i];
debug("Mapping BAR%d from %#x to %#x", i, BARBase, BARBase + BARSize); debug("Mapping BAR%d %#x-%#x", i, BARBase, BARBase + BARSize);
Memory::Virtual().Map((void *)BARBase, (void *)BARBase, BARSize, Memory::PTFlag::RW | Memory::PTFlag::PWT); Memory::Virtual().Map((void *)BARBase, (void *)BARBase, BARSize, Memory::PTFlag::RW | Memory::PTFlag::PWT);
} }
} }