From c548125a34862ecda4e8a74fc26d22f9972ea91a Mon Sep 17 00:00:00 2001
From: Reiko Asakura
Date: Wed, 20 Jan 2021 16:28:31 -0500
Subject: Merge common: dmacmgr

---
 include/common/kernel/dmacmgr.h | 33 +++++++++++++++++++++++++++++++++
 include/kernel/kernel/dmac.h    | 36 ------------------------------------
 include/user/kernel/dmac.h      | 36 ------------------------------------
 3 files changed, 33 insertions(+), 72 deletions(-)
 create mode 100644 include/common/kernel/dmacmgr.h
 delete mode 100644 include/kernel/kernel/dmac.h
 delete mode 100644 include/user/kernel/dmac.h

diff --git a/include/common/kernel/dmacmgr.h b/include/common/kernel/dmacmgr.h
new file mode 100644
index 0000000..5b4a431
--- /dev/null
+++ b/include/common/kernel/dmacmgr.h
@@ -0,0 +1,33 @@
+#ifndef _VDSUITE_COMMON_KERNEL_DMACMGR_H
+#define _VDSUITE_COMMON_KERNEL_DMACMGR_H
+
+#include <cdefs.h>
+#include <kernel/types.h>
+
+SCE_CDECL_BEGIN
+
+/**
+ * DMA memcpy
+ *
+ * @param[in] dst - Destination
+ * @param[in] src - Source
+ * @param[in] size - Size
+ *
+ * @return dst.
+*/
+void *sceDmacMemcpy(void *dst, const void *src, SceSize size);
+
+/**
+ * DMA memset
+ *
+ * @param[in] dst - Destination
+ * @param[in] c - Constant
+ * @param[in] size - Size
+ *
+ * @return dst.
+*/
+void *sceDmacMemset(void *dst, int c, SceSize size);
+
+SCE_CDECL_END
+
+#endif /* _VDSUITE_COMMON_KERNEL_DMACMGR_H */
diff --git a/include/kernel/kernel/dmac.h b/include/kernel/kernel/dmac.h
deleted file mode 100644
index adb1008..0000000
--- a/include/kernel/kernel/dmac.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _PSP2_KERNEL_DMAC_H_
-#define _PSP2_KERNEL_DMAC_H_
-
-#include <psp2kern/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * DMA memcpy
- *
- * @param[in] dst - Destination
- * @param[in] src - Source
- * @param[in] size - Size
- *
- * @return dst.
-*/
-void *sceDmacMemcpy(void *dst, const void *src, SceSize size);
-
-/**
- * DMA memset
- *
- * @param[in] dst - Destination
- * @param[in] c - Constant
- * @param[in] size - Size
- *
- * @return dst.
-*/
-void *sceDmacMemset(void *dst, int c, SceSize size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PSP2_KERNEL_DMAC_H_ */
diff --git a/include/user/kernel/dmac.h b/include/user/kernel/dmac.h
deleted file mode 100644
index a6e0e42..0000000
--- a/include/user/kernel/dmac.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _PSP2_DMAC_H_
-#define _PSP2_DMAC_H_
-
-#include <psp2/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * DMA memcpy
- *
- * @param[in] dst - Destination
- * @param[in] src - Source
- * @param[in] size - Size
- *
- * @return dst.
-*/
-void *sceDmacMemcpy(void *dst, const void *src, SceSize size);
-
-/**
- * DMA memset
- *
- * @param[in] dst - Destination
- * @param[in] c - Constant
- * @param[in] size - Size
- *
- * @return dst.
-*/
-void *sceDmacMemset(void *dst, int c, SceSize size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PSP2_DMAC_H_ */
-- 
cgit v1.2.3