diff --git a/kernel/src/Api/BuildNo.hpp b/kernel/src/Api/BuildNo.hpp index 5e3f826..848f27d 100644 --- a/kernel/src/Api/BuildNo.hpp +++ b/kernel/src/Api/BuildNo.hpp @@ -12,4 +12,4 @@ #pragma once -#define MONTAUK_BUILD_NUMBER 126 +#define MONTAUK_BUILD_NUMBER 127 diff --git a/kernel/src/Terminal/Terminal.cpp b/kernel/src/Terminal/Terminal.cpp index 6b3c5a7..2cd6532 100644 --- a/kernel/src/Terminal/Terminal.cpp +++ b/kernel/src/Terminal/Terminal.cpp @@ -169,20 +169,6 @@ namespace Kt { return fbctx->font_scale_y; } - void UpdatePanelBar(CString panelText) { - kout << "\033[s"; - kout << "\033[H"; - - int panelWidth = g_terminal_width / 9; - - kout << "\033[44m" << "\033[97m"; - kout << panelText; - for (int i = static_cast(Lib::strlen(panelText)); i < panelWidth; ++i) - kout << " "; - kout << "\033[0m"; - kout << "\033[u"; - } - void Initialize(std::uint32_t *framebuffer, std::size_t width, std::size_t height, std::size_t pitch, std::uint8_t red_mask_size, std::uint8_t red_mask_shift, std::uint8_t green_mask_size, std::uint8_t green_mask_shift, @@ -216,7 +202,6 @@ namespace Kt { struct flanterm_fb_context *fbctx = (struct flanterm_fb_context *)ctx; fbctx->plot_char = plot_char_universal; - UpdatePanelBar("Initializing..."); kout << "\n\n\n"; } diff --git a/kernel/src/Terminal/Terminal.hpp b/kernel/src/Terminal/Terminal.hpp index 9402819..14752a5 100644 --- a/kernel/src/Terminal/Terminal.hpp +++ b/kernel/src/Terminal/Terminal.hpp @@ -48,8 +48,6 @@ namespace Kt // preventing dropped PS/2 mouse/keyboard bytes during log output. extern kcp::Mutex g_termLock; - void UpdatePanelBar(const char* panelText); - void Rescale(std::size_t font_scale_x, std::size_t font_scale_y); std::size_t GetFontScaleX(); std::size_t GetFontScaleY(); diff --git a/kernel/src/Timekeeping/Time.cpp b/kernel/src/Timekeeping/Time.cpp index 3175f35..18343cb 100644 --- a/kernel/src/Timekeeping/Time.cpp +++ b/kernel/src/Timekeeping/Time.cpp @@ -70,14 +70,6 @@ static Timekeeping::DateTime EpochToDate(int64_t epoch) { void Timekeeping::Init(uint16_t Year, uint8_t Month, uint8_t Day, uint8_t Hour, uint8_t Minute, uint8_t Second) { g_bootEpoch = DateToEpoch(Year, Month, Day, Hour, Minute, Second); - /* Apply default timezone offset for boot log display */ - int adjMin = Minute + (g_tzOffsetMinutes % 60); - int adjHour = Hour + (g_tzOffsetMinutes / 60); - if (adjMin < 0) { adjMin += 60; adjHour -= 1; } - if (adjMin >= 60) { adjMin -= 60; adjHour += 1; } - if (adjHour < 0) adjHour += 24; - if (adjHour >= 24) adjHour -= 24; - int offH = g_tzOffsetMinutes / 60; int offM = g_tzOffsetMinutes % 60; if (offM < 0) offM = -offM; @@ -86,35 +78,6 @@ void Timekeeping::Init(uint16_t Year, uint8_t Month, uint8_t Day, uint8_t Hour, << (offH >= 0 ? "+" : "") << offH << (offM ? ":" : "") << (offM >= 10 ? "" : (offM ? "0" : "")) << (offM ? offM : 0); - - kcp::cstringstream minuteStream; - if (adjMin < 10) { - minuteStream << "0"; - } - minuteStream << adjMin; - CString minuteStr = minuteStream.c_str(); - - kcp::cstringstream secondStream; - if (Second < 10) { - secondStream << "0"; - } - secondStream << Second; - CString secondStr = secondStream.c_str(); - - kcp::cstringstream panelStr; - panelStr - << " " - << Day << " " - << Months[Month] << " " - << Year << ", " - << adjHour << ":" - << minuteStr << ":" - << secondStr - << " (UTC" << (offH >= 0 ? "+" : "") << offH << ")"; - - CString dateString = panelStr.c_str(); - - UpdatePanelBar(dateString); } int64_t Timekeeping::GetUnixTimestamp() {