justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add block device management to device manager

Browse Source
This commit is contained in:
Justin C. Miller
2018-05-12 20:27:46 -07:00
parent 0684fcf7e9
commit 716109bab5
7 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/kernel/main.cpp
View File

@@ -3,10 +3,7 @@
#include "kutil/assert.h"
#include "kutil/memory.h"
#include "ahci/driver.h"
#include "ahci/port.h"
#include "block_device.h"
#include "console.h"
#include "cpu.h"
#include "device_manager.h"
@@ -27,8 +24,6 @@ extern "C" {
void *__bss_start, *__bss_end;
}
extern ahci_driver ahcid;
extern void __kernel_assert(const char *, unsigned, const char *);
void
@@ -98,7 +93,7 @@ kernel_main(popcorn_data *header)
devices->init_drivers();
ahci::port *disk = ahcid.find_disk();
block_device *disk = devices->get_block_device(0);
if (disk) {
uint8_t buf[512];
kutil::memset(buf, 0, 512);
@@ -113,6 +108,8 @@ kernel_main(popcorn_data *header)
}
cons->putc('\n');
}
} else {
log::warn(logs::boot, "No block devices present.");
}
// do_error_1();