More SceDisplayForDriver NIDs, Update pspkern/display.h

2 files changed, 37 insertions, 1 deletions

diff --git a/include/kernel/display.h b/include/kernel/display.h
index b5b4809..1c4715f 100644
--- a/include/kernel/display.h
+++ b/include/kernel/display.h
@@ -82,7 +82,9 @@ int sceDisplayGetFrameBuf(SceDisplayFrameBuf *pParam, int sync);
 int sceDisplayGetFrameBufDimensions(int *width, int *height);
 
 /**
- * Number of vertical blank pulses up to now
+ * Number of vertical blank pulses up to now for display
+ *
+ * @param[in] display - Display index
  */
 int sceDisplayGetVcountForDisplay(int display);
 
@@ -92,11 +94,25 @@ int sceDisplayGetVcountForDisplay(int display);
 int sceDisplayWaitVblankStart(void);
 
 /**
+ * Wait for vertical blank start for display
+ *
+ * @param[in] display - Display index
+ */
+int sceDisplayWaitVblankStartForDisplay(int display);
+
+/**
  * Wait for vertical blank start with callback
  */
 int sceDisplayWaitVblankStartCB(void);
 
 /**
+ * Wait for vertical blank start with callback for display
+ *
+ * @param[in] display - Display index
+ */
+int sceDisplayWaitVblankStartCBForDisplay(int display);
+
+/**
  * Wait for vertical blank start after specified number of vertical periods
  *
  * @param[in] vcount - Number of vertical periods before waiting for vertical blank start
@@ -104,6 +120,14 @@ int sceDisplayWaitVblankStartCB(void);
 int sceDisplayWaitVblankStartMulti(unsigned int vcount);
 
 /**
+ * Wait for vertical blank start after specified number of vertical periods for display
+ *
+ * @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);
+
+/**
  * 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
@@ -111,6 +135,14 @@ int sceDisplayWaitVblankStartMulti(unsigned int vcount);
 int sceDisplayWaitVblankStartMultiCB(unsigned int vcount);
 
 /**
+ * Wait for vertical blank start with callback after specified number of vertical periods for display
+ *
+ * @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);
+
+/**
  * Wait for vertical blank start since last update of framebuffer
  */
 int sceDisplayWaitSetFrameBuf(void);
diff --git a/nids/360/SceDisplay.yml b/nids/360/SceDisplay.yml
index e096faa..e732ed9 100644
--- a/nids/360/SceDisplay.yml
+++ b/nids/360/SceDisplay.yml
@@ -43,8 +43,12 @@ modules:
           sceDisplayWaitSetFrameBufMultiCB: 0x863EACBE
           sceDisplayWaitVblankStart: 0x984C27E7
           sceDisplayWaitVblankStartCB: 0x46F186C3
+          sceDisplayWaitVblankStartCBForDisplay: 0x8F3C0E19
+          sceDisplayWaitVblankStartForDisplay: 0xB80CA224
           sceDisplayWaitVblankStartMulti: 0x40F1469C
           sceDisplayWaitVblankStartMultiCB: 0x77ED8B3A
+          sceDisplayWaitVblankStartMultiCBForDisplay: 0x61421AAF
+          sceDisplayWaitVblankStartMultiForDisplay: 0x32287576
       SceDisplayUser:
         nid: 0x4FAACD11
         functions: