From 51db782e7ae11d716417d54b2f850e49ee55a30b Mon Sep 17 00:00:00 2001
From: fincs <fincs@devkitpro.org>
Date: Thu, 19 Sep 2019 04:23:00 +0200
Subject: [PATCH] fatal: Use new IPC interface

---
 nx/source/services/fatal.c | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/nx/source/services/fatal.c b/nx/source/services/fatal.c
index ac66b063..fa594ba0 100644
--- a/nx/source/services/fatal.c
+++ b/nx/source/services/fatal.c
@@ -1,7 +1,6 @@
 // Copyright 2017 plutoo
 #include "types.h"
 #include "result.h"
-#include "kernel/ipc.h"
 #include "kernel/detect.h"
 #include "kernel/svc.h"
 #include "services/fatal.h"
@@ -26,33 +25,22 @@ static void _fatalImpl(u32 cmd_id, Result err, FatalType type, FatalContext *ctx
         rc = smGetServiceOriginal(&srv, smEncodeName("fatal:u"));
 
         if (R_SUCCEEDED(rc)) {
-            IpcCommand c;
-            ipcInitialize(&c);
-            ipcSendPid(&c);
-            if (ctx != NULL) {
-                ipcAddSendBuffer(&c, ctx, sizeof(*ctx), BufferType_Normal);
-            }
-
-            struct {
-                u64 magic;
-                u64 cmd_id;
+            const struct {
                 u32 result;
                 u32 type;
                 u64 pid_placeholder;
-            } *raw;
+            } in = { err, type };
 
-            raw = ipcPrepareHeader(&c, sizeof(*raw));
-
-            raw->magic = SFCI_MAGIC;
-            raw->cmd_id = cmd_id;
-            raw->result = err;
-            raw->type = type;
-            raw->pid_placeholder = 0; // Overwritten by fatal with PID descriptor.
-
-            ipcDispatch(srv);
+            Service s;
+            serviceCreate(&s, srv);
+            serviceDispatchIn(&s, cmd_id, in,
+                .buffer_attrs = { ctx ? (SfBufferAttr_In | SfBufferAttr_HipcMapAlias) : 0U },
+                .buffers      = { { ctx, sizeof(*ctx) } },
+                .in_send_pid  = true,
+            );
         }
     }
-    
+
     switch (type) {
         case FatalType_ErrorReport:
             break;
@@ -72,7 +60,7 @@ void NORETURN fatalSimple(Result err) {
 }
 
 void fatalWithType(Result err, FatalType type) {
-    _fatalImpl(1, err, type, NULL); 
+    _fatalImpl(1, err, type, NULL);
 }
 
 void fatalWithContext(Result err, FatalType type, FatalContext *ctx) {