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

ams: use R_SUCCEED, R_THROW globally

Browse Source
This commit is contained in:
Michael Scire
2022-03-26 00:14:36 -07:00
parent e5b1739f65
commit dd78ede99f
370 changed files with 2107 additions and 2107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libraries/libstratosphere/source/htclow/mux/htclow_mux_channel_impl.cpp
View File

@@ -52,15 +52,15 @@ namespace ams::htclow::mux {
/* Otherwise, return appropriate failure error. */
if (m_state == ChannelState_Disconnected) {
return htclow::ResultInvalidChannelStateDisconnected();
R_THROW(htclow::ResultInvalidChannelStateDisconnected());
} else {
return htclow::ResultInvalidChannelState();
R_THROW(htclow::ResultInvalidChannelState());
}
}
Result ChannelImpl::CheckPacketVersion(s16 version) const {
R_UNLESS(version == m_version, htclow::ResultChannelVersionNotMatched());
return ResultSuccess();
R_SUCCEED();
}
@@ -73,7 +73,7 @@ namespace ams::htclow::mux {
case PacketType_Error:
return this->ProcessReceiveErrorPacket();
default:
return htclow::ResultProtocolError();
R_THROW(htclow::ResultProtocolError());
}
}
@@ -110,7 +110,7 @@ namespace ams::htclow::mux {
/* Notify the data was received. */
m_task_manager->NotifyReceiveData(m_channel, m_receive_buffer.GetDataSize());
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::ProcessReceiveMaxDataPacket(s16 version, u64 share) {
@@ -134,14 +134,14 @@ namespace ams::htclow::mux {
this->SignalSendPacketEvent();
}
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::ProcessReceiveErrorPacket() {
if (m_state == ChannelState_Connected || m_state == ChannelState_Disconnected) {
this->ShutdownForce();
}
return ResultSuccess();
R_SUCCEED();
}
bool ChannelImpl::QuerySendPacket(PacketHeader *header, PacketBody *body, int *out_body_size) {
@@ -250,7 +250,7 @@ namespace ams::htclow::mux {
/* Set the output task id. */
*out_task_id = task_id;
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::DoConnectEnd() {
@@ -287,7 +287,7 @@ namespace ams::htclow::mux {
/* Set our state as connected. */
this->SetState(ChannelState_Connected);
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::DoFlush(u32 *out_task_id) {
@@ -308,7 +308,7 @@ namespace ams::htclow::mux {
/* Set the output task id. */
*out_task_id = task_id;
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::DoReceiveBegin(u32 *out_task_id, size_t size) {
@@ -331,7 +331,7 @@ namespace ams::htclow::mux {
/* Set the output task id. */
*out_task_id = task_id;
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::DoReceiveEnd(size_t *out, void *dst, size_t dst_size) {
@@ -341,7 +341,7 @@ namespace ams::htclow::mux {
/* If we have nowhere to receive, we're done. */
if (dst_size == 0) {
*out = 0;
return ResultSuccess();
R_SUCCEED();
}
/* Get the amount of receivable data. */
@@ -381,7 +381,7 @@ namespace ams::htclow::mux {
/* Set the output size. */
*out = received;
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::DoSend(u32 *out_task_id, size_t *out, const void *src, size_t src_size) {
@@ -413,7 +413,7 @@ namespace ams::htclow::mux {
*out_task_id = task_id;
*out = sent;
return ResultSuccess();
R_SUCCEED();
}
Result ChannelImpl::DoShutdown() {
@@ -422,7 +422,7 @@ namespace ams::htclow::mux {
/* Set our state. */
this->SetState(ChannelState_Disconnected);
return ResultSuccess();
R_SUCCEED();
}
void ChannelImpl::SetConfig(const ChannelConfig &config) {