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

AK: Rename the common integer typedefs to make it obvious what they are.

Browse source 
These types can be picked up by including <AK/Types.h>:

* u8, u16, u32, u64 (unsigned)
* i8, i16, i32, i64 (signed)
This commit is contained in:
Andreas Kling 2019-07-03 21:17:35 +02:00
parent c4c4bbc5ba
commit 27f699ef0c
208 changed files with 1603 additions and 1621 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/TTY/MasterPTY.cpp
View file

@ -31,14 +31,14 @@ String MasterPTY::pts_name() const
return m_pts_name;
}
ssize_t MasterPTY::read(FileDescription&, byte* buffer, ssize_t size)
ssize_t MasterPTY::read(FileDescription&, u8* buffer, ssize_t size)
{
if (!m_slave && m_buffer.is_empty())
return 0;
return m_buffer.read(buffer, size);
}
ssize_t MasterPTY::write(FileDescription&, const byte* buffer, ssize_t size)
ssize_t MasterPTY::write(FileDescription&, const u8* buffer, ssize_t size)
{
if (!m_slave)
return -EIO;
@ -69,7 +69,7 @@ void MasterPTY::notify_slave_closed(Badge<SlavePTY>)
m_slave = nullptr;
}
ssize_t MasterPTY::on_slave_write(const byte* data, ssize_t size)
ssize_t MasterPTY::on_slave_write(const u8* data, ssize_t size)
{
if (m_closed)
return -EIO;

6
Kernel/TTY/MasterPTY.h
View file

@ -13,15 +13,15 @@ public:
unsigned index() const { return m_index; }
String pts_name() const;
ssize_t on_slave_write(const byte*, ssize_t);
ssize_t on_slave_write(const u8*, ssize_t);
bool can_write_from_slave() const;
void notify_slave_closed(Badge<SlavePTY>);
bool is_closed() const { return m_closed; }
private:
// ^CharacterDevice
virtual ssize_t read(FileDescription&, byte*, ssize_t) override;
virtual ssize_t write(FileDescription&, const byte*, ssize_t) override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(FileDescription&) const override;
virtual bool can_write(FileDescription&) const override;
virtual void close() override;

4
Kernel/TTY/PTYMultiplexer.h
View file

@ -16,8 +16,8 @@ public:
// ^CharacterDevice
virtual KResultOr<NonnullRefPtr<FileDescription>> open(int options) override;
virtual ssize_t read(FileDescription&, byte*, ssize_t) override { return 0; }
virtual ssize_t write(FileDescription&, const byte*, ssize_t) override { return 0; }
virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return 0; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override { return 0; }
virtual bool can_read(FileDescription&) const override { return true; }
virtual bool can_write(FileDescription&) const override { return true; }

6
Kernel/TTY/SlavePTY.cpp
View file

@ -30,13 +30,13 @@ String SlavePTY::tty_name() const
return m_tty_name;
}
void SlavePTY::on_master_write(const byte* buffer, ssize_t size)
void SlavePTY::on_master_write(const u8* buffer, ssize_t size)
{
for (ssize_t i = 0; i < size; ++i)
emit(buffer[i]);
}
ssize_t SlavePTY::on_tty_write(const byte* data, ssize_t size)
ssize_t SlavePTY::on_tty_write(const u8* data, ssize_t size)
{
return m_master->on_slave_write(data, size);
}
@ -53,7 +53,7 @@ bool SlavePTY::can_read(FileDescription& description) const
return TTY::can_read(description);
}
ssize_t SlavePTY::read(FileDescription& description, byte* buffer, ssize_t size)
ssize_t SlavePTY::read(FileDescription& description, u8* buffer, ssize_t size)
{
if (m_master->is_closed())
return 0;

6
Kernel/TTY/SlavePTY.h
View file

@ -9,7 +9,7 @@ class SlavePTY final : public TTY {
public:
virtual ~SlavePTY() override;
void on_master_write(const byte*, ssize_t);
void on_master_write(const u8*, ssize_t);
unsigned index() const { return m_index; }
InodeIdentifier devpts_inode_id() const { return m_devpts_inode_id; }
@ -18,11 +18,11 @@ public:
private:
// ^TTY
virtual String tty_name() const override;
virtual ssize_t on_tty_write(const byte*, ssize_t) override;
virtual ssize_t on_tty_write(const u8*, ssize_t) override;
// ^CharacterDevice
virtual bool can_read(FileDescription&) const override;
virtual ssize_t read(FileDescription&, byte*, ssize_t) override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual bool can_write(FileDescription&) const override;
virtual const char* class_name() const override { return "SlavePTY"; }
virtual void close() override;

6
Kernel/TTY/TTY.cpp
View file

@ -24,12 +24,12 @@ void TTY::set_default_termios()
memcpy(m_termios.c_cc, default_cc, sizeof(default_cc));
}
ssize_t TTY::read(FileDescription&, byte* buffer, ssize_t size)
ssize_t TTY::read(FileDescription&, u8* buffer, ssize_t size)
{
return m_buffer.read(buffer, size);
}
ssize_t TTY::write(FileDescription&, const byte* buffer, ssize_t size)
ssize_t TTY::write(FileDescription&, const u8* buffer, ssize_t size)
{
#ifdef TTY_DEBUG
dbgprintf("TTY::write {%u} ", size);
@ -52,7 +52,7 @@ bool TTY::can_write(FileDescription&) const
return true;
}
void TTY::emit(byte ch)
void TTY::emit(u8 ch)
{
if (should_generate_signals()) {
if (ch == m_termios.c_cc[VINTR]) {

8
Kernel/TTY/TTY.h
View file

@ -10,8 +10,8 @@ class TTY : public CharacterDevice {
public:
virtual ~TTY() override;
virtual ssize_t read(FileDescription&, byte*, ssize_t) override;
virtual ssize_t write(FileDescription&, const byte*, ssize_t) override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(FileDescription&) const override;
virtual bool can_write(FileDescription&) const override;
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override final;
@ -34,11 +34,11 @@ public:
void hang_up();
protected:
virtual ssize_t on_tty_write(const byte*, ssize_t) = 0;
virtual ssize_t on_tty_write(const u8*, ssize_t) = 0;
void set_size(unsigned short columns, unsigned short rows);
TTY(unsigned major, unsigned minor);
void emit(byte);
void emit(u8);
void generate_signal(int signal);

62
Kernel/TTY/VirtualConsole.cpp
View file

@ -5,13 +5,13 @@
#include <AK/AKString.h>
#include <Kernel/Arch/i386/CPU.h>
static byte* s_vga_buffer;
static u8* s_vga_buffer;
static VirtualConsole* s_consoles[6];
static int s_active_console;
void VirtualConsole::get_vga_cursor(byte& row, byte& column)
void VirtualConsole::get_vga_cursor(u8& row, u8& column)
{
word value;
u16 value;
IO::out8(0x3d4, 0x0e);
value = IO::in8(0x3d5) << 8;
IO::out8(0x3d4, 0x0f);
@ -22,7 +22,7 @@ void VirtualConsole::get_vga_cursor(byte& row, byte& column)
void VirtualConsole::flush_vga_cursor()
{
word value = m_current_vga_start_address + (m_cursor_row * columns() + m_cursor_column);
u16 value = m_current_vga_start_address + (m_cursor_row * columns() + m_cursor_column);
IO::out8(0x3d4, 0x0e);
IO::out8(0x3d5, MSB(value));
IO::out8(0x3d4, 0x0f);
@ -31,7 +31,7 @@ void VirtualConsole::flush_vga_cursor()
void VirtualConsole::initialize()
{
s_vga_buffer = (byte*)0xb8000;
s_vga_buffer = (u8*)0xb8000;
memset(s_consoles, 0, sizeof(s_consoles));
s_active_console = -1;
}
@ -42,20 +42,20 @@ VirtualConsole::VirtualConsole(unsigned index, InitialContents initial_contents)
{
m_tty_name = String::format("/dev/tty%u", m_index);
set_size(80, 25);
m_horizontal_tabs = static_cast<byte*>(kmalloc(columns()));
m_horizontal_tabs = static_cast<u8*>(kmalloc(columns()));
for (unsigned i = 0; i < columns(); ++i)
m_horizontal_tabs[i] = (i % 8) == 0;
// Rightmost column is always last tab on line.
m_horizontal_tabs[columns() - 1] = 1;
s_consoles[index] = this;
m_buffer = (byte*)kmalloc_eternal(rows() * columns() * 2);
m_buffer = (u8*)kmalloc_eternal(rows() * columns() * 2);
if (initial_contents == AdoptCurrentVGABuffer) {
memcpy(m_buffer, s_vga_buffer, rows() * columns() * 2);
get_vga_cursor(m_cursor_row, m_cursor_column);
} else {
word* line_mem = reinterpret_cast<word*>(m_buffer);
for (word i = 0; i < rows() * columns(); ++i)
u16* line_mem = reinterpret_cast<u16*>(m_buffer);
for (u16 i = 0; i < rows() * columns(); ++i)
line_mem[i] = 0x0720;
}
}
@ -68,8 +68,8 @@ VirtualConsole::~VirtualConsole()
void VirtualConsole::clear()
{
word* linemem = m_active ? (word*)s_vga_buffer : (word*)m_buffer;
for (word i = 0; i < rows() * columns(); ++i)
u16* linemem = m_active ? (u16*)s_vga_buffer : (u16*)m_buffer;
for (u16 i = 0; i < rows() * columns(); ++i)
linemem[i] = 0x0720;
if (m_active)
set_vga_start_row(0);
@ -113,22 +113,22 @@ void VirtualConsole::set_active(bool b)
#endif
}
inline bool is_valid_parameter_character(byte ch)
inline bool is_valid_parameter_character(u8 ch)
{
return ch >= 0x30 && ch <= 0x3f;
}
inline bool is_valid_intermediate_character(byte ch)
inline bool is_valid_intermediate_character(u8 ch)
{
return ch >= 0x20 && ch <= 0x2f;
}
inline bool is_valid_final_character(byte ch)
inline bool is_valid_final_character(u8 ch)
{
return ch >= 0x40 && ch <= 0x7e;
}
enum class VGAColor : byte {
enum class VGAColor : u8 {
Black = 0,
Blue,
Green,
@ -147,7 +147,7 @@ enum class VGAColor : byte {
White,
};
enum class ANSIColor : byte {
enum class ANSIColor : u8 {
Black = 0,
Red,
Green,
@ -206,9 +206,9 @@ static inline VGAColor ansi_color_to_vga(ANSIColor color)
return VGAColor::LightGray;
}
static inline byte ansi_color_to_vga(byte color)
static inline u8 ansi_color_to_vga(u8 color)
{
return (byte)ansi_color_to_vga((ANSIColor)color);
return (u8)ansi_color_to_vga((ANSIColor)color);
}
void VirtualConsole::escape$m(const Vector<unsigned>& params)
@ -319,7 +319,7 @@ void VirtualConsole::escape$J(const Vector<unsigned>& params)
}
}
void VirtualConsole::execute_escape_sequence(byte final)
void VirtualConsole::execute_escape_sequence(u8 final)
{
auto paramparts = String::copy(m_parameters).split(';');
Vector<unsigned> params;
@ -362,10 +362,10 @@ void VirtualConsole::execute_escape_sequence(byte final)
m_intermediates.clear();
}
void VirtualConsole::clear_vga_row(word row)
void VirtualConsole::clear_vga_row(u16 row)
{
word* linemem = (word*)&m_current_vga_window[row * 160];
for (word i = 0; i < columns(); ++i)
u16* linemem = (u16*)&m_current_vga_window[row * 160];
for (u16 i = 0; i < columns(); ++i)
linemem[i] = 0x0720;
}
@ -383,8 +383,8 @@ void VirtualConsole::scroll_up()
}
} else {
memcpy(m_buffer, m_buffer + 160, 160 * 24);
word* linemem = (word*)&m_buffer[24 * 160];
for (word i = 0; i < columns(); ++i)
u16* linemem = (u16*)&m_buffer[24 * 160];
for (u16 i = 0; i < columns(); ++i)
linemem[i] = 0x0720;
}
} else {
@ -403,13 +403,13 @@ void VirtualConsole::set_cursor(unsigned row, unsigned column)
flush_vga_cursor();
}
void VirtualConsole::put_character_at(unsigned row, unsigned column, byte ch)
void VirtualConsole::put_character_at(unsigned row, unsigned column, u8 ch)
{
ASSERT(row < rows());
ASSERT(column < columns());
word cur = (row * 160) + (column * 2);
u16 cur = (row * 160) + (column * 2);
if (m_active) {
word cur = (row * 160) + (column * 2);
u16 cur = (row * 160) + (column * 2);
m_current_vga_window[cur] = ch;
m_current_vga_window[cur + 1] = m_current_attribute;
} else {
@ -418,7 +418,7 @@ void VirtualConsole::put_character_at(unsigned row, unsigned column, byte ch)
}
}
void VirtualConsole::on_char(byte ch)
void VirtualConsole::on_char(u8 ch)
{
switch (m_escape_state) {
case ExpectBracket:
@ -506,7 +506,7 @@ void VirtualConsole::on_key_pressed(KeyboardDevice::Event key)
emit(key.character);
}
void VirtualConsole::on_sysconsole_receive(byte ch)
void VirtualConsole::on_sysconsole_receive(u8 ch)
{
InterruptDisabler disabler;
auto old_attribute = m_current_attribute;
@ -515,7 +515,7 @@ void VirtualConsole::on_sysconsole_receive(byte ch)
m_current_attribute = old_attribute;
}
ssize_t VirtualConsole::on_tty_write(const byte* data, ssize_t size)
ssize_t VirtualConsole::on_tty_write(const u8* data, ssize_t size)
{
InterruptDisabler disabler;
for (ssize_t i = 0; i < size; ++i)
@ -528,7 +528,7 @@ String VirtualConsole::tty_name() const
return m_tty_name;
}
void VirtualConsole::set_vga_start_row(word row)
void VirtualConsole::set_vga_start_row(u16 row)
{
m_vga_start_row = row;
m_current_vga_start_address = row * columns();

40
Kernel/TTY/VirtualConsole.h
View file

@ -25,28 +25,28 @@ private:
virtual void on_key_pressed(KeyboardDevice::Event) override;
// ^ConsoleImplementation
virtual void on_sysconsole_receive(byte) override;
virtual void on_sysconsole_receive(u8) override;
// ^TTY
virtual ssize_t on_tty_write(const byte*, ssize_t) override;
virtual ssize_t on_tty_write(const u8*, ssize_t) override;
virtual String tty_name() const override;
// ^CharacterDevice
virtual const char* class_name() const override { return "VirtualConsole"; }
void set_active(bool);
void on_char(byte);
void on_char(u8);
void get_vga_cursor(byte& row, byte& column);
void get_vga_cursor(u8& row, u8& column);
void flush_vga_cursor();
byte* m_buffer;
u8* m_buffer;
unsigned m_index;
bool m_active { false };
void scroll_up();
void set_cursor(unsigned row, unsigned column);
void put_character_at(unsigned row, unsigned column, byte ch);
void put_character_at(unsigned row, unsigned column, u8 ch);
void escape$A(const Vector<unsigned>&);
void escape$D(const Vector<unsigned>&);
@ -58,19 +58,19 @@ private:
void clear();
byte m_cursor_row { 0 };
byte m_cursor_column { 0 };
byte m_saved_cursor_row { 0 };
byte m_saved_cursor_column { 0 };
byte m_current_attribute { 0x07 };
u8 m_cursor_row { 0 };
u8 m_cursor_column { 0 };
u8 m_saved_cursor_row { 0 };
u8 m_saved_cursor_column { 0 };
u8 m_current_attribute { 0x07 };
void clear_vga_row(word row);
void set_vga_start_row(word row);
word m_vga_start_row { 0 };
word m_current_vga_start_address { 0 };
byte* m_current_vga_window { nullptr };
void clear_vga_row(u16 row);
void set_vga_start_row(u16 row);
u16 m_vga_start_row { 0 };
u16 m_current_vga_start_address { 0 };
u8* m_current_vga_window { nullptr };
void execute_escape_sequence(byte final);
void execute_escape_sequence(u8 final);
enum EscapeState {
Normal,
@ -80,8 +80,8 @@ private:
ExpectFinal,
};
EscapeState m_escape_state { Normal };
Vector<byte> m_parameters;
Vector<byte> m_intermediates;
byte* m_horizontal_tabs { nullptr };
Vector<u8> m_parameters;
Vector<u8> m_intermediates;
u8* m_horizontal_tabs { nullptr };
String m_tty_name;
};