RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:28:11 +00:00
Code Issues Activity Actions

Kernel: Add explicit offset parameter to File::read etc

Browse source
This commit is contained in:
Conrad Pankoff 2020-04-10 19:44:42 +10:00 • committed by Andreas Kling
parent 68c7ca7d3b
commit a3edeb5868
45 changed files with 199 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Devices/BXVGADevice.h
View file

@ -45,10 +45,10 @@ public:
private: private:
virtual const char* class_name() const override { return "BXVGA"; } virtual const char* class_name() const override { return "BXVGA"; }
virtual bool can_read(const FileDescription&) const override { return true; } virtual bool can_read(const FileDescription&, size_t) const override { return true; }
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return -EINVAL; } virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override { return -EINVAL; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override { return -EINVAL; } virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override { return -EINVAL; }
virtual bool read_blocks(unsigned, u16, u8*) override { return false; } virtual bool read_blocks(unsigned, u16, u8*) override { return false; }
virtual bool write_blocks(unsigned, u16, const u8*) override { return false; } virtual bool write_blocks(unsigned, u16, const u8*) override { return false; }

60
Kernel/Devices/DiskPartition.cpp
View file

@ -48,32 +48,48 @@ DiskPartition::~DiskPartition()
{ {
} }
ssize_t DiskPartition::read(FileDescription& file_description, u8* buffer, ssize_t length) ssize_t DiskPartition::read(FileDescription& fd, size_t offset, u8* outbuf, ssize_t len)
{ {
// FIXME: This is a hacky solution, but works fine for now... unsigned adjust = m_block_offset * block_size();
off_t current_offset = file_description.seek(0, SEEK_CUR);
auto new_offset = current_offset + (m_block_offset * m_device->block_size()); #ifdef OFFD_DEBUG
if ((new_offset / m_device->block_size()) > m_block_limit || ((new_offset + length) / m_device->block_size()) > m_block_limit) { klog() << "DiskPartition::read offset=" << fd.offset() << " adjust=" << adjust << " len=" << len;
return 0; #endif
}
file_description.seek(new_offset, SEEK_SET); return m_device->read(fd, offset + adjust, outbuf, len);
auto result = m_device->read(file_description, buffer, length);
file_description.seek(current_offset, SEEK_SET);
return result;
} }
ssize_t DiskPartition::write(FileDescription& file_description, const u8* buffer, ssize_t length) bool DiskPartition::can_read(const FileDescription& fd, size_t offset) const
{ {
// FIXME: This is a hacky solution, but works fine for now... unsigned adjust = m_block_offset * block_size();
off_t current_offset = file_description.seek(0, SEEK_CUR);
auto new_offset = current_offset + (m_block_offset * m_device->block_size()); #ifdef OFFD_DEBUG
if ((new_offset / m_device->block_size()) > m_block_limit || ((new_offset + length) / m_device->block_size()) > m_block_limit) { klog() << "DiskPartition::can_read offset=" << offset << " adjust=" << adjust;
return 0; #endif
}
file_description.seek(new_offset, SEEK_SET); return m_device->can_read(fd, offset + adjust);
auto result = m_device->write(file_description, buffer, length); }
file_description.seek(current_offset, SEEK_SET);
return result; ssize_t DiskPartition::write(FileDescription& fd, size_t offset, const u8* inbuf, ssize_t len)
{
unsigned adjust = m_block_offset * block_size();
#ifdef OFFD_DEBUG
klog() << "DiskPartition::write offset=" << offset << " adjust=" << adjust << " len=" << len;
#endif
return m_device->write(fd, offset + adjust, inbuf, len);
}
bool DiskPartition::can_write(const FileDescription& fd, size_t offset) const
{
unsigned adjust = m_block_offset * block_size();
#ifdef OFFD_DEBUG
klog() << "DiskPartition::can_write offset=" << offset << " adjust=" << adjust;
#endif
return m_device->can_write(fd, offset + adjust);
} }
bool DiskPartition::read_blocks(unsigned index, u16 count, u8* out) bool DiskPartition::read_blocks(unsigned index, u16 count, u8* out)

8
Kernel/Devices/DiskPartition.h
View file

@ -40,10 +40,10 @@ public:
virtual bool write_blocks(unsigned index, u16 count, const u8*) override; virtual bool write_blocks(unsigned index, u16 count, const u8*) override;
// ^BlockDevice // ^BlockDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override { return true; } virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override;
private: private:
virtual const char* class_name() const override; virtual const char* class_name() const override;

6
Kernel/Devices/FullDevice.cpp
View file

@ -40,19 +40,19 @@ FullDevice::~FullDevice()
{ {
} }
bool FullDevice::can_read(const FileDescription&) const bool FullDevice::can_read(const FileDescription&, size_t) const
{ {
return true; return true;
} }
ssize_t FullDevice::read(FileDescription&, u8* buffer, ssize_t size) ssize_t FullDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
ssize_t count = min(PAGE_SIZE, size); ssize_t count = min(PAGE_SIZE, size);
memset(buffer, 0, (size_t)count); memset(buffer, 0, (size_t)count);
return count; return count;
} }
ssize_t FullDevice::write(FileDescription&, const u8*, ssize_t size) ssize_t FullDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
{ {
if (size == 0) if (size == 0)
return 0; return 0;

8
Kernel/Devices/FullDevice.h
View file

@ -38,10 +38,10 @@ public:
private: private:
// ^CharacterDevice // ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* class_name() const override { return "FullDevice"; } virtual const char* class_name() const override { return "FullDevice"; }
}; };

6
Kernel/Devices/KeyboardDevice.cpp
View file

@ -573,12 +573,12 @@ KeyboardDevice::~KeyboardDevice()
{ {
} }
bool KeyboardDevice::can_read(const FileDescription&) const bool KeyboardDevice::can_read(const FileDescription&, size_t) const
{ {
return !m_queue.is_empty(); return !m_queue.is_empty();
} }
ssize_t KeyboardDevice::read(FileDescription&, u8* buffer, ssize_t size) ssize_t KeyboardDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
ssize_t nread = 0; ssize_t nread = 0;
while (nread < size) { while (nread < size) {
@ -594,7 +594,7 @@ ssize_t KeyboardDevice::read(FileDescription&, u8* buffer, ssize_t size)
return nread; return nread;
} }
ssize_t KeyboardDevice::write(FileDescription&, const u8*, ssize_t) ssize_t KeyboardDevice::write(FileDescription&, size_t, const u8*, ssize_t)
{ {
return 0; return 0;
} }

8
Kernel/Devices/KeyboardDevice.h
View file

@ -52,10 +52,10 @@ public:
void set_maps(const char* n_map, const char* n_shift_map, const char* n_alt_map, const char* n_altgr_map); void set_maps(const char* n_map, const char* n_shift_map, const char* n_alt_map, const char* n_altgr_map);
// ^CharacterDevice // ^CharacterDevice
virtual ssize_t read(FileDescription&, u8* buffer, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8* buffer, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, const u8* buffer, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8* buffer, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* purpose() const override { return class_name(); } virtual const char* purpose() const override { return class_name(); }

8
Kernel/Devices/MBVGADevice.h
View file

@ -45,10 +45,10 @@ public:
private: private:
virtual const char* class_name() const override { return "MBVGA"; } virtual const char* class_name() const override { return "MBVGA"; }
virtual bool can_read(const FileDescription&) const override { return true; } virtual bool can_read(const FileDescription&, size_t) const override { return true; }
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return -EINVAL; } virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override { return -EINVAL; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override { return -EINVAL; } virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override { return -EINVAL; }
virtual bool read_blocks(unsigned, u16, u8*) override { return false; } virtual bool read_blocks(unsigned, u16, u8*) override { return false; }
virtual bool write_blocks(unsigned, u16, const u8*) override { return false; } virtual bool write_blocks(unsigned, u16, const u8*) override { return false; }

6
Kernel/Devices/NullDevice.cpp
View file

@ -47,17 +47,17 @@ NullDevice::~NullDevice()
{ {
} }
bool NullDevice::can_read(const FileDescription&) const bool NullDevice::can_read(const FileDescription&, size_t) const
{ {
return true; return true;
} }
ssize_t NullDevice::read(FileDescription&, u8*, ssize_t) ssize_t NullDevice::read(FileDescription&, size_t, u8*, ssize_t)
{ {
return 0; return 0;
} }
ssize_t NullDevice::write(FileDescription&, const u8*, ssize_t buffer_size) ssize_t NullDevice::write(FileDescription&, size_t, const u8*, ssize_t buffer_size)
{ {
return min(PAGE_SIZE, buffer_size); return min(PAGE_SIZE, buffer_size);
} }

8
Kernel/Devices/NullDevice.h
View file

@ -40,10 +40,10 @@ public:
private: private:
// ^CharacterDevice // ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual const char* class_name() const override { return "NullDevice"; } virtual const char* class_name() const override { return "NullDevice"; }
}; };

16
Kernel/Devices/PATADiskDevice.cpp
View file

@ -80,9 +80,9 @@ void PATADiskDevice::set_drive_geometry(u16 cyls, u16 heads, u16 spt)
m_sectors_per_track = spt; m_sectors_per_track = spt;
} }
ssize_t PATADiskDevice::read(FileDescription& fd, u8* outbuf, ssize_t len) ssize_t PATADiskDevice::read(FileDescription&, size_t offset, u8* outbuf, ssize_t len)
{ {
unsigned index = fd.offset() / block_size(); unsigned index = offset / block_size();
u16 whole_blocks = len / block_size(); u16 whole_blocks = len / block_size();
ssize_t remaining = len % block_size(); ssize_t remaining = len % block_size();
@ -116,14 +116,14 @@ ssize_t PATADiskDevice::read(FileDescription& fd, u8* outbuf, ssize_t len)
return pos + remaining; return pos + remaining;
} }
bool PATADiskDevice::can_read(const FileDescription& fd) const bool PATADiskDevice::can_read(const FileDescription&, size_t offset) const
{ {
return static_cast<unsigned>(fd.offset()) < (m_cylinders * m_heads * m_sectors_per_track * block_size()); return offset < (m_cylinders * m_heads * m_sectors_per_track * block_size());
} }
ssize_t PATADiskDevice::write(FileDescription& fd, const u8* inbuf, ssize_t len) ssize_t PATADiskDevice::write(FileDescription&, size_t offset, const u8* inbuf, ssize_t len)
{ {
unsigned index = fd.offset() / block_size(); unsigned index = offset / block_size();
u16 whole_blocks = len / block_size(); u16 whole_blocks = len / block_size();
ssize_t remaining = len % block_size(); ssize_t remaining = len % block_size();
@ -162,9 +162,9 @@ ssize_t PATADiskDevice::write(FileDescription& fd, const u8* inbuf, ssize_t len)
return pos + remaining; return pos + remaining;
} }
bool PATADiskDevice::can_write(const FileDescription& fd) const bool PATADiskDevice::can_write(const FileDescription&, size_t offset) const
{ {
return static_cast<unsigned>(fd.offset()) < (m_cylinders * m_heads * m_sectors_per_track * block_size()); return offset < (m_cylinders * m_heads * m_sectors_per_track * block_size());
} }
bool PATADiskDevice::read_sectors_with_dma(u32 lba, u16 count, u8* outbuf) bool PATADiskDevice::read_sectors_with_dma(u32 lba, u16 count, u8* outbuf)

8
Kernel/Devices/PATADiskDevice.h
View file

@ -61,10 +61,10 @@ public:
void set_drive_geometry(u16, u16, u16); void set_drive_geometry(u16, u16, u16);
// ^BlockDevice // ^BlockDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
protected: protected:
explicit PATADiskDevice(PATAChannel&, DriveType, int, int); explicit PATADiskDevice(PATAChannel&, DriveType, int, int);

6
Kernel/Devices/PS2MouseDevice.cpp
View file

@ -293,12 +293,12 @@ u8 PS2MouseDevice::mouse_read()
return IO::in8(I8042_BUFFER); return IO::in8(I8042_BUFFER);
} }
bool PS2MouseDevice::can_read(const FileDescription&) const bool PS2MouseDevice::can_read(const FileDescription&, size_t) const
{ {
return !m_queue.is_empty(); return !m_queue.is_empty();
} }
ssize_t PS2MouseDevice::read(FileDescription&, u8* buffer, ssize_t size) ssize_t PS2MouseDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
ASSERT(size > 0); ASSERT(size > 0);
size_t nread = 0; size_t nread = 0;
@ -318,7 +318,7 @@ ssize_t PS2MouseDevice::read(FileDescription&, u8* buffer, ssize_t size)
return nread; return nread;
} }
ssize_t PS2MouseDevice::write(FileDescription&, const u8*, ssize_t) ssize_t PS2MouseDevice::write(FileDescription&, size_t, const u8*, ssize_t)
{ {
return 0; return 0;
} }

8
Kernel/Devices/PS2MouseDevice.h
View file

@ -42,10 +42,10 @@ public:
static PS2MouseDevice& the(); static PS2MouseDevice& the();
// ^CharacterDevice // ^CharacterDevice
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* purpose() const override { return class_name(); } virtual const char* purpose() const override { return class_name(); }

6
Kernel/Devices/RandomDevice.cpp
View file

@ -38,18 +38,18 @@ RandomDevice::~RandomDevice()
{ {
} }
bool RandomDevice::can_read(const FileDescription&) const bool RandomDevice::can_read(const FileDescription&, size_t) const
{ {
return true; return true;
} }
ssize_t RandomDevice::read(FileDescription&, u8* buffer, ssize_t size) ssize_t RandomDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
get_good_random_bytes(buffer, size); get_good_random_bytes(buffer, size);
return size; return size;
} }
ssize_t RandomDevice::write(FileDescription&, const u8*, ssize_t size) ssize_t RandomDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
{ {
// FIXME: Use input for entropy? I guess that could be a neat feature? // FIXME: Use input for entropy? I guess that could be a neat feature?
return min(PAGE_SIZE, size); return min(PAGE_SIZE, size);

8
Kernel/Devices/RandomDevice.h
View file

@ -38,10 +38,10 @@ public:
private: private:
// ^CharacterDevice // ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* class_name() const override { return "RandomDevice"; } virtual const char* class_name() const override { return "RandomDevice"; }
}; };

6
Kernel/Devices/SB16.cpp
View file

@ -167,12 +167,12 @@ void SB16::set_irq_line(u8 irq_number)
change_irq_number(irq_number); change_irq_number(irq_number);
} }
bool SB16::can_read(const FileDescription&) const bool SB16::can_read(const FileDescription&, size_t) const
{ {
return false; return false;
} }
ssize_t SB16::read(FileDescription&, u8*, ssize_t) ssize_t SB16::read(FileDescription&, size_t, u8*, ssize_t)
{ {
return 0; return 0;
} }
@ -226,7 +226,7 @@ void SB16::wait_for_irq()
disable_irq(); disable_irq();
} }
ssize_t SB16::write(FileDescription&, const u8* data, ssize_t length) ssize_t SB16::write(FileDescription&, size_t, const u8* data, ssize_t length)
{ {
if (!m_dma_region) { if (!m_dma_region) {
auto page = MM.allocate_supervisor_physical_page(); auto page = MM.allocate_supervisor_physical_page();

8
Kernel/Devices/SB16.h
View file

@ -45,10 +45,10 @@ public:
static SB16& the(); static SB16& the();
// ^CharacterDevice // ^CharacterDevice
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* purpose() const override { return class_name(); } virtual const char* purpose() const override { return class_name(); }

8
Kernel/Devices/SerialDevice.cpp
View file

@ -40,12 +40,12 @@ SerialDevice::~SerialDevice()
{ {
} }
bool SerialDevice::can_read(const FileDescription&) const bool SerialDevice::can_read(const FileDescription&, size_t) const
{ {
return (get_line_status() & DataReady) != 0; return (get_line_status() & DataReady) != 0;
} }
ssize_t SerialDevice::read(FileDescription&, u8* buffer, ssize_t size) ssize_t SerialDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
if (!size) if (!size)
return 0; return 0;
@ -58,12 +58,12 @@ ssize_t SerialDevice::read(FileDescription&, u8* buffer, ssize_t size)
return 1; return 1;
} }
bool SerialDevice::can_write(const FileDescription&) const bool SerialDevice::can_write(const FileDescription&, size_t) const
{ {
return (get_line_status() & EmptyTransmitterHoldingRegister) != 0; return (get_line_status() & EmptyTransmitterHoldingRegister) != 0;
} }
ssize_t SerialDevice::write(FileDescription&, const u8* buffer, ssize_t size) ssize_t SerialDevice::write(FileDescription&, size_t, const u8* buffer, ssize_t size)
{ {
if (!size) if (!size)
return 0; return 0;

8
Kernel/Devices/SerialDevice.h
View file

@ -40,10 +40,10 @@ public:
virtual ~SerialDevice() override; virtual ~SerialDevice() override;
// ^CharacterDevice // ^CharacterDevice
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
enum InterruptEnable { enum InterruptEnable {
LowPowerMode = 0x01 << 5, LowPowerMode = 0x01 << 5,

6
Kernel/Devices/ZeroDevice.cpp
View file

@ -39,19 +39,19 @@ ZeroDevice::~ZeroDevice()
{ {
} }
bool ZeroDevice::can_read(const FileDescription&) const bool ZeroDevice::can_read(const FileDescription&, size_t) const
{ {
return true; return true;
} }
ssize_t ZeroDevice::read(FileDescription&, u8* buffer, ssize_t size) ssize_t ZeroDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
ssize_t count = min(PAGE_SIZE, size); ssize_t count = min(PAGE_SIZE, size);
memset(buffer, 0, (size_t)count); memset(buffer, 0, (size_t)count);
return count; return count;
} }
ssize_t ZeroDevice::write(FileDescription&, const u8*, ssize_t size) ssize_t ZeroDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
{ {
return min(PAGE_SIZE, size); return min(PAGE_SIZE, size);
} }

8
Kernel/Devices/ZeroDevice.h
View file

@ -38,10 +38,10 @@ public:
private: private:
// ^CharacterDevice // ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* class_name() const override { return "ZeroDevice"; } virtual const char* class_name() const override { return "ZeroDevice"; }
}; };

8
Kernel/FileSystem/FIFO.cpp
View file

@ -106,17 +106,17 @@ void FIFO::detach(Direction direction)
} }
} }
bool FIFO::can_read(const FileDescription&) const bool FIFO::can_read(const FileDescription&, size_t) const
{ {
return !m_buffer.is_empty() || !m_writers; return !m_buffer.is_empty() || !m_writers;
} }
bool FIFO::can_write(const FileDescription&) const bool FIFO::can_write(const FileDescription&, size_t) const
{ {
return m_buffer.space_for_writing() || !m_readers; return m_buffer.space_for_writing() || !m_readers;
} }
ssize_t FIFO::read(FileDescription&, u8* buffer, ssize_t size) ssize_t FIFO::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
if (!m_writers && m_buffer.is_empty()) if (!m_writers && m_buffer.is_empty())
return 0; return 0;
@ -130,7 +130,7 @@ ssize_t FIFO::read(FileDescription&, u8* buffer, ssize_t size)
return nread; return nread;
} }
ssize_t FIFO::write(FileDescription&, const u8* buffer, ssize_t size) ssize_t FIFO::write(FileDescription&, size_t, const u8* buffer, ssize_t size)
{ {
if (!m_readers) { if (!m_readers) {
Thread::current->send_signal(SIGPIPE, Process::current); Thread::current->send_signal(SIGPIPE, Process::current);

8
Kernel/FileSystem/FIFO.h
View file

@ -54,10 +54,10 @@ public:
private: private:
// ^File // ^File
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual String absolute_path(const FileDescription&) const override; virtual String absolute_path(const FileDescription&) const override;
virtual const char* class_name() const override { return "FIFO"; } virtual const char* class_name() const override { return "FIFO"; }
virtual bool is_fifo() const override { return true; } virtual bool is_fifo() const override { return true; }

8
Kernel/FileSystem/File.h
View file

@ -71,11 +71,11 @@ public:
virtual KResultOr<NonnullRefPtr<FileDescription>> open(int options); virtual KResultOr<NonnullRefPtr<FileDescription>> open(int options);
virtual void close(); virtual void close();
virtual bool can_read(const FileDescription&) const = 0; virtual bool can_read(const FileDescription&, size_t) const = 0;
virtual bool can_write(const FileDescription&) const = 0; virtual bool can_write(const FileDescription&, size_t) const = 0;
virtual ssize_t read(FileDescription&, u8*, ssize_t) = 0; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) = 0;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) = 0; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) = 0;
virtual int ioctl(FileDescription&, unsigned request, unsigned arg); virtual int ioctl(FileDescription&, unsigned request, unsigned arg);
virtual KResultOr<Region*> mmap(Process&, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t size, int prot, bool shared); virtual KResultOr<Region*> mmap(Process&, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t size, int prot, bool shared);

8
Kernel/FileSystem/FileDescription.cpp
View file

@ -130,7 +130,7 @@ ssize_t FileDescription::read(u8* buffer, ssize_t count)
if ((m_current_offset + count) < 0) if ((m_current_offset + count) < 0)
return -EOVERFLOW; return -EOVERFLOW;
SmapDisabler disabler; SmapDisabler disabler;
int nread = m_file->read(*this, buffer, count); int nread = m_file->read(*this, offset(), buffer, count);
if (nread > 0 && m_file->is_seekable()) if (nread > 0 && m_file->is_seekable())
m_current_offset += nread; m_current_offset += nread;
return nread; return nread;
@ -142,7 +142,7 @@ ssize_t FileDescription::write(const u8* data, ssize_t size)
if ((m_current_offset + size) < 0) if ((m_current_offset + size) < 0)
return -EOVERFLOW; return -EOVERFLOW;
SmapDisabler disabler; SmapDisabler disabler;
int nwritten = m_file->write(*this, data, size); int nwritten = m_file->write(*this, offset(), data, size);
if (nwritten > 0 && m_file->is_seekable()) if (nwritten > 0 && m_file->is_seekable())
m_current_offset += nwritten; m_current_offset += nwritten;
return nwritten; return nwritten;
@ -150,12 +150,12 @@ ssize_t FileDescription::write(const u8* data, ssize_t size)
bool FileDescription::can_write() const bool FileDescription::can_write() const
{ {
return m_file->can_write(*this); return m_file->can_write(*this, offset());
} }
bool FileDescription::can_read() const bool FileDescription::can_read() const
{ {
return m_file->can_read(*this); return m_file->can_read(*this, offset());
} }
ByteBuffer FileDescription::read_entire_file() ByteBuffer FileDescription::read_entire_file()

8
Kernel/FileSystem/InodeFile.cpp
View file

@ -44,17 +44,17 @@ InodeFile::~InodeFile()
{ {
} }
ssize_t InodeFile::read(FileDescription& description, u8* buffer, ssize_t count) ssize_t InodeFile::read(FileDescription& description, size_t offset, u8* buffer, ssize_t count)
{ {
ssize_t nread = m_inode->read_bytes(description.offset(), count, buffer, &description); ssize_t nread = m_inode->read_bytes(offset, count, buffer, &description);
if (nread > 0) if (nread > 0)
Thread::current->did_file_read(nread); Thread::current->did_file_read(nread);
return nread; return nread;
} }
ssize_t InodeFile::write(FileDescription& description, const u8* data, ssize_t count) ssize_t InodeFile::write(FileDescription& description, size_t offset, const u8* data, ssize_t count)
{ {
ssize_t nwritten = m_inode->write_bytes(description.offset(), count, data, &description); ssize_t nwritten = m_inode->write_bytes(offset, count, data, &description);
if (nwritten > 0) { if (nwritten > 0) {
m_inode->set_mtime(kgettimeofday().tv_sec); m_inode->set_mtime(kgettimeofday().tv_sec);
Thread::current->did_file_write(nwritten); Thread::current->did_file_write(nwritten);

8
Kernel/FileSystem/InodeFile.h
View file

@ -44,11 +44,11 @@ public:
const Inode& inode() const { return *m_inode; } const Inode& inode() const { return *m_inode; }
Inode& inode() { return *m_inode; } Inode& inode() { return *m_inode; }
virtual bool can_read(const FileDescription&) const override { return true; } virtual bool can_read(const FileDescription&, size_t) const override { return true; }
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual KResultOr<Region*> mmap(Process&, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t size, int prot, bool shared) override; virtual KResultOr<Region*> mmap(Process&, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t size, int prot, bool shared) override;
virtual String absolute_path(const FileDescription&) const override; virtual String absolute_path(const FileDescription&) const override;

8
Kernel/FileSystem/InodeWatcher.cpp
View file

@ -47,17 +47,17 @@ InodeWatcher::~InodeWatcher()
safe_inode->unregister_watcher({}, *this); safe_inode->unregister_watcher({}, *this);
} }
bool InodeWatcher::can_read(const FileDescription&) const bool InodeWatcher::can_read(const FileDescription&, size_t) const
{ {
return !m_queue.is_empty() || !m_inode; return !m_queue.is_empty() || !m_inode;
} }
bool InodeWatcher::can_write(const FileDescription&) const bool InodeWatcher::can_write(const FileDescription&, size_t) const
{ {
return true; return true;
} }
ssize_t InodeWatcher::read(FileDescription&, u8* buffer, ssize_t buffer_size) ssize_t InodeWatcher::read(FileDescription&, size_t, u8* buffer, ssize_t buffer_size)
{ {
ASSERT(!m_queue.is_empty() || !m_inode); ASSERT(!m_queue.is_empty() || !m_inode);
@ -71,7 +71,7 @@ ssize_t InodeWatcher::read(FileDescription&, u8* buffer, ssize_t buffer_size)
return sizeof(event); return sizeof(event);
} }
ssize_t InodeWatcher::write(FileDescription&, const u8*, ssize_t) ssize_t InodeWatcher::write(FileDescription&, size_t, const u8*, ssize_t)
{ {
return -EIO; return -EIO;
} }

8
Kernel/FileSystem/InodeWatcher.h
View file

@ -49,10 +49,10 @@ public:
Type type { Type::Invalid }; Type type { Type::Invalid };
}; };
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual String absolute_path(const FileDescription&) const override; virtual String absolute_path(const FileDescription&) const override;
virtual const char* class_name() const override { return "InodeWatcher"; }; virtual const char* class_name() const override { return "InodeWatcher"; };

4
Kernel/Net/IPv4Socket.cpp
View file

@ -168,7 +168,7 @@ void IPv4Socket::detach(FileDescription&)
{ {
} }
bool IPv4Socket::can_read(const FileDescription&) const bool IPv4Socket::can_read(const FileDescription&, size_t) const
{ {
if (m_role == Role::Listener) if (m_role == Role::Listener)
return can_accept(); return can_accept();
@ -177,7 +177,7 @@ bool IPv4Socket::can_read(const FileDescription&) const
return m_can_read; return m_can_read;
} }
bool IPv4Socket::can_write(const FileDescription&) const bool IPv4Socket::can_write(const FileDescription&, size_t) const
{ {
return is_connected(); return is_connected();
} }

4
Kernel/Net/IPv4Socket.h
View file

@ -56,8 +56,8 @@ public:
virtual void get_peer_address(sockaddr*, socklen_t*) override; virtual void get_peer_address(sockaddr*, socklen_t*) override;
virtual void attach(FileDescription&) override; virtual void attach(FileDescription&) override;
virtual void detach(FileDescription&) override; virtual void detach(FileDescription&) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual ssize_t sendto(FileDescription&, const void*, size_t, int, const sockaddr*, socklen_t) override; virtual ssize_t sendto(FileDescription&, const void*, size_t, int, const sockaddr*, socklen_t) override;
virtual ssize_t recvfrom(FileDescription&, void*, size_t, int flags, sockaddr*, socklen_t*) override; virtual ssize_t recvfrom(FileDescription&, void*, size_t, int flags, sockaddr*, socklen_t*) override;
virtual KResult setsockopt(int level, int option, const void*, socklen_t) override; virtual KResult setsockopt(int level, int option, const void*, socklen_t) override;

6
Kernel/Net/LocalSocket.cpp
View file

@ -227,7 +227,7 @@ void LocalSocket::detach(FileDescription& description)
} }
} }
bool LocalSocket::can_read(const FileDescription& description) const bool LocalSocket::can_read(const FileDescription& description, size_t) const
{ {
auto role = this->role(description); auto role = this->role(description);
if (role == Role::Listener) if (role == Role::Listener)
@ -249,7 +249,7 @@ bool LocalSocket::has_attached_peer(const FileDescription& description) const
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
bool LocalSocket::can_write(const FileDescription& description) const bool LocalSocket::can_write(const FileDescription& description, size_t) const
{ {
auto role = this->role(description); auto role = this->role(description);
if (role == Role::Accepted) if (role == Role::Accepted)
@ -298,7 +298,7 @@ ssize_t LocalSocket::recvfrom(FileDescription& description, void* buffer, size_t
return 0; return 0;
return -EAGAIN; return -EAGAIN;
} }
} else if (!can_read(description)) { } else if (!can_read(description, 0)) {
auto result = Thread::current->block<Thread::ReadBlocker>(description); auto result = Thread::current->block<Thread::ReadBlocker>(description);
if (result != Thread::BlockResult::WokeNormally) if (result != Thread::BlockResult::WokeNormally)
return -EINTR; return -EINTR;

4
Kernel/Net/LocalSocket.h
View file

@ -55,8 +55,8 @@ public:
virtual void get_peer_address(sockaddr*, socklen_t*) override; virtual void get_peer_address(sockaddr*, socklen_t*) override;
virtual void attach(FileDescription&) override; virtual void attach(FileDescription&) override;
virtual void detach(FileDescription&) override; virtual void detach(FileDescription&) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual ssize_t sendto(FileDescription&, const void*, size_t, int, const sockaddr*, socklen_t) override; virtual ssize_t sendto(FileDescription&, const void*, size_t, int, const sockaddr*, socklen_t) override;
virtual ssize_t recvfrom(FileDescription&, void*, size_t, int flags, sockaddr*, socklen_t*) override; virtual ssize_t recvfrom(FileDescription&, void*, size_t, int flags, sockaddr*, socklen_t*) override;
virtual KResult getsockopt(FileDescription&, int level, int option, void*, socklen_t*) override; virtual KResult getsockopt(FileDescription&, int level, int option, void*, socklen_t*) override;

4
Kernel/Net/Socket.cpp
View file

@ -176,14 +176,14 @@ KResult Socket::getsockopt(FileDescription&, int level, int option, void* value,
} }
} }
ssize_t Socket::read(FileDescription& description, u8* buffer, ssize_t size) ssize_t Socket::read(FileDescription& description, size_t, u8* buffer, ssize_t size)
{ {
if (is_shut_down_for_reading()) if (is_shut_down_for_reading())
return 0; return 0;
return recvfrom(description, buffer, size, 0, nullptr, 0); return recvfrom(description, buffer, size, 0, nullptr, 0);
} }
ssize_t Socket::write(FileDescription& description, const u8* data, ssize_t size) ssize_t Socket::write(FileDescription& description, size_t, const u8* data, ssize_t size)
{ {
if (is_shut_down_for_writing()) if (is_shut_down_for_writing())
return -EPIPE; return -EPIPE;

4
Kernel/Net/Socket.h
View file

@ -124,8 +124,8 @@ public:
Lock& lock() { return m_lock; } Lock& lock() { return m_lock; }
// ^File // ^File
virtual ssize_t read(FileDescription&, u8*, ssize_t) override final; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override final;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override final; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override final;
virtual String absolute_path(const FileDescription&) const override = 0; virtual String absolute_path(const FileDescription&) const override = 0;
bool has_receive_timeout() const { return m_receive_timeout.tv_sec || m_receive_timeout.tv_usec; } bool has_receive_timeout() const { return m_receive_timeout.tv_sec || m_receive_timeout.tv_usec; }

8
Kernel/TTY/MasterPTY.cpp
View file

@ -59,14 +59,14 @@ String MasterPTY::pts_name() const
return m_pts_name; return m_pts_name;
} }
ssize_t MasterPTY::read(FileDescription&, u8* buffer, ssize_t size) ssize_t MasterPTY::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
if (!m_slave && m_buffer.is_empty()) if (!m_slave && m_buffer.is_empty())
return 0; return 0;
return m_buffer.read(buffer, size); return m_buffer.read(buffer, size);
} }
ssize_t MasterPTY::write(FileDescription&, const u8* buffer, ssize_t size) ssize_t MasterPTY::write(FileDescription&, size_t, const u8* buffer, ssize_t size)
{ {
if (!m_slave) if (!m_slave)
return -EIO; return -EIO;
@ -74,14 +74,14 @@ ssize_t MasterPTY::write(FileDescription&, const u8* buffer, ssize_t size)
return size; return size;
} }
bool MasterPTY::can_read(const FileDescription&) const bool MasterPTY::can_read(const FileDescription&, size_t) const
{ {
if (!m_slave) if (!m_slave)
return true; return true;
return !m_buffer.is_empty(); return !m_buffer.is_empty();
} }
bool MasterPTY::can_write(const FileDescription&) const bool MasterPTY::can_write(const FileDescription&, size_t) const
{ {
return true; return true;
} }

8
Kernel/TTY/MasterPTY.h
View file

@ -50,10 +50,10 @@ public:
private: private:
// ^CharacterDevice // ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual void close() override; virtual void close() override;
virtual bool is_master_pty() const override { return true; } virtual bool is_master_pty() const override { return true; }
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override; virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override;

8
Kernel/TTY/PTYMultiplexer.h
View file

@ -44,10 +44,10 @@ public:
// ^CharacterDevice // ^CharacterDevice
virtual KResultOr<NonnullRefPtr<FileDescription>> open(int options) override; virtual KResultOr<NonnullRefPtr<FileDescription>> open(int options) override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return 0; } virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override { return 0; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override { return 0; } virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override { return 0; }
virtual bool can_read(const FileDescription&) const override { return true; } virtual bool can_read(const FileDescription&, size_t) const override { return true; }
virtual bool can_write(const FileDescription&) const override { return true; } virtual bool can_write(const FileDescription&, size_t) const override { return true; }
void notify_master_destroyed(Badge<MasterPTY>, unsigned index); void notify_master_destroyed(Badge<MasterPTY>, unsigned index);

10
Kernel/TTY/SlavePTY.cpp
View file

@ -76,23 +76,23 @@ ssize_t SlavePTY::on_tty_write(const u8* data, ssize_t size)
return m_master->on_slave_write(data, size); return m_master->on_slave_write(data, size);
} }
bool SlavePTY::can_write(const FileDescription&) const bool SlavePTY::can_write(const FileDescription&, size_t) const
{ {
return m_master->can_write_from_slave(); return m_master->can_write_from_slave();
} }
bool SlavePTY::can_read(const FileDescription& description) const bool SlavePTY::can_read(const FileDescription& description, size_t offset) const
{ {
if (m_master->is_closed()) if (m_master->is_closed())
return true; return true;
return TTY::can_read(description); return TTY::can_read(description, offset);
} }
ssize_t SlavePTY::read(FileDescription& description, u8* buffer, ssize_t size) ssize_t SlavePTY::read(FileDescription& description, size_t offset, u8* buffer, ssize_t size)
{ {
if (m_master->is_closed()) if (m_master->is_closed())
return 0; return 0;
return TTY::read(description, buffer, size); return TTY::read(description, offset, buffer, size);
} }
void SlavePTY::close() void SlavePTY::close()

6
Kernel/TTY/SlavePTY.h
View file

@ -47,9 +47,9 @@ private:
virtual void echo(u8) override; virtual void echo(u8) override;
// ^CharacterDevice // ^CharacterDevice
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual const char* class_name() const override { return "SlavePTY"; } virtual const char* class_name() const override { return "SlavePTY"; }
virtual void close() override; virtual void close() override;

8
Kernel/TTY/TTY.cpp
View file

@ -52,7 +52,7 @@ void TTY::set_default_termios()
memcpy(m_termios.c_cc, default_cc, sizeof(default_cc)); memcpy(m_termios.c_cc, default_cc, sizeof(default_cc));
} }
ssize_t TTY::read(FileDescription&, u8* buffer, ssize_t size) ssize_t TTY::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{ {
ASSERT(size >= 0); ASSERT(size >= 0);
@ -85,7 +85,7 @@ ssize_t TTY::read(FileDescription&, u8* buffer, ssize_t size)
return size; return size;
} }
ssize_t TTY::write(FileDescription&, const u8* buffer, ssize_t size) ssize_t TTY::write(FileDescription&, size_t, const u8* buffer, ssize_t size)
{ {
#ifdef TTY_DEBUG #ifdef TTY_DEBUG
dbg() << "TTY::write {" << String::format("%u", size) << "} "; dbg() << "TTY::write {" << String::format("%u", size) << "} ";
@ -98,7 +98,7 @@ ssize_t TTY::write(FileDescription&, const u8* buffer, ssize_t size)
return size; return size;
} }
bool TTY::can_read(const FileDescription&) const bool TTY::can_read(const FileDescription&, size_t) const
{ {
if (in_canonical_mode()) { if (in_canonical_mode()) {
return m_available_lines > 0; return m_available_lines > 0;
@ -106,7 +106,7 @@ bool TTY::can_read(const FileDescription&) const
return !m_input_buffer.is_empty(); return !m_input_buffer.is_empty();
} }
bool TTY::can_write(const FileDescription&) const bool TTY::can_write(const FileDescription&, size_t) const
{ {
return true; return true;
} }

8
Kernel/TTY/TTY.h
View file

@ -39,10 +39,10 @@ class TTY : public CharacterDevice {
public: public:
virtual ~TTY() override; virtual ~TTY() override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override; virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override; virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&) const override; virtual bool can_write(const FileDescription&, size_t) const override;
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override final; virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override final;
virtual String absolute_path(const FileDescription&) const override { return tty_name(); } virtual String absolute_path(const FileDescription&) const override { return tty_name(); }

6
Libraries/LibBareMetal/Output/Console.cpp
View file

@ -57,19 +57,19 @@ Console::~Console()
} }
#if defined(KERNEL) #if defined(KERNEL)
bool Console::can_read(const Kernel::FileDescription&) const bool Console::can_read(const Kernel::FileDescription&, size_t) const
{ {
return false; return false;
} }
ssize_t Console::read(Kernel::FileDescription&, u8*, ssize_t) ssize_t Console::read(Kernel::FileDescription&, size_t, u8*, ssize_t)
{ {
// FIXME: Implement reading from the console. // FIXME: Implement reading from the console.
// Maybe we could use a ring buffer for this device? // Maybe we could use a ring buffer for this device?
return 0; return 0;
} }
ssize_t Console::write(Kernel::FileDescription&, const u8* data, ssize_t size) ssize_t Console::write(Kernel::FileDescription&, size_t, const u8* data, ssize_t size)
{ {
if (!size) if (!size)
return 0; return 0;

8
Libraries/LibBareMetal/Output/Console.h
View file

@ -57,10 +57,10 @@ public:
#if defined(KERNEL) #if defined(KERNEL)
// ^CharacterDevice // ^CharacterDevice
virtual bool can_read(const Kernel::FileDescription&) const override; virtual bool can_read(const Kernel::FileDescription&, size_t) const override;
virtual bool can_write(const Kernel::FileDescription&) const override { return true; } virtual bool can_write(const Kernel::FileDescription&, size_t) const override { return true; }
virtual ssize_t read(Kernel::FileDescription&, u8*, ssize_t) override; virtual ssize_t read(Kernel::FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(Kernel::FileDescription&, const u8*, ssize_t) override; virtual ssize_t write(Kernel::FileDescription&, size_t, const u8*, ssize_t) override;
virtual const char* class_name() const override { return "Console"; } virtual const char* class_name() const override { return "Console"; }
#endif #endif
void set_implementation(ConsoleImplementation* implementation) void set_implementation(ConsoleImplementation* implementation)