mirror of
https://github.com/raspberrypi/userland.git
synced 2025-12-06 04:49:12 +00:00
interface: Updates from vdec3 firmware update
This commit is contained in:
Dom Cobley
153
interface/vcos/vcos_attr.h
Normal file
153
interface/vcos/vcos_attr.h
Normal file
@@ -0,0 +1,153 @@
|
||||
/*
|
||||
Copyright (c) 2012, Broadcom Europe Ltd
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
* Neither the name of the copyright holder nor the
|
||||
names of its contributors may be used to endorse or promote products
|
||||
derived from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
|
||||
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
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.
|
||||
*/
|
||||
|
||||
/*=============================================================================
|
||||
VideoCore OS Abstraction Layer - compiler-specific attributes
|
||||
=============================================================================*/
|
||||
|
||||
#ifndef VCOS_ATTR_H
|
||||
#define VCOS_ATTR_H
|
||||
|
||||
/**
|
||||
* Type attribute indicating the enum should be stored in as few bytes as
|
||||
* possible. MetaWare does this by default, so the attribute is useful when
|
||||
* structs need to be portable to GCC too.
|
||||
*
|
||||
* MSVC doesn't support VCOS_ENUM_PACKED, so code that needs to be portable
|
||||
* across all platforms but wants the type-safety and debug-info benefits
|
||||
* of enum types when possible, should do:
|
||||
*
|
||||
* typedef enum VCOS_ENUM_PACKED { a = 0, b = 0xffff } EXAMPLE_T;
|
||||
* struct foo {
|
||||
* int bar;
|
||||
* #if VCOS_HAS_ENUM_PACKED
|
||||
* EXAMPLE_T baz;
|
||||
* #else
|
||||
* uint16_t baz;
|
||||
* #endif
|
||||
* };
|
||||
*/
|
||||
|
||||
#if defined(__VECTORC__)
|
||||
# define VCOS_ENUM_PACKED
|
||||
# define VCOS_HAS_ENUM_PACKED 0
|
||||
#elif defined(__GNUC__)
|
||||
# define VCOS_ENUM_PACKED __attribute__ ((packed))
|
||||
# define VCOS_HAS_ENUM_PACKED 1
|
||||
#elif defined(__HIGHC__)
|
||||
# define VCOS_ENUM_PACKED /* packed enums are default on Metaware */
|
||||
# define VCOS_HAS_ENUM_PACKED 1
|
||||
#else
|
||||
# define VCOS_ENUM_PACKED
|
||||
# define VCOS_HAS_ENUM_PACKED 0
|
||||
#endif
|
||||
|
||||
/** Variable attribute indicating the variable must be emitted even if it appears unused. */
|
||||
#if defined(__GNUC__) || defined(__HIGHC__)
|
||||
# define VCOS_ATTR_USED __attribute__ ((used))
|
||||
#else
|
||||
# define VCOS_ATTR_USED
|
||||
#endif
|
||||
|
||||
/** Variable attribute indicating the compiler should not warn if the variable is unused. */
|
||||
#if defined(__GNUC__) || defined(__HIGHC__)
|
||||
# define VCOS_ATTR_POSSIBLY_UNUSED __attribute__ ((unused))
|
||||
#else
|
||||
# define VCOS_ATTR_POSSIBLY_UNUSED
|
||||
#endif
|
||||
|
||||
/** Variable attribute requiring specific alignment.
|
||||
*
|
||||
* Use as:
|
||||
* int VCOS_ATTR_ALIGNED(256) n;
|
||||
* or:
|
||||
* VCOS_ATTR_ALIGNED(256) int n;
|
||||
* or if you don't want to support MSVC:
|
||||
* int n VCOS_ATTR_ALIGNED(256);
|
||||
*/
|
||||
#if defined(__GNUC__) || defined(__HIGHC__)
|
||||
# define VCOS_ATTR_ALIGNED(n) __attribute__ ((aligned(n)))
|
||||
#elif defined(_MSC_VER)
|
||||
# define VCOS_ATTR_ALIGNED(n) __declspec(align(n))
|
||||
#else
|
||||
/* Force a syntax error if this is used when the compiler doesn't support it,
|
||||
* instead of silently misaligning */
|
||||
# define VCOS_ATTR_ALIGNED(n) VCOS_ATTR_ALIGNED_NOT_SUPPORTED_ON_THIS_COMPILER
|
||||
#endif
|
||||
|
||||
/** Variable attribute requiring specific ELF section.
|
||||
*
|
||||
* Use as:
|
||||
* int n VCOS_ATTR_SECTION(".foo") = 1;
|
||||
*
|
||||
* A pointer like &n will have type "VCOS_ATTR_SECTION_QUALIFIER int *".
|
||||
*/
|
||||
#if defined(__HIGHC__) || defined(__VECTORC__)
|
||||
/* hcvc requires 'far' else it'll put small objects in .sdata/.rsdata/.sbss */
|
||||
# define VCOS_ATTR_SECTION(s) __attribute__ ((far, section(s)))
|
||||
# define VCOS_ATTR_SECTION_QUALIFIER _Far
|
||||
#elif defined(__GNUC__)
|
||||
# define VCOS_ATTR_SECTION(s) __attribute__ ((section(s)))
|
||||
# define VCOS_ATTR_SECTION_QUALIFIER
|
||||
#else
|
||||
/* Force a syntax error if this is used when the compiler doesn't support it */
|
||||
# define VCOS_ATTR_SECTION(s) VCOS_ATTR_SECTION_NOT_SUPPORTED_ON_THIS_COMPILER
|
||||
# define VCOS_ATTR_SECTION_QUALIFIER
|
||||
#endif
|
||||
|
||||
/** Define a function as a weak alias to another function.
|
||||
* @param ret_type Function return type.
|
||||
* @param alias_name Name of the alias.
|
||||
* @param param_list Function parameter list, including the parentheses.
|
||||
* @param target_name Target function (bare function name, not a string).
|
||||
*/
|
||||
#if defined(__GNUC__) || defined(__HIGHC__)
|
||||
/* N.B. gcc allows __attribute__ after parameter list, but hcvc seems to silently ignore it. */
|
||||
# define VCOS_WEAK_ALIAS(ret_type, alias_name, param_list, target_name) \
|
||||
__attribute__ ((weak, alias(#target_name))) ret_type alias_name param_list
|
||||
#else
|
||||
# define VCOS_WEAK_ALIAS(ret_type, alias, params, target) VCOS_CASSERT(0)
|
||||
#endif
|
||||
|
||||
/** Define a function as a weak alias to another function, specified as a string.
|
||||
* @param ret_type Function return type.
|
||||
* @param alias_name Name of the alias.
|
||||
* @param param_list Function parameter list, including the parentheses.
|
||||
* @param target_name Target function name as a string.
|
||||
* @note Prefer the use of VCOS_WEAK_ALIAS - it is likely to be more portable.
|
||||
* Only use VCOS_WEAK_ALIAS_STR if you need to do pre-processor mangling of the target
|
||||
* symbol.
|
||||
*/
|
||||
#if defined(__GNUC__) || defined(__HIGHC__)
|
||||
/* N.B. gcc allows __attribute__ after parameter list, but hcvc seems to silently ignore it. */
|
||||
# define VCOS_WEAK_ALIAS_STR(ret_type, alias_name, param_list, target_name) \
|
||||
__attribute__ ((weak, alias(target_name))) ret_type alias_name param_list
|
||||
#else
|
||||
# define VCOS_WEAK_ALIAS_STR(ret_type, alias, params, target) VCOS_CASSERT(0)
|
||||
#endif
|
||||
|
||||
#endif /* VCOS_ATTR_H */
|
||||
@@ -36,6 +36,7 @@ VideoCore OS Abstraction Layer - basic types
|
||||
|
||||
#include <stddef.h>
|
||||
#include "vcos_platform_types.h"
|
||||
#include "interface/vcos/vcos_attr.h"
|
||||
|
||||
#if !defined(VCOSPRE_) || !defined(VCOSPOST_)
|
||||
#error VCOSPRE_ and VCOSPOST_ not defined!
|
||||
|
||||
@@ -329,7 +329,7 @@ typedef enum OMX_INDEXTYPE {
|
||||
OMX_IndexConfigCameraFlashConfig, /**<reference: OMX_CONFIG_CAMERAFLASHCONFIGTYPE */
|
||||
OMX_IndexConfigCaptureRawImageURI, /**<reference: OMX_PARAM_CONTENTURITYPE */
|
||||
OMX_IndexConfigCameraStripeFuncMinLines, /**<reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexConfigCameraAlgorithmVersionDeprecated, /**<reference: OMX_CONFIG_CAMERAALGORITHMVERSIONTYPE */
|
||||
OMX_IndexConfigCameraAlgorithmVersionDeprecated, /**<reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexConfigCameraIsoReferenceValue, /**<reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexConfigCameraCaptureAbortsAutoFocus, /**<reference: OMX_CONFIG_BOOLEANTYPE */
|
||||
OMX_IndexConfigBrcmClockMissCount, /**<reference: OMX_PARAM_U32TYPE */
|
||||
@@ -355,7 +355,7 @@ typedef enum OMX_INDEXTYPE {
|
||||
OMX_IndexParamBrcmDisableProprietaryTunnels, /**< reference: OMX_PARAM_BRCMDISABLEPROPRIETARYTUNNELSTYPE */
|
||||
OMX_IndexParamBrcmOutputBufferSize, /**< reference: OMX_PARAM_BRCMOUTPUTBUFFERSIZETYPE */
|
||||
OMX_IndexParamBrcmRetainMemory, /**< reference: OMX_PARAM_BRCMRETAINMEMORYTYPE */
|
||||
OMX_IndexConfigCanFocus_Deprecated, /**< reference: OMX_CONFIG_CANFOCUSTYPE */
|
||||
OMX_IndexConfigCanFocus_Deprecated, /**< reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexParamBrcmImmutableInput, /**< reference: OMX_CONFIG_BOOLEANTYPE */
|
||||
OMX_IndexParamDynamicParameterFile, /**< reference: OMX_PARAM_CONTENTURITYPE */
|
||||
|
||||
@@ -460,8 +460,8 @@ typedef enum OMX_INDEXTYPE {
|
||||
OMX_IndexParamRateControlModel, /**< reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexParamBrcmExtraBuffers, /**< reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexConfigFieldOfView, /**< reference: OMX_CONFIG_BRCMFOVTYPE */
|
||||
OMX_IndexParamBrcmAlignHoriz, /**< reference: OMX_CONFIG_U32TYPE */
|
||||
OMX_IndexParamBrcmAlignVert, /**< reference: OMX_CONFIG_U32TYPE */
|
||||
OMX_IndexParamBrcmAlignHoriz, /**< reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexParamBrcmAlignVert, /**< reference: OMX_PARAM_U32TYPE */
|
||||
OMX_IndexParamColorSpace, /**< reference: OMX_PARAM_COLORSPACETYPE */
|
||||
OMX_IndexParamBrcmDroppablePFrames, /**< reference: OMX_CONFIG_BOOLEANTYPE */
|
||||
OMX_IndexParamBrcmVideoInitialQuant, /**< reference: OMX_PARAM_U32TYPE */
|
||||
|
||||
Reference in New Issue
Block a user