Merge common definitions in display.h

2 files changed, 16 insertions, 38 deletions

diff --git a/include/user/display.h b/include/common/display.h
index 645f7b9..756087b 100644
--- a/include/user/display.h
+++ b/include/common/display.h
@@ -2,8 +2,8 @@
 	Vita Development Suite Libraries
 */
 
-#ifndef _VDSUITE_USER_DISPLAY_H
-#define _VDSUITE_USER_DISPLAY_H
+#ifndef _VDSUITE_COMMON_DISPLAY_H
+#define _VDSUITE_COMMON_DISPLAY_H
 
 #include_next <display.h>
 
@@ -33,9 +33,22 @@ int sceDisplayGetMaximumFrameBufResolution(int *width, int *height);
  */
 int sceDisplayGetVcountInternal(int display);
 
+/**
+ * Set/Update framebuffer parameters for display
+ *
+ * @param[in] head - Use 0 for OLED/LCD and 1 for HDMI
+ * @param[in] index - Can be 0 or 1
+ * @param[in] pParam - Pointer to a ::SceDisplayFrameBuf structure.
+ * @param[in] sync - One of ::DisplaySetBufSync
+ *
+ * @return 0 on success, < 0 on error.
+ * @note - If NULL is provided as pParam pointer, output is blacked out.
+*/
+int sceDisplaySetFrameBufInternal(int head, int index, const SceDisplayFrameBuf *pParam, int sync);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _VDSUITE_USER_DISPLAY_H */
+#endif	/* _VDSUITE_COMMON_DISPLAY_H */
 
diff --git a/include/kernel/display.h b/include/kernel/display.h
index de92a44..918c12b 100644
--- a/include/kernel/display.h
+++ b/include/kernel/display.h
@@ -26,19 +26,6 @@ typedef struct SceDisplayFrameBufInfo {
 } SceDisplayFrameBufInfo;
 
 /**
- * Set/Update framebuffer parameters for display
- *
- * @param[in] head - Use 0 for OLED/LCD and 1 for HDMI
- * @param[in] index - Can be 0 or 1
- * @param[in] pParam - Pointer to a ::SceDisplayFrameBuf structure.
- * @param[in] sync - One of ::DisplaySetBufSync
- *
- * @return 0 on success, < 0 on error.
- * @note - If NULL is provided as pParam pointer, output is blacked out.
-*/
-int sceDisplaySetFrameBufInternal(int head, int index, const SceDisplayFrameBuf *pParam, int sync);
-
-/**
  * Get the configured framebuffer information of a head and its framebuffer index for a PID
  *
  * @param[in] pid - PID of the process to get the framebuffer information from.
@@ -54,28 +41,6 @@ int sceDisplaySetFrameBufInternal(int head, int index, const SceDisplayFrameBuf
 int sceDisplayGetProcFrameBufInternal(SceUID pid, int head, int index, SceDisplayFrameBufInfo *info);
 
 /**
- * Get maximum framebuffer resolution
- *
- * @param[out] width - Maximum width
- * @param[out] height - Maximum height
- *
- * @return 0 on success, < 0 on error.
-*/
-int sceDisplayGetMaximumFrameBufResolution(int *width, int *height);
-
-/**
- * Primary display index
- */
-int sceDisplayGetPrimaryHead(void);
-
-/**
- * Number of vertical blank pulses up to now for a display
- *
- * @param[in] display - Display index
- */
-int sceDisplayGetVcountInternal(int display);
-
-/**
  * Wait for vertical blank start for display
  *
  * @param[in] display - Display index