Skip to content

add usbDsGetSpeed and missing speed enum entries. #676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add usbDsGetSpeed and missing speed enum entries. #676

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b306750
add usbDsGetSpeed and missing speed enum entries.
ITotalJustice May 21, 2025
e7ceefb
fix code style.
ITotalJustice May 21, 2025
076dd7b
fix code style 2.
ITotalJustice May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion nx/include/switch/services/usbds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ typedef enum {
} UsbComplexId;

typedef enum {
UsbDeviceSpeed_None = 0x0,
UsbDeviceSpeed_Low = 0x1, ///< USB 1.0 Low Speed
UsbDeviceSpeed_Full = 0x2, ///< USB 1.1 Full Speed
UsbDeviceSpeed_High = 0x3, ///< USB 2.0 High Speed
UsbDeviceSpeed_Super = 0x4, ///< USB 3.0 Super Speed
Expand Down Expand Up @@ -119,6 +121,9 @@ Result usbDsEnable(void);
/// Only available on [5.0.0+].
Result usbDsDisable(void);

/// Only available on [8.0.0+].
Result usbDsGetSpeed(UsbDeviceSpeed* out);

///@}

///@name IDsInterface
Expand Down Expand Up @@ -158,4 +163,3 @@ Result usbDsEndpoint_Stall(UsbDsEndpoint* endpoint);
Result usbDsEndpoint_SetZlt(UsbDsEndpoint* endpoint, bool zlt); // Sets Zero Length Termination for endpoint

///@}

9 changes: 8 additions & 1 deletion nx/source/services/usbds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,14 @@ Result usbDsDisable(void) {
return _usbDsCmdNoIO(&g_usbDsSrv, hosversionAtLeast(11,0,0) ? 10 : 11);
}

Result usbDsGetSpeed(UsbDeviceSpeed *out) {
if (hosversionBefore(8,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);

_Static_assert(sizeof(*out) == sizeof(u32));
return _usbDsCmdNoInOutU32(&g_usbDsSrv, (u32*)out, hosversionAtLeast(11,0,0) ? 11 : 12);
}


//IDsInterface

Expand Down Expand Up @@ -729,4 +737,3 @@ Result usbDsEndpoint_SetZlt(UsbDsEndpoint* endpoint, bool zlt) {

return _usbDsCmdInBoolNoOut(&endpoint->s, zlt, 5);
}