RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:57:43 +00:00
Code Issues Activity Actions

Kernel: Modernize use of pointers in VirtIO

Browse source 
Raw pointers were mostly replaced with smart pointers and references
where appropriate based on kling and smartcomputer7's suggestions :)

Co-authored-by: Sahan <sahan.h.fernando@gmail.com>
This commit is contained in:
Idan Horowitz 2021-04-15 19:12:06 +10:00 • committed by Andreas Kling
parent ea4c9efbb9
commit 4a467c553a
6 changed files with 146 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/VirtIO/VirtIOConsole.cpp
View file

@ -32,7 +32,7 @@ VirtIOConsole::VirtIOConsole(PCI::Address address)
: CharacterDevice(229, 0)
, VirtIODevice(address, "VirtIOConsole")
{
if (auto* cfg = get_device_config()) {
if (auto cfg = get_config(ConfigurationType::Device)) {
bool success = negotiate_features([&](u64 supported_features) {
u64 negotiated = 0;
if (is_feature_set(supported_features, VIRTIO_CONSOLE_F_SIZE))
@ -46,11 +46,11 @@ VirtIOConsole::VirtIOConsole(PCI::Address address)
u16 cols = 0, rows = 0;
read_config_atomic([&]() {
if (is_feature_accepted(VIRTIO_CONSOLE_F_SIZE)) {
cols = config_read16(cfg, 0x0);
rows = config_read16(cfg, 0x2);
cols = config_read16(*cfg, 0x0);
rows = config_read16(*cfg, 0x2);
}
if (is_feature_accepted(VIRTIO_CONSOLE_F_MULTIPORT)) {
max_nr_ports = config_read32(cfg, 0x4);
max_nr_ports = config_read32(*cfg, 0x4);
}
});
dbgln("VirtIOConsole: cols: {}, rows: {}, max nr ports {}", cols, rows, max_nr_ports);
@ -58,12 +58,10 @@ VirtIOConsole::VirtIOConsole(PCI::Address address)
success = finish_init();
}
if (success) {
m_receive_queue = get_queue(RECEIVEQ);
m_receive_queue->on_data_available = [&]() {
get_queue(RECEIVEQ).on_data_available = [&]() {
dbgln("VirtIOConsole: receive_queue on_data_available");
};
m_send_queue = get_queue(TRANSMITQ);
m_send_queue->on_data_available = [&]() {
get_queue(TRANSMITQ).on_data_available = [&]() {
dbgln("VirtIOConsole: send_queue on_data_available");
};
dbgln("TODO: Populate receive queue with a receive buffer");
@ -75,9 +73,10 @@ VirtIOConsole::~VirtIOConsole()
{
}
void VirtIOConsole::handle_device_config_change()
bool VirtIOConsole::handle_device_config_change()
{
dbgln("VirtIOConsole: Handle device config change");
return true;
}
bool VirtIOConsole::can_read(const FileDescription&, size_t) const