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

Kernel: Use IOAddress instead of direct IO calls in SerialDevice

Browse source
This commit is contained in:
Idan Horowitz 2021-05-15 13:51:13 +03:00 • committed by Andreas Kling
parent a5699a141d
commit 62f69cc50f
3 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Kernel/Devices/SerialDevice.cpp
View file

@ -10,7 +10,7 @@
namespace Kernel { namespace Kernel {
UNMAP_AFTER_INIT SerialDevice::SerialDevice(u32 base_addr, unsigned minor) UNMAP_AFTER_INIT SerialDevice::SerialDevice(IOAddress base_addr, unsigned minor)
: CharacterDevice(4, minor) : CharacterDevice(4, minor)
, m_base_addr(base_addr) , m_base_addr(base_addr)
{ {
@ -36,7 +36,7 @@ KResultOr<size_t> SerialDevice::read(FileDescription&, u64, UserOrKernelBuffer&
return buffer.write_buffered<128>(size, [&](u8* data, size_t data_size) { return buffer.write_buffered<128>(size, [&](u8* data, size_t data_size) {
for (size_t i = 0; i < data_size; i++) for (size_t i = 0; i < data_size; i++)
data[i] = IO::in8(m_base_addr); data[i] = m_base_addr.in<u8>();
return data_size; return data_size;
}); });
} }
@ -67,9 +67,9 @@ void SerialDevice::put_char(char ch)
; ;
if (ch == '\n' && !m_last_put_char_was_carriage_return) if (ch == '\n' && !m_last_put_char_was_carriage_return)
IO::out8(m_base_addr, '\r'); m_base_addr.out<u8>('\r');
IO::out8(m_base_addr, ch); m_base_addr.out<u8>(ch);
m_last_put_char_was_carriage_return = (ch == '\r'); m_last_put_char_was_carriage_return = (ch == '\r');
} }
@ -92,24 +92,24 @@ UNMAP_AFTER_INIT void SerialDevice::set_interrupts(bool interrupt_enable)
{ {
m_interrupt_enable = interrupt_enable; m_interrupt_enable = interrupt_enable;
IO::out8(m_base_addr + 1, interrupt_enable); m_base_addr.offset(1).out<u8>(interrupt_enable);
} }
void SerialDevice::set_baud(Baud baud) void SerialDevice::set_baud(Baud baud)
{ {
m_baud = baud; m_baud = baud;
IO::out8(m_base_addr + 3, IO::in8(m_base_addr + 3) | 0x80); // turn on DLAB m_base_addr.offset(3).out<u8>(m_base_addr.offset(3).in<u8>() | 0x80); // turn on DLAB
IO::out8(m_base_addr + 0, ((u8)(baud)) & 0xff); // lower half of divisor m_base_addr.out<u8>(((u8)(baud)) & 0xff); // lower half of divisor
IO::out8(m_base_addr + 1, ((u8)(baud)) >> 2); // upper half of divisor m_base_addr.offset(1).out<u8>(((u8)(baud)) >> 2); // upper half of divisor
IO::out8(m_base_addr + 3, IO::in8(m_base_addr + 3) & 0x7f); // turn off DLAB m_base_addr.offset(3).out<u8>(m_base_addr.offset(3).in<u8>() & 0x7f); // turn off DLAB
} }
void SerialDevice::set_fifo_control(u8 fifo_control) void SerialDevice::set_fifo_control(u8 fifo_control)
{ {
m_fifo_control = fifo_control; m_fifo_control = fifo_control;
IO::out8(m_base_addr + 2, fifo_control); m_base_addr.offset(2).out<u8>(fifo_control);
} }
void SerialDevice::set_line_control(ParitySelect parity_select, StopBits stop_bits, WordLength word_length) void SerialDevice::set_line_control(ParitySelect parity_select, StopBits stop_bits, WordLength word_length)
@ -118,26 +118,26 @@ void SerialDevice::set_line_control(ParitySelect parity_select, StopBits stop_bi
m_stop_bits = stop_bits; m_stop_bits = stop_bits;
m_word_length = word_length; m_word_length = word_length;
IO::out8(m_base_addr + 3, (IO::in8(m_base_addr + 3) & ~0x3f) | parity_select | stop_bits | word_length); m_base_addr.offset(3).out<u8>((m_base_addr.offset(3).in<u8>() & ~0x3f) | parity_select | stop_bits | word_length);
} }
void SerialDevice::set_break_enable(bool break_enable) void SerialDevice::set_break_enable(bool break_enable)
{ {
m_break_enable = break_enable; m_break_enable = break_enable;
IO::out8(m_base_addr + 3, IO::in8(m_base_addr + 3) & (break_enable ? 0xff : 0xbf)); m_base_addr.offset(3).out<u8>(m_base_addr.offset(3).in<u8>() & (break_enable ? 0xff : 0xbf));
} }
void SerialDevice::set_modem_control(u8 modem_control) void SerialDevice::set_modem_control(u8 modem_control)
{ {
m_modem_control = modem_control; m_modem_control = modem_control;
IO::out8(m_base_addr + 4, modem_control); m_base_addr.offset(4).out<u8>(modem_control);
} }
u8 SerialDevice::get_line_status() const u8 SerialDevice::get_line_status() const
{ {
return IO::in8(m_base_addr + 5); return m_base_addr.offset(5).in<u8>();
} }
} }

5
Kernel/Devices/SerialDevice.h
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
#include <Kernel/Devices/CharacterDevice.h> #include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/IO.h>
namespace Kernel { namespace Kernel {
@ -18,7 +19,7 @@ namespace Kernel {
class SerialDevice final : public CharacterDevice { class SerialDevice final : public CharacterDevice {
AK_MAKE_ETERNAL AK_MAKE_ETERNAL
public: public:
SerialDevice(u32 base_addr, unsigned minor); SerialDevice(IOAddress base_addr, unsigned minor);
virtual ~SerialDevice() override; virtual ~SerialDevice() override;
// ^CharacterDevice // ^CharacterDevice
@ -122,7 +123,7 @@ private:
void set_modem_control(u8 modem_control); void set_modem_control(u8 modem_control);
u8 get_line_status() const; u8 get_line_status() const;
u32 m_base_addr { 0 }; IOAddress m_base_addr;
bool m_interrupt_enable { false }; bool m_interrupt_enable { false };
u8 m_fifo_control { 0 }; u8 m_fifo_control { 0 };
Baud m_baud { Baud38400 }; Baud m_baud { Baud38400 };

8
Kernel/init.cpp
View file

@ -157,10 +157,10 @@ extern "C" UNMAP_AFTER_INIT [[noreturn]] void init()
NullDevice::initialize(); NullDevice::initialize();
if (!get_serial_debug()) if (!get_serial_debug())
new SerialDevice(SERIAL_COM1_ADDR, 64); new SerialDevice(IOAddress(SERIAL_COM1_ADDR), 64);
new SerialDevice(SERIAL_COM2_ADDR, 65); new SerialDevice(IOAddress(SERIAL_COM2_ADDR), 65);
new SerialDevice(SERIAL_COM3_ADDR, 66); new SerialDevice(IOAddress(SERIAL_COM3_ADDR), 66);
new SerialDevice(SERIAL_COM4_ADDR, 67); new SerialDevice(IOAddress(SERIAL_COM4_ADDR), 67);
VMWareBackdoor::the(); // don't wait until first mouse packet VMWareBackdoor::the(); // don't wait until first mouse packet
HIDManagement::initialize(); HIDManagement::initialize();