Update master branch to next

extra/git_hash

@@ -1 +1 @@
-ada8b4415ff44d535d63e4291a0eca733bc2ad0f
+f7aef7a72c32631b8300af33c44ba3a3421b3c0c

hardfp/opt/vc/include/IL/OMX_Broadcom.h

@@ -1433,20 +1433,20 @@ IDLE, then taken back to LOADED, the profile increased and the
 component taken back to IDLE.
 */
 
-typedef enum OMX_PARAM_CAMERAUSECASE {
+typedef enum OMX_CONFIG_CAMERAUSECASE {
    OMX_CameraUseCaseAuto,
    OMX_CameraUseCaseVideo,
    OMX_CameraUseCaseStills,
    OMX_CameraUseCaseKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
    OMX_CameraUseCaseVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
    OMX_CameraUseCaseMax = 0x7FFFFFFF
-} OMX_PARAM_CAMERAUSECASE;
+} OMX_CONFIG_CAMERAUSECASE;
 
-typedef struct OMX_PARAM_CAMERAUSECASETYPE {
+typedef struct OMX_CONFIG_CAMERAUSECASETYPE {
    OMX_U32 nSize;
    OMX_VERSIONTYPE nVersion;
-   OMX_PARAM_CAMERAUSECASE eUseCase;
-} OMX_PARAM_CAMERAUSECASETYPE;
+   OMX_CONFIG_CAMERAUSECASE eUseCase;
+} OMX_CONFIG_CAMERAUSECASETYPE;
 
 /* OMX_IndexParamBrcmDisableProprietaryTunnels: Disabling proprietary tunnelling */
 typedef struct OMX_PARAM_BRCMDISABLEPROPRIETARYTUNNELSTYPE {
@@ -2165,15 +2165,38 @@ typedef enum OMX_COLORSPACETYPE
    OMX_COLORSPACE_JPEG_JFIF,
    OMX_COLORSPACE_ITU_R_BT601,
    OMX_COLORSPACE_ITU_R_BT709,
+   OMX_COLORSPACE_FCC,
+   OMX_COLORSPACE_SMPTE240M,
+   OMX_COLORSPACE_BT470_2_M,
+   OMX_COLORSPACE_BT470_2_BG,
+   OMX_COLORSPACE_JFIF_Y16_255,
    OMX_COLORSPACE_MAX = 0x7FFFFFFF
 } OMX_COLORSPACETYPE;
 
 typedef struct OMX_PARAM_COLORSPACETYPE
 {
    OMX_U32 nSize;
    OMX_VERSIONTYPE nVersion;
+   OMX_U32 nPortIndex;
    OMX_COLORSPACETYPE eColorSpace;
 } OMX_PARAM_COLORSPACETYPE;
+
+typedef enum OMX_CAPTURESTATETYPE
+{
+   OMX_NotCapturing,
+   OMX_CaptureStarted,
+   OMX_CaptureComplete,
+   OMX_CaptureMax = 0x7FFFFFFF
+} OMX_CAPTURESTATETYPE;
+
+typedef struct OMX_PARAM_CAPTURESTATETYPE
+{
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+   OMX_U32 nPortIndex;
+   OMX_CAPTURESTATETYPE eCaptureState;
+} OMX_PARAM_CAPTURESTATETYPE;
+
 /*
 Provides information on the colour space that's in use during image/video processing.
 */
@@ -2213,5 +2236,60 @@ This control can be used to control whether loadable modules used a dedicated me
 pool or use heap allocated memory.
 */
 
+typedef struct OMX_PARAM_BRCMCONFIGFILETYPE {
+   OMX_U32 nSize;                      /**< size of the structure in bytes, including
+                                            actual URI name */
+   OMX_VERSIONTYPE nVersion;           /**< OMX specification version information */
+   OMX_U32 fileSize;                   /**< Size of complete file data */
+} OMX_PARAM_BRCMCONFIGFILETYPE;
+
+typedef struct OMX_PARAM_BRCMCONFIGFILECHUNKTYPE {
+   OMX_U32 nSize;                      /**< size of the structure in bytes, including
+                                            actual chunk data */
+   OMX_VERSIONTYPE nVersion;           /**< OMX specification version information */
+   OMX_U32 size;                       /**< Number of bytes being transferred in this chunk */
+   OMX_U32 offset;                     /**< Offset of this chunk in the file */
+   OMX_U8 data[1];                     /**< Chunk data */
+} OMX_PARAM_BRCMCONFIGFILECHUNKTYPE;
+
+typedef struct OMX_PARAM_BRCMFRAMERATERANGETYPE {
+   OMX_U32 nSize;                      /**< size of the structure in bytes, including
+                                            actual chunk data */
+   OMX_VERSIONTYPE nVersion;           /**< OMX specification version information */
+   OMX_U32 nPortIndex;
+   OMX_U32 xFramerateLow;              /**< Low end of framerate range. Q16 format */
+   OMX_U32 xFramerateHigh;             /**< High end of framerate range. Q16 format */
+} OMX_PARAM_BRCMFRAMERATERANGETYPE;
+
+typedef struct OMX_PARAM_S32TYPE {
+    OMX_U32 nSize;                    /**< Size of this structure, in Bytes */
+    OMX_VERSIONTYPE nVersion;         /**< OMX specification version information */
+    OMX_U32 nPortIndex;               /**< port that this structure applies to */
+    OMX_S32 nS32;                     /**< S32 value */
+} OMX_PARAM_S32TYPE;
+
+typedef struct OMX_PARAM_BRCMVIDEODRMPROTECTBUFFERTYPE
+{
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+
+   OMX_U32 size_wanted;     /**< Input. Zero size means internal video decoder buffer,
+                                 mem_handle and phys_addr not returned in this case */
+   OMX_U32 protect;         /**< Input. 1 = protect, 0 = unprotect */
+
+   OMX_U32 mem_handle;      /**< Output. Handle for protected buffer */
+   OMX_PTR phys_addr;       /**< Output. Physical memory address of protected buffer */
+} OMX_PARAM_BRCMVIDEODRMPROTECTBUFFERTYPE;
+
+typedef struct OMX_CONFIG_ZEROSHUTTERLAGTYPE
+{
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+
+   OMX_U32 bZeroShutterMode;        /**< Select ZSL mode from the camera. */
+   OMX_U32 bConcurrentCapture;      /**< Perform concurrent captures for full ZSL. */
+
+} OMX_CONFIG_ZEROSHUTTERLAGTYPE;
+
 #endif
 /* File EOF */

hardfp/opt/vc/include/IL/OMX_IVCommon.h

@@ -139,6 +139,9 @@ typedef enum OMX_COLOR_FORMATTYPE {
     OMX_COLOR_FormatYUVUV128,
     OMX_COLOR_FormatRawBayer12bit,
     OMX_COLOR_FormatBRCMEGL,
+    OMX_COLOR_FormatBRCMOpaque,
+    OMX_COLOR_FormatYVU420PackedPlanar,
+    OMX_COLOR_FormatYVU420PackedSemiPlanar,
     OMX_COLOR_FormatMax = 0x7FFFFFFF
 } OMX_COLOR_FORMATTYPE;
 
@@ -205,6 +208,7 @@ typedef enum OMX_IMAGEFILTERTYPE {
     OMX_ImageFilterColourPoint,
     OMX_ImageFilterPosterise,
     OMX_ImageFilterColourBalance,
+    OMX_ImageFilterCartoon,
 
     OMX_ImageFilterMax = 0x7FFFFFFF
 } OMX_IMAGEFILTERTYPE;
@@ -1029,6 +1033,8 @@ typedef enum OMX_FOCUSSTATUSTYPE {
     OMX_FocusStatusLost,
     OMX_FocusStatusKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 
     OMX_FocusStatusVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
+    OMX_FocusStatusCafWatching,
+    OMX_FocusStatusCafSceneChanged,
     OMX_FocusStatusMax = 0x7FFFFFFF
 } OMX_FOCUSSTATUSTYPE;
 

hardfp/opt/vc/include/IL/OMX_Image.h

@@ -205,6 +205,13 @@ typedef enum OMX_IMAGE_FOCUSCONTROLTYPE {
     OMX_IMAGE_FocusControlNearFixed,          /* Focus at a fixed near focus point - (50cm-1m) */
     OMX_IMAGE_FocusControlAutoNear,           /* CF over a near range (eg 0-200cm) */
     OMX_IMAGE_FocusControlAutoLockNear,       /* AF over a near range (eg 0-200cm) */
+    OMX_IMAGE_FocusControlInfinityFixed,      /* Focus at infinity */
+    OMX_IMAGE_FocusControlMacroFixed,         /* Focus at a macro distance */
+    OMX_IMAGE_FocusControlAutoFast,           /* CF over a full range with fast response */
+    OMX_IMAGE_FocusControlAutoMacroFast,      /* CF over a macro range (eg 0-50cm) with fast response */
+    OMX_IMAGE_FocusControlAutoNearFast,       /* CF over a near range (eg 0-200cm) */
+    OMX_IMAGE_FocusControlAutoInfinityFast,   /* CF over distant range (eg 50cm to infinity) with fast response */
+    OMX_IMAGE_FocusControlCurrentFixed,       /* Stop the lens at the current position */
     OMX_IMAGE_FocusControlMax = 0x7FFFFFFF
 } OMX_IMAGE_FOCUSCONTROLTYPE;
 

hardfp/opt/vc/include/IL/OMX_Index.h

@@ -351,7 +351,7 @@ typedef enum OMX_INDEXTYPE {
     OMX_IndexConfigBrcmVideoEncoderMBRowsPerSlice, /**< reference: OMX_PARAM_U32TYPE */
     OMX_IndexParamCameraAFAssistDeviceNumber_Deprecated,   /**< reference: OMX_PARAM_U32TYPE */
     OMX_IndexParamCameraPrivacyIndicatorDeviceNumber_Deprecated,   /**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexParamCameraUseCase,                /**< reference: OMX_PARAM_CAMERAUSECASETYPE */
+    OMX_IndexConfigCameraUseCase,               /**< reference: OMX_CONFIG_CAMERAUSECASETYPE */
     OMX_IndexParamBrcmDisableProprietaryTunnels,   /**< reference: OMX_PARAM_BRCMDISABLEPROPRIETARYTUNNELSTYPE */
     OMX_IndexParamBrcmOutputBufferSize,         /**<  reference: OMX_PARAM_BRCMOUTPUTBUFFERSIZETYPE */
     OMX_IndexParamBrcmRetainMemory,             /**< reference: OMX_PARAM_BRCMRETAINMEMORYTYPE */
@@ -469,9 +469,32 @@ typedef enum OMX_INDEXTYPE {
 
     // 0x7f0000c0
     OMX_IndexParamBrcmVideoRCSliceDQuant,      /**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexConfigBrcmVideoH264UseCABAC,      /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexParamBrcmVideoFrameLimitBits,     /**< reference: OMX_PARAM_U32TYPE */
+    OMX_IndexParamBrcmVideoPeakRate,           /**< reference: OMX_PARAM_U32TYPE */
+    OMX_IndexConfigBrcmVideoH264DisableCABAC,  /**< reference: OMX_CONFIG_BOOLEANTYPE */
     OMX_IndexConfigBrcmVideoH264LowLatency,    /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexConfigBrcmVideoH264AUDelimiters,  /**< reference: OMX_CONFIG_BOOLEANTYPE */
     OMX_IndexConfigBrcmVideoH264DeblockIDC,    /**< reference: OMX_PARAM_U32TYPE */
+    OMX_IndexConfigBrcmVideoH264IntraMBMode,   /**< reference: OMX_PARAM_U32TYPE */
+    OMX_IndexConfigContrastEnhance,            /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexParamCameraCustomSensorConfig,    /**< reference: OMX_PARAM_U32TYPE */
+    OMX_IndexParamBrcmHeaderOnOpen,            /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexConfigBrcmUseRegisterFile,        /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexConfigBrcmRegisterFileFailFatal,  /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexParamBrcmConfigFileRegisters,     /**< reference: OMX_CONFIG_CONFIGFILETYPE */
+    OMX_IndexParamBrcmConfigFileChunkRegisters,/**< reference: OMX_CONFIG_CONFIGFILECHUNKTYPE */
+    OMX_IndexParamBrcmAttachLog,               /**< reference: OMX_CONFIG_BOOLEANTYPE */
+
+    // 0x7f0000d0
+    OMX_IndexParamCameraZeroShutterLag,        /**< reference: OMX_CONFIG_ZEROSHUTTERLAGTYPE */
+    OMX_IndexParamBrcmFpsRange,                /**< reference: OMX_PARAM_BRCMFRAMERATERANGETYPE */
+    OMX_IndexParamCaptureExposureCompensation, /**< reference: OMX_PARAM_S32TYPE */
+    OMX_IndexParamBrcmVideoPrecodeForQP,       /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexParamBrcmVideoTimestampFifo,      /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexParamSWSharpenDisable,            /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexConfigBrcmFlashRequired,          /**< reference: OMX_CONFIG_BOOLEANTYPE */
+    OMX_IndexParamBrcmVideoDrmProtectBuffer,   /**< reference: OMX_PARAM_BRCMVIDEODRMPROTECTBUFFERTYPE */
+    OMX_IndexParamSWSaturationDisable,         /**< reference: OMX_CONFIG_BOOLEANTYPE */
 
     // 0x7f0000f0
     OMX_IndexConfigBrcmAudioDownmixCoefficients = 0x7f0000f0, /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS */

hardfp/opt/vc/include/IL/OMX_Video.h

@@ -297,14 +297,13 @@ typedef struct OMX_VIDEO_PARAM_MOTIONVECTORTYPE {
  * Enumeration of possible methods to use for Intra Refresh 
  */
 typedef enum OMX_VIDEO_INTRAREFRESHTYPE {
-    OMX_VIDEO_IntraRefreshNone      = 0,    /**< No Intra refresh*/
-    OMX_VIDEO_IntraRefreshCyclic    = 1,    /**< Cyclic intra refresh, bit 0 is set*/
-    OMX_VIDEO_IntraRefreshAdaptive  = 2,    /**< Adaptive intra refresh, bit 1 is set*/
-    OMX_VIDEO_IntraRefreshBoth      = 3,    /**< Cyclic + Adaptive intra refresh (no mrows since bit 2 is off)*/
-    OMX_VIDEO_IntraRefreshCyclicMrows = 5,  /**< Cyclic intra refresh, multiple rows at a time bits 0 and 2 are set*/
-    OMX_VIDEO_IntraRefreshPseudoRand = 8,   /**< Psuedo random intra refresh, uses bit 3*/
+    OMX_VIDEO_IntraRefreshCyclic,                         /**< Cyclic intra refresh, bit 0 is set*/
+    OMX_VIDEO_IntraRefreshAdaptive,                       /**< Adaptive intra refresh, bit 1 is set*/
+    OMX_VIDEO_IntraRefreshBoth,                           /**< Cyclic + Adaptive intra refresh (no mrows since bit 2 is off)*/
     OMX_VIDEO_IntraRefreshKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 
     OMX_VIDEO_IntraRefreshVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
+    OMX_VIDEO_IntraRefreshCyclicMrows,                    /**< Cyclic intra refresh, multiple rows at a time bits 0 and 2 are set*/
+    OMX_VIDEO_IntraRefreshPseudoRand,                     /**< Psuedo random intra refresh, uses bit 3*/
     OMX_VIDEO_IntraRefreshMax = 0x7FFFFFFF
 } OMX_VIDEO_INTRAREFRESHTYPE;
 
@@ -785,6 +784,7 @@ typedef enum OMX_VIDEO_AVCPROFILETYPE {
     OMX_VIDEO_AVCProfileHigh10   = 0x10,   /**< High 10 profile */
     OMX_VIDEO_AVCProfileHigh422  = 0x20,   /**< High 4:2:2 profile */
     OMX_VIDEO_AVCProfileHigh444  = 0x40,   /**< High 4:4:4 profile */
+    OMX_VIDEO_AVCProfileConstrainedBaseline = 0x80, /**< Constrained Baseline Profile   */
     OMX_VIDEO_AVCProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 
     OMX_VIDEO_AVCProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
     OMX_VIDEO_AVCProfileMax      = 0x7FFFFFFF  

hardfp/opt/vc/include/interface/vchi/connections/connection.h

@@ -25,6 +25,12 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+/*
+ * \file
+ *
+ * \brief Contains the protypes for the interface functions.
+*/
+
 #ifndef CONNECTION_H_
 #define CONNECTION_H_
 

hardfp/opt/vc/include/interface/vchi/message_drivers/message.h

@@ -25,6 +25,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+// MPHI videocore message driver
+
 #ifndef _VCHI_MESSAGE_H_
 #define _VCHI_MESSAGE_H_
 

hardfp/opt/vc/include/interface/vchi/vchi.h

@@ -25,6 +25,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+// Contains the protypes for the vchi functions.
+
 #ifndef VCHI_H_
 #define VCHI_H_
 
@@ -39,6 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  Global defs
  *****************************************************************************/
 
+#define VCHI_SERVICE_HANDLE_INVALID 0
+
 #define VCHI_BULK_ROUND_UP(x)     ((((unsigned long)(x))+VCHI_BULK_ALIGN-1) & ~(VCHI_BULK_ALIGN-1))
 #define VCHI_BULK_ROUND_DOWN(x)   (((unsigned long)(x)) & ~(VCHI_BULK_ALIGN-1))
 #define VCHI_BULK_ALIGN_NBYTES(x) (VCHI_BULK_ALIGNED(x) ? 0 : (VCHI_BULK_ALIGN - ((unsigned long)(x) & (VCHI_BULK_ALIGN-1))))
@@ -49,6 +53,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define VCHI_BULK_ALIGNED(x)      (((unsigned long)(x) & (VCHI_BULK_ALIGN-1)) == 0)
 #endif
 
+typedef struct 
+{
+   uint32_t version;
+   uint32_t version_min;
+} VCHI_VERSION_T;
+#define VCHI_VERSION(v_) { v_, v_ }
+#define VCHI_VERSION_EX(v_,m_) { v_, m_ }
 
 typedef enum
 {
@@ -113,6 +124,7 @@ typedef struct
 
 // structure used to provide the information needed to open a server or a client
 typedef struct {
+   VCHI_VERSION_T version;
    vcos_fourcc_t service_id;
    VCHI_CONNECTION_T *connection;
    uint32_t rx_fifo_size;
@@ -128,7 +140,7 @@ typedef struct {
 typedef struct opaque_vchi_instance_handle_t *VCHI_INSTANCE_T;
 
 // Opaque handle for a server or client
-typedef struct opaque_vchi_service_handle_t *VCHI_SERVICE_HANDLE_T;
+typedef unsigned int VCHI_SERVICE_HANDLE_T;
 
 // Service registration & startup
 typedef void (*VCHI_SERVICE_INIT)(VCHI_INSTANCE_T initialise_instance, VCHI_CONNECTION_T **connections, uint32_t num_connections);
@@ -190,6 +202,9 @@ extern int32_t vchi_service_open( VCHI_INSTANCE_T instance_handle,
                                   SERVICE_CREATION_T *setup,
                                   VCHI_SERVICE_HANDLE_T *handle);
 
+extern int32_t vchi_get_peer_version( const VCHI_SERVICE_HANDLE_T handle,
+                                      short *peer_version );
+
 // Routine to close a named service
 extern int32_t vchi_service_close( const VCHI_SERVICE_HANDLE_T handle );
 

hardfp/opt/vc/include/interface/vchi/vchi_cfg.h

@@ -25,6 +25,10 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+// Contains the #defines for the number of servers / clients etc, these can be
+// over-ridden from the platform makefile if needed
+
+
 #ifndef VCHI_CFG_H_
 #define VCHI_CFG_H_
 

hardfp/opt/vc/include/interface/vchi/vchi_cfg_internal.h

@@ -24,6 +24,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+
 #ifndef VCHI_CFG_INTERNAL_H_
 #define VCHI_CFG_INTERNAL_H_
 

hardfp/opt/vc/include/interface/vchi/vchi_common.h

@@ -25,6 +25,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+// Contains global defs used by submodules within vchi
+
 #ifndef VCHI_COMMON_H_
 #define VCHI_COMMON_H_
 

hardfp/opt/vc/include/interface/vchiq_arm/vchiq_cfg.h

@@ -23,17 +23,19 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef VCHIQ_CFG_H
 #define VCHIQ_CFG_H
 
-#define VCHIQ_MAGIC              VCHIQ_MAKE_FOURCC('V','C','H','I')
+#define VCHIQ_MAGIC              VCHIQ_MAKE_FOURCC('V', 'C', 'H', 'I')
 /* The version of VCHIQ - change with any non-trivial change */
-#define VCHIQ_VERSION            2
-/* The minimum compatible version - update to match VCHIQ_VERSION with any incompatible change */
-#define VCHIQ_VERSION_MIN        2
+#define VCHIQ_VERSION            5
+/* The minimum compatible version - update to match VCHIQ_VERSION with any
+** incompatible change */
+#define VCHIQ_VERSION_MIN        3
 
+#define VCHIQ_MAX_STATES         2
 #define VCHIQ_MAX_SERVICES       4096
 #define VCHIQ_MAX_SLOTS          128
 #define VCHIQ_MAX_SLOTS_PER_SIDE 64