---

yaml
---
r: 205864
b: refs/heads/master
c: 318b5df
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 383b834522b11eec607dbe422835dcf5812730c3
+refs/heads/master: 318b5df99bbbe58eb9f80105d9534117ac2f25ce

trunk/drivers/staging/tidspbridge/core/io_sm.c

@@ -1014,12 +1014,12 @@ void io_mbox_msg(u32 msg)
  *      interrupts the DSP.
  */
 void io_request_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
-			u8 io_mode, OUT u16 *pwMbVal)
+			u8 io_mode, OUT u16 *mbx_val)
 {
 	struct chnl_mgr *chnl_mgr_obj;
 	struct shm *sm;
 
-	if (!pchnl || !pwMbVal)
+	if (!pchnl || !mbx_val)
 		goto func_end;
 	chnl_mgr_obj = pio_mgr->hchnl_mgr;
 	sm = pio_mgr->shared_mem;
@@ -1033,7 +1033,7 @@ void io_request_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
 		/* Indicate to the DSP we have a buffer available for input */
 		IO_OR_VALUE(pio_mgr->hbridge_context, struct shm, sm,
 			    host_free_mask, (1 << pchnl->chnl_id));
-		*pwMbVal = MBX_PCPY_CLASS;
+		*mbx_val = MBX_PCPY_CLASS;
 	} else if (io_mode == IO_OUTPUT) {
 		/*
 		 * This assertion fails if CHNL_AddIOReq() was called on a

trunk/drivers/staging/tidspbridge/dynload/getsection.c

@@ -226,8 +226,8 @@ void *dload_module_open(struct dynamic_loader_stream *module,
  *
  * Parameters:
  *  minfo		Handle from dload_module_open for this module
- *	sectionName	Pointer to the string name of the section desired
- *	sectionInfo	Address of a section info structure pointer to be
+ *	section_name	Pointer to the string name of the section desired
+ *	section_info	Address of a section info structure pointer to be
  *			initialized
  *
  * Effect:
@@ -237,8 +237,8 @@ void *dload_module_open(struct dynamic_loader_stream *module,
  * Returns:
  *	true for success, false for section not found
  ************************************************************************* */
-int dload_get_section_info(void *minfo, const char *sectionName,
-			   const struct ldr_section_info **const sectionInfo)
+int dload_get_section_info(void *minfo, const char *section_name,
+			   const struct ldr_section_info **const section_info)
 {
 	struct dload_state *dlthis;
 	struct ldr_section_info *shp;
@@ -250,8 +250,8 @@ int dload_get_section_info(void *minfo, const char *sectionName,
 
 	for (sec = 0; sec < dlthis->dfile_hdr.df_no_scns; sec++) {
 		shp = DOFFSEC_IS_LDRSEC(&dlthis->sect_hdrs[sec]);
-		if (strcmp(sectionName, shp->name) == 0) {
-			*sectionInfo = shp;
+		if (strcmp(section_name, shp->name) == 0) {
+			*section_info = shp;
 			return true;
 		}
 	}
@@ -267,9 +267,9 @@ int dload_get_section_info(void *minfo, const char *sectionName,
  *
  * Parameters:
  *  minfo		Handle from dload_module_open for this module
- *	sectionInfo	Pointer to a section info structure for the desired
+ *	section_info	Pointer to a section info structure for the desired
  *			section
- *	sectionData	Buffer to contain the section initialized data
+ *	section_data	Buffer to contain the section initialized data
  *
  * Effect:
  *	Copies the initialized data for the specified section into the
@@ -279,8 +279,8 @@ int dload_get_section_info(void *minfo, const char *sectionName,
  *	true for success, false for section not found
  ************************************************************************* */
 int dload_get_section(void *minfo,
-		      const struct ldr_section_info *sectionInfo,
-		      void *sectionData)
+		      const struct ldr_section_info *section_info,
+		      void *section_data)
 {
 	struct dload_state *dlthis;
 	u32 pos;
@@ -289,12 +289,12 @@ int dload_get_section(void *minfo,
 	struct image_packet_t ipacket;
 	s32 ipsize;
 	u32 checks;
-	s8 *dest = (s8 *) sectionData;
+	s8 *dest = (s8 *) section_data;
 
 	dlthis = (struct dload_state *)minfo;
 	if (!dlthis)
 		return false;
-	sptr = LDRSEC_IS_DOFFSEC(sectionInfo);
+	sptr = LDRSEC_IS_DOFFSEC(section_info);
 	if (sptr == NULL)
 		return false;
 

trunk/drivers/staging/tidspbridge/include/dspbridge/cmm.h

@@ -209,17 +209,17 @@ extern bool cmm_init(void);
  *      c_factor:         Add offset if CMM_ADDTODSPPA, sub if CMM_SUBFROMDSPPA.
  *      dw_dsp_base:       DSP virtual base byte address.
  *      ul_dsp_size:       Size of DSP segment in bytes.
- *      pulSegId:        Address to store segment Id.
+ *      sgmt_id:         Address to store segment Id.
  *
  *  Returns:
  *      0:         Success.
  *      -EFAULT:     Invalid hcmm_mgr handle.
  *      -EINVAL: Invalid input argument.
  *      -EPERM:       Unable to register.
- *      - On success *pulSegId is a valid SM segment ID.
+ *      - On success *sgmt_id is a valid SM segment ID.
  *  Requires:
  *      ul_size > 0
- *      pulSegId != NULL
+ *      sgmt_id != NULL
  *      dw_gpp_base_pa != 0
  *      c_factor = CMM_ADDTODSPPA || c_factor = CMM_SUBFROMDSPPA
  *  Ensures:
@@ -232,7 +232,7 @@ extern int cmm_register_gppsm_seg(struct cmm_object *hcmm_mgr,
 					 s8 c_factor,
 					 unsigned int dw_dsp_base,
 					 u32 ul_dsp_size,
-					 u32 *pulSegId, u32 gpp_base_ba);
+					 u32 *sgmt_id, u32 gpp_base_ba);
 
 /*
  *  ======== cmm_un_register_gppsm_seg ========
@@ -261,18 +261,18 @@ extern int cmm_un_register_gppsm_seg(struct cmm_object *hcmm_mgr,
  *      Place on the descriptor on the translator's HaQ (Host Alloc'd Queue).
  *  Parameters:
  *      xlator:    Handle to a Xlator object.
- *      pVaBuf:     Virtual address ptr(client context)
+ *      va_buf:     Virtual address ptr(client context)
  *      uPaSize:    Size of SM memory to allocate.
  *  Returns:
  *      Ptr to valid physical address(Pa) of uPaSize bytes, NULL if failed.
  *  Requires:
- *      pVaBuf != 0.
+ *      va_buf != 0.
  *      uPaSize != 0.
  *  Ensures:
  *
  */
 extern void *cmm_xlator_alloc_buf(struct cmm_xlatorobject *xlator,
-				  void *pVaBuf, u32 uPaSize);
+				  void *va_buf, u32 uPaSize);
 
 /*
  *  ======== cmm_xlator_create ========
@@ -283,21 +283,21 @@ extern void *cmm_xlator_alloc_buf(struct cmm_xlatorobject *xlator,
  *  Parameters:
  *     xlator:         Address to place handle to a new Xlator handle.
  *     hcmm_mgr:        Handle to Cmm Mgr associated with this translator.
- *     pXlatorAttrs:   Translator attributes used for the client NODE or STREAM.
+ *     xlator_attrs:   Translator attributes used for the client NODE or STREAM.
  *  Returns:
  *     0:            Success.
  *     -EINVAL:    Bad input Attrs.
  *     -ENOMEM:   Insufficient memory(local) for requested resources.
  *  Requires:
  *     xlator != NULL
  *     hcmm_mgr != NULL
- *     pXlatorAttrs != NULL
+ *     xlator_attrs != NULL
  *  Ensures:
  *
  */
 extern int cmm_xlator_create(OUT struct cmm_xlatorobject **xlator,
 				    struct cmm_object *hcmm_mgr,
-				    struct cmm_xlatorattrs *pXlatorAttrs);
+				    struct cmm_xlatorattrs *xlator_attrs);
 
 /*
  *  ======== cmm_xlator_delete ========

trunk/drivers/staging/tidspbridge/include/dspbridge/cod.h

@@ -169,17 +169,17 @@ extern int cod_get_base_name(struct cod_manager *cod_mgr_obj,
  *      Retrieve the entry point of a loaded DSP program image
  *  Parameters:
  *      cod_mgr_obj:   handle of manager to be deleted
- *      pulEntry:   pointer to location for entry point
+ *      entry_pt:   pointer to location for entry point
  *  Returns:
  *      0:       Success.
  *  Requires:
  *      COD module initialized.
  *      valid cod_mgr_obj.
- *      pulEntry != NULL.
+ *      entry_pt != NULL.
  *  Ensures:
  */
 extern int cod_get_entry(struct cod_manager *cod_mgr_obj,
-				u32 *pulEntry);
+				u32 *entry_pt);
 
 /*
  *  ======== cod_get_loader ========
@@ -208,7 +208,7 @@ extern int cod_get_loader(struct cod_manager *cod_mgr_obj,
  *      lib         Library handle returned from cod_open().
  *      str_sect:   name of the section, with or without leading "."
  *      addr:       Location to store address.
- *      puLen:      Location to store length.
+ *      len:        Location to store length.
  *  Returns:
  *      0:                Success
  *      -ESPIPE:  Symbols could not be found or have not been loaded onto
@@ -218,16 +218,16 @@ extern int cod_get_loader(struct cod_manager *cod_mgr_obj,
  *      valid cod_mgr_obj.
  *      str_sect != NULL;
  *      addr != NULL;
- *      puLen != NULL;
+ *      len != NULL;
  *  Ensures:
- *      0:  *addr and *puLen contain the address and length of the
+ *      0:  *addr and *len contain the address and length of the
  *                 section.
- *      else:  *addr == 0 and *puLen == 0;
+ *      else:  *addr == 0 and *len == 0;
  *
  */
 extern int cod_get_section(struct cod_libraryobj *lib,
 				  IN char *str_sect,
-				  OUT u32 *addr, OUT u32 *puLen);
+				  OUT u32 *addr, OUT u32 *len);
 
 /*
  *  ======== cod_get_sym_value ========

trunk/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h

@@ -278,7 +278,7 @@ extern int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr,
  *      hdcd_mgr:                A DCD manager handle.
  *      sz_coff_path:           Pointer to name of COFF file containing DCD
  *                              objects.
- *      registerFxn:            Callback fxn to be applied on each located
+ *      register_fxn:           Callback fxn to be applied on each located
  *                              DCD object.
  *      handle:                 Handle to pass to callback.
  *  Returns:
@@ -296,7 +296,7 @@ extern int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr,
  */
 extern int dcd_get_objects(IN struct dcd_manager *hdcd_mgr,
 				  IN char *sz_coff_path,
-				  dcd_registerfxn registerFxn, void *handle);
+				  dcd_registerfxn register_fxn, void *handle);
 
 /*
  *  ======== dcd_init ========

trunk/drivers/staging/tidspbridge/include/dspbridge/dbll.h

@@ -43,7 +43,7 @@ extern int dbll_load(struct dbll_library_obj *lib,
 			    dbll_flags flags,
 			    struct dbll_attrs *attrs, u32 * entry);
 extern int dbll_load_sect(struct dbll_library_obj *lib,
-				 char *sectName, struct dbll_attrs *attrs);
+				 char *sec_name, struct dbll_attrs *attrs);
 extern int dbll_open(struct dbll_tar_obj *target, char *file,
 			    dbll_flags flags,
 		       struct dbll_library_obj **lib_obj);
@@ -53,7 +53,7 @@ extern void dbll_set_attrs(struct dbll_tar_obj *target,
 			   struct dbll_attrs *pattrs);
 extern void dbll_unload(struct dbll_library_obj *lib, struct dbll_attrs *attrs);
 extern int dbll_unload_sect(struct dbll_library_obj *lib,
-				   char *sectName, struct dbll_attrs *attrs);
+				   char *sect_name, struct dbll_attrs *attrs);
 #ifdef CONFIG_TIDSPBRIDGE_BACKTRACE
 bool dbll_find_dsp_symbol(struct dbll_library_obj *zl_lib, u32 address,
 		u32 offset_range, u32 *sym_addr_output, char *name_output);

trunk/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h

@@ -334,7 +334,7 @@ typedef bool(*dbll_init_fxn) (void);
  *      lib             - Library handle returned from dbll_open().
  *      flags           - Load code, data and/or symbols.
  *      attrs           - May contain alloc, free, and write function.
- *      pulEntry        - Location to store program entry on output.
+ *      entry_pt        - Location to store program entry on output.
  *  Returns:
  *      0:        Success.
  *      -EBADF:     File read failed.
@@ -354,15 +354,15 @@ typedef int(*dbll_load_fxn) (struct dbll_library_obj *lib,
  *  Load a named section from an library (for overlay support).
  *  Parameters:
  *      lib             - Handle returned from dbll_open().
- *      sectName        - Name of section to load.
+ *      sec_name        - Name of section to load.
  *      attrs           - Contains write function and handle to pass to it.
  *  Returns:
  *      0:        Success.
  *      -ENXIO:    Section not found.
  *      -ENOSYS:   Function not implemented.
  *  Requires:
  *      Valid lib.
- *      sectName != NULL.
+ *      sec_name != NULL.
  *      attrs != NULL.
  *      attrs->write != NULL.
  *  Ensures:
@@ -458,7 +458,7 @@ typedef void (*dbll_unload_fxn) (struct dbll_library_obj *library,
  *  Unload a named section from an library (for overlay support).
  *  Parameters:
  *      lib             - Handle returned from dbll_open().
- *      sectName        - Name of section to load.
+ *      sec_name        - Name of section to load.
  *      attrs           - Contains free() function and handle to pass to it.
  *  Returns:
  *      0:        Success.
@@ -467,7 +467,7 @@ typedef void (*dbll_unload_fxn) (struct dbll_library_obj *library,
  *  Requires:
  *      DBL initialized.
  *      Valid lib.
- *      sectName != NULL.
+ *      sec_name != NULL.
  *  Ensures:
  */
 typedef int(*dbll_unload_sect_fxn) (struct dbll_library_obj *lib,

trunk/drivers/staging/tidspbridge/include/dspbridge/drv.h

@@ -470,20 +470,20 @@ extern void *mem_alloc_phys_mem(IN u32 byte_size,
  *  Purpose:
  *      Free the given block of physically contiguous memory.
  *  Parameters:
- *      pVirtualAddress:  Pointer to virtual memory region allocated
+ *      virtual_address:  Pointer to virtual memory region allocated
  *      by mem_alloc_phys_mem().
  *      physical_address:  Pointer to physical memory region  allocated
  *      by mem_alloc_phys_mem().
  *      byte_size:  Size of the memory region allocated by mem_alloc_phys_mem().
  *  Returns:
  *  Requires:
  *      MEM initialized.
- *      pVirtualAddress is a valid memory address returned by
+ *      virtual_address is a valid memory address returned by
  *          mem_alloc_phys_mem()
  *  Ensures:
- *      pVirtualAddress is no longer a valid pointer to memory.
+ *      virtual_address is no longer a valid pointer to memory.
  */
-extern void mem_free_phys_mem(void *pVirtualAddress,
+extern void mem_free_phys_mem(void *virtual_address,
 			      u32 physical_address, u32 byte_size);
 
 /*

trunk/drivers/staging/tidspbridge/include/dspbridge/getsection.h

@@ -54,8 +54,8 @@ extern void *dload_module_open(struct dynamic_loader_stream
  *
  * Parameters:
  *  minfo       Handle from dload_module_open for this module
- *  sectionName Pointer to the string name of the section desired
- *  sectionInfo Address of a section info structure pointer to be initialized
+ *  section_name Pointer to the string name of the section desired
+ *  section_info Address of a section info structure pointer to be initialized
  *
  * Effect:
  *  Finds the specified section in the module information, and fills in
@@ -65,17 +65,17 @@ extern void *dload_module_open(struct dynamic_loader_stream
  *  TRUE for success, FALSE for section not found
  */
 extern int dload_get_section_info(void *minfo,
-				  const char *sectionName,
+				  const char *section_name,
 				  const struct ldr_section_info
-				  **const sectionInfo);
+				  **const section_info);
 
 /*
  * Procedure dload_get_section
  *
  * Parameters:
  *  minfo       Handle from dload_module_open for this module
- *  sectionInfo Pointer to a section info structure for the desired section
- *  sectionData Buffer to contain the section initialized data
+ *  section_info Pointer to a section info structure for the desired section
+ *  section_data Buffer to contain the section initialized data
  *
  * Effect:
  *  Copies the initialized data for the specified section into the
@@ -85,8 +85,8 @@ extern int dload_get_section_info(void *minfo,
  *  TRUE for success, FALSE for section not found
  */
 extern int dload_get_section(void *minfo,
-			     const struct ldr_section_info *sectionInfo,
-			     void *sectionData);
+			     const struct ldr_section_info *section_info,
+			     void *section_data);
 
 /*
  * Procedure dload_module_close