diff --git a/troposphere/haze/include/haze/console_main_loop.hpp b/troposphere/haze/include/haze/console_main_loop.hpp index e4e72142a..fed41e90c 100644 --- a/troposphere/haze/include/haze/console_main_loop.hpp +++ b/troposphere/haze/include/haze/console_main_loop.hpp @@ -95,7 +95,6 @@ namespace haze { m_reactor->RemoveConsumer(this); } - private: void RedrawConsole() { u32 heap_used = m_object_heap->GetSizeUsed(); @@ -130,7 +129,6 @@ namespace haze { consoleUpdate(NULL); } - protected: void ProcessEvent() override { this->RedrawConsole(); diff --git a/troposphere/haze/include/haze/event_reactor.hpp b/troposphere/haze/include/haze/event_reactor.hpp index 890982fe4..4b4ab2372 100644 --- a/troposphere/haze/include/haze/event_reactor.hpp +++ b/troposphere/haze/include/haze/event_reactor.hpp @@ -31,24 +31,20 @@ namespace haze { Waiter m_waiters[MAX_WAIT_OBJECTS]; s32 m_num_wait_objects; bool m_stop_requested; - public: constexpr explicit EventReactor() : m_consumers(), m_waiters(), m_num_wait_objects(), m_stop_requested() { /* ... */ } bool AddConsumer(EventConsumer *consumer, Waiter waiter); void RemoveConsumer(EventConsumer *consumer); - public: void RequestStop() { m_stop_requested = true; } bool GetStopRequested() const { return m_stop_requested; } - public: template Result WaitFor(s32 *out_arg_waiter, Args &&... arg_waiters) { const Waiter arg_waiter_array[] = {arg_waiters...}; return this->WaitForImpl(out_arg_waiter, sizeof...(Args), arg_waiter_array); } - private: Result WaitForImpl(s32 *out_arg_waiter, s32 num_arg_waiters, const Waiter *arg_waiters); }; diff --git a/troposphere/haze/include/haze/ptp_responder.hpp b/troposphere/haze/include/haze/ptp_responder.hpp index ecbc8e0ad..b78c9cdbb 100644 --- a/troposphere/haze/include/haze/ptp_responder.hpp +++ b/troposphere/haze/include/haze/ptp_responder.hpp @@ -32,17 +32,15 @@ namespace haze { PtpObjectHeap *m_object_heap; u32 m_send_object_id; bool m_session_open; - PtpObjectDatabase m_object_database; + PtpObjectDatabase m_object_database; public: constexpr explicit PtpResponder() : m_usb_server(), m_fs(), m_request_header(), m_object_heap(), m_send_object_id(), m_session_open(), m_object_database() { /* ... */ } Result Initialize(EventReactor *reactor, PtpObjectHeap *object_heap); void Finalize(); - public: Result HandleRequest(); - private: /* Request handling. */ Result HandleRequestImpl();