mirrors/Atmosphere
0
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-08-15 23:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

haze: misc

Browse source
This commit is contained in:
Liam 2023-04-17 13:36:52 -04:00
commit e1fcf4ef19
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
troposphere/haze/include/haze/ptp.hpp
View file

@ -25,11 +25,11 @@ namespace haze {
constexpr inline u32 PtpStringMaxLength = 255; constexpr inline u32 PtpStringMaxLength = 255;
enum PtpUsbBulkContainerType : u16 { enum PtpUsbBulkContainerType : u16 {
PtpUsbBulkContainerType_Undefined = 0, PtpUsbBulkContainerType_Undefined = 0x0000,
PtpUsbBulkContainerType_Command = 1, PtpUsbBulkContainerType_Command = 0x0001,
PtpUsbBulkContainerType_Data = 2, PtpUsbBulkContainerType_Data = 0x0002,
PtpUsbBulkContainerType_Response = 3, PtpUsbBulkContainerType_Response = 0x0003,
PtpUsbBulkContainerType_Event = 4, PtpUsbBulkContainerType_Event = 0x0004,
}; };
enum PtpOperationCode : u16 { enum PtpOperationCode : u16 {
@ -427,13 +427,13 @@ namespace haze {
}; };
enum PtpAssociationType : u16 { enum PtpAssociationType : u16 {
PtpAssociationType_Undefined = 0x0, PtpAssociationType_Undefined = 0x0000,
PtpAssociationType_GenericFolder = 0x1, PtpAssociationType_GenericFolder = 0x0001,
}; };
enum PtpGetObjectHandles : u32 { enum PtpGetObjectHandles : u32 {
PtpGetObjectHandles_AllFormats = 0x0, PtpGetObjectHandles_AllFormats = 0x00000000,
PtpGetObjectHandles_AllAssocs = 0x0, PtpGetObjectHandles_AllAssocs = 0x00000000,
PtpGetObjectHandles_AllStorage = 0xffffffff, PtpGetObjectHandles_AllStorage = 0xffffffff,
PtpGetObjectHandles_RootParent = 0xffffffff, PtpGetObjectHandles_RootParent = 0xffffffff,
}; };

4
troposphere/haze/include/haze/ptp_object_database.hpp
View file

@ -56,7 +56,7 @@ namespace haze {
} }
}; };
struct IdComparator { struct ObjectIdComparator {
struct RedBlackKeyType { struct RedBlackKeyType {
u32 m_object_id; u32 m_object_id;
@ -80,7 +80,7 @@ namespace haze {
using ObjectNameTree = ObjectNameTreeTraits::TreeType<PtpObject::NameComparator>; using ObjectNameTree = ObjectNameTreeTraits::TreeType<PtpObject::NameComparator>;
using ObjectIdTreeTraits = util::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&PtpObject::m_object_id_node>; using ObjectIdTreeTraits = util::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&PtpObject::m_object_id_node>;
using ObjectIdTree = ObjectIdTreeTraits::TreeType<PtpObject::IdComparator>; using ObjectIdTree = ObjectIdTreeTraits::TreeType<PtpObject::ObjectIdComparator>;
PtpObjectHeap *m_object_heap; PtpObjectHeap *m_object_heap;
ObjectNameTree m_name_tree; ObjectNameTree m_name_tree;

1
troposphere/haze/source/event_reactor.cpp
View file

@ -53,6 +53,7 @@ namespace haze {
HAZE_ASSERT(m_num_wait_objects + num_arg_waiters <= svc::ArgumentHandleCountMax); HAZE_ASSERT(m_num_wait_objects + num_arg_waiters <= svc::ArgumentHandleCountMax);
while (true) { while (true) {
/* Check if we should wait for an event. */
R_TRY(m_result); R_TRY(m_result);
/* Insert waiters from argument list. */ /* Insert waiters from argument list. */