diff --git a/include/fvid2_drvMgr.h b/include/fvid2_drvMgr.h
index b49288c93305bc8e0f826f62b317500332baab5a..0bf2cc86cd556ed1c43cdc3771b09d3676e3b795 100644 (file)
--- a/include/fvid2_drvMgr.h
+++ b/include/fvid2_drvMgr.h
-/* =============================================================================
- * Copyright (c) Texas Instruments Incorporated 2012-2018
+/*
+ * Copyright (c) Texas Instruments Incorporated 2018
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
/* Include Files */
/* ========================================================================== */
/* Include Files */
/* ========================================================================== */
-#include <ti/drv/fvid2/fvid2.h>
+#include <ti/drv/fvid2/include/fvid2_api.h>
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
/* ========================================================================== */
/** \brief Number of driver object to allocate in FVID2 library. */
/* ========================================================================== */
/** \brief Number of driver object to allocate in FVID2 library. */
-#define FVID2_CFG_FDM_NUM_DRV_OBJS (40U)
+#define FVID2_CFG_FDM_NUM_DRV_OBJS (40U)
/** \brief Number of channel object to allocate in FVID2 library. */
/** \brief Number of channel object to allocate in FVID2 library. */
-#define FVID2_CFG_FDM_NUM_CH_OBJS (80U)
-
-
+#define FVID2_CFG_FDM_NUM_CH_OBJS (80U)
/** \brief FVID2 driver handle returned by individual drivers. */
/** \brief FVID2 driver handle returned by individual drivers. */
-typedef Ptr Fdrv_Handle;
+typedef void *Fdrv_Handle;
/** \brief Typedef for callback function parameters. */
/** \brief Typedef for callback function parameters. */
-typedef struct Fvid2_DrvCbParams_t Fvid2_DrvCbParams;
+typedef struct Fvid2_DrvCbParams_t Fvid2_DrvCbParams;
/**
* \brief Typedef for FVID2 driver callback function prototype. This will be
/**
* \brief Typedef for FVID2 driver callback function prototype. This will be
*
* fdmData: FVID2 driver manager internal data passed to driver during create
* call.
*
* fdmData: FVID2 driver manager internal data passed to driver during create
* call.
- *
- * reserved: For future use. Not used currently. This will be set to NULL.
*/
*/
-typedef Int32 (*Fdm_CbFxn)(Ptr fdmData, Ptr reserved);
+typedef int32_t (*Fdm_CbFxn)(void *fdmData);
/**
* \brief Typedef for FVID2 driver error callback function prototype.
/**
* \brief Typedef for FVID2 driver error callback function prototype.
*
* errList: Error data passed to the application.
*
*
* errList: Error data passed to the application.
*
- * reserved: For future use. Not used currently. This will be set to NULL.
*/
*/
-typedef Int32 (*Fdm_ErrCbFxn)(Ptr fdmData, void *errList, Ptr reserved);
+typedef int32_t (*Fdm_ErrCbFxn)(void *fdmData, void *errList);
/** \brief Typedef for FVID2 create function pointer. */
/** \brief Typedef for FVID2 create function pointer. */
-typedef Fdrv_Handle (*Fvid2_DrvCreate)(UInt32 drvId,
- UInt32 instanceId,
- Ptr createArgs,
- Ptr
- createStatusArgs,
+typedef Fdrv_Handle (*Fvid2_DrvCreate)(uint32_t drvId,
+ uint32_t instanceId,
+ void *createArgs,
+ void *createStatusArgs,
const Fvid2_DrvCbParams *fdmCbParams);
/** \brief Typedef for FVID2 delete function pointer. */
const Fvid2_DrvCbParams *fdmCbParams);
/** \brief Typedef for FVID2 delete function pointer. */
-typedef Int32 (*Fvid2_DrvDelete)(Fdrv_Handle handle, Ptr deleteArgs);
+typedef int32_t (*Fvid2_DrvDelete)(Fdrv_Handle handle, void *deleteArgs);
/** \brief Typedef for FVID2 control function pointer. */
/** \brief Typedef for FVID2 control function pointer. */
-typedef Int32 (*Fvid2_DrvControl)(Fdrv_Handle handle,
- UInt32 cmd,
- Ptr cmdArgs,
- Ptr cmdStatusArgs);
+typedef int32_t (*Fvid2_DrvControl)(Fdrv_Handle handle,
+ uint32_t cmd,
+ void *cmdArgs,
+ void *cmdStatusArgs);
/** \brief Typedef for FVID2 queue function pointer. */
/** \brief Typedef for FVID2 queue function pointer. */
-typedef Int32 (*Fvid2_DrvQueue)(Fdrv_Handle handle,
- Fvid2_FrameList *frameList,
- UInt32 streamId);
+typedef int32_t (*Fvid2_DrvQueue)(Fdrv_Handle handle,
+ Fvid2_FrameList *frameList,
+ uint32_t streamId);
/** \brief Typedef for FVID2 dequeue function pointer. */
/** \brief Typedef for FVID2 dequeue function pointer. */
-typedef Int32 (*Fvid2_DrvDequeue)(Fdrv_Handle handle,
- Fvid2_FrameList *frameList,
- UInt32 streamId,
- UInt32 timeout);
+typedef int32_t (*Fvid2_DrvDequeue)(Fdrv_Handle handle,
+ Fvid2_FrameList *frameList,
+ uint32_t streamId,
+ uint32_t timeout);
/** \brief Typedef for FVID2 process frames function pointer. */
/** \brief Typedef for FVID2 process frames function pointer. */
-typedef Int32 (*Fvid2_DrvProcessRequest)(Fdrv_Handle handle,
- Fvid2_FrameList *inProcessList,
- Fvid2_FrameList *outProcessList);
+typedef int32_t (*Fvid2_DrvProcessRequest)(Fdrv_Handle handle,
+ Fvid2_FrameList *inProcessList,
+ Fvid2_FrameList *outProcessList);
/** \brief Typedef for FVID2 get processed frames function pointer. */
/** \brief Typedef for FVID2 get processed frames function pointer. */
-typedef Int32 (*Fvid2_DrvGetProcessedRequest)(Fdrv_Handle handle,
- Fvid2_FrameList *inProcessList,
- Fvid2_FrameList *outProcessList,
- UInt32 timeout);
+typedef int32_t (*Fvid2_DrvGetProcessedRequest)(Fdrv_Handle handle,
+ Fvid2_FrameList *inProcessList,
+ Fvid2_FrameList *outProcessList,
+ uint32_t timeout);
/* ========================================================================== */
/* ========================================================================== */
void *errList;
/**< Pointer to a valid framelist or processlist where the driver
* copies the aborted/error packet. */
void *errList;
/**< Pointer to a valid framelist or processlist where the driver
* copies the aborted/error packet. */
- Ptr fdmData;
+ void *fdmData;
/**< FDM specific data which is returned in the callback function
* as it is. */
/**< FDM specific data which is returned in the callback function
* as it is. */
- Ptr reserved;
- /**< For future use. Not used currently. Set this to NULL. */
};
/**
};
/**
*/
typedef struct
{
*/
typedef struct
{
- UInt32 drvId;
+ uint32_t drvId;
/**< Unique driver Id. */
Fvid2_DrvCreate createFxn;
/**< FVID2 create function pointer. */
/**< Unique driver Id. */
Fvid2_DrvCreate createFxn;
/**< FVID2 create function pointer. */
*
* \return Returns 0 on success else returns error value.
*/
*
* \return Returns 0 on success else returns error value.
*/
-Int32 Fvid2_registerDriver(const Fvid2_DrvOps *drvOps);
+int32_t Fvid2_registerDriver(const Fvid2_DrvOps *drvOps);
/**
* Fvid2_unRegisterDriver
/**
* Fvid2_unRegisterDriver
*
* \return Returns 0 on success else returns error value.
*/
*
* \return Returns 0 on success else returns error value.
*/
-Int32 Fvid2_unRegisterDriver(const Fvid2_DrvOps *drvOps);
+int32_t Fvid2_unRegisterDriver(const Fvid2_DrvOps *drvOps);
/**
* Fvid2_checkFrameList
/**
* Fvid2_checkFrameList
*
* \return Returns 0 on success else returns error value.
*/
*
* \return Returns 0 on success else returns error value.
*/
-Int32 Fvid2_checkFrameList(const Fvid2_FrameList *frameList, UInt32 maxFrames);
+int32_t Fvid2_checkFrameList(const Fvid2_FrameList *frameList,
+ uint32_t maxFrames);
/**
* Fvid2_checkDqFrameList
/**
* Fvid2_checkDqFrameList
*
* \return Returns 0 on success else returns error value.
*/
*
* \return Returns 0 on success else returns error value.
*/
-Int32 Fvid2_checkDqFrameList(const Fvid2_FrameList *frameList,
- UInt32 maxFrames);
+int32_t Fvid2_checkDqFrameList(const Fvid2_FrameList *frameList,
+ uint32_t maxFrames);
/**
* Fvid2_copyFrameList
/**
* Fvid2_copyFrameList