Merge common: dmacmgr

2 files changed, 7 insertions, 46 deletions

diff --git a/include/kernel/kernel/dmac.h b/include/common/kernel/dmacmgr.h
index adb1008..5b4a431 100644
--- a/include/kernel/kernel/dmac.h
+++ b/include/common/kernel/dmacmgr.h
@@ -1,11 +1,10 @@
-#ifndef _PSP2_KERNEL_DMAC_H_
-#define _PSP2_KERNEL_DMAC_H_
+#ifndef _VDSUITE_COMMON_KERNEL_DMACMGR_H
+#define _VDSUITE_COMMON_KERNEL_DMACMGR_H
 
-#include <psp2kern/types.h>
+#include <cdefs.h>
+#include <kernel/types.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+SCE_CDECL_BEGIN
 
 /**
  * DMA memcpy
@@ -29,8 +28,6 @@ void *sceDmacMemcpy(void *dst, const void *src, SceSize size);
 */
 void *sceDmacMemset(void *dst, int c, SceSize size);
 
-#ifdef __cplusplus
-}
-#endif
+SCE_CDECL_END
 
-#endif /* _PSP2_KERNEL_DMAC_H_ */
+#endif /* _VDSUITE_COMMON_KERNEL_DMACMGR_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_ */