OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update usbds_getspeed to match pr, fix appstore install returning a bool instead of Result.

Browse Source
This commit is contained in:
ITotalJustice
2025-05-21 21:52:54 +01:00
parent a91550174a
commit 2e6d757852
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sphaira/source/ui/menus/appstore.cpp
View File

@@ -527,9 +527,7 @@ auto InstallApp(ProgressBox* pbox, const Entry& entry) -> Result {
continue; continue;
} }
if (!unzip_to(new_entry.path, new_entry.path)) { R_TRY(unzip_to(new_entry.path, new_entry.path));
return false;
}
} }
// finally finally, remove files no longer in the manifest // finally finally, remove files no longer in the manifest

4
sphaira/source/usb/usbds.cpp
View File

@@ -20,7 +20,7 @@ constexpr u16 DEVICE_SPEED[] = {
}; };
// TODO: pr this to libnx. // TODO: pr this to libnx.
Result usbDsGetSpeed(u32 *out) { Result usbDsGetSpeed(UsbDeviceSpeed *out) {
if (hosversionBefore(8,0,0)) { if (hosversionBefore(8,0,0)) {
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
} }
@@ -247,7 +247,7 @@ Result UsbDs::IsUsbConnected(u64 timeout) {
Result UsbDs::GetSpeed(UsbDeviceSpeed* out, u16* max_packet_size) { Result UsbDs::GetSpeed(UsbDeviceSpeed* out, u16* max_packet_size) {
if (hosversionAtLeast(8,0,0)) { if (hosversionAtLeast(8,0,0)) {
R_TRY(usbDsGetSpeed((u32*)out)); R_TRY(usbDsGetSpeed(out));
} else { } else {
// assume USB 2.0 speed (likely the case anyway). // assume USB 2.0 speed (likely the case anyway).
*out = UsbDeviceSpeed_High; *out = UsbDeviceSpeed_High;