Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

update main #1

Merged
Sinipelto merged 240 commits from Bananymous/banan-os:main into main 2023-11-20 13:20:51 +02:00
Conversation 0 Commits 240 Files Changed 263 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f7097398ca - Show all commits

2
kernel/include/kernel/Terminal/TTY.h
View File

@ -40,7 +40,7 @@ namespace Kernel
void putchar(uint8_t ch); void putchar(uint8_t ch);
virtual void putchar_impl(uint8_t ch) = 0; virtual void putchar_impl(uint8_t ch) = 0;
bool has_data() const; virtual bool has_data_impl() const override;
protected: protected:
TTY(mode_t mode, uid_t uid, gid_t gid) TTY(mode_t mode, uid_t uid, gid_t gid)

2
kernel/kernel/Terminal/TTY.cpp
View File

@ -328,7 +328,7 @@ namespace Kernel
return count; return count;
} }
bool TTY::has_data() const bool TTY::has_data_impl() const
{ {
LockGuard _(m_lock); LockGuard _(m_lock);
return m_output.flush; return m_output.flush;