Remove dupe: display.h

1 files changed, 1 insertions, 132 deletions

diff --git a/include/user/display.h b/include/user/display.h
index 4950d69..a400762 100644
--- a/include/user/display.h
+++ b/include/user/display.h
@@ -1,79 +1,12 @@
 #ifndef _PSP2_DISPLAY_H_
 #define _PSP2_DISPLAY_H_
 
-#include <psp2/types.h>
+#include_next <display.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef enum SceDisplayErrorCode {
-	SCE_DISPLAY_ERROR_OK                    = 0,
-	SCE_DISPLAY_ERROR_INVALID_HEAD          = (int)0x80290000,
-	SCE_DISPLAY_ERROR_INVALID_VALUE         = (int)0x80290001,
-	SCE_DISPLAY_ERROR_INVALID_ADDR          = (int)0x80290002,
-	SCE_DISPLAY_ERROR_INVALID_PIXELFORMAT   = (int)0x80290003,
-	SCE_DISPLAY_ERROR_INVALID_PITCH         = (int)0x80290004,
-	SCE_DISPLAY_ERROR_INVALID_RESOLUTION    = (int)0x80290005,
-	SCE_DISPLAY_ERROR_INVALID_UPDATETIMING  = (int)0x80290006,
-	SCE_DISPLAY_ERROR_NO_FRAME_BUFFER       = (int)0x80290007,
-	SCE_DISPLAY_ERROR_NO_PIXEL_DATA         = (int)0x80290008,
-	SCE_DISPLAY_ERROR_NO_OUTPUT_SIGNAL      = (int)0x80290009
-} SceDisplayErrorCode;
-
-typedef enum SceDisplayPixelFormat {
-	SCE_DISPLAY_PIXELFORMAT_A8B8G8R8 = 0x00000000U
-} SceDisplayPixelFormat;
-
-#define SCE_DISPLAY_UPDATETIMING_NEXTHSYNC	0
-#define SCE_DISPLAY_UPDATETIMING_NEXTVSYNC	1
-
-// This enum is for backward compatibility with Vitasdk
-typedef enum SceDisplaySetBufSync {
-	SCE_DISPLAY_SETBUF_IMMEDIATE = SCE_DISPLAY_UPDATETIMING_NEXTHSYNC,
-	SCE_DISPLAY_SETBUF_NEXTFRAME = SCE_DISPLAY_UPDATETIMING_NEXTVSYNC,
-} SceDisplaySetBufSync;
-
-/**
- * Structure used with ::sceDisplaySetFrameBuf to set/update framebuffer.
- * Original screen resolution is 960x544, but the following resolutions
- * can also be supplied as width and height :
- * 480x272, 640x368, 720x408
- *
- * @note - This structure is returned by ::sceDisplayGetFrameBuf
-*/
-typedef struct SceDisplayFrameBuf {
-	SceSize size;               //!< sizeof(SceDisplayFrameBuf)
-	void *base;                 //!< Pointer to framebuffer
-	unsigned int pitch;         //!< pitch pixels
-	unsigned int pixelformat;   //!< pixel format (one of ::SceDisplayPixelFormat)
-	unsigned int width;         //!< framebuffer width
-	unsigned int height;        //!< framebuffer height
-} SceDisplayFrameBuf;
-
-/**
- * Set/Update framebuffer parameters
- *
- * @param[in] pParam - Pointer to a ::SceDisplayFrameBuf structure.
- * @param[in] sync - One of ::SceDisplaySetBufSync
- *
- * @return 0 on success, < 0 on error.
- * @note - If NULL is provided as pParam pointer, output is blacked out.
-*/
-int sceDisplaySetFrameBuf(const SceDisplayFrameBuf *pParam, SceDisplaySetBufSync sync);
-
-/**
- * Get current framebuffer parameters
- *
- * @param[out] pParam - Pointer to a ::SceDisplayFrameBuf structure
- * which will receive framebuffer parameters.
- *
- * @param[in] sync - One of ::SceDisplaySetBufSync
- *
- * @return 0 on success, < 0 on error.
-*/
-int sceDisplayGetFrameBuf(SceDisplayFrameBuf *pParam, SceDisplaySetBufSync sync);
-
 /**
  * Primary display index
  */
@@ -111,70 +44,6 @@ int sceDisplayGetVcount(void);
  */
 int sceDisplayGetVcountInternal(int display);
 
-/**
- * Wait for vertical blank start
- */
-int sceDisplayWaitVblankStart(void);
-
-/**
- * Wait for vertical blank start with callback
- */
-int sceDisplayWaitVblankStartCB(void);
-
-/**
- * Wait for vertical blank start after specified number of vertical periods
- *
- * @param[in] vcount - Number of vertical periods before waiting for vertical blank start
- */
-int sceDisplayWaitVblankStartMulti(unsigned int vcount);
-
-/**
- * Wait for vertical blank start with callback after specified number of vertical periods
- *
- * @param[in] vcount - Number of vertical periods before waiting for vertical blank start
- */
-int sceDisplayWaitVblankStartMultiCB(unsigned int vcount);
-
-/**
- * Wait for vertical blank start since last update of framebuffer
- */
-int sceDisplayWaitSetFrameBuf(void);
-
-/**
- * Wait for vertical blank start with callback since last update of framebuffer
- */
-int sceDisplayWaitSetFrameBufCB(void);
-
-/**
- * Wait for vertical blank start after specified number of vertical periods
- * since last update of framebuffer.
- *
- * @param[in] vcount - Number of vertical periods before waiting for vertical blank start
- */
-int sceDisplayWaitSetFrameBufMulti(unsigned int vcount);
-
-/**
- * Wait for vertical blank start with callback after specified number of vertical periods
- * since last update of framebuffer.
- *
- * @param[in] vcount - Number of vertical periods before waiting for vertical blank start
- */
-int sceDisplayWaitSetFrameBufMultiCB(unsigned int vcount);
-
-/**
- * Register callback to be used at each vertical blank start
- *
- * @param[in] uid - Callback UID
- */
-int sceDisplayRegisterVblankStartCallback(SceUID uid);
-
-/**
- * Unregister callback used at each vertical blank start
- *
- * @param[in] uid - Callback UID
- */
-int sceDisplayUnregisterVblankStartCallback(SceUID uid);
-
 #ifdef __cplusplus
 }
 #endif