mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-08-07 08:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stylefixes

Browse Source
This commit is contained in:
plutooo 2018-04-15 23:26:49 +02:00
parent c5bc2ec77a
commit daf819cb75
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nx/include/switch/services/usb.h
View File

@ -49,19 +49,19 @@ typedef struct {
char Manufacturer[0x20]; char Manufacturer[0x20];
char Product[0x20]; char Product[0x20];
char SerialNumber[0x20]; char SerialNumber[0x20];
} usbDsDeviceInfo; } UsbDsDeviceInfo;
typedef struct { typedef struct {
u32 id; /// urbId from post-buffer cmds u32 id; /// urbId from post-buffer cmds
u32 requestedSize; u32 requestedSize;
u32 transferredSize; u32 transferredSize;
u32 urb_status; u32 urb_status;
} usbDsReportEntry; } UsbDsReportEntry;
typedef struct { typedef struct {
usbDsReportEntry report[8]; UsbDsReportEntry report[8];
u32 report_count; u32 report_count;
} usbDsReportData; } UsbDsReportData;
typedef struct { typedef struct {
bool initialized; bool initialized;
@ -153,7 +153,7 @@ enum usb_iso_usage_type {
USB_ISO_USAGE_TYPE_IMPLICIT = 2, USB_ISO_USAGE_TYPE_IMPLICIT = 2,
}; };
Result usbDsInitialize(UsbComplexId complexId, const usbDsDeviceInfo* deviceinfo); Result usbDsInitialize(UsbComplexId complexId, const UsbDsDeviceInfo* deviceinfo);
/// Exit usbDs. Any interfaces/endpoints which are left open are automatically closed, since otherwise usb-sysmodule won't fully reset usbds to defaults. /// Exit usbDs. Any interfaces/endpoints which are left open are automatically closed, since otherwise usb-sysmodule won't fully reset usbds to defaults.
void usbDsExit(void); void usbDsExit(void);
@ -168,7 +168,7 @@ Result usbDsGetDsInterface(UsbDsInterface** interface, struct usb_interface_desc
Result usbDsWaitReady(void); Result usbDsWaitReady(void);
/// Parse usbDsReportData from the Get*ReportData commands, where urbId is from the post-buffer commands. Will return the converted urb_status result-value. /// Parse usbDsReportData from the Get*ReportData commands, where urbId is from the post-buffer commands. Will return the converted urb_status result-value.
Result usbDsParseReportData(usbDsReportData *reportdata, u32 urbId, u32 *requestedSize, u32 *transferredSize); Result usbDsParseReportData(UsbDsReportData *reportdata, u32 urbId, u32 *requestedSize, u32 *transferredSize);
/// IDsInterface /// IDsInterface
void usbDsInterface_Close(UsbDsInterface* interface); void usbDsInterface_Close(UsbDsInterface* interface);
@ -177,14 +177,14 @@ Result usbDsInterface_EnableInterface(UsbDsInterface* interface);
Result usbDsInterface_DisableInterface(UsbDsInterface* interface); Result usbDsInterface_DisableInterface(UsbDsInterface* interface);
Result usbDsInterface_CtrlInPostBufferAsync(UsbDsInterface* interface, void* buffer, size_t size, u32 *urbId); Result usbDsInterface_CtrlInPostBufferAsync(UsbDsInterface* interface, void* buffer, size_t size, u32 *urbId);
Result usbDsInterface_CtrlOutPostBufferAsync(UsbDsInterface* interface, void* buffer, size_t size, u32 *urbId); Result usbDsInterface_CtrlOutPostBufferAsync(UsbDsInterface* interface, void* buffer, size_t size, u32 *urbId);
Result usbDsInterface_GetCtrlInReportData(UsbDsInterface* interface, usbDsReportData *out); Result usbDsInterface_GetCtrlInReportData(UsbDsInterface* interface, UsbDsReportData *out);
Result usbDsInterface_GetCtrlOutReportData(UsbDsInterface* interface, usbDsReportData *out); Result usbDsInterface_GetCtrlOutReportData(UsbDsInterface* interface, UsbDsReportData *out);
Result usbDsInterface_StallCtrl(UsbDsInterface* interface); Result usbDsInterface_StallCtrl(UsbDsInterface* interface);
/// IDsEndpoint /// IDsEndpoint
void usbDsEndpoint_Close(UsbDsEndpoint* endpoint); void usbDsEndpoint_Close(UsbDsEndpoint* endpoint);
Result usbDsEndpoint_PostBufferAsync(UsbDsEndpoint* endpoint, void* buffer, size_t size, u32 *urbId); Result usbDsEndpoint_PostBufferAsync(UsbDsEndpoint* endpoint, void* buffer, size_t size, u32 *urbId);
Result usbDsEndpoint_GetReportData(UsbDsEndpoint* endpoint, usbDsReportData *out); Result usbDsEndpoint_GetReportData(UsbDsEndpoint* endpoint, UsbDsReportData *out);
Result usbDsEndpoint_StallCtrl(UsbDsEndpoint* endpoint); Result usbDsEndpoint_StallCtrl(UsbDsEndpoint* endpoint);

4
nx/source/runtime/devices/usb_comms.c
View File

@ -232,7 +232,7 @@ static Result _usbCommsRead(usbCommsInterface *interface, void* buffer, size_t s
u32 chunksize=0; u32 chunksize=0;
u32 tmp_transferredSize = 0; u32 tmp_transferredSize = 0;
size_t total_transferredSize=0; size_t total_transferredSize=0;
usbDsReportData reportdata; UsbDsReportData reportdata;
//Makes sure endpoints are ready for data-transfer / wait for init if needed. //Makes sure endpoints are ready for data-transfer / wait for init if needed.
rc = usbDsWaitReady(); rc = usbDsWaitReady();
@ -297,7 +297,7 @@ static Result _usbCommsWrite(usbCommsInterface *interface, const void* buffer, s
u8 *transfer_buffer = NULL; u8 *transfer_buffer = NULL;
u32 tmp_transferredSize = 0; u32 tmp_transferredSize = 0;
size_t total_transferredSize=0; size_t total_transferredSize=0;
usbDsReportData reportdata; UsbDsReportData reportdata;
//Makes sure endpoints are ready for data-transfer / wait for init if needed. //Makes sure endpoints are ready for data-transfer / wait for init if needed.
rc = usbDsWaitReady(); rc = usbDsWaitReady();

22
nx/source/services/usb.c
View File

@ -21,11 +21,11 @@ static void _usbDsFreeTables(void);
static Result _usbDsBindDevice(UsbComplexId complexId); static Result _usbDsBindDevice(UsbComplexId complexId);
static Result _usbDsBindClientProcess(Handle prochandle); static Result _usbDsBindClientProcess(Handle prochandle);
static Result _usbDsGetEvent(Service* srv, Handle* handle_out, u64 cmd_id); static Result _usbDsGetEvent(Service* srv, Handle* handle_out, u64 cmd_id);
static Result _usbDsSetVidPidBcd(const usbDsDeviceInfo* deviceinfo); static Result _usbDsSetVidPidBcd(const UsbDsDeviceInfo* deviceinfo);
static Result _usbDsGetSession(Service* srv, Service* srv_out, u64 cmd_id, const void* buf0, size_t buf0size, const void* buf1, size_t buf1size); static Result _usbDsGetSession(Service* srv, Service* srv_out, u64 cmd_id, const void* buf0, size_t buf0size, const void* buf1, size_t buf1size);
Result usbDsInitialize(UsbComplexId complexId, const usbDsDeviceInfo* deviceinfo) Result usbDsInitialize(UsbComplexId complexId, const UsbDsDeviceInfo* deviceinfo)
{ {
if (serviceIsActive(&g_usbDsSrv)) if (serviceIsActive(&g_usbDsSrv))
return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized); return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized);
@ -322,11 +322,11 @@ Result usbDsWaitReady(void) {
return rc; return rc;
} }
Result usbDsParseReportData(usbDsReportData *reportdata, u32 urbId, u32 *requestedSize, u32 *transferredSize) { Result usbDsParseReportData(UsbDsReportData *reportdata, u32 urbId, u32 *requestedSize, u32 *transferredSize) {
Result rc = 0; Result rc = 0;
u32 pos; u32 pos;
u32 count = reportdata->report_count; u32 count = reportdata->report_count;
usbDsReportEntry *entry = NULL; UsbDsReportEntry *entry = NULL;
if(count>8)count = 8; if(count>8)count = 8;
for(pos=0; pos<count; pos++) { for(pos=0; pos<count; pos++) {
@ -362,7 +362,7 @@ Result usbDsParseReportData(usbDsReportData *reportdata, u32 urbId, u32 *request
return rc; return rc;
} }
static Result _usbDsSetVidPidBcd(const usbDsDeviceInfo* deviceinfo) { static Result _usbDsSetVidPidBcd(const UsbDsDeviceInfo* deviceinfo) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -371,7 +371,7 @@ static Result _usbDsSetVidPidBcd(const usbDsDeviceInfo* deviceinfo) {
u64 cmd_id; u64 cmd_id;
} *raw; } *raw;
ipcAddSendBuffer(&c, deviceinfo, sizeof(usbDsDeviceInfo), 0); ipcAddSendBuffer(&c, deviceinfo, sizeof(UsbDsDeviceInfo), 0);
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = ipcPrepareHeader(&c, sizeof(*raw));
@ -507,7 +507,7 @@ static Result _usbDsPostBuffer(Service* srv, u64 cmd_id, void* buffer, size_t si
return rc; return rc;
} }
static Result _usbDsGetReport(Service* srv, u64 cmd_id, usbDsReportData *out) { static Result _usbDsGetReport(Service* srv, u64 cmd_id, UsbDsReportData *out) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -530,7 +530,7 @@ static Result _usbDsGetReport(Service* srv, u64 cmd_id, usbDsReportData *out) {
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
usbDsReportData out; UsbDsReportData out;
} *resp = r.Raw; } *resp = r.Raw;
rc = resp->result; rc = resp->result;
@ -621,14 +621,14 @@ Result usbDsInterface_CtrlOutPostBufferAsync(UsbDsInterface* interface, void* bu
return _usbDsPostBuffer(&interface->h, 6, buffer, size, urbId); return _usbDsPostBuffer(&interface->h, 6, buffer, size, urbId);
} }
Result usbDsInterface_GetCtrlInReportData(UsbDsInterface* interface, usbDsReportData *out) Result usbDsInterface_GetCtrlInReportData(UsbDsInterface* interface, UsbDsReportData *out)
{ {
if(!interface->initialized)return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); if(!interface->initialized)return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
return _usbDsGetReport(&interface->h, 8, out); return _usbDsGetReport(&interface->h, 8, out);
} }
Result usbDsInterface_GetCtrlOutReportData(UsbDsInterface* interface, usbDsReportData *out) Result usbDsInterface_GetCtrlOutReportData(UsbDsInterface* interface, UsbDsReportData *out)
{ {
if(!interface->initialized)return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); if(!interface->initialized)return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
@ -656,7 +656,7 @@ Result usbDsEndpoint_PostBufferAsync(UsbDsEndpoint* endpoint, void* buffer, size
return _usbDsPostBuffer(&endpoint->h, 0, buffer, size, urbId); return _usbDsPostBuffer(&endpoint->h, 0, buffer, size, urbId);
} }
Result usbDsEndpoint_GetReportData(UsbDsEndpoint* endpoint, usbDsReportData *out) Result usbDsEndpoint_GetReportData(UsbDsEndpoint* endpoint, UsbDsReportData *out)
{ {
if(!endpoint->initialized)return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); if(!endpoint->initialized)return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);