summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/kernel/display.h24
-rw-r--r--include/user/display.h10
-rw-r--r--nids/360/SceDisplay.yml33
3 files changed, 39 insertions, 28 deletions
diff --git a/include/kernel/display.h b/include/kernel/display.h
index 90ebbe5..cdc3672 100644
--- a/include/kernel/display.h
+++ b/include/kernel/display.h
@@ -72,14 +72,14 @@ int sceDisplaySetFrameBuf(const SceDisplayFrameBuf *pParam, int sync);
int sceDisplayGetFrameBuf(SceDisplayFrameBuf *pParam, int sync);
/**
- * Get current framebuffer dimensions
+ * Get maximum framebuffer resolution
*
- * @param[out] width - Framebuffer width
- * @param[out] height - Framebuffer height
+ * @param[out] width - Maximum width
+ * @param[out] height - Maximum height
*
* @return 0 on success, < 0 on error.
*/
-int sceDisplayGetFrameBufDimensions(int *width, int *height);
+int sceDisplayGetMaximumFrameBufResolution(int *width, int *height);
/**
* Primary display index
@@ -91,7 +91,7 @@ int sceDisplayGetPrimaryHead(void);
*
* @param[in] display - Display index
*/
-int sceDisplayGetVcountForDisplay(int display);
+int sceDisplayGetVcountInternal(int display);
/**
* Wait for vertical blank start
@@ -103,7 +103,7 @@ int sceDisplayWaitVblankStart(void);
*
* @param[in] display - Display index
*/
-int sceDisplayWaitVblankStartForDisplay(int display);
+int sceDisplayWaitVblankStartInternal(int display);
/**
* Wait for vertical blank start with callback
@@ -115,7 +115,7 @@ int sceDisplayWaitVblankStartCB(void);
*
* @param[in] display - Display index
*/
-int sceDisplayWaitVblankStartCBForDisplay(int display);
+int sceDisplayWaitVblankStartCBInternal(int display);
/**
* Wait for vertical blank start after specified number of vertical periods
@@ -130,7 +130,7 @@ int sceDisplayWaitVblankStartMulti(unsigned int vcount);
* @param[in] display - Display index
* @param[in] vcount - Number of vertical periods before waiting for vertical blank start
*/
-int sceDisplayWaitVblankStartMultiForDisplay(int display, unsigned int vcount);
+int sceDisplayWaitVblankStartMultiInternal(int display, unsigned int vcount);
/**
* Wait for vertical blank start with callback after specified number of vertical periods
@@ -145,7 +145,7 @@ int sceDisplayWaitVblankStartMultiCB(unsigned int vcount);
* @param[in] display - Display index
* @param[in] vcount - Number of vertical periods before waiting for vertical blank start
*/
-int sceDisplayWaitVblankStartMultiCBForDisplay(int display, unsigned int vcount);
+int sceDisplayWaitVblankStartMultiCBInternal(int display, unsigned int vcount);
/**
* Wait for vertical blank start since last update of framebuffer
@@ -186,7 +186,7 @@ int sceDisplayRegisterVblankStartCallback(SceUID uid);
* @param[in] display - Display index
* @param[in] uid - Callback UID
*/
-int sceDisplayRegisterVblankStartCallbackForDisplay(int display, SceUID uid);
+int sceDisplayRegisterVblankStartCallbackInternal(int display, SceUID uid);
/**
* Unregister callback used at each vertical blank start
@@ -201,7 +201,7 @@ int sceDisplayUnregisterVblankStartCallback(SceUID uid);
* @param[in] display - Display index
* @param[in] uid - Callback UID
*/
-int sceDisplayUnregisterVblankStartCallbackForDisplay(int display, SceUID uid);
+int sceDisplayUnregisterVblankStartCallbackInternal(int display, SceUID uid);
/**
* Register callback to be used when the framebuffer changes
@@ -216,7 +216,7 @@ int sceDisplayRegisterFrameBufCallback(SceUID uid);
* @param[in] display - Display index
* @param[in] uid - Callback UID
*/
-int sceDisplayRegisterFrameBufCallbackForDisplay(int display, SceUID uid);
+int sceDisplayRegisterFrameBufCallbackInternal(int display, SceUID uid);
/**
* Enable/disable color inversion for a display.
diff --git a/include/user/display.h b/include/user/display.h
index 73fbeb3..87fc3d9 100644
--- a/include/user/display.h
+++ b/include/user/display.h
@@ -87,14 +87,14 @@ int sceDisplayGetPrimaryHead(void);
int sceDisplayGetRefreshRate(float *pFps);
/**
- * Get current framebuffer dimensions
+ * Get maximum framebuffer resolution
*
- * @param[out] width - Framebuffer width
- * @param[out] height - Framebuffer height
+ * @param[out] width - Maximum width
+ * @param[out] height - Maximum height
*
* @return 0 on success, < 0 on error.
*/
-int sceDisplayGetFrameBufDimensions(int *width, int *height);
+int sceDisplayGetMaximumFrameBufResolution(int *width, int *height);
/**
* Number of vertical blank pulses up to now
@@ -106,7 +106,7 @@ int sceDisplayGetVcount(void);
*
* @param[in] display - Display index
*/
-int sceDisplayGetVcountForDisplay(int display);
+int sceDisplayGetVcountInternal(int display);
/**
* Wait for vertical blank start
diff --git a/nids/360/SceDisplay.yml b/nids/360/SceDisplay.yml
index f081367..40fbe35 100644
--- a/nids/360/SceDisplay.yml
+++ b/nids/360/SceDisplay.yml
@@ -5,11 +5,17 @@ modules:
SceDisplay:
nid: 0x5ED8F994
functions:
- sceDisplayGetFrameBufDimensions: 0x2EBFC7CB
+ _sceDisplayGetFrameBuf: 0xA753B0CA
+ _sceDisplayGetFrameBufInternal: 0x86A8E436
+ _sceDisplayGetMaximumFrameBufResolution: 0x2EBFC7CB
+ _sceDisplayGetResolutionInfoInternal: 0xFEFEB240
+ _sceDisplaySetFrameBuf: 0xF51523CB
+ _sceDisplaySetFrameBufForCompat: 0x45BCB941
+ _sceDisplaySetFrameBufInternal: 0x7A8CB78E
sceDisplayGetPrimaryHead: 0x7178FADA
sceDisplayGetRefreshRate: 0xA08CA60D
sceDisplayGetVcount: 0xB6FDE0BA
- sceDisplayGetVcountForDisplay: 0x9686859E
+ sceDisplayGetVcountInternal: 0x9686859E
sceDisplayRegisterVblankStartCallback: 0x6BDF4C4D
sceDisplayUnregisterVblankStartCallback: 0x98436A80
sceDisplayWaitSetFrameBuf: 0x9423560C
@@ -25,15 +31,15 @@ modules:
functions:
sceDisplayGetActualViewportConf: 0x40ACFE51
sceDisplayGetFrameBuf: 0xEEDA2E54
- sceDisplayGetFrameBufDimensions: 0x5AFE6CD3
sceDisplayGetFrameBufInternal: 0x19F94C63
+ sceDisplayGetMaximumFrameBufResolution: 0x5AFE6CD3
sceDisplayGetPrimaryHead: 0xC8E554C5
sceDisplayGetResolutionInfoInternal: 0xB3C6D647
- sceDisplayGetVcountForDisplay: 0x8B5DA27B
+ sceDisplayGetVcountInternal: 0x8B5DA27B
sceDisplayRegisterFrameBufCallback: 0x6E22990E
- sceDisplayRegisterFrameBufCallbackForDisplay: 0xFA7CE579
+ sceDisplayRegisterFrameBufCallbackInternal: 0xFA7CE579
sceDisplayRegisterVblankStartCallback: 0x7FB0BD28
- sceDisplayRegisterVblankStartCallbackForDisplay: 0x4AE2A2B1
+ sceDisplayRegisterVblankStartCallbackInternal: 0x4AE2A2B1
sceDisplaySetBrightness: 0x9E3C6DC6
sceDisplaySetDisplayColorSpaceMode: 0x8D79D187
sceDisplaySetFrameBuf: 0x289D82FE
@@ -41,21 +47,26 @@ modules:
sceDisplaySetInvertColors: 0x19140ACD
sceDisplaySetViewportConf: 0xEE5EB52D
sceDisplayUnregisterVblankStartCallback: 0x4B27191F
- sceDisplayUnregisterVblankStartCallbackForDisplay: 0xB027433E
+ sceDisplayUnregisterVblankStartCallbackInternal: 0xB027433E
sceDisplayWaitSetFrameBuf: 0x1C0C9C4A
sceDisplayWaitSetFrameBufCB: 0x9D7F203C
sceDisplayWaitSetFrameBufMulti: 0xE6D27E0A
sceDisplayWaitSetFrameBufMultiCB: 0x863EACBE
sceDisplayWaitVblankStart: 0x984C27E7
sceDisplayWaitVblankStartCB: 0x46F186C3
- sceDisplayWaitVblankStartCBForDisplay: 0x8F3C0E19
- sceDisplayWaitVblankStartForDisplay: 0xB80CA224
+ sceDisplayWaitVblankStartCBInternal: 0x8F3C0E19
+ sceDisplayWaitVblankStartInternal: 0xB80CA224
sceDisplayWaitVblankStartMulti: 0x40F1469C
sceDisplayWaitVblankStartMultiCB: 0x77ED8B3A
- sceDisplayWaitVblankStartMultiCBForDisplay: 0x61421AAF
- sceDisplayWaitVblankStartMultiForDisplay: 0x32287576
+ sceDisplayWaitVblankStartMultiCBInternal: 0x61421AAF
+ sceDisplayWaitVblankStartMultiInternal: 0x32287576
SceDisplayUser:
nid: 0x4FAACD11
functions:
sceDisplayGetFrameBuf: 0x42AE6BBC
+ sceDisplayGetFrameBufInternal: 0x5213F74B
+ sceDisplayGetMaximumFrameBufResolution: 0x8848ADDD
+ sceDisplayGetResolutionInfoInternal: 0x0BFB78C6
sceDisplaySetFrameBuf: 0x7A410B64
+ sceDisplaySetFrameBufForCompat: 0x8C36B628
+ sceDisplaySetFrameBufInternal: 0x89F86A1E