mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-22 18:26:39 +00:00
Code Issues Releases Activity

Fix building with latest libnx commit.

Browse source
This commit is contained in:
Pablo Curiel 2023-11-26 23:13:58 +01:00
parent e2c0cbc898
commit 8c4e432035
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/usb.c
View file

@ -160,7 +160,7 @@ enum usb_supported_speed {
}; };
/// Imported from libusb, with some adjustments. /// Imported from libusb, with some adjustments.
struct PACKED usb_bos_descriptor { struct NX_PACKED usb_bos_descriptor {
u8 bLength; u8 bLength;
u8 bDescriptorType; ///< Must match USB_DT_BOS. u8 bDescriptorType; ///< Must match USB_DT_BOS.
u16 wTotalLength; ///< Length of this descriptor and all of its sub descriptors. u16 wTotalLength; ///< Length of this descriptor and all of its sub descriptors.
@ -170,7 +170,7 @@ struct PACKED usb_bos_descriptor {
NXDT_ASSERT(struct usb_bos_descriptor, 0x5); NXDT_ASSERT(struct usb_bos_descriptor, 0x5);
/// Imported from libusb, with some adjustments. /// Imported from libusb, with some adjustments.
struct PACKED usb_2_0_extension_descriptor { struct NX_PACKED usb_2_0_extension_descriptor {
u8 bLength; u8 bLength;
u8 bDescriptorType; ///< Must match USB_DT_DEVICE_CAPABILITY. u8 bDescriptorType; ///< Must match USB_DT_DEVICE_CAPABILITY.
u8 bDevCapabilityType; ///< Must match USB_BT_USB_2_0_EXTENSION. u8 bDevCapabilityType; ///< Must match USB_BT_USB_2_0_EXTENSION.
@ -180,7 +180,7 @@ struct PACKED usb_2_0_extension_descriptor {
NXDT_ASSERT(struct usb_2_0_extension_descriptor, 0x7); NXDT_ASSERT(struct usb_2_0_extension_descriptor, 0x7);
/// Imported from libusb, with some adjustments. /// Imported from libusb, with some adjustments.
struct PACKED usb_ss_usb_device_capability_descriptor { struct NX_PACKED usb_ss_usb_device_capability_descriptor {
u8 bLength; u8 bLength;
u8 bDescriptorType; ///< Must match USB_DT_DEVICE_CAPABILITY. u8 bDescriptorType; ///< Must match USB_DT_DEVICE_CAPABILITY.
u8 bDevCapabilityType; ///< Must match USB_BT_SS_USB_DEVICE_CAPABILITY. u8 bDevCapabilityType; ///< Must match USB_BT_SS_USB_DEVICE_CAPABILITY.

2
source/exception_handler.cpp
View file

@ -92,7 +92,7 @@ namespace nxdt::utils {
} }
#endif /* LOG_LEVEL < LOG_LEVEL_NONE */ #endif /* LOG_LEVEL < LOG_LEVEL_NONE */
static void NORETURN AbortProgramExecution(std::string str) static void NX_NORETURN AbortProgramExecution(std::string str)
{ {
if (g_borealisInitialized) if (g_borealisInitialized)
{ {