From 92c37b00b7808413cf0470303c092d915a1cfa77 Mon Sep 17 00:00:00 2001
From: Ian Chamberlain <ian.h.chamberlain@gmail.com>
Date: Mon, 31 Jan 2022 22:46:56 -0500
Subject: [PATCH 1/2] Add translations of result macros + debug impl

---
 ctru-rs/src/error.rs   | 16 ++++++++++++++--
 ctru-sys/src/lib.rs    | 11 +++++++----
 ctru-sys/src/result.rs | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 ctru-sys/src/result.rs

diff --git a/ctru-rs/src/error.rs b/ctru-rs/src/error.rs
index b1d968b..bd9c222 100644
--- a/ctru-rs/src/error.rs
+++ b/ctru-rs/src/error.rs
@@ -1,6 +1,8 @@
 use std::error;
 use std::fmt;
 
+use ctru_sys::result::{R_DESCRIPTION, R_LEVEL, R_MODULE, R_SUMMARY};
+
 pub type Result<T> = ::std::result::Result<T, Error>;
 
 /// The error type returned by all libctru functions.
@@ -17,12 +19,22 @@ impl From<i32> for Error {
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            Error::Os(err) => write!(f, "libctru result code: {:08X}", err),
+            Error::Os(err) => {
+                write!(f, "libctru result code: {:08X}:", err)?;
+                f.debug_struct("")
+                    .field("description", &R_DESCRIPTION(err))
+                    .field("module", &R_MODULE(err))
+                    .field("summary", &R_SUMMARY(err))
+                    .field("level", &R_LEVEL(err))
+                    .finish()
+            }
         }
     }
 }
 
-// TODO: Expand libctru result code into human-readable error message
+// TODO: Expand libctru result code into human-readable error message. These should be useful:
+// https://www.3dbrew.org/wiki/Error_codes
+// https://github.com/devkitPro/libctru/blob/master/libctru/include/3ds/result.h
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
diff --git a/ctru-sys/src/lib.rs b/ctru-sys/src/lib.rs
index d91d887..454a380 100644
--- a/ctru-sys/src/lib.rs
+++ b/ctru-sys/src/lib.rs
@@ -1,9 +1,12 @@
 #![no_std]
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+#![allow(clippy::all)]
+
+pub mod result;
 
-#[allow(non_upper_case_globals)]
-#[allow(non_camel_case_types)]
-#[allow(non_snake_case)]
-#[allow(clippy::all)]
 mod bindings;
 
 pub use bindings::*;
+pub use result::*;
diff --git a/ctru-sys/src/result.rs b/ctru-sys/src/result.rs
new file mode 100644
index 0000000..5f54694
--- /dev/null
+++ b/ctru-sys/src/result.rs
@@ -0,0 +1,42 @@
+//! Ports of macros in
+//! <https://github.com/devkitPro/libctru/blob/master/libctru/include/3ds/result.h>
+
+use crate::Result;
+
+/// Checks whether a result code indicates success.
+pub fn R_SUCCEEDED(res: Result) -> bool {
+    res >= 0
+}
+
+/// Checks whether a result code indicates failure.
+pub fn R_FAILED(res: Result) -> bool {
+    res < 0
+}
+
+/// Returns the level of a result code.
+pub fn R_LEVEL(res: Result) -> Result {
+    (res >> 27) & 0x1F
+}
+
+/// Returns the summary of a result code.
+pub fn R_SUMMARY(res: Result) -> Result {
+    (res >> 21) & 0x3F
+}
+
+/// Returns the module ID of a result code.
+pub fn R_MODULE(res: Result) -> Result {
+    (res >> 10) & 0xFF
+}
+
+/// Returns the description of a result code.
+pub fn R_DESCRIPTION(res: Result) -> Result {
+    res & 0x3FF
+}
+
+/// Builds a result code from its constituent components.
+pub fn MAKERESULT(level: Result, summary: Result, module: Result, description: Result) -> Result {
+    ((level & 0x1F) << 27)
+        | ((summary & 0x3F) << 21)
+        | ((module & 0xFF) << 10)
+        | (description & 0x3FF)
+}

From 0326e9ea9d1b7906e7025d03d6d5297ff3089461 Mon Sep 17 00:00:00 2001
From: Ian Chamberlain <ian.h.chamberlain@gmail.com>
Date: Tue, 1 Feb 2022 08:24:07 -0500
Subject: [PATCH 2/2] Address review comments for Debug impl

---
 ctru-rs/src/error.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ctru-rs/src/error.rs b/ctru-rs/src/error.rs
index bd9c222..53c3fbe 100644
--- a/ctru-rs/src/error.rs
+++ b/ctru-rs/src/error.rs
@@ -6,12 +6,13 @@ use ctru_sys::result::{R_DESCRIPTION, R_LEVEL, R_MODULE, R_SUMMARY};
 pub type Result<T> = ::std::result::Result<T, Error>;
 
 /// The error type returned by all libctru functions.
+#[non_exhaustive]
 pub enum Error {
-    Os(i32),
+    Os(ctru_sys::Result),
 }
 
-impl From<i32> for Error {
-    fn from(err: i32) -> Self {
+impl From<ctru_sys::Result> for Error {
+    fn from(err: ctru_sys::Result) -> Self {
         Error::Os(err)
     }
 }
@@ -19,15 +20,14 @@ impl From<i32> for Error {
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            Error::Os(err) => {
-                write!(f, "libctru result code: {:08X}:", err)?;
-                f.debug_struct("")
-                    .field("description", &R_DESCRIPTION(err))
-                    .field("module", &R_MODULE(err))
-                    .field("summary", &R_SUMMARY(err))
-                    .field("level", &R_LEVEL(err))
-                    .finish()
-            }
+            Error::Os(err) => f
+                .debug_struct("Error")
+                .field("raw", &format_args!("{:#08X}", err))
+                .field("description", &R_DESCRIPTION(err))
+                .field("module", &R_MODULE(err))
+                .field("summary", &R_SUMMARY(err))
+                .field("level", &R_LEVEL(err))
+                .finish(),
         }
     }
 }