diff options
Diffstat (limited to 'include/user')
37 files changed, 44 insertions, 74 deletions
diff --git a/include/user/audiocodec.h b/include/user/audiocodec.h index 3884039..1c8d898 100644 --- a/include/user/audiocodec.h +++ b/include/user/audiocodec.h @@ -1,7 +1,7 @@ #ifndef _DOLCESDK_PSP2_AUDIOCODEC_H_ #define _DOLCESDK_PSP2_AUDIOCODEC_H_ -#include <psp2/audiodec.h> +#include <audiodec.h> /* Error definition */ #define SCE_AUDIOCODEC_ERROR_API_FAIL (0x8000 + SCE_AUDIODEC_ERROR_API_FAIL) diff --git a/include/user/avcdec.h b/include/user/avcdec.h index 20c386b..3a21626 100644 --- a/include/user/avcdec.h +++ b/include/user/avcdec.h @@ -1,6 +1,7 @@ #ifndef _DOLCESDK_PSP2_AVCDEC_H_ #define _DOLCESDK_PSP2_AVCDEC_H_ +#include <videodec.h> #include_next <avcdec.h> #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus) diff --git a/include/user/avconfig.h b/include/user/avconfig.h index 7d28bd6..82029cb 100644 --- a/include/user/avconfig.h +++ b/include/user/avconfig.h @@ -1,7 +1,7 @@ #ifndef _PSP2_AVCONFIG_H_ #define _PSP2_AVCONFIG_H_ -#include <psp2/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/compat.h b/include/user/compat.h index 8112c46..3548e6b 100644 --- a/include/user/compat.h +++ b/include/user/compat.h @@ -1,10 +1,9 @@ #ifndef _PSP2_COMPAT_H_ #define _PSP2_COMPAT_H_ -#include <psp2/kernel/iofilemgr.h> -#include <psp2/rtc.h> -#include <psp2/types.h> -#include <stdint.h> +#include <kernel/iofilemgr.h> +#include <rtc.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/gim.h b/include/user/gim.h index 2d83431..f4da13b 100644 --- a/include/user/gim.h +++ b/include/user/gim.h @@ -5,12 +5,10 @@ extern "C" { #endif -#include <stdbool.h> -#include <psp2/gxm.h> -#include <psp2/scebase.h> - -#include <psp2/kernel/clib.h> -#include <psp2/kernel/sysmem.h> +#include <stddef.h> +#include <gxm.h> +#include <kernel/libkernel.h> +#include <kernel/sysmem/memblock.h> #define SCE_GIM_TAG 0x2E47494DUL /* 'GIM.' */ #define SCE_GIM_VERSION 0x312E3030UL /* '1.00' */ diff --git a/include/user/gxm.h b/include/user/gxm.h deleted file mode 100644 index 60f3e11..0000000 --- a/include/user/gxm.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _DOLCESDK_PSP2_GXM_INTERNAL_H_ -#define _DOLCESDK_PSP2_GXM_INTERNAL_H_ - -/** @file - - Helper include file that includes all public headers. -*/ - -#include <psp2/gxm.h> - -#include <psp2/gxm/context_internal.h> -#include <psp2/gxm/init_internal.h> -#include <psp2/gxm/memory_internal.h> -#include <psp2/gxm/render_target_internal.h> -#include <psp2/gxm/shader_patcher_internal.h> -#include <psp2/gxm/sync_object_internal.h> - -#endif /* _DOLCESDK_PSP2_GXM_INTERNAL_H_ */ diff --git a/include/user/gxm/context.h b/include/user/gxm/context.h index 3897677..e644610 100644 --- a/include/user/gxm/context.h +++ b/include/user/gxm/context.h @@ -4,7 +4,7 @@ /** @file */ -#include <psp2/gxm/context.h> +#include_next <gxm/context.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/gxm/init.h b/include/user/gxm/init.h index 8f27a79..76841d4 100644 --- a/include/user/gxm/init.h +++ b/include/user/gxm/init.h @@ -4,7 +4,7 @@ /** @file */ -#include <psp2/gxm/init.h> +#include_next <gxm/init.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/gxm/memory.h b/include/user/gxm/memory.h index cc4125a..889c57c 100644 --- a/include/user/gxm/memory.h +++ b/include/user/gxm/memory.h @@ -6,7 +6,7 @@ Memory mapping API for the GPU. */ -#include <psp2/gxm/memory.h> +#include_next <gxm/memory.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/gxm/render_target.h b/include/user/gxm/render_target.h index 44a38a3..e129bf0 100644 --- a/include/user/gxm/render_target.h +++ b/include/user/gxm/render_target.h @@ -4,7 +4,7 @@ /** @file */ -#include <psp2/gxm/render_target.h> +#include_next <gxm/render_target.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/gxm/shader_patcher.h b/include/user/gxm/shader_patcher.h index 7ae47dd..a5adfd9 100644 --- a/include/user/gxm/shader_patcher.h +++ b/include/user/gxm/shader_patcher.h @@ -4,7 +4,7 @@ /** @file */ -#include <psp2/gxm/shader_patcher.h> +#include_next <gxm/shader_patcher.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/gxm/sync_object.h b/include/user/gxm/sync_object.h index 811560c..a78d992 100644 --- a/include/user/gxm/sync_object.h +++ b/include/user/gxm/sync_object.h @@ -4,7 +4,7 @@ /** @file */ -#include <psp2/gxm/sync_object.h> +#include_next <gxm/sync_object.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/hid.h b/include/user/hid.h index 1fe133b..eb8d55b 100644 --- a/include/user/hid.h +++ b/include/user/hid.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include <psp2/types.h> +#include <scetypes.h> typedef struct SceHidKeyboardReport { SceUInt8 reserved; diff --git a/include/user/incoming_dialog.h b/include/user/incoming_dialog.h index da4c4f3..9d37b50 100644 --- a/include/user/incoming_dialog.h +++ b/include/user/incoming_dialog.h @@ -1,9 +1,9 @@ #ifndef _DOLCESDK_PSP2_INCOMING_DIALOG_H_ #define _DOLCESDK_PSP2_INCOMING_DIALOG_H_ -#include <psp2/kernel/clib.h> -#include <psp2/scebase.h> -#include <psp2/types.h> +#include <kernel/libkernel.h> +#include <scetypes.h> +#include <sdk_version.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/ini_file_processor.h b/include/user/ini_file_processor.h index cd8c6a1..8bc7d80 100644 --- a/include/user/ini_file_processor.h +++ b/include/user/ini_file_processor.h @@ -11,7 +11,7 @@ #ifdef __cplusplus -#include <cstddef> +#include <stddef.h> namespace sce { namespace Ini { diff --git a/include/user/jpegarm.h b/include/user/jpegarm.h index 6a5f5c7..868476f 100644 --- a/include/user/jpegarm.h +++ b/include/user/jpegarm.h @@ -1,8 +1,7 @@ #ifndef _DOLCESDK_PSP2_JPEGARM_H_ #define _DOLCESDK_PSP2_JPEGARM_H_ -#include <psp2/types.h> -#include <psp2/jpeg.h> +#include <scejpeg.h> #if defined(_LANGUAGE_C_PLUS_PLUS)||defined(__cplusplus)||defined(c_plusplus) extern "C" { diff --git a/include/user/kernel/iofilemgr.h b/include/user/kernel/iofilemgr.h index ce8561f..1533ef5 100644 --- a/include/user/kernel/iofilemgr.h +++ b/include/user/kernel/iofilemgr.h @@ -3,8 +3,6 @@ #include_next <kernel/iofilemgr.h> -#include <kernel/iofilemgr_async.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/user/kernel/iofilemgr_syscall.h b/include/user/kernel/iofilemgr_syscall.h index 331dc16..65535bb 100644 --- a/include/user/kernel/iofilemgr_syscall.h +++ b/include/user/kernel/iofilemgr_syscall.h @@ -1,7 +1,7 @@ #ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_SYSCALL_H_ #define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_SYSCALL_H_ -#include <scetypes.h> +#include <kernel/types.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/kernel/libkernel.h b/include/user/kernel/libkernel.h index 2e8e015..9c9c77c 100644 --- a/include/user/kernel/libkernel.h +++ b/include/user/kernel/libkernel.h @@ -3,6 +3,8 @@ #include_next <kernel/libkernel.h> +#include <stdarg.h> + SCE_CDECL_BEGIN /** diff --git a/include/user/kernel/rng.h b/include/user/kernel/rng.h index af302f1..6a13cc5 100644 --- a/include/user/kernel/rng.h +++ b/include/user/kernel/rng.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_RNG_H_ #define _PSP2_KERNEL_RNG_H_ -#include <psp2/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/net/net_syscalls.h b/include/user/net/net_syscalls.h index 9752be9..61b580c 100644 --- a/include/user/net/net_syscalls.h +++ b/include/user/net/net_syscalls.h @@ -1,7 +1,7 @@ #ifndef _PSP2_NET_NET_SYSCALLS_H_ #define _PSP2_NET_NET_SYSCALLS_H_ -#include <psp2/net/net.h> +#include <net.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/notification_util.h b/include/user/notification_util.h index 2f4bd9e..ef527bd 100644 --- a/include/user/notification_util.h +++ b/include/user/notification_util.h @@ -1,7 +1,7 @@ #ifndef _DOLCESDK_PSP2_NOTIFICATION_UTIL_H_ #define _DOLCESDK_PSP2_NOTIFICATION_UTIL_H_ -#include <psp2/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/npdrm.h b/include/user/npdrm.h index 83a0c03..3d66cdb 100644 --- a/include/user/npdrm.h +++ b/include/user/npdrm.h @@ -1,7 +1,6 @@ #ifndef _PSP2_NPDRM_H_ #define _PSP2_NPDRM_H_ -#include <psp2/types.h> #include <stdint.h> #ifdef __cplusplus diff --git a/include/user/npdrmpackage.h b/include/user/npdrmpackage.h index ffa5124..07a293a 100644 --- a/include/user/npdrmpackage.h +++ b/include/user/npdrmpackage.h @@ -1,7 +1,7 @@ #ifndef _PSP2_NPDRMPACKAGE_H_ #define _PSP2_NPDRMPACKAGE_H_ -#include <psp2/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/paf.h b/include/user/paf.h index 2cf7444..2cd421b 100644 --- a/include/user/paf.h +++ b/include/user/paf.h @@ -3,8 +3,7 @@ #include <stdarg.h> #include <wchar.h> -#include <psp2/types.h> -#include <psp2/ces/error.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/promoterutil.h b/include/user/promoterutil.h index 2526712..eae4577 100644 --- a/include/user/promoterutil.h +++ b/include/user/promoterutil.h @@ -1,7 +1,7 @@ #ifndef _PSP2_PROMOTERUTIL_H_ #define _PSP2_PROMOTERUTIL_H_ -#include <psp2/types.h> +#include <stdint.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/pss.h b/include/user/pss.h index 1330a6d..2a4f37f 100644 --- a/include/user/pss.h +++ b/include/user/pss.h @@ -1,12 +1,13 @@ #ifndef _PSP2_PSS_H_ #define _PSP2_PSS_H_ -#include <psp2/types.h> +#include <stdint.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { #endif - + typedef struct ScePssCryptoHandle { SceUID fd; uint32_t unk1; diff --git a/include/user/registrymgr.h b/include/user/registrymgr.h index a85a56b..f294422 100644 --- a/include/user/registrymgr.h +++ b/include/user/registrymgr.h @@ -1,7 +1,7 @@ #ifndef _PSP2_REGISTRYMGR_H_ #define _PSP2_REGISTRYMGR_H_ -#include <psp2/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/sblacmgr.h b/include/user/sblacmgr.h index 17a14f5..2d6e2e6 100644 --- a/include/user/sblacmgr.h +++ b/include/user/sblacmgr.h @@ -1,8 +1,6 @@ #ifndef _PSP2_SBLACMGR_H_ #define _PSP2_SBLACMGR_H_ -#include <psp2/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/user/shacccg.h b/include/user/shacccg.h index cf5a088..ea763ca 100644 --- a/include/user/shacccg.h +++ b/include/user/shacccg.h @@ -1,8 +1,8 @@ #ifndef _DOLCESDK_PSP2_SHACCCG_H_ #define _DOLCESDK_PSP2_SHACCCG_H_ -#include <psp2/shacccg/types.h> -#include <psp2/shacccg/paramquery.h> +#include <shacccg/types.h> +#include <shacccg/paramquery.h> /** @file shacccg.h diff --git a/include/user/shellsvc.h b/include/user/shellsvc.h index 462fa13..5720dba 100644 --- a/include/user/shellsvc.h +++ b/include/user/shellsvc.h @@ -1,7 +1,7 @@ #ifndef _DOLCESDK_PSP2_SHELLSVC_H_ #define _DOLCESDK_PSP2_SHELLSVC_H_ -#include <psp2/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/trigger_util.h b/include/user/trigger_util.h index 30eaa06..227c310 100644 --- a/include/user/trigger_util.h +++ b/include/user/trigger_util.h @@ -1,9 +1,8 @@ #ifndef _DOLCESDK_PSP2_TRIGGER_UTIL_H_ #define _DOLCESDK_PSP2_TRIGGER_UTIL_H_ -#include <psp2/kernel/clib.h> -#include <psp2/rtc.h> -#include <psp2/types.h> +#include <rtc.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/udcd.h b/include/user/udcd.h index eec370f..93bd38d 100644 --- a/include/user/udcd.h +++ b/include/user/udcd.h @@ -1,7 +1,8 @@ #ifndef _PSP2_UDCD_H_ #define _PSP2_UDCD_H_ -#include <psp2/types.h> +#include <stdint.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/usbd.h b/include/user/usbd.h index 1b40d14..ece2514 100644 --- a/include/user/usbd.h +++ b/include/user/usbd.h @@ -1,7 +1,7 @@ #ifndef _PSP2_USBD_H_ #define _PSP2_USBD_H_ -#include <psp2/kernel/threadmgr.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/user/usbserial.h b/include/user/usbserial.h index e510a63..f510367 100644 --- a/include/user/usbserial.h +++ b/include/user/usbserial.h @@ -1,8 +1,6 @@ #ifndef _PSP2_USBSERIAL_H_ #define _PSP2_USBSERIAL_H_ -#include <psp2/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/user/videoexport.h b/include/user/videoexport.h index a002dde..a552db1 100644 --- a/include/user/videoexport.h +++ b/include/user/videoexport.h @@ -1,9 +1,6 @@ #ifndef _PSP2_VIDEO_EXPORT_H_ #define _PSP2_VIDEO_EXPORT_H_ -#include <psp2/types.h> -#include <stdint.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/user/vshbridge.h b/include/user/vshbridge.h index 09f256b..1f39e27 100644 --- a/include/user/vshbridge.h +++ b/include/user/vshbridge.h @@ -1,8 +1,7 @@ #ifndef _PSP2_VSHBRIDGE_H_ #define _PSP2_VSHBRIDGE_H_ -#include <psp2/types.h> -#include <psp2/kernel/modulemgr.h> +#include <kernel/modulemgr.h> #ifdef __cplusplus extern "C" { |