diff --git a/.vscode/settings.json b/.vscode/settings.json index 21352bc2..c4e42aef 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -144,7 +144,8 @@ "ktest_utils.h": "c", "kthread.h": "c", "lockref.h": "c", - "compiler_attributes.h": "c" + "compiler_attributes.h": "c", + "timer.h": "c" }, "C_Cpp.errorSquiggles": "Enabled", "esbonio.sphinx.confDir": "" diff --git a/kernel/driver/pci/pci.c b/kernel/driver/pci/pci.c index a1538493..db39e754 100644 --- a/kernel/driver/pci/pci.c +++ b/kernel/driver/pci/pci.c @@ -439,7 +439,8 @@ void pci_init() { if (ptr->Status & 0x10) { - kinfo("[ pci device %d ] class code = %d\tsubclass=%d\tstatus=%#010lx\tcap_pointer=%#010lx\tbar5=%#010lx", i, ptr->Class_code, ptr->SubClass, ptr->Status, ((struct pci_device_structure_general_device_t *)ptr)->Capabilities_Pointer, ((struct pci_device_structure_general_device_t *)ptr)->BAR5); + kinfo("[ pci device %d ] class code = %d\tsubclass=%d\tstatus=%#010lx\tcap_pointer=%#010lx\tbar5=%#010lx, vendor=%#08x, device id=%#08x", i, ptr->Class_code, ptr->SubClass, ptr->Status, ((struct pci_device_structure_general_device_t *)ptr)->Capabilities_Pointer, ((struct pci_device_structure_general_device_t *)ptr)->BAR5, + ptr->Vendor_ID, ptr->Device_ID); uint32_t tmp = pci_read_config(ptr->bus, ptr->device, ptr->func, ((struct pci_device_structure_general_device_t *)ptr)->Capabilities_Pointer); } else diff --git a/kernel/driver/video/video.c b/kernel/driver/video/video.c index 79be713e..c20d4ddd 100644 --- a/kernel/driver/video/video.c +++ b/kernel/driver/video/video.c @@ -1,17 +1,17 @@ #include "video.h" -#include -#include -#include -#include