diff --git a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/index.html b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/index.html index f68ccd22..490d53cf 100755 --- a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/index.html +++ b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/index.html @@ -2,7 +2,7 @@ - Deinterlacer + Deinterlacer v3_2 @@ -16,7 +16,7 @@
  • Classes
  • Files
    • -

    Deinterlacer

    +

    Deinterlacer v3_2

    This is the main header file of Xilinx Video Deinterlacer core.

    Interrupt Service

    @@ -35,7 +35,9 @@ Example(s) are provided with this driver to demonstrate the self test.

    1.00a rjh 07/10/11 First release 2.00a rjh 18/01/12 Updated for v_deinterlacer 2.00 3.0 adk 19/12/13 Updated as per the New Tcl API's. - 3.2 adk 02/13/14 Added Doxygen support, adherence to Xilinx + 3.2 adk 02/13/14 Modified XDeint_IntrDisable macro replace ISR_OFFSET + with IER OFFSET, XDeint_InReset. + Added Doxygen support, adherence to Xilinx coding standards.

                           Modification history of xdeint_sinit.c:
                        Added Doxygen support, adherence to Xilinx
diff --git a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint_8h.html b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint_8h.html
index 1ae32da6..70259391 100644
--- a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint_8h.html
+++ b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint_8h.html
@@ -223,14 +223,14 @@
 
 
    
 Value:
    XDeint_ReadReg((InstancePtr)->Config.BaseAddress, \
-                (XDEINT_MODE_OFFSET)) & (XDEINT_MODE_COLOUR_YUV)
+                (XDEINT_MODE_OFFSET)) & (XDEINT_MODE_COL)
 
    This macro gets the Deinterlacer's color space.
    
 
    Parameters:
    
   
    
     
    InstancePtr is a pointer to XDeint instance to be worked on.
    
   
    
 
    
-
    Returns:
    Returns the color space. 0x00000004 - YUV color space, 0x00000000 - RGB color space.
    
+
    Returns:
    Returns the color space. 0x00000004 - RGB color space, 0x00000000 - YUV color space.
    
 
    Note:
    C-style signature: u32 XDeint_GetColorSpace(XDeint *InstancePtr) 
    
 
 
@@ -282,8 +282,8 @@ Internal Register update done
 
    
 
 
    
-Value:
    XDeint_ReadReg((InstancePtr)->Config.BaseAddress, \
-                                (XDEINT_RESET_OFFSET))
+Value:
    (XDeint_ReadReg((InstancePtr)->Config.BaseAddress, \
+                                (XDEINT_RESET_OFFSET)) & (XDEINT_RESET_RESET_MASK))
 
    This macro returns the current soft-reset state.
    
 
    Parameters:
    
   
@@ -353,7 +353,7 @@ Internal Register update done
 Value:
    XDeint_WriteReg((InstancePtr)->Config.BaseAddress, \
                 (XDEINT_IER_OFFSET), ((~(IntrType)) & \
                         (XDEINT_IXR_ALLINTR_MASK)) & \
-        XDeint_ReadReg((InstancePtr)->Config.BaseAddress, (XDEINT_ISR_OFFSET)))
+        XDeint_ReadReg((InstancePtr)->Config.BaseAddress, (XDEINT_IER_OFFSET)))
 
    This macro disables the given individual interrupt(s) on the Deinterlacer core.
    
 
    Parameters:
    
   
    
diff --git a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__g_8c.html b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__g_8c.html
index ffb9a325..5e913855 100755
--- a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__g_8c.html
+++ b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__g_8c.html
@@ -55,8 +55,8 @@ This file contains a template for configuration table of Xilinx Video Deinterlac
 
    
 Initial value:
     {
         {
-                XPAR_FMC_SENSOR_INPUT_V_DEINTERLACER_1_DEVICE_ID,
-                XPAR_FMC_SENSOR_INPUT_V_DEINTERLACER_1__BASEADDR
+                0,
+                0x4300000
         }
 }
 
    The configuration table for Video Deinterlacers devices 
diff --git a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__hw_8h.html b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__hw_8h.html
index 1d5a948e..16e1f9d4 100755
--- a/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__hw_8h.html
+++ b/XilinxProcessorIPLib/drivers/deinterlacer/doc/html/api/xdeint__hw_8h.html
@@ -33,6 +33,9 @@ For more information about the operation of this core, see the hardware specific
  3.2   adk    02/13/14 Suffixed "_OFFSET" to all register offset macros.
                        Added bit masks for the registers and added
                        backward compatibility for macros.
+                       Swapped bit definitions of XDEINT_MODE_COLOUR_YUV
+                       and XDEINT_MODE_COLOUR_RGB.
+                       Modified bit definitions of version register.
  
    
 #include "xil_io.h"
    
@@ -106,11 +109,11 @@ For more information about the operation of this core, see the hardware specific
 
    
-
+
 
-
+
 
-
+
 
@@ -146,9 +149,9 @@ For more information about the operation of this core, see the hardware specific
 
 
 
-
+
 
-
+
 
@@ -950,7 +953,7 @@ Color Space
 
    
       
     
 
    #define XDEINT_STS_FS_RD_FRAME_ERROR   0x00000800
    
 
 

    Deinterlacer Control Fields:
    #define XDEINT_VER_MAJOR_MASK   0xF0000000
    #define XDEINT_VER_MAJOR_MASK   0xFF000000
    #define XDEINT_VER_MAJOR_SHIFT   28
    #define XDEINT_VER_MAJOR_SHIFT   24
    #define XDEINT_VER_MINOR_MASK   0x0FF00000
    #define XDEINT_VER_MINOR_MASK   0x00F00000
    
 
 
    #define XDEINT_VER_MINOR_SHIFT   20
    #define XDEINT_MODE_PULL_22_FIELDP   0x00000200
    #define XDEINT_MODE_COLOUR_RGB   0x00000000
    #define XDEINT_MODE_COLOUR_YUV   0x00000000
    #define XDEINT_MODE_COLOUR_YUV   0x00000004
    #define XDEINT_MODE_COLOUR_RGB   0x00000004
    
 
 
    #define XDEINT_MODE_ALGORITHM_RAW   0x00000000
    
-          
+          
    
         
    #define XDEINT_MODE_COLOUR_RGB   0x00000000          #define XDEINT_MODE_COLOUR_RGB   0x00000004          
         
    
       
    
 
    
@@ -965,7 +968,7 @@ Deinterlacer color space
 
    
       
-          
+          
    
         
    #define XDEINT_MODE_COLOUR_YUV   0x00000004          #define XDEINT_MODE_COLOUR_YUV   0x00000000          
         
    
       
    
 
    
@@ -1492,7 +1495,7 @@ Deinterlacer threshold
 
    
       
-          
+          
    
         
    #define XDEINT_VER_MAJOR_MASK   0xF0000000          #define XDEINT_VER_MAJOR_MASK   0xFF000000          
         
    
       
    
 
    
@@ -1507,7 +1510,7 @@ Major Version
 
    
       
-          
+          
    
         
    #define XDEINT_VER_MAJOR_SHIFT   28          #define XDEINT_VER_MAJOR_SHIFT   24          
         
    
       
    
 
    
@@ -1522,7 +1525,7 @@ Major Bit Shift
 
    
       
-          
+          
    
         
    #define XDEINT_VER_MINOR_MASK   0x0FF00000          #define XDEINT_VER_MINOR_MASK   0x00F00000