summaryrefslogtreecommitdiff
path: root/Kernel
diff options
context:
space:
mode:
Diffstat (limited to 'Kernel')
-rw-r--r--Kernel/BochsVGADevice.cpp2
-rw-r--r--Kernel/IDEDiskDevice.cpp4
-rw-r--r--Kernel/MemoryManager.cpp3
-rw-r--r--Kernel/Syscall.cpp4
-rw-r--r--Kernel/i8253.cpp2
5 files changed, 6 insertions, 9 deletions
diff --git a/Kernel/BochsVGADevice.cpp b/Kernel/BochsVGADevice.cpp
index 45a32a9262..83cdad4882 100644
--- a/Kernel/BochsVGADevice.cpp
+++ b/Kernel/BochsVGADevice.cpp
@@ -61,7 +61,7 @@ dword BochsVGADevice::find_framebuffer_address()
PCI::enumerate_all([&framebuffer_address] (const PCI::Address& address, PCI::ID id) {
if (id == bochs_vga_id || id == virtualbox_vga_id) {
framebuffer_address = PCI::get_BAR0(address) & 0xfffffff0;
- kprintf("BochsVGA framebuffer @ PCI %w:%w BAR0=%x\n", id.vendor_id, id.device_id, framebuffer_address);
+ kprintf("BochsVGA: framebuffer @ P%x\n", framebuffer_address);
}
});
return framebuffer_address;
diff --git a/Kernel/IDEDiskDevice.cpp b/Kernel/IDEDiskDevice.cpp
index e8123fa716..944ffbe91c 100644
--- a/Kernel/IDEDiskDevice.cpp
+++ b/Kernel/IDEDiskDevice.cpp
@@ -154,7 +154,7 @@ void IDEDiskDevice::initialize()
m_sectors_per_track = wbufbase[6];
kprintf(
- "ide0: Master=\"%s\", C/H/Spt=%u/%u/%u\n",
+ "IDEDiskDevice: Master=\"%s\", C/H/Spt=%u/%u/%u\n",
bbuf.pointer() + 54,
m_cylinders,
m_heads,
@@ -187,7 +187,7 @@ bool IDEDiskDevice::read_sectors(dword start_sector, word count, byte* outbuf)
while (IO::in8(IDE0_STATUS) & BUSY);
#ifdef DISK_DEBUG
- kprintf("ide0: Reading %u sector(s) @ LBA %u (%u/%u/%u)\n", count, start_sector, chs.cylinder, chs.head, chs.sector);
+ kprintf("IDEDiskDevice: Reading %u sector(s) @ LBA %u (%u/%u/%u)\n", count, start_sector, chs.cylinder, chs.head, chs.sector);
#endif
IO::out8(0x1F2, count == 256 ? 0 : LSB(count));
diff --git a/Kernel/MemoryManager.cpp b/Kernel/MemoryManager.cpp
index 159a535f32..8f36b5b2bf 100644
--- a/Kernel/MemoryManager.cpp
+++ b/Kernel/MemoryManager.cpp
@@ -42,7 +42,6 @@ MemoryManager::~MemoryManager()
PageDirectory::PageDirectory(PhysicalAddress paddr)
{
- kprintf("Instantiating PageDirectory with specific paddr P%x\n", paddr.get());
m_directory_page = adopt(*new PhysicalPage(paddr, true));
}
@@ -311,7 +310,7 @@ bool MemoryManager::page_in_from_inode(Region& region, unsigned page_index_in_re
cli();
if (!vmo_page.is_null()) {
- kprintf("MM: page_in_from_inode() but page already present. Fine with me!\n");
+ dbgprintf("MM: page_in_from_inode() but page already present. Fine with me!\n");
remap_region_page(region, page_index_in_region, true);
return true;
}
diff --git a/Kernel/Syscall.cpp b/Kernel/Syscall.cpp
index 4b2b8d4d2e..a96a9de536 100644
--- a/Kernel/Syscall.cpp
+++ b/Kernel/Syscall.cpp
@@ -41,7 +41,7 @@ namespace Syscall {
void initialize()
{
register_user_callable_interrupt_handler(0x80, syscall_trap_handler);
- kprintf("syscall: int 0x80 handler installed\n");
+ kprintf("Syscall: int 0x80 handler installed\n");
}
int sync()
@@ -79,10 +79,8 @@ static dword handle(RegisterDump& regs, dword function, dword arg1, dword arg2,
case Syscall::SC_write:
return current->sys$write((int)arg1, (const void*)arg2, (size_t)arg3);
case Syscall::SC_close:
- //kprintf("syscall: close(%d)\n", arg1);
return current->sys$close((int)arg1);
case Syscall::SC_read:
- //kprintf("syscall: read(%d, %p, %u)\n", arg1, arg2, arg3);
return current->sys$read((int)arg1, (void*)arg2, (size_t)arg3);
case Syscall::SC_lseek:
return current->sys$lseek((int)arg1, (off_t)arg2, (int)arg3);
diff --git a/Kernel/i8253.cpp b/Kernel/i8253.cpp
index 53ed76f5d9..4de7378964 100644
--- a/Kernel/i8253.cpp
+++ b/Kernel/i8253.cpp
@@ -83,7 +83,7 @@ void initialize()
timer_reload = (BASE_FREQUENCY / TICKS_PER_SECOND);
- kprintf("PIT(i8253): %u Hz, square wave (%x)\n", TICKS_PER_SECOND, timer_reload);
+ kprintf("PIT: %u Hz, square wave (%x)\n", TICKS_PER_SECOND, timer_reload);
IO::out8(TIMER0_CTL, LSB(timer_reload));
IO::out8(TIMER0_CTL, MSB(timer_reload));