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

Add GPT partition handling as virtual block devices

Browse Source
This commit is contained in:
Justin C. Miller
2018-05-16 10:14:40 -07:00
parent a5da56d02f
commit 0d75cc999c
10 changed files with 191 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/kernel/ahci/hba.cpp
View File

@@ -3,6 +3,7 @@
#include "ahci/hba.h"
#include "console.h"
#include "device_manager.h"
#include "fs/gpt.h"
#include "log.h"
#include "page_manager.h"
#include "pci.h"
@@ -85,15 +86,20 @@ hba::hba(pci_device *device)
port &p = m_ports.emplace(this, i, kutil::offset_pointer(pd, 0x80 * i), impl);
if (p.get_state() == port::state::active)
needs_interrupt = true;
if (p.get_type() == sata_signature::sata_drive)
dm.register_block_device(&p);
}
if (needs_interrupt) {
device_manager::get().allocate_msi("AHCI Device", *device, irq_cb, this);
m_data->host_control |= 0x02; // enable interrupts
}
for (auto &p : m_ports) {
if (p.get_state() == port::state::active &&
p.get_type() == sata_signature::sata_drive) {
if (fs::partition::load(&p) == 0)
dm.register_block_device(&p);
}
}
}
void

3
src/kernel/ahci/port.cpp
View File

@@ -387,6 +387,9 @@ port::finish_read(int slot)
static_cast<addr_t>(cmdt.entries[i].data_base_high) << 32;
void *mem = kutil::offset_pointer(pm->offset_virt(phys), offset);
log::debug(logs::driver, "Reading PRD %2d: %016lx->%016lx [%lxb]", i, mem, p, prd_len);
kutil::memcpy(p, mem, prd_len);
p = kutil::offset_pointer(p, prd_len - offset);
count += (prd_len - offset);