Fix osStrError (previously it was completely broken...)

This commit is contained in:
fincs 2020-07-01 00:21:40 +02:00
parent 41d0d615f5
commit 64f29fa024
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 17 additions and 15 deletions

View File

@ -75,7 +75,7 @@ void* osConvertOldLINEARMemToNew(const void* vaddr);
* *
* This can be used to get some details about an error returned by a service call. * This can be used to get some details about an error returned by a service call.
*/ */
const char* osStrError(u32 error); const char* osStrError(Result error);
/** /**
* @brief Gets the system's FIRM version. * @brief Gets the system's FIRM version.

View File

@ -119,30 +119,32 @@ double osTickCounterRead(const TickCounter* cnt) {
} }
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
const char* osStrError(u32 error) { const char* osStrError(Result error) {
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
switch((error>>26) & 0x3F) { switch(R_SUMMARY(error)) {
case 0: case RS_SUCCESS:
return "Success."; return "Success.";
case 1: case RS_NOP:
return "Nothing happened."; return "Nothing happened.";
case 2: case RS_WOULDBLOCK:
return "Would block."; return "Would block.";
case 3: case RS_OUTOFRESOURCE:
return "Not enough resources."; return "Not enough resources.";
case 4: case RS_NOTFOUND:
return "Not found."; return "Not found.";
case 5: case RS_INVALIDSTATE:
return "Invalid state."; return "Invalid state.";
case 6: case RS_NOTSUPPORTED:
return "Unsupported."; return "Unsupported.";
case 7: case RS_INVALIDARG:
return "Invalid argument."; return "Invalid argument.";
case 8: case RS_WRONGARG:
return "Wrong argument."; return "Wrong argument.";
case 9: case RS_CANCELED:
return "Interrupted."; return "Cancelled.";
case 10: case RS_STATUSCHANGED:
return "Status changed.";
case RS_INTERNAL:
return "Internal error."; return "Internal error.";
default: default:
return "Unknown."; return "Unknown.";