The header file _dcd.h contained the function prototypes of dspapi.c, so _dcd.h file is removed and its content is placed into dspapi.h. Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@xxxxxx> --- arch/arm/plat-omap/include/dspbridge/_dcd.h | 152 ------------------------- arch/arm/plat-omap/include/dspbridge/dspapi.h | 151 +++++++++++++++++++++++-- drivers/dsp/bridge/pmgr/dspapi.c | 2 +- drivers/dsp/bridge/rmgr/drv_interface.c | 2 +- drivers/dsp/bridge/rmgr/dspdrv.c | 2 +- 5 files changed, 144 insertions(+), 165 deletions(-) delete mode 100644 arch/arm/plat-omap/include/dspbridge/_dcd.h diff --git a/arch/arm/plat-omap/include/dspbridge/_dcd.h b/arch/arm/plat-omap/include/dspbridge/_dcd.h deleted file mode 100644 index 4c3f701..0000000 --- a/arch/arm/plat-omap/include/dspbridge/_dcd.h +++ /dev/null @@ -1,152 +0,0 @@ -/* - * _dcd.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Includes the wrapper functions called directly by the - * DeviceIOControl interface. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef _WCD_ -#define _WCD_ - -#include <dspbridge/dspapi-ioctl.h> - -/* - * ======== api_call_dev_ioctl ======== - * Purpose: - * Call the (wrapper) function for the corresponding API IOCTL. - * Parameters: - * cmd: IOCTL id, base 0. - * args: Argument structure. - * pResult: - * Returns: - * DSP_SOK if command called; DSP_EINVALIDARG if command not in IOCTL - * table. - * Requires: - * Ensures: - */ -extern dsp_status api_call_dev_ioctl(unsigned int cmd, - union Trapped_Args *args, - u32 *pResult, void *pr_ctxt); - -/* - * ======== api_init ======== - * Purpose: - * Initialize modules used by Bridge API. - * This procedure is called when the driver is loaded. - * Parameters: - * Returns: - * TRUE if success; FALSE otherwise. - * Requires: - * Ensures: - */ -extern bool api_init(void); - -/* - * ======== api_init_complete2 ======== - * Purpose: - * Perform any required bridge initialization which cannot - * be performed in api_init() or dev_start_device() due - * to the fact that some services are not yet - * completely initialized. - * Parameters: - * Returns: - * DSP_SOK: Allow this device to load - * DSP_EFAIL: Failure. - * Requires: - * Bridge API initialized. - * Ensures: - */ -extern dsp_status api_init_complete2(void); - -/* - * ======== api_exit ======== - * Purpose: - * Exit all modules initialized in api_init(void). - * This procedure is called when the driver is unloaded. - * Parameters: - * Returns: - * Requires: - * api_init(void) was previously called. - * Ensures: - * Resources acquired in api_init(void) are freed. - */ -extern void api_exit(void); - -/* MGR wrapper functions */ -extern u32 mgrwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt); -extern u32 mgrwrap_enum_proc_info(union Trapped_Args *args, void *pr_ctxt); -extern u32 mgrwrap_register_object(union Trapped_Args *args, void *pr_ctxt); -extern u32 mgrwrap_unregister_object(union Trapped_Args *args, void *pr_ctxt); -extern u32 mgrwrap_wait_for_bridge_events(union Trapped_Args *args, - void *pr_ctxt); - -extern u32 mgrwrap_get_process_resources_info(union Trapped_Args *args, - void *pr_ctxt); - -/* CPRC (Processor) wrapper Functions */ -extern u32 procwrap_attach(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_ctrl(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_detach(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_enum_resources(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_get_state(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_get_trace(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_load(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_register_notify(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_start(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_reserve_memory(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_un_reserve_memory(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_map(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_un_map(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_flush_memory(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_stop(union Trapped_Args *args, void *pr_ctxt); -extern u32 procwrap_invalidate_memory(union Trapped_Args *args, void *pr_ctxt); - -/* NODE wrapper functions */ -extern u32 nodewrap_allocate(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_alloc_msg_buf(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_change_priority(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_connect(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_create(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_delete(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_free_msg_buf(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_get_attr(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_get_message(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_pause(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_put_message(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_register_notify(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_run(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_terminate(union Trapped_Args *args, void *pr_ctxt); -extern u32 nodewrap_get_uuid_props(union Trapped_Args *args, void *pr_ctxt); - -/* STRM wrapper functions */ -extern u32 strmwrap_allocate_buffer(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_close(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_free_buffer(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_get_event_handle(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_get_info(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_idle(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_issue(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_open(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_reclaim(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_register_notify(union Trapped_Args *args, void *pr_ctxt); -extern u32 strmwrap_select(union Trapped_Args *args, void *pr_ctxt); - -extern u32 cmmwrap_calloc_buf(union Trapped_Args *args, void *pr_ctxt); -extern u32 cmmwrap_free_buf(union Trapped_Args *args, void *pr_ctxt); -extern u32 cmmwrap_get_handle(union Trapped_Args *args, void *pr_ctxt); -extern u32 cmmwrap_get_info(union Trapped_Args *args, void *pr_ctxt); - -#endif /* _WCD_ */ diff --git a/arch/arm/plat-omap/include/dspbridge/dspapi.h b/arch/arm/plat-omap/include/dspbridge/dspapi.h index 232aab0..9589574 100644 --- a/arch/arm/plat-omap/include/dspbridge/dspapi.h +++ b/arch/arm/plat-omap/include/dspbridge/dspapi.h @@ -3,17 +3,17 @@ * * DSP-BIOS Bridge driver support functions for TI OMAP processors. * - * Bridge class driver library functions, object definitions, and - * return error/status codes. To be included by Bridge mini drivers. + * Includes the wrapper functions called directly by the + * DeviceIOControl interface. * * Notes: - * Bridge Class Driver services exported to WMD's are initialized by the - * WCD on behalf of the WMD. WMD's must not call module Init/Exit + * Bridge services exported to Bridge driver are initialized by the DSPAPI on + * behalf of the Bridge driver. Bridge driver must not call module Init/Exit * functions. * - * To ensure WMD binary compatibility across different platforms, - * for the same processor, a WMD must restrict its usage of system - * services to those exported by the 'Bridge class library. + * To ensure Bridge driver binary compatibility across different platforms, + * for the same processor, a Bridge driver must restrict its usage of system + * services to those exported by the DSPAPI library. * * Copyright (C) 2005-2006 Texas Instruments, Inc. * @@ -26,11 +26,142 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef WCD_ -#define WCD_ +#ifndef DSPAPI_ +#define DSPAPI_ + +#include <dspbridge/dspapi-ioctl.h> /* This BRD API Library Version: */ #define BRD_API_MAJOR_VERSION (u32)8 /* .8x - Alpha, .9x - Beta, 1.x FCS */ #define BRD_API_MINOR_VERSION (u32)0 -#endif /* WCD_ */ + +/* + * ======== api_call_dev_ioctl ======== + * Purpose: + * Call the (wrapper) function for the corresponding API IOCTL. + * Parameters: + * cmd: IOCTL id, base 0. + * args: Argument structure. + * pResult: + * Returns: + * DSP_SOK if command called; DSP_EINVALIDARG if command not in IOCTL + * table. + * Requires: + * Ensures: + */ +extern dsp_status api_call_dev_ioctl(unsigned int cmd, + union Trapped_Args *args, + u32 *pResult, void *pr_ctxt); + +/* + * ======== api_init ======== + * Purpose: + * Initialize modules used by Bridge API. + * This procedure is called when the driver is loaded. + * Parameters: + * Returns: + * TRUE if success; FALSE otherwise. + * Requires: + * Ensures: + */ +extern bool api_init(void); + +/* + * ======== api_init_complete2 ======== + * Purpose: + * Perform any required bridge initialization which cannot + * be performed in api_init() or dev_start_device() due + * to the fact that some services are not yet + * completely initialized. + * Parameters: + * Returns: + * DSP_SOK: Allow this device to load + * DSP_EFAIL: Failure. + * Requires: + * Bridge API initialized. + * Ensures: + */ +extern dsp_status api_init_complete2(void); + +/* + * ======== api_exit ======== + * Purpose: + * Exit all modules initialized in api_init(void). + * This procedure is called when the driver is unloaded. + * Parameters: + * Returns: + * Requires: + * api_init(void) was previously called. + * Ensures: + * Resources acquired in api_init(void) are freed. + */ +extern void api_exit(void); + +/* MGR wrapper functions */ +extern u32 mgrwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt); +extern u32 mgrwrap_enum_proc_info(union Trapped_Args *args, void *pr_ctxt); +extern u32 mgrwrap_register_object(union Trapped_Args *args, void *pr_ctxt); +extern u32 mgrwrap_unregister_object(union Trapped_Args *args, void *pr_ctxt); +extern u32 mgrwrap_wait_for_bridge_events(union Trapped_Args *args, + void *pr_ctxt); + +extern u32 mgrwrap_get_process_resources_info(union Trapped_Args *args, + void *pr_ctxt); + +/* CPRC (Processor) wrapper Functions */ +extern u32 procwrap_attach(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_ctrl(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_detach(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_enum_resources(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_get_state(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_get_trace(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_load(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_register_notify(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_start(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_reserve_memory(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_un_reserve_memory(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_map(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_un_map(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_flush_memory(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_stop(union Trapped_Args *args, void *pr_ctxt); +extern u32 procwrap_invalidate_memory(union Trapped_Args *args, void *pr_ctxt); + +/* NODE wrapper functions */ +extern u32 nodewrap_allocate(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_alloc_msg_buf(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_change_priority(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_connect(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_create(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_delete(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_free_msg_buf(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_get_attr(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_get_message(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_pause(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_put_message(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_register_notify(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_run(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_terminate(union Trapped_Args *args, void *pr_ctxt); +extern u32 nodewrap_get_uuid_props(union Trapped_Args *args, void *pr_ctxt); + +/* STRM wrapper functions */ +extern u32 strmwrap_allocate_buffer(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_close(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_free_buffer(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_get_event_handle(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_get_info(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_idle(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_issue(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_open(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_reclaim(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_register_notify(union Trapped_Args *args, void *pr_ctxt); +extern u32 strmwrap_select(union Trapped_Args *args, void *pr_ctxt); + +extern u32 cmmwrap_calloc_buf(union Trapped_Args *args, void *pr_ctxt); +extern u32 cmmwrap_free_buf(union Trapped_Args *args, void *pr_ctxt); +extern u32 cmmwrap_get_handle(union Trapped_Args *args, void *pr_ctxt); +extern u32 cmmwrap_get_info(union Trapped_Args *args, void *pr_ctxt); + + +#endif /* DSPAPI_ */ diff --git a/drivers/dsp/bridge/pmgr/dspapi.c b/drivers/dsp/bridge/pmgr/dspapi.c index 1ac7e78..2274e21 100644 --- a/drivers/dsp/bridge/pmgr/dspapi.c +++ b/drivers/dsp/bridge/pmgr/dspapi.c @@ -53,7 +53,7 @@ #include <dspbridge/io.h> /* ----------------------------------- This */ -#include <dspbridge/_dcd.h> +#include <dspbridge/dspapi.h> #include <dspbridge/dbdcd.h> #include <dspbridge/resourcecleanup.h> diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 70e1a3a..bf1e562 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -46,7 +46,7 @@ /* ----------------------------------- Platform Manager */ #include <dspbridge/dspapi-ioctl.h> -#include <dspbridge/_dcd.h> +#include <dspbridge/dspapi.h> #include <dspbridge/dspdrv.h> /* ----------------------------------- Resource Manager */ diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c index 175582a..cbdfa73 100644 --- a/drivers/dsp/bridge/rmgr/dspdrv.c +++ b/drivers/dsp/bridge/rmgr/dspdrv.c @@ -34,7 +34,7 @@ /* ----------------------------------- Platform Manager */ #include <dspbridge/drv.h> #include <dspbridge/dev.h> -#include <dspbridge/_dcd.h> +#include <dspbridge/dspapi.h> /* ----------------------------------- Resource Manager */ #include <dspbridge/mgr.h> -- 1.7.0.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
