summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorReiko Asakura2020-06-23 17:15:05 -0400
committerReiko Asakura2020-06-23 17:15:05 -0400
commit5b790219e34cb71abaebde7b8b933cca83298918 (patch)
treeb18f7fe595960ade0ceaaf4f0f2954456401ae5a /include
parentAdded sceAppMgrGetBudgetInfo prototype. (diff)
downloadvds-libraries-5b790219e34cb71abaebde7b8b933cca83298918.tar.gz
Revert vitasdk commits
Revert "Added sceAppMgrGetBudgetInfo prototype." This reverts commit 8fa5c1fd177b7f921ee809cea04099d3c7e25933. Revert "Added sceSharedFB group in doxygen doc." This reverts commit 70876044c82f8320eaa8c2da6b8af61b48625b18. Revert "Fix for incorrect sceGxmGetRenderTargetMemSize prototype." This reverts commit 361b2153c3ffee8aa4a022a41541391b6465d9fd. Revert "Added sceAVConfigSetDisplayColorSpaceMode prototype (#444)" This reverts commit 3a130e9ab8a981316dbd3d03abccf0a651baabe1. Revert "Added sceSharedFb prototypes." This reverts commit fe1adba231c35f60c0c54ed63bc52d9c25520bc5. Revert "tabification." This reverts commit 537864dfd836390810a0fc5b91256507f3459398. Revert "Fix value for SCE_EVENT_WAITMULTIPLE, add other missing event flags" This reverts commit eaeaa78e3890aa5ebf12ff88c2f57a08cfda9a51. Revert "Added sceGxmVshInitialize reference." This reverts commit dafa6f1c3a58a2ea9af8008edef4d4c6168c2f90.
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
4 files changed, 3 insertions, 104 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_ */