summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/user/appmgr.h38
-rw-r--r--include/user/avconfig.h16
-rw-r--r--include/user/kernel/threadmgr.h12
-rw-r--r--include/user/sharedfb.h41
-rw-r--r--nids/360/SceGxm.yml6
5 files changed, 4 insertions, 109 deletions
diff --git a/include/user/appmgr.h b/include/user/appmgr.h
index 16fd815..ae0f6c9 100644
--- a/include/user/appmgr.h
+++ b/include/user/appmgr.h
@@ -40,12 +40,6 @@ typedef enum SceAppMgrInfoBarTransparency {
SCE_APPMGR_INFOBAR_TRANSPARENCY_TRANSLUCENT = 1
} SceAppMgrInfoBarTransparency;
-typedef enum SceAppMgrApplicationMode {
- SCE_APPMGR_APPLICATION_MODE_A = 2, //!< Application without physically contiguous memory access
- SCE_APPMGR_APPLICATION_MODE_B = 3, //!< Application with physically contiguous memory access
- SCE_APPMGR_APPLICATION_MODE_C = 4 //!< Application with physically contiguous memory and extra memory access
-} SceAppMgrApplicationMode;
-
typedef struct SceAppMgrSystemEvent {
int systemEvent; //!< One of ::SceAppMgrSystemEventType
uint8_t reserved[60]; //!< Reserved data
@@ -93,25 +87,6 @@ typedef struct SceAppMgrAppState {
SceUInt8 reserved[116];
} SceAppMgrAppState;
-typedef struct SceAppMgrBudgetInfo {
- int size; //!< Must be 0x88
- int app_mode; //!< One of ::SceAppMgrApplicationMode
- int unk0; //!< Unknown Data
- unsigned int total_user_rw_mem; //!< Total amount of accessible USER_RW memory
- unsigned int free_user_rw; //!< Free amount of accessible USER_RW memory
- SceBool extra_mem_allowed; //!< Flag for extra memory accessibility
- int unk1; //!< Unknown Data
- unsigned int total_extra_mem; //!< Total amount of accessible extra memory
- unsigned int free_extra_mem; //!< Free amount of accessible extra memory
- int unk2[2]; //!< Unknown Data
- unsigned int total_phycont_mem; //!< Total amount of accessible physically contiguous memory
- unsigned int free_phycont_mem; //!< Free amount of accessible physically contiguous memory
- int unk3[10]; //!< Unknown Data
- unsigned int total_cdram_mem; //!< Total amount of accessible CDRAM memory
- unsigned int free_cdram_mem; //!< Free amount of accessible CDRAM memory
- int reserved[9]; //!< Reserved data
-} SceAppMgrBudgetInfo;
-
typedef struct SceAppMgrExecOptParam SceAppMgrExecOptParam; // Missing struct
typedef struct SceAppMgrLaunchAppOptParam SceAppMgrLaunchAppOptParam; // Missing struct
@@ -512,18 +487,7 @@ int _sceAppMgrGetRawPath(char *path, char *resolved_path, int resolved_path_size
* @return 0 on success.
*/
int _sceAppMgrGetRawPathOfApp0ByAppIdForShell(int appId, char resolved_path[292]);
-
-/**
- * Get memory budget info for a running system application
- *
- * @param[out] info - Info related to the memory budget of the running application.
- *
- * @return 0 on success, < 0 on error.
- *
- * @note This function will always return an error if used in a normal application.
- */
-int sceAppMgrGetBudgetInfo(SceAppMgrBudgetInfo *info);
-
+
#ifdef __cplusplus
}
#endif
diff --git a/include/user/avconfig.h b/include/user/avconfig.h
index bef9ba4..d171647 100644
--- a/include/user/avconfig.h
+++ b/include/user/avconfig.h
@@ -7,12 +7,6 @@
extern "C" {
#endif
-/** Color Space Mode values to specify to ::sceAVConfigSetDisplayColorSpaceMode */
-typedef enum SceAVConfigColorSpaceMode {
- SCE_AVCONFIG_COLOR_SPACE_MODE_DEFAULT = 0, //!< Default
- SCE_AVCONFIG_COLOR_SPACE_MODE_HIGH_CONTRAST = 1 //!< High Contrast Mode
-} SceAVConfigColorSpaceMode;
-
/**
* Get the maximum brightness.
*
@@ -65,16 +59,6 @@ int sceAVConfigSetSystemVol(int volume);
*
*/
int sceAVConfigMuteOn(void);
-
-/**
- * Sets the color space mode on runtime.
- *
- * @param[in] csm - see ::SceAVConfigColorSpaceMode()
- *
- * @return 0 on success, < 0 on error.
- * @note - This does not change color_space_mode in the registry.
- */
-int sceAVConfigSetDisplayColorSpaceMode(int csm);
#ifdef __cplusplus
diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h
index a73562f..c5d93b7 100644
--- a/include/user/kernel/threadmgr.h
+++ b/include/user/kernel/threadmgr.h
@@ -585,16 +585,8 @@ typedef struct SceKernelEventFlagOptParam SceKernelEventFlagOptParam;
/** Event flag creation attributes */
typedef enum SceEventFlagAttributes {
- /* Waiting threads queued on a FIFO basis */
- SCE_EVENT_THREAD_FIFO = 0,
- /* Waiting threads queued on priority basis */
- SCE_EVENT_THREAD_PRIO = 0x00002000,
- /* Event flag can only be waited upon by one thread */
- SCE_EVENT_WAITSINGLE = 0,
- /* Event flag can be waited upon by multiple threads */
- SCE_EVENT_WAITMULTIPLE = 0x00001000,
- /* Event flag can be accessed by sceKernelOpenEventFlag / sceKernelCloseEventFlag */
- SCE_EVENT_OPENABLE = 0x00000080
+ /** Allow the event flag to be waited upon by multiple threads */
+ SCE_EVENT_WAITMULTIPLE = 0x200
} SceEventFlagAttributes;
/** Event flag wait types */
diff --git a/include/user/sharedfb.h b/include/user/sharedfb.h
deleted file mode 100644
index a8266c4..0000000
--- a/include/user/sharedfb.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _PSP2_SHAREDFB_H_
-#define _PSP2_SHAREDFB_H_
-
-#include <psp2/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct SceSharedFbInfo {
- void *fb_base;
- int fb_size;
- void *fb_base2;
- int unk0[6];
- int stride;
- int width;
- int height;
- int unk1;
- int index;
- int unk2[4];
- int vsync;
- int unk3[3];
-} SceSharedFbInfo;
-
-SceUID _sceSharedFbOpen(int index, int sysver);
-int sceSharedFbClose(SceUID fb_id);
-int sceSharedFbBegin(SceUID fb_id, SceSharedFbInfo *info);
-int sceSharedFbEnd(SceUID fb_id);
-int sceSharedFbGetInfo(SceUID fb_id, SceSharedFbInfo *info);
-
-static inline
-SceUID sceSharedFbOpen(int index)
-{
- return _sceSharedFbOpen(index, 0x03570011);
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PSP2_SHAREDFB_H_ */
diff --git a/nids/360/SceGxm.yml b/nids/360/SceGxm.yml
index 830a96c..9ead82c 100644
--- a/nids/360/SceGxm.yml
+++ b/nids/360/SceGxm.yml
@@ -68,7 +68,7 @@ modules:
sceGxmGetPrecomputedDrawSize: 0x41BBD792
sceGxmGetPrecomputedFragmentStateSize: 0x85DE8506
sceGxmGetPrecomputedVertexStateSize: 0x9D83CA3B
- sceGxmGetRenderTargetMemSize: 0xB291C959
+ sceGxmGetRenderTargetMemSizes: 0xB291C959
sceGxmInitialize: 0xB0F1E4EC
sceGxmIsDebugVersion: 0x873B07C0
sceGxmMapFragmentUsseMemory: 0x008402C6
@@ -269,7 +269,3 @@ modules:
sceGxmVertexFence: 0xE05277D6
sceGxmVertexProgramGetProgram: 0xBC52320E
sceGxmWaitEvent: 0x8BD94593
- SceGxmInternalForVsh:
- nid: 0xC98AEB79
- functions:
- sceGxmVshInitialize: 0xA04F5FAC