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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 aqZZz`8kc$x8kQcE;3Dn+*u7mi#{U;AMO#|{ diff --git a/troposphere/haze/icon.svg b/troposphere/haze/icon.svg index c8c2f6247..e1478a7e3 100644 --- a/troposphere/haze/icon.svg +++ b/troposphere/haze/icon.svg @@ -1,2 +1,2 @@ - + 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++) {