From 1741004f1903c01d5d27f68475a05323c0ee6d03 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 17 Apr 2023 16:07:32 -0400 Subject: [PATCH] haze: move static_assert to requires, fix alignment --- troposphere/haze/include/haze/event_reactor.hpp | 3 +-- troposphere/haze/source/usb_session.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/troposphere/haze/include/haze/event_reactor.hpp b/troposphere/haze/include/haze/event_reactor.hpp index fb87ff03c..563f9cb86 100644 --- a/troposphere/haze/include/haze/event_reactor.hpp +++ b/troposphere/haze/include/haze/event_reactor.hpp @@ -40,9 +40,8 @@ namespace haze { void SetResult(Result r) { m_result = r; } Result GetResult() const { return m_result; } public: - template + template requires (sizeof...(Args) > 0) Result WaitFor(s32 *out_arg_waiter, Args &&... arg_waiters) { - static_assert(sizeof...(Args) > 0); const Waiter arg_waiter_array[] = { arg_waiters... }; return this->WaitForImpl(out_arg_waiter, arg_waiter_array, sizeof...(Args)); } diff --git a/troposphere/haze/source/usb_session.cpp b/troposphere/haze/source/usb_session.cpp index 377aadcbc..e6e98b041 100644 --- a/troposphere/haze/source/usb_session.cpp +++ b/troposphere/haze/source/usb_session.cpp @@ -139,7 +139,7 @@ namespace haze { R_TRY(usbDsInterface_AppendConfigurationData(m_interface, UsbDeviceSpeed_High, std::addressof(endpoint_descriptor_interrupt), USB_DT_ENDPOINT_SIZE)); /* Super speed config. */ - endpoint_descriptor_in.wMaxPacketSize = PtpUsbBulkSuperSpeedMaxPacketLength; + endpoint_descriptor_in.wMaxPacketSize = PtpUsbBulkSuperSpeedMaxPacketLength; endpoint_descriptor_out.wMaxPacketSize = PtpUsbBulkSuperSpeedMaxPacketLength; R_TRY(usbDsInterface_AppendConfigurationData(m_interface, UsbDeviceSpeed_Super, std::addressof(interface_descriptor), USB_DT_INTERFACE_SIZE)); R_TRY(usbDsInterface_AppendConfigurationData(m_interface, UsbDeviceSpeed_Super, std::addressof(endpoint_descriptor_in), USB_DT_ENDPOINT_SIZE));