Use IPC helpers for hb

diff --git a/libctru/source/services/hb.c b/libctru/source/services/hb.c
index 7ef8f1ef33be14e9ab428a00e3723cde45432ce8..6c1efc246286ca928fbd3d1c1336f5af0ef8a163 100644 (file)
--- a/libctru/source/services/hb.c
+++ b/libctru/source/services/hb.c
@@ -2,6 +2,7 @@
 #include <3ds/svc.h>\r
 #include <3ds/srv.h>\r
 #include <3ds/services/hb.h>\r
+#include <3ds/ipc.h>\r
 \r
 static Handle hbHandle;\r
 \r
@@ -20,9 +21,9 @@ Result HB_FlushInvalidateCache(void)
        Result ret = 0;\r
        u32 *cmdbuf = getThreadCommandBuffer();\r
 \r
-       cmdbuf[0] = 0x00010042;\r
+       cmdbuf[0] = IPC_MakeHeader(0x1,1,2); // 0x10042\r
        cmdbuf[1] = 0x00000000;\r
-       cmdbuf[2] = 0x00000000;\r
+       cmdbuf[2] = IPC_Desc_SharedHandles(1);\r
        cmdbuf[3] = CUR_PROCESS_HANDLE;\r
 \r
        if((ret = svcSendSyncRequest(hbHandle))!=0) return ret;\r
@@ -35,7 +36,7 @@ Result HB_GetBootloaderAddresses(void** load3dsx, void** setArgv)
        Result ret = 0;\r
        u32 *cmdbuf = getThreadCommandBuffer();\r
 \r
-       cmdbuf[0] = 0x00060000;\r
+       cmdbuf[0] = IPC_MakeHeader(0x6,0,0); // 0x60000\r
 \r
        if((ret = svcSendSyncRequest(hbHandle))!=0) return ret;\r
 \r
@@ -50,7 +51,7 @@ Result HB_ReprotectMemory(u32* addr, u32 pages, u32 mode, u32* reprotectedPages)
        Result ret = 0;\r
        u32 *cmdbuf = getThreadCommandBuffer();\r
 \r
-       cmdbuf[0] = 0x000900C0;\r
+       cmdbuf[0] = IPC_MakeHeader(0x9,3,0); // 0x900C0\r
        cmdbuf[1] = (u32)addr;\r
        cmdbuf[2] = pages;\r
        cmdbuf[3] = mode;\r