From c63f9eeb415bda43c133f8a845bfcf9a8ad4eff9 Mon Sep 17 00:00:00 2001
From: Sergi Granell
Date: Thu, 26 Oct 2017 13:37:19 +0200
Subject: More SceDisplay NIDs, update psp2/display.h

---
 include/kernel/display.h |  2 +-
 include/user/display.h   | 22 ++++++++++++++++++++++
 nids/360/SceDisplay.yml  |  3 +++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/kernel/display.h b/include/kernel/display.h
index 999a67f..9f5991b 100644
--- a/include/kernel/display.h
+++ b/include/kernel/display.h
@@ -82,7 +82,7 @@ int sceDisplayGetFrameBuf(SceDisplayFrameBuf *pParam, int sync);
 int sceDisplayGetFrameBufDimensions(int *width, int *height);
 
 /**
- * Number of vertical blank pulses up to now for display
+ * Number of vertical blank pulses up to now for a display
  *
  * @param[in] display - Display index
  */
diff --git a/include/user/display.h b/include/user/display.h
index 58a08d2..3121c94 100644
--- a/include/user/display.h
+++ b/include/user/display.h
@@ -71,6 +71,11 @@ int sceDisplaySetFrameBuf(const SceDisplayFrameBuf *pParam, SceDisplaySetBufSync
 */
 int sceDisplayGetFrameBuf(SceDisplayFrameBuf *pParam, SceDisplaySetBufSync sync);
 
+/**
+ * Current display index
+ */
+int sceDisplayGetDisplay(void);
+
 /**
  * Get current number of fps for the current screen mode.
  *
@@ -81,11 +86,28 @@ int sceDisplayGetFrameBuf(SceDisplayFrameBuf *pParam, SceDisplaySetBufSync sync)
 */
 int sceDisplayGetRefreshRate(float *pFps);
 
+/**
+ * Get current framebuffer dimensions
+ *
+ * @param[out] width - Framebuffer width
+ * @param[out] height - Framebuffer height
+ *
+ * @return 0 on success, < 0 on error.
+*/
+int sceDisplayGetFrameBufDimensions(int *width, int *height);
+
 /**
  * Number of vertical blank pulses up to now
  */
 int sceDisplayGetVcount(void);
 
+/**
+ * Number of vertical blank pulses up to now for a display
+ *
+ * @param[in] display - Display index
+ */
+int sceDisplayGetVcountForDisplay(int display);
+
 /**
  * Wait for vertical blank start
  */
diff --git a/nids/360/SceDisplay.yml b/nids/360/SceDisplay.yml
index 0bef0e8..3cb1e78 100644
--- a/nids/360/SceDisplay.yml
+++ b/nids/360/SceDisplay.yml
@@ -5,8 +5,11 @@ modules:
       SceDisplay:
         nid: 0x5ED8F994
         functions:
+          sceDisplayGetDisplay: 0x7178FADA
+          sceDisplayGetFrameBufDimensions: 0x2EBFC7CB
           sceDisplayGetRefreshRate: 0xA08CA60D
           sceDisplayGetVcount: 0xB6FDE0BA
+          sceDisplayGetVcountForDisplay: 0x9686859E
           sceDisplayRegisterVblankStartCallback: 0x6BDF4C4D
           sceDisplayUnregisterVblankStartCallback: 0x98436A80
           sceDisplayWaitSetFrameBuf: 0x9423560C
-- 
cgit v1.2.3