justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[util] Replace kutil with util

Browse Source 
Now that kutil has no kernel-specific code in it anymore, it can
actually be linked to by anything, so I'm renaming it 'util'.

Also, I've tried to unify the way that the system libraries from
src/libraries are #included using <> instead of "".

Other small change: util::bip_buffer got a spinlock to guard against
state corruption.
This commit is contained in:
Justin C. Miller
2022-01-03 00:03:29 -08:00
parent 5f88f5ed02
commit cd9b85b555
68 changed files with 231 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/kernel/device_manager.h
View File

@@ -1,7 +1,9 @@
#pragma once
/// \file device_manager.h
/// The device manager definition
#include "kutil/vector.h"
#include <util/vector.h>
#include "apic.h"
#include "hpet.h"
#include "pci.h"
@@ -79,7 +81,7 @@ public:
};
/// Get the list of APIC ids for other CPUs
inline const kutil::vector<uint8_t> & get_apic_ids() const { return m_apic_ids; }
inline const util::vector<uint8_t> & get_apic_ids() const { return m_apic_ids; }
/// Get the LAPIC base address
/// \returns The physical base address of the local apic registers
@@ -150,18 +152,18 @@ private:
uintptr_t m_lapic_base;
kutil::vector<ioapic> m_ioapics;
kutil::vector<hpet> m_hpets;
kutil::vector<uint8_t> m_apic_ids;
kutil::vector<apic_nmi> m_nmis;
kutil::vector<irq_override> m_overrides;
util::vector<ioapic> m_ioapics;
util::vector<hpet> m_hpets;
util::vector<uint8_t> m_apic_ids;
util::vector<apic_nmi> m_nmis;
util::vector<irq_override> m_overrides;
kutil::vector<pci_group> m_pci;
kutil::vector<pci_device> m_devices;
util::vector<pci_group> m_pci;
util::vector<pci_device> m_devices;
kutil::vector<endpoint*> m_irqs;
util::vector<endpoint*> m_irqs;
kutil::vector<block_device *> m_blockdevs;
util::vector<block_device *> m_blockdevs;
static device_manager s_instance;