From a3f088a6584a909557b0be442a528b269a630168 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 15 Apr 2023 16:58:29 -0400 Subject: [PATCH] haze: adjust banner, new lines between class sections, single-statement if --- troposphere/haze/icon.jpg | Bin 7823 -> 6391 bytes troposphere/haze/icon.svg | 2 +- .../haze/include/haze/async_usb_server.hpp | 3 --- .../haze/include/haze/console_main_loop.hpp | 20 +++++++++------- .../haze/include/haze/event_reactor.hpp | 1 - .../haze/include/haze/filesystem_proxy.hpp | 3 --- .../haze/include/haze/ptp_data_builder.hpp | 2 -- .../haze/include/haze/ptp_data_parser.hpp | 2 -- .../haze/include/haze/ptp_object_database.hpp | 3 --- .../haze/include/haze/ptp_object_heap.hpp | 22 +++++++++++------- .../haze/include/haze/ptp_responder.hpp | 1 - troposphere/haze/include/haze/usb_session.hpp | 2 -- .../haze/source/ptp_object_database.cpp | 16 +++++++++---- troposphere/haze/source/ptp_object_heap.cpp | 8 +++++-- 14 files changed, 43 insertions(+), 42 deletions(-) diff --git a/troposphere/haze/icon.jpg b/troposphere/haze/icon.jpg index c23abe907985b1f4e4965974dd53771fdf57513d..6c64f740ea7202ab92e3c1d450eea1ecba00b238 100644 GIT binary patch literal 6391 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 - + diff --git a/troposphere/haze/include/haze/async_usb_server.hpp b/troposphere/haze/include/haze/async_usb_server.hpp index af62fd666..7283d6574 100644 --- a/troposphere/haze/include/haze/async_usb_server.hpp +++ b/troposphere/haze/include/haze/async_usb_server.hpp @@ -23,16 +23,13 @@ namespace haze { class AsyncUsbServer final { private: EventReactor *m_reactor; - public: constexpr explicit AsyncUsbServer() : m_reactor() { /* ... */ } Result Initialize(const UsbCommsInterfaceInfo *interface_info, u16 id_vendor, u16 id_product, EventReactor *reactor); void Finalize(); - private: Result TransferPacketImpl(bool read, void *page, u32 size, u32 *out_size_transferred) const; - public: Result ReadPacket(void *page, u32 size, u32 *out_size_transferred) const { return this->TransferPacketImpl(true, page, size, out_size_transferred); diff --git a/troposphere/haze/include/haze/console_main_loop.hpp b/troposphere/haze/include/haze/console_main_loop.hpp index 99de59382..e4e72142a 100644 --- a/troposphere/haze/include/haze/console_main_loop.hpp +++ b/troposphere/haze/include/haze/console_main_loop.hpp @@ -23,7 +23,7 @@ namespace haze { class ConsoleMainLoop : public EventConsumer { private: static constexpr size_t FrameDelayNs = 33333333; - + private: EventReactor *m_reactor; PtpObjectHeap *m_object_heap; @@ -36,7 +36,6 @@ namespace haze { u32 m_last_heap_used; u32 m_last_heap_total; bool m_is_applet_mode; - private: static void Run(void *arg) { static_cast(arg)->Run(); @@ -49,11 +48,14 @@ namespace haze { Waiter cancel_waiter = waiterForUEvent(std::addressof(m_cancel_event)); Result rc = waitObjects(std::addressof(idx), std::addressof(cancel_waiter), 1, FrameDelayNs); - if (R_SUCCEEDED(rc)) break; - if (svc::ResultTimedOut::Includes(rc)) ueventSignal(std::addressof(m_event)); + if (R_SUCCEEDED(rc)) { + break; + } + if (svc::ResultTimedOut::Includes(rc)) { + ueventSignal(std::addressof(m_event)); + } } } - public: explicit ConsoleMainLoop() : m_reactor(), m_pad(), m_thread(), m_event(), m_cancel_event(), m_last_heap_used(), m_last_heap_total(), m_is_applet_mode() { /* ... */ } @@ -110,12 +112,12 @@ namespace haze { m_last_heap_total = heap_total; const char *used_unit = "B"; - if (heap_used > 1024) { heap_used >>= 10; used_unit = "KiB"; } - if (heap_used > 1024) { heap_used >>= 10; used_unit = "MiB"; } + if (heap_used >= 1024) { heap_used >>= 10; used_unit = "KiB"; } + if (heap_used >= 1024) { heap_used >>= 10; used_unit = "MiB"; } const char *total_unit = "B"; - if (heap_total > 1024) { heap_total >>= 10; total_unit = "KiB"; } - if (heap_total > 1024) { heap_total >>= 10; total_unit = "MiB"; } + if (heap_total >= 1024) { heap_total >>= 10; total_unit = "KiB"; } + if (heap_total >= 1024) { heap_total >>= 10; total_unit = "MiB"; } consoleClear(); printf("USB File Transfer\n\n"); diff --git a/troposphere/haze/include/haze/event_reactor.hpp b/troposphere/haze/include/haze/event_reactor.hpp index 5f762133a..890982fe4 100644 --- a/troposphere/haze/include/haze/event_reactor.hpp +++ b/troposphere/haze/include/haze/event_reactor.hpp @@ -29,7 +29,6 @@ namespace haze { private: EventConsumer *m_consumers[MAX_WAIT_OBJECTS]; Waiter m_waiters[MAX_WAIT_OBJECTS]; - s32 m_num_wait_objects; bool m_stop_requested; diff --git a/troposphere/haze/include/haze/filesystem_proxy.hpp b/troposphere/haze/include/haze/filesystem_proxy.hpp index 3fce92ad2..3e16d400d 100644 --- a/troposphere/haze/include/haze/filesystem_proxy.hpp +++ b/troposphere/haze/include/haze/filesystem_proxy.hpp @@ -24,7 +24,6 @@ namespace haze { private: EventReactor *m_reactor; FsFileSystem *m_filesystem; - public: constexpr explicit FilesystemProxy() : m_reactor(), m_filesystem() { /* ... */ } @@ -39,7 +38,6 @@ namespace haze { m_reactor = nullptr; m_filesystem = nullptr; } - private: template Result ForwardResult(F func, Args &&... args) { @@ -49,7 +47,6 @@ namespace haze { R_RETURN(rc); } - public: Result GetTotalSpace(const char *path, s64 *out) { R_RETURN(this->ForwardResult(fsFsGetTotalSpace, m_filesystem, path, out)); diff --git a/troposphere/haze/include/haze/ptp_data_builder.hpp b/troposphere/haze/include/haze/ptp_data_builder.hpp index 972eda42b..2e9d8dceb 100644 --- a/troposphere/haze/include/haze/ptp_data_builder.hpp +++ b/troposphere/haze/include/haze/ptp_data_builder.hpp @@ -28,7 +28,6 @@ namespace haze { size_t m_offset; u8 *m_data; bool m_disabled; - private: template constexpr static size_t Strlen(const T *str) { @@ -50,7 +49,6 @@ namespace haze { R_RETURN(m_server->WritePacket(m_data, m_offset)); } } - public: constexpr explicit PtpDataBuilder(void *data, AsyncUsbServer *server) : m_server(server), m_transmitted_size(), m_offset(), m_data(static_cast(data)), m_disabled() { /* ... */ } diff --git a/troposphere/haze/include/haze/ptp_data_parser.hpp b/troposphere/haze/include/haze/ptp_data_parser.hpp index a642fefdd..d862cc785 100644 --- a/troposphere/haze/include/haze/ptp_data_parser.hpp +++ b/troposphere/haze/include/haze/ptp_data_parser.hpp @@ -28,7 +28,6 @@ namespace haze { u32 m_offset; u8 *m_data; bool m_eos; - private: Result Flush() { R_UNLESS(!m_eos, haze::ResultEndOfTransmission()); @@ -40,7 +39,6 @@ namespace haze { R_RETURN(m_server->ReadPacket(m_data, haze::UsbBulkPacketBufferSize, std::addressof(m_received_size))); } - public: constexpr explicit PtpDataParser(void *data, AsyncUsbServer *server) : m_server(server), m_received_size(), m_offset(), m_data(static_cast(data)), m_eos() { /* ... */ } diff --git a/troposphere/haze/include/haze/ptp_object_database.hpp b/troposphere/haze/include/haze/ptp_object_database.hpp index af8511b87..59ff26d6e 100644 --- a/troposphere/haze/include/haze/ptp_object_database.hpp +++ b/troposphere/haze/include/haze/ptp_object_database.hpp @@ -70,7 +70,6 @@ namespace haze { } }; }; - private: using ObjectNameToIdTreeTraits = util::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&ObjectNode::m_object_name_to_id_node>; using ObjectNameToIdTree = ObjectNameToIdTreeTraits::TreeType; @@ -82,13 +81,11 @@ namespace haze { ObjectNameToIdTree m_name_to_object_id; ObjectIdToNameTree m_object_id_to_name; u32 m_next_object_id; - public: constexpr explicit PtpObjectDatabase() : m_object_heap(), m_name_to_object_id(), m_object_id_to_name(), m_next_object_id() { /* ... */ } void Initialize(PtpObjectHeap *object_heap); void Finalize(); - public: /* Object database API. */ Result AddObjectId(const char *parent_name, const char *name, u32 *out_object_id, u32 parent_id, u32 desired_object_id = 0); diff --git a/troposphere/haze/include/haze/ptp_object_heap.hpp b/troposphere/haze/include/haze/ptp_object_heap.hpp index 826893d59..fda104ef0 100644 --- a/troposphere/haze/include/haze/ptp_object_heap.hpp +++ b/troposphere/haze/include/haze/ptp_object_heap.hpp @@ -24,18 +24,16 @@ namespace haze { class PtpObjectHeap { private: static constexpr size_t NumHeapBlocks = 2; - + private: void *m_heap_blocks[NumHeapBlocks]; void *m_next_address; u32 m_heap_block_size; u32 m_current_heap_block; - public: constexpr explicit PtpObjectHeap() : m_heap_blocks(), m_next_address(), m_heap_block_size(), m_current_heap_block() { /* ... */ } void Initialize(); void Finalize(); - public: constexpr size_t GetSizeTotal() const { return m_heap_block_size * NumHeapBlocks; @@ -44,7 +42,6 @@ namespace haze { constexpr size_t GetSizeUsed() const { return (m_heap_block_size * m_current_heap_block) + this->GetNextAddress() - this->GetFirstAddress(); } - private: constexpr u8 *GetNextAddress() const { return static_cast(m_next_address); } constexpr u8 *GetFirstAddress() const { return static_cast(m_heap_blocks[m_current_heap_block]); } @@ -58,8 +55,12 @@ namespace haze { } constexpr bool AllocationIsSatisfyable(size_t n) const { - if (this->GetNextAddress() + n < this->GetNextAddress()) return false; - if (this->GetNextAddress() + n > this->GetCurrentBlockEnd()) return false; + if (this->GetNextAddress() + n < this->GetNextAddress()) { + return false; + } + if (this->GetNextAddress() + n > this->GetCurrentBlockEnd()) { + return false; + } return true; } @@ -80,17 +81,20 @@ namespace haze { return result; } - public: template constexpr T *Allocate(size_t n) { - if (n + 7 < n) return nullptr; + if (n + 7 < n) { + return nullptr; + } /* Round up the amount to a multiple of 8. */ n = (n + 7) & ~7ull; /* Check if the allocation is possible. */ - if (!this->AllocationIsPossible(n)) return nullptr; + if (!this->AllocationIsPossible(n)) { + return nullptr; + } /* If the allocation is not satisfyable now, we might be able to satisfy it on the next block. */ /* However, if the next block would be empty, we won't be able to satisfy the request. */ diff --git a/troposphere/haze/include/haze/ptp_responder.hpp b/troposphere/haze/include/haze/ptp_responder.hpp index 79effa4d3..ecbc8e0ad 100644 --- a/troposphere/haze/include/haze/ptp_responder.hpp +++ b/troposphere/haze/include/haze/ptp_responder.hpp @@ -32,7 +32,6 @@ namespace haze { PtpObjectHeap *m_object_heap; u32 m_send_object_id; bool m_session_open; - PtpObjectDatabase m_object_database; public: diff --git a/troposphere/haze/include/haze/usb_session.hpp b/troposphere/haze/include/haze/usb_session.hpp index 55f414b1b..5796304ad 100644 --- a/troposphere/haze/include/haze/usb_session.hpp +++ b/troposphere/haze/include/haze/usb_session.hpp @@ -30,11 +30,9 @@ namespace haze { private: UsbDsInterface *m_interface; UsbDsEndpoint *m_endpoints[UsbSessionEndpoint_Count]; - private: Result Initialize1x(const UsbCommsInterfaceInfo *info); Result Initialize5x(const UsbCommsInterfaceInfo *info); - public: constexpr explicit UsbSession() : m_interface(), m_endpoints() { /* ... */ } diff --git a/troposphere/haze/source/ptp_object_database.cpp b/troposphere/haze/source/ptp_object_database.cpp index 2f8a7f284..847f661d3 100644 --- a/troposphere/haze/source/ptp_object_database.cpp +++ b/troposphere/haze/source/ptp_object_database.cpp @@ -60,7 +60,9 @@ namespace haze { /* Check if an object with this name already exists. If it does, we can just return it here. */ auto it = m_name_to_object_id.find_key(node->m_name); if (it != m_name_to_object_id.end()) { - if (out_object_id) *out_object_id = it->GetObjectId(); + if (out_object_id) { + *out_object_id = it->GetObjectId(); + } R_SUCCEED(); } @@ -74,7 +76,9 @@ namespace haze { m_object_id_to_name.insert(*node); /* Set output. */ - if (out_object_id) *out_object_id = node->GetObjectId(); + if (out_object_id) { + *out_object_id = node->GetObjectId(); + } /* We succeeded. */ R_SUCCEED(); @@ -83,7 +87,9 @@ namespace haze { void PtpObjectDatabase::RemoveObjectId(u32 object_id) { /* Find in forward mapping. */ auto it = m_object_id_to_name.find_key(object_id); - if (it == m_object_id_to_name.end()) return; + if (it == m_object_id_to_name.end()) { + return; + } /* Free the node. */ ObjectNode *node = std::addressof(*it); @@ -95,7 +101,9 @@ namespace haze { PtpObjectDatabase::ObjectNode *PtpObjectDatabase::GetObject(u32 object_id) { /* Find in forward mapping. */ auto it = m_object_id_to_name.find_key(object_id); - if (it == m_object_id_to_name.end()) return nullptr; + if (it == m_object_id_to_name.end()) { + return nullptr; + } return std::addressof(*it); } diff --git a/troposphere/haze/source/ptp_object_heap.cpp b/troposphere/haze/source/ptp_object_heap.cpp index fd2f20966..eadde042e 100644 --- a/troposphere/haze/source/ptp_object_heap.cpp +++ b/troposphere/haze/source/ptp_object_heap.cpp @@ -28,7 +28,9 @@ namespace haze { size_t mem_used = 0; /* Skip re-initialization if we are currently initialized. */ - if (m_heap_block_size != 0) return; + if (m_heap_block_size != 0) { + return; + } /* Estimate how much memory we can reserve. */ HAZE_R_ABORT_UNLESS(svcGetInfo(std::addressof(mem_used), InfoType_UsedMemorySize, CUR_PROCESS_HANDLE, 0)); @@ -50,7 +52,9 @@ namespace haze { } void PtpObjectHeap::Finalize() { - if (m_heap_block_size == 0) return; + if (m_heap_block_size == 0) { + return; + } /* Tear down the heap, allowing a subsequent call to Initialize() if desired. */ for (size_t i = 0; i < NumHeapBlocks; i++) {