diff options
Diffstat (limited to 'drivers/staging/tidspbridge/include')
20 files changed, 1 insertions, 451 deletions
diff --git a/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h b/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h index 6e7ab4fd8c3..cc95a18f1db 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h @@ -99,14 +99,10 @@ struct shm { struct opp_rqst_struct opp_request; /* load monitor information structure */ struct load_mon_struct load_mon_info; -#ifdef CONFIG_TIDSPBRIDGE_WDT3 /* Flag for WDT enable/disable F/I clocks */ u32 wdt_setclocks; u32 wdt_overflow; /* WDT overflow time */ char dummy[176]; /* padding to 256 byte boundary */ -#else - char dummy[184]; /* padding to 256 byte boundary */ -#endif u32 shm_dbg_var[64]; /* shared memory debug variables */ }; diff --git a/drivers/staging/tidspbridge/include/dspbridge/chnl.h b/drivers/staging/tidspbridge/include/dspbridge/chnl.h index 92f6a13424f..9b018b1f9bf 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/chnl.h +++ b/drivers/staging/tidspbridge/include/dspbridge/chnl.h @@ -48,7 +48,6 @@ * -ECHRNG: This manager cannot handle this many channels. * -EEXIST: Channel manager already exists for this device. * Requires: - * chnl_init(void) called. * channel_mgr != NULL. * mgr_attrts != NULL. * Ensures: @@ -70,7 +69,6 @@ extern int chnl_create(struct chnl_mgr **channel_mgr, * 0: Success. * -EFAULT: hchnl_mgr was invalid. * Requires: - * chnl_init(void) called. * Ensures: * 0: Cancels I/O on each open channel. * Closes each open channel. @@ -79,31 +77,4 @@ extern int chnl_create(struct chnl_mgr **channel_mgr, */ extern int chnl_destroy(struct chnl_mgr *hchnl_mgr); -/* - * ======== chnl_exit ======== - * Purpose: - * Discontinue usage of the CHNL module. - * Parameters: - * Returns: - * Requires: - * chnl_init(void) previously called. - * Ensures: - * Resources, if any acquired in chnl_init(void), are freed when the last - * client of CHNL calls chnl_exit(void). - */ -extern void chnl_exit(void); - -/* - * ======== chnl_init ======== - * Purpose: - * Initialize the CHNL module's private state. - * Parameters: - * Returns: - * TRUE if initialized; FALSE if error occurred. - * Requires: - * Ensures: - * A requirement for each of the other public CHNL functions. - */ -extern bool chnl_init(void); - #endif /* CHNL_ */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/cmm.h b/drivers/staging/tidspbridge/include/dspbridge/cmm.h index aff22051cf5..c66bcf7ea90 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/cmm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/cmm.h @@ -79,7 +79,6 @@ extern void *cmm_calloc_buf(struct cmm_object *hcmm_mgr, * -EPERM: Failed to initialize critical sect sync object. * * Requires: - * cmm_init(void) called. * ph_cmm_mgr != NULL. * mgr_attrts->min_block_size >= 4 bytes. * Ensures: @@ -111,20 +110,6 @@ extern int cmm_create(struct cmm_object **ph_cmm_mgr, extern int cmm_destroy(struct cmm_object *hcmm_mgr, bool force); /* - * ======== cmm_exit ======== - * Purpose: - * Discontinue usage of module. Cleanup CMM module if CMM cRef reaches zero. - * Parameters: - * n/a - * Returns: - * n/a - * Requires: - * CMM is initialized. - * Ensures: - */ -extern void cmm_exit(void); - -/* * ======== cmm_free_buf ======== * Purpose: * Free the given buffer. @@ -185,19 +170,6 @@ extern int cmm_get_info(struct cmm_object *hcmm_mgr, struct cmm_info *cmm_info_obj); /* - * ======== cmm_init ======== - * Purpose: - * Initializes private state of CMM module. - * Parameters: - * Returns: - * TRUE if initialized; FALSE if error occurred. - * Requires: - * Ensures: - * CMM initialized. - */ -extern bool cmm_init(void); - -/* * ======== cmm_register_gppsm_seg ======== * Purpose: * Register a block of SM with the CMM. @@ -333,7 +305,6 @@ extern int cmm_xlator_free_buf(struct cmm_xlatorobject *xlator, * 0: Success. * -EFAULT: Bad translator handle. * Requires: - * (refs > 0) * (paddr != NULL) * (ul_size > 0) * Ensures: @@ -355,7 +326,6 @@ extern int cmm_xlator_info(struct cmm_xlatorobject *xlator, * Returns: * Valid address on success, else NULL. * Requires: - * refs > 0 * paddr != NULL * xtype >= CMM_VA2PA) && (xtype <= CMM_DSPPA2PA) * Ensures: diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h index cb684c11b30..ba2005d0242 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/cod.h +++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h @@ -100,21 +100,6 @@ extern int cod_create(struct cod_manager **mgr, extern void cod_delete(struct cod_manager *cod_mgr_obj); /* - * ======== cod_exit ======== - * Purpose: - * Discontinue usage of the COD module. - * Parameters: - * None. - * Returns: - * None. - * Requires: - * COD initialized. - * Ensures: - * Resources acquired in cod_init(void) are freed. - */ -extern void cod_exit(void); - -/* * ======== cod_get_base_lib ======== * Purpose: * Get handle to the base image DBL library. @@ -243,20 +228,6 @@ extern int cod_get_sym_value(struct cod_manager *cod_mgr_obj, char *str_sym, u32 * pul_value); /* - * ======== cod_init ======== - * Purpose: - * Initialize the COD module's private state. - * Parameters: - * None. - * Returns: - * TRUE if initialized; FALSE if error occurred. - * Requires: - * Ensures: - * A requirement for each of the other public COD functions. - */ -extern bool cod_init(void); - -/* * ======== cod_load_base ======== * Purpose: * Load the initial program image, optionally with command-line arguments, diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbc.h b/drivers/staging/tidspbridge/include/dspbridge/dbc.h deleted file mode 100644 index 463760f499a..00000000000 --- a/drivers/staging/tidspbridge/include/dspbridge/dbc.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * dbc.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * "Design by Contract" programming macros. - * - * Notes: - * Requires that the GT->ERROR function has been defaulted to a valid - * error handler for the given execution environment. - * - * Does not require that GT_init() be called. - * - * Copyright (C) 2008 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 DBC_ -#define DBC_ - -/* Assertion Macros: */ -#ifdef CONFIG_TIDSPBRIDGE_DEBUG - -#define DBC_ASSERT(exp) \ - if (!(exp)) \ - pr_err("%s, line %d: Assertion (" #exp ") failed.\n", \ - __FILE__, __LINE__) -#define DBC_REQUIRE DBC_ASSERT /* Function Precondition. */ -#define DBC_ENSURE DBC_ASSERT /* Function Postcondition. */ - -#else - -#define DBC_ASSERT(exp) {} -#define DBC_REQUIRE(exp) {} -#define DBC_ENSURE(exp) {} - -#endif /* DEBUG */ - -#endif /* DBC_ */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h index f92b4be0b41..fa2d79ef6cc 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/dev.h +++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h @@ -478,33 +478,6 @@ extern int dev_get_bridge_context(struct dev_object *hdev_obj, **phbridge_context); /* - * ======== dev_exit ======== - * Purpose: - * Decrement reference count, and free resources when reference count is - * 0. - * Parameters: - * Returns: - * Requires: - * DEV is initialized. - * Ensures: - * When reference count == 0, DEV's private resources are freed. - */ -extern void dev_exit(void); - -/* - * ======== dev_init ======== - * Purpose: - * Initialize DEV's private state, keeping a reference count on each call. - * Parameters: - * Returns: - * TRUE if initialized; FALSE if error occurred. - * Requires: - * Ensures: - * TRUE: A requirement for the other public DEV functions. - */ -extern bool dev_init(void); - -/* * ======== dev_insert_proc_object ======== * Purpose: * Inserts the Processor Object into the List of PROC Objects diff --git a/drivers/staging/tidspbridge/include/dspbridge/disp.h b/drivers/staging/tidspbridge/include/dspbridge/disp.h index 5dfdc8cfb93..39d3cea9ca8 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/disp.h +++ b/drivers/staging/tidspbridge/include/dspbridge/disp.h @@ -53,7 +53,6 @@ struct disp_attr { * -ENOMEM: Insufficient memory for requested resources. * -EPERM: Unable to create dispatcher. * Requires: - * disp_init(void) called. * disp_attrs != NULL. * hdev_obj != NULL. * dispatch_obj != NULL. @@ -73,7 +72,6 @@ extern int disp_create(struct disp_object **dispatch_obj, * disp_obj: Node Dispatcher object. * Returns: * Requires: - * disp_init(void) called. * Valid disp_obj. * Ensures: * disp_obj is invalid. @@ -81,31 +79,6 @@ extern int disp_create(struct disp_object **dispatch_obj, extern void disp_delete(struct disp_object *disp_obj); /* - * ======== disp_exit ======== - * Discontinue usage of DISP module. - * - * Parameters: - * Returns: - * Requires: - * disp_init(void) previously called. - * Ensures: - * Any resources acquired in disp_init(void) will be freed when last DISP - * client calls disp_exit(void). - */ -extern void disp_exit(void); - -/* - * ======== disp_init ======== - * Initialize the DISP module. - * - * Parameters: - * Returns: - * TRUE if initialization succeeded, FALSE otherwise. - * Ensures: - */ -extern bool disp_init(void); - -/* * ======== disp_node_change_priority ======== * Change the priority of a node currently running on the target. * @@ -120,7 +93,6 @@ extern bool disp_init(void); * 0: Success. * -ETIME: A timeout occurred before the DSP responded. * Requires: - * disp_init(void) called. * Valid disp_obj. * hnode != NULL. * Ensures: @@ -148,7 +120,6 @@ extern int disp_node_change_priority(struct disp_object * -ETIME: A timeout occurred before the DSP responded. * -EPERM: A failure occurred, unable to create node. * Requires: - * disp_init(void) called. * Valid disp_obj. * pargs != NULL. * hnode != NULL. @@ -178,7 +149,6 @@ extern int disp_node_create(struct disp_object *disp_obj, * 0: Success. * -ETIME: A timeout occurred before the DSP responded. * Requires: - * disp_init(void) called. * Valid disp_obj. * hnode != NULL. * Ensures: @@ -204,7 +174,6 @@ extern int disp_node_delete(struct disp_object *disp_obj, * 0: Success. * -ETIME: A timeout occurred before the DSP responded. * Requires: - * disp_init(void) called. * Valid disp_obj. * hnode != NULL. * Ensures: diff --git a/drivers/staging/tidspbridge/include/dspbridge/dmm.h b/drivers/staging/tidspbridge/include/dspbridge/dmm.h index 6c58335c5f6..c3487be8fcf 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/dmm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/dmm.h @@ -61,10 +61,6 @@ extern int dmm_create(struct dmm_object **dmm_manager, struct dev_object *hdev_obj, const struct dmm_mgrattrs *mgr_attrts); -extern bool dmm_init(void); - -extern void dmm_exit(void); - extern int dmm_create_tables(struct dmm_object *dmm_mgr, u32 addr, u32 size); diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h index 9cdbd955dce..b0c7708321b 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/drv.h +++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h @@ -199,17 +199,6 @@ extern int drv_create(struct drv_object **drv_obj); extern int drv_destroy(struct drv_object *driver_obj); /* - * ======== drv_exit ======== - * Purpose: - * Exit the DRV module, freeing any modules initialized in drv_init. - * Parameters: - * Returns: - * Requires: - * Ensures: - */ -extern void drv_exit(void); - -/* * ======== drv_get_first_dev_object ======== * Purpose: * Returns the Ptr to the FirstDev Object in the List @@ -294,18 +283,6 @@ extern u32 drv_get_next_dev_object(u32 hdev_obj); extern u32 drv_get_next_dev_extension(u32 dev_extension); /* - * ======== drv_init ======== - * Purpose: - * Initialize the DRV module. - * Parameters: - * Returns: - * TRUE if success; FALSE otherwise. - * Requires: - * Ensures: - */ -extern int drv_init(void); - -/* * ======== drv_insert_dev_object ======== * Purpose: * Insert a DeviceObject into the list of Driver object. diff --git a/drivers/staging/tidspbridge/include/dspbridge/gh.h b/drivers/staging/tidspbridge/include/dspbridge/gh.h index 9de291d1f56..da85079dbfb 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/gh.h +++ b/drivers/staging/tidspbridge/include/dspbridge/gh.h @@ -23,9 +23,7 @@ extern struct gh_t_hash_tab *gh_create(u16 max_bucket, u16 val_size, bool(*match) (void *, void *), void (*delete) (void *)); extern void gh_delete(struct gh_t_hash_tab *hash_tab); -extern void gh_exit(void); extern void *gh_find(struct gh_t_hash_tab *hash_tab, void *key); -extern void gh_init(void); extern void *gh_insert(struct gh_t_hash_tab *hash_tab, void *key, void *value); #ifdef CONFIG_TIDSPBRIDGE_BACKTRACE void gh_iterate(struct gh_t_hash_tab *hash_tab, diff --git a/drivers/staging/tidspbridge/include/dspbridge/io.h b/drivers/staging/tidspbridge/include/dspbridge/io.h index 500bbd71684..75057185690 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/io.h +++ b/drivers/staging/tidspbridge/include/dspbridge/io.h @@ -55,7 +55,6 @@ struct io_attrs { * -EINVAL: Invalid DSP word size (must be > 0). * Invalid base address for DSP communications. * Requires: - * io_init(void) called. * io_man != NULL. * mgr_attrts != NULL. * Ensures: @@ -74,36 +73,8 @@ extern int io_create(struct io_mgr **io_man, * 0: Success. * -EFAULT: hio_mgr was invalid. * Requires: - * io_init(void) called. * Ensures: */ extern int io_destroy(struct io_mgr *hio_mgr); -/* - * ======== io_exit ======== - * Purpose: - * Discontinue usage of the IO module. - * Parameters: - * Returns: - * Requires: - * io_init(void) previously called. - * Ensures: - * Resources, if any acquired in io_init(void), are freed when the last - * client of IO calls io_exit(void). - */ -extern void io_exit(void); - -/* - * ======== io_init ======== - * Purpose: - * Initialize the IO module's private state. - * Parameters: - * Returns: - * TRUE if initialized; FALSE if error occurred. - * Requires: - * Ensures: - * A requirement for each of the other public CHNL functions. - */ -extern bool io_init(void); - #endif /* CHNL_ */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h index a054dad2133..903ff12b14d 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h @@ -154,8 +154,6 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context); void dump_dl_modules(struct bridge_dev_context *bridge_context); -#endif -#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG) void print_dsp_debug_trace(struct io_mgr *hio_mgr); #endif diff --git a/drivers/staging/tidspbridge/include/dspbridge/msg.h b/drivers/staging/tidspbridge/include/dspbridge/msg.h index 95778bcb5aa..2c8712c933f 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/msg.h +++ b/drivers/staging/tidspbridge/include/dspbridge/msg.h @@ -34,7 +34,6 @@ * msg_callback: Called whenever an RMS_EXIT message is received. * Returns: * Requires: - * msg_mod_init(void) called. * msg_man != NULL. * hdev_obj != NULL. * msg_callback != NULL. @@ -52,35 +51,9 @@ extern int msg_create(struct msg_mgr **msg_man, * hmsg_mgr: Handle returned from msg_create(). * Returns: * Requires: - * msg_mod_init(void) called. * Valid hmsg_mgr. * Ensures: */ extern void msg_delete(struct msg_mgr *hmsg_mgr); -/* - * ======== msg_exit ======== - * Purpose: - * Discontinue usage of msg_ctrl module. - * Parameters: - * Returns: - * Requires: - * msg_mod_init(void) successfully called before. - * Ensures: - * Any resources acquired in msg_mod_init(void) will be freed when last - * msg_ctrl client calls msg_exit(void). - */ -extern void msg_exit(void); - -/* - * ======== msg_mod_init ======== - * Purpose: - * Initialize the msg_ctrl module. - * Parameters: - * Returns: - * TRUE if initialization succeeded, FALSE otherwise. - * Ensures: - */ -extern bool msg_mod_init(void); - #endif /* MSG_ */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldr.h b/drivers/staging/tidspbridge/include/dspbridge/nldr.h index d9653ee667e..c5e48ca6c54 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/nldr.h +++ b/drivers/staging/tidspbridge/include/dspbridge/nldr.h @@ -36,7 +36,6 @@ extern int nldr_create(struct nldr_object **nldr, const struct nldr_attrs *pattrs); extern void nldr_delete(struct nldr_object *nldr_obj); -extern void nldr_exit(void); extern int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, char *str_fxn, u32 * addr); @@ -44,7 +43,6 @@ extern int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, extern int nldr_get_rmm_manager(struct nldr_object *nldr, struct rmm_target_obj **rmm_mgr); -extern bool nldr_init(void); extern int nldr_load(struct nldr_nodeobject *nldr_node_obj, enum nldr_phase phase); extern int nldr_unload(struct nldr_nodeobject *nldr_node_obj, diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h index ee3a85f08fc..7e3c7f58b49 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h +++ b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h @@ -119,7 +119,6 @@ enum nldr_phase { * 0: Success. * -ENOMEM: Insufficient memory on GPP. * Requires: - * nldr_init(void) called. * Valid nldr_obj. * node_props != NULL. * nldr_nodeobj != NULL. @@ -148,7 +147,6 @@ typedef int(*nldr_allocatefxn) (struct nldr_object *nldr_obj, * 0: Success; * -ENOMEM: Insufficient memory for requested resources. * Requires: - * nldr_init(void) called. * nldr != NULL. * hdev_obj != NULL. * pattrs != NULL. @@ -168,7 +166,6 @@ typedef int(*nldr_createfxn) (struct nldr_object **nldr, * nldr_obj: Node manager object. * Returns: * Requires: - * nldr_init(void) called. * Valid nldr_obj. * Ensures: * nldr_obj invalid @@ -176,20 +173,6 @@ typedef int(*nldr_createfxn) (struct nldr_object **nldr, typedef void (*nldr_deletefxn) (struct nldr_object *nldr_obj); /* - * ======== nldr_exit ======== - * Discontinue usage of NLDR module. - * - * Parameters: - * Returns: - * Requires: - * nldr_init(void) successfully called before. - * Ensures: - * Any resources acquired in nldr_init(void) will be freed when last NLDR - * client calls nldr_exit(void). - */ -typedef void (*nldr_exitfxn) (void); - -/* * ======== NLDR_Free ======== * Free resources allocated in nldr_allocate. * @@ -197,7 +180,6 @@ typedef void (*nldr_exitfxn) (void); * nldr_node_obj: Handle returned from nldr_allocate(). * Returns: * Requires: - * nldr_init(void) called. * Valid nldr_node_obj. * Ensures: */ @@ -216,7 +198,6 @@ typedef void (*nldr_freefxn) (struct nldr_nodeobject *nldr_node_obj); * 0: Success. * -ESPIPE: Address of function not found. * Requires: - * nldr_init(void) called. * Valid nldr_node_obj. * addr != NULL; * str_fxn != NULL; @@ -227,17 +208,6 @@ typedef int(*nldr_getfxnaddrfxn) (struct nldr_nodeobject char *str_fxn, u32 * addr); /* - * ======== nldr_init ======== - * Initialize the NLDR module. - * - * Parameters: - * Returns: - * TRUE if initialization succeeded, FALSE otherwise. - * Ensures: - */ -typedef bool(*nldr_initfxn) (void); - -/* * ======== nldr_load ======== * Load create, delete, or execute phase function of a node on the DSP. * @@ -251,7 +221,6 @@ typedef bool(*nldr_initfxn) (void); * is already in use. * -EILSEQ: Failure in dynamic loader library. * Requires: - * nldr_init(void) called. * Valid nldr_node_obj. * Ensures: */ @@ -269,7 +238,6 @@ typedef int(*nldr_loadfxn) (struct nldr_nodeobject *nldr_node_obj, * 0: Success. * -ENOMEM: Insufficient memory on GPP. * Requires: - * nldr_init(void) called. * Valid nldr_node_obj. * Ensures: */ @@ -283,9 +251,7 @@ struct node_ldr_fxns { nldr_allocatefxn allocate; nldr_createfxn create; nldr_deletefxn delete; - nldr_exitfxn exit; nldr_getfxnaddrfxn get_fxn_addr; - nldr_initfxn init; nldr_loadfxn load; nldr_unloadfxn unload; }; diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h index 16371d818e3..7397b7a12f7 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/node.h +++ b/drivers/staging/tidspbridge/include/dspbridge/node.h @@ -47,7 +47,6 @@ * -EPERM: A failure occurred, unable to allocate node. * -EBADR: Proccessor is not in the running state. * Requires: - * node_init(void) called. * hprocessor != NULL. * node_uuid != NULL. * noderes != NULL. @@ -81,7 +80,6 @@ extern int node_allocate(struct proc_object *hprocessor, * -EPERM: General Failure. * -EINVAL: Invalid Size. * Requires: - * node_init(void) called. * pbuffer != NULL. * Ensures: */ @@ -106,7 +104,6 @@ extern int node_alloc_msg_buf(struct node_object *hnode, * or NODE_RUNNING state. * -ETIME: A timeout occurred before the DSP responded. * Requires: - * node_init(void) called. * Ensures: * 0 && (Node's current priority == prio) */ @@ -157,7 +154,6 @@ extern int node_change_priority(struct node_object *hnode, s32 prio); * Device node to device node, or device node to * GPP), the two nodes are on different DSPs. * Requires: - * node_init(void) called. * Ensures: */ extern int node_connect(struct node_object *node1, @@ -185,7 +181,6 @@ extern int node_connect(struct node_object *node1, * -ETIME: A timeout occurred before the DSP responded. * -EPERM: A failure occurred, unable to create node. * Requires: - * node_init(void) called. * Ensures: */ extern int node_create(struct node_object *hnode); @@ -206,7 +201,6 @@ extern int node_create(struct node_object *hnode); * -ENOMEM: Insufficient memory for requested resources. * -EPERM: General failure. * Requires: - * node_init(void) called. * node_man != NULL. * hdev_obj != NULL. * Ensures: @@ -234,7 +228,6 @@ extern int node_create_mgr(struct node_mgr **node_man, * -EPERM: A failure occurred in deleting the node. * -ESPIPE: Delete function not found in the COFF file. * Requires: - * node_init(void) called. * Ensures: * 0: hnode is invalid. */ @@ -250,7 +243,6 @@ extern int node_delete(struct node_res_object *noderes, * Returns: * 0: Success. * Requires: - * node_init(void) called. * Valid hnode_mgr. * Ensures: */ @@ -287,20 +279,6 @@ extern int node_enum_nodes(struct node_mgr *hnode_mgr, u32 *pu_allocated); /* - * ======== node_exit ======== - * Purpose: - * Discontinue usage of NODE module. - * Parameters: - * Returns: - * Requires: - * node_init(void) successfully called before. - * Ensures: - * Any resources acquired in node_init(void) will be freed when last NODE - * client calls node_exit(void). - */ -extern void node_exit(void); - -/* * ======== node_free_msg_buf ======== * Purpose: * Free a message buffer previously allocated with node_alloc_msg_buf. @@ -313,7 +291,6 @@ extern void node_exit(void); * -EFAULT: Invalid node handle. * -EPERM: Failure to free the buffer. * Requires: - * node_init(void) called. * pbuffer != NULL. * Ensures: */ @@ -336,7 +313,6 @@ extern int node_free_msg_buf(struct node_object *hnode, * 0: Success. * -EFAULT: Invalid hnode. * Requires: - * node_init(void) called. * pattr != NULL. * Ensures: * 0: *pattrs contains the node's current attributes. @@ -363,7 +339,6 @@ extern int node_get_attr(struct node_object *hnode, * Error occurred while trying to retrieve a message. * -ETIME: Timeout occurred and no message is available. * Requires: - * node_init(void) called. * message != NULL. * Ensures: */ @@ -386,17 +361,6 @@ extern int node_get_nldr_obj(struct node_mgr *hnode_mgr, struct nldr_object **nldr_ovlyobj); /* - * ======== node_init ======== - * Purpose: - * Initialize the NODE module. - * Parameters: - * Returns: - * TRUE if initialization succeeded, FALSE otherwise. - * Ensures: - */ -extern bool node_init(void); - -/* * ======== node_on_exit ======== * Purpose: * Gets called when RMS_EXIT is received for a node. PROC needs to pass @@ -425,7 +389,6 @@ void node_on_exit(struct node_object *hnode, s32 node_status); * -ETIME: A timeout occurred before the DSP responded. * DSP_EWRONGSTSATE: Node is not in NODE_RUNNING state. * Requires: - * node_init(void) called. * Ensures: */ extern int node_pause(struct node_object *hnode); @@ -449,7 +412,6 @@ extern int node_pause(struct node_object *hnode); * -ETIME: Timeout occurred before message could be set. * -EBADR: Node is in invalid state for sending messages. * Requires: - * node_init(void) called. * pmsg != NULL. * Ensures: */ @@ -473,7 +435,6 @@ extern int node_put_message(struct node_object *hnode, * -ENOSYS: Notification type specified by notify_type is not * supported. * Requires: - * node_init(void) called. * hnotification != NULL. * Ensures: */ @@ -500,7 +461,6 @@ extern int node_register_notify(struct node_object *hnode, * DSP_EWRONGSTSATE: Node is not in NODE_PAUSED or NODE_CREATED state. * -ESPIPE: Execute function not found in the COFF file. * Requires: - * node_init(void) called. * Ensures: */ extern int node_run(struct node_object *hnode); @@ -523,7 +483,6 @@ extern int node_run(struct node_object *hnode); * Unable to terminate the node. * -EBADR: Operation not valid for the current node state. * Requires: - * node_init(void) called. * pstatus != NULL. * Ensures: */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h b/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h index 9c1e06758c8..d5b54bb81e8 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h +++ b/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h @@ -96,7 +96,6 @@ struct node_createargs { * -EINVAL: The node's stream corresponding to index and dir * is not a stream to or from the host. * Requires: - * node_init(void) called. * Valid dir. * chan_id != NULL. * Ensures: diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h index f00dffd5198..a82380ebc04 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/proc.h +++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h @@ -189,20 +189,6 @@ extern int proc_get_resource_info(void *hprocessor, u32 resource_info_size); /* - * ======== proc_exit ======== - * Purpose: - * Decrement reference count, and free resources when reference count is - * 0. - * Parameters: - * Returns: - * Requires: - * PROC is initialized. - * Ensures: - * When reference count == 0, PROC's private resources are freed. - */ -extern void proc_exit(void); - -/* * ======== proc_get_dev_object ========= * Purpose: * Returns the DEV Hanlde for a given Processor handle @@ -223,20 +209,6 @@ extern int proc_get_dev_object(void *hprocessor, struct dev_object **device_obj); /* - * ======== proc_init ======== - * Purpose: - * Initialize PROC's private state, keeping a reference count on each - * call. - * Parameters: - * Returns: - * TRUE if initialized; FALSE if error occurred. - * Requires: - * Ensures: - * TRUE: A requirement for the other public PROC functions. - */ -extern bool proc_init(void); - -/* * ======== proc_get_state ======== * Purpose: * Report the state of the specified DSP processor. diff --git a/drivers/staging/tidspbridge/include/dspbridge/rmm.h b/drivers/staging/tidspbridge/include/dspbridge/rmm.h index baea536681e..f7a4dc8ecb4 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/rmm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/rmm.h @@ -115,18 +115,6 @@ extern int rmm_create(struct rmm_target_obj **target_obj, extern void rmm_delete(struct rmm_target_obj *target); /* - * ======== rmm_exit ======== - * Exit the RMM module - * - * Parameters: - * Returns: - * Requires: - * rmm_init successfully called. - * Ensures: - */ -extern void rmm_exit(void); - -/* * ======== rmm_free ======== * Free or unreserve memory allocated through rmm_alloc(). * @@ -148,19 +136,6 @@ extern bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size, bool reserved); /* - * ======== rmm_init ======== - * Initialize the RMM module - * - * Parameters: - * Returns: - * TRUE: Success. - * FALSE: Failure. - * Requires: - * Ensures: - */ -extern bool rmm_init(void); - -/* * ======== rmm_stat ======== * Obtain memory segment status * diff --git a/drivers/staging/tidspbridge/include/dspbridge/strm.h b/drivers/staging/tidspbridge/include/dspbridge/strm.h index 613fe53dd23..dacf0c234fd 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/strm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/strm.h @@ -40,7 +40,6 @@ * -EPERM: Failure occurred, unable to allocate buffers. * -EINVAL: usize must be > 0 bytes. * Requires: - * strm_init(void) called. * ap_buffer != NULL. * Ensures: */ @@ -63,7 +62,6 @@ extern int strm_allocate_buffer(struct strm_res_object *strmres, * been reclaimed. * -EPERM: Failure to close stream. * Requires: - * strm_init(void) called. * Ensures: */ extern int strm_close(struct strm_res_object *strmres, @@ -83,7 +81,6 @@ extern int strm_close(struct strm_res_object *strmres, * -ENOMEM: Insufficient memory for requested resources. * -EPERM: General failure. * Requires: - * strm_init(void) called. * strm_man != NULL. * dev_obj != NULL. * Ensures: @@ -101,7 +98,6 @@ extern int strm_create(struct strm_mgr **strm_man, * strm_mgr_obj: Handle to STRM manager object from strm_create. * Returns: * Requires: - * strm_init(void) called. * Valid strm_mgr_obj. * Ensures: * strm_mgr_obj is not valid. @@ -109,18 +105,6 @@ extern int strm_create(struct strm_mgr **strm_man, extern void strm_delete(struct strm_mgr *strm_mgr_obj); /* - * ======== strm_exit ======== - * Purpose: - * Discontinue usage of STRM module. - * Parameters: - * Returns: - * Requires: - * strm_init(void) successfully called before. - * Ensures: - */ -extern void strm_exit(void); - -/* * ======== strm_free_buffer ======== * Purpose: * Free buffer(s) allocated with strm_allocate_buffer. @@ -133,7 +117,6 @@ extern void strm_exit(void); * -EFAULT: Invalid stream handle. * -EPERM: Failure occurred, unable to free buffers. * Requires: - * strm_init(void) called. * ap_buffer != NULL. * Ensures: */ @@ -156,7 +139,6 @@ extern int strm_free_buffer(struct strm_res_object *strmres, * -EINVAL: stream_info_size < sizeof(dsp_streaminfo). * -EPERM: Unable to get stream info. * Requires: - * strm_init(void) called. * stream_info != NULL. * Ensures: */ @@ -184,24 +166,11 @@ extern int strm_get_info(struct strm_object *stream_obj, * -ETIME: A timeout occurred before the stream could be idled. * -EPERM: Unable to idle stream. * Requires: - * strm_init(void) called. * Ensures: */ extern int strm_idle(struct strm_object *stream_obj, bool flush_data); /* - * ======== strm_init ======== - * Purpose: - * Initialize the STRM module. - * Parameters: - * Returns: - * TRUE if initialization succeeded, FALSE otherwise. - * Requires: - * Ensures: - */ -extern bool strm_init(void); - -/* * ======== strm_issue ======== * Purpose: * Send a buffer of data to a stream. @@ -217,8 +186,7 @@ extern bool strm_init(void); * -ENOSR: The stream is full. * -EPERM: Failure occurred, unable to issue buffer. * Requires: - * strm_init(void) called. - * pbuf != NULL. +* pbuf != NULL. * Ensures: */ extern int strm_issue(struct strm_object *stream_obj, u8 * pbuf, @@ -244,7 +212,6 @@ extern int strm_issue(struct strm_object *stream_obj, u8 * pbuf, * Unable to open stream. * -EINVAL: Invalid index. * Requires: - * strm_init(void) called. * strmres != NULL. * pattr != NULL. * Ensures: @@ -275,7 +242,6 @@ extern int strm_open(struct node_object *hnode, u32 dir, * retrieved. * -EPERM: Failure occurred, unable to reclaim buffer. * Requires: - * strm_init(void) called. * buf_ptr != NULL. * nbytes != NULL. * pdw_arg != NULL. @@ -302,7 +268,6 @@ extern int strm_reclaim(struct strm_object *stream_obj, * -ENOSYS: Notification type specified by notify_type is not * supported. * Requires: - * strm_init(void) called. * hnotification != NULL. * Ensures: */ @@ -328,7 +293,6 @@ extern int strm_register_notify(struct strm_object *stream_obj, * -ETIME: A timeout occurred before a stream became ready. * -EPERM: Failure occurred, unable to select a stream. * Requires: - * strm_init(void) called. * strm_tab != NULL. * strms > 0. * pmask != NULL. |