haze: remove additional newlines between sections

This commit is contained in:
Liam 2023-04-15 17:01:32 -04:00
commit 942f979be2
3 changed files with 1 additions and 9 deletions

View file

@ -95,7 +95,6 @@ namespace haze {
m_reactor->RemoveConsumer(this); m_reactor->RemoveConsumer(this);
} }
private: private:
void RedrawConsole() { void RedrawConsole() {
u32 heap_used = m_object_heap->GetSizeUsed(); u32 heap_used = m_object_heap->GetSizeUsed();
@ -130,7 +129,6 @@ namespace haze {
consoleUpdate(NULL); consoleUpdate(NULL);
} }
protected: protected:
void ProcessEvent() override { void ProcessEvent() override {
this->RedrawConsole(); this->RedrawConsole();

View file

@ -31,24 +31,20 @@ namespace haze {
Waiter m_waiters[MAX_WAIT_OBJECTS]; Waiter m_waiters[MAX_WAIT_OBJECTS];
s32 m_num_wait_objects; s32 m_num_wait_objects;
bool m_stop_requested; bool m_stop_requested;
public: public:
constexpr explicit EventReactor() : m_consumers(), m_waiters(), m_num_wait_objects(), m_stop_requested() { /* ... */ } constexpr explicit EventReactor() : m_consumers(), m_waiters(), m_num_wait_objects(), m_stop_requested() { /* ... */ }
bool AddConsumer(EventConsumer *consumer, Waiter waiter); bool AddConsumer(EventConsumer *consumer, Waiter waiter);
void RemoveConsumer(EventConsumer *consumer); void RemoveConsumer(EventConsumer *consumer);
public: public:
void RequestStop() { m_stop_requested = true; } void RequestStop() { m_stop_requested = true; }
bool GetStopRequested() const { return m_stop_requested; } bool GetStopRequested() const { return m_stop_requested; }
public: public:
template <typename... Args> template <typename... Args>
Result WaitFor(s32 *out_arg_waiter, Args &&... arg_waiters) { Result WaitFor(s32 *out_arg_waiter, Args &&... arg_waiters) {
const Waiter arg_waiter_array[] = {arg_waiters...}; const Waiter arg_waiter_array[] = {arg_waiters...};
return this->WaitForImpl(out_arg_waiter, sizeof...(Args), arg_waiter_array); return this->WaitForImpl(out_arg_waiter, sizeof...(Args), arg_waiter_array);
} }
private: private:
Result WaitForImpl(s32 *out_arg_waiter, s32 num_arg_waiters, const Waiter *arg_waiters); Result WaitForImpl(s32 *out_arg_waiter, s32 num_arg_waiters, const Waiter *arg_waiters);
}; };

View file

@ -32,17 +32,15 @@ namespace haze {
PtpObjectHeap *m_object_heap; PtpObjectHeap *m_object_heap;
u32 m_send_object_id; u32 m_send_object_id;
bool m_session_open; bool m_session_open;
PtpObjectDatabase m_object_database;
PtpObjectDatabase m_object_database;
public: 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() { /* ... */ } 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); Result Initialize(EventReactor *reactor, PtpObjectHeap *object_heap);
void Finalize(); void Finalize();
public: public:
Result HandleRequest(); Result HandleRequest();
private: private:
/* Request handling. */ /* Request handling. */
Result HandleRequestImpl(); Result HandleRequestImpl();