Commit 383b8345 authored by Rene Sapiens's avatar Rene Sapiens Committed by Greg Kroah-Hartman
Browse files

staging: ti dspbridge: Rename words with camel case 



The intention of this patch is to rename the remaining variables with camel
case. Variables will be renamed avoiding camel case and Hungarian notation.
The words to be renamed in this patch are:
========================================
pstrFxn to str_fxn
pstrLibName to str_lib_name
pstrSect to str_sect
pstrSym to str_sym
pstrZLFileName to str_zl_file_name
pstrZLFile to str_zl_file
pszCoffPath to sz_coff_path
pszMode to sz_mode
pszName to sz_name
pszSectName to sz_sect_name
pszUuid to sz_uuid
pszZlDllName to sz_zl_dll_name
puAddr to addr
pulAddr to addr
pulBufSize to buff_size
pulBytes to nbytes
========================================

Signed-off-by: default avatarRene Sapiens <rene.sapiens@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 13b18c29

drivers/staging/tidspbridge/gen/uuidutil.c

+20 −20
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ 
 *      Note: snprintf format specifier is:

 *      %[flags] [width] [.precision] [{h | l | I64 | L}]type

 */

void uuid_uuid_to_string(IN struct dsp_uuid *uuid_obj, OUT char *pszUuid,

void uuid_uuid_to_string(IN struct dsp_uuid *uuid_obj, OUT char *sz_uuid,

			 IN s32 size)

{

	s32 i;			/* return result from snprintf. */



	DBC_REQUIRE(uuid_obj && pszUuid);

	DBC_REQUIRE(uuid_obj && sz_uuid);



	i = snprintf(pszUuid, size,

	i = snprintf(sz_uuid, size,

		     "%.8X_%.4X_%.4X_%.2X%.2X_%.2X%.2X%.2X%.2X%.2X%.2X",

		     uuid_obj->ul_data1, uuid_obj->us_data2, uuid_obj->us_data3,

		     uuid_obj->uc_data4, uuid_obj->uc_data5,
@@ -75,39 +75,39 @@ static s32 uuid_hex_to_bin(char *buf, s32 len) 
 *  Purpose:

 *      Converts a string to a struct dsp_uuid.

 */

void uuid_uuid_from_string(IN char *pszUuid, OUT struct dsp_uuid *uuid_obj)

void uuid_uuid_from_string(IN char *sz_uuid, OUT struct dsp_uuid *uuid_obj)

{

	s32 j;



	uuid_obj->ul_data1 = uuid_hex_to_bin(pszUuid, 8);

	pszUuid += 8;

	uuid_obj->ul_data1 = uuid_hex_to_bin(sz_uuid, 8);

	sz_uuid += 8;



	/* Step over underscore */

	pszUuid++;

	sz_uuid++;



	uuid_obj->us_data2 = (u16) uuid_hex_to_bin(pszUuid, 4);

	pszUuid += 4;

	uuid_obj->us_data2 = (u16) uuid_hex_to_bin(sz_uuid, 4);

	sz_uuid += 4;



	/* Step over underscore */

	pszUuid++;

	sz_uuid++;



	uuid_obj->us_data3 = (u16) uuid_hex_to_bin(pszUuid, 4);

	pszUuid += 4;

	uuid_obj->us_data3 = (u16) uuid_hex_to_bin(sz_uuid, 4);

	sz_uuid += 4;



	/* Step over underscore */

	pszUuid++;

	sz_uuid++;



	uuid_obj->uc_data4 = (u8) uuid_hex_to_bin(pszUuid, 2);

	pszUuid += 2;

	uuid_obj->uc_data4 = (u8) uuid_hex_to_bin(sz_uuid, 2);

	sz_uuid += 2;



	uuid_obj->uc_data5 = (u8) uuid_hex_to_bin(pszUuid, 2);

	pszUuid += 2;

	uuid_obj->uc_data5 = (u8) uuid_hex_to_bin(sz_uuid, 2);

	sz_uuid += 2;



	/* Step over underscore */

	pszUuid++;

	sz_uuid++;



	for (j = 0; j < 6; j++) {

		uuid_obj->uc_data6[j] = (u8) uuid_hex_to_bin(pszUuid, 2);

		pszUuid += 2;

		uuid_obj->uc_data6[j] = (u8) uuid_hex_to_bin(sz_uuid, 2);

		sz_uuid += 2;

	}

}

drivers/staging/tidspbridge/include/dspbridge/cfg.h

+4 −4
Original line number Diff line number Diff line
@@ -155,20 +155,20 @@ extern void cfg_get_perf_value(OUT bool *enable_perf); 
 *  Parameters:

 *      dev_node_obj: Handle to the dev_node who's driver we are querying.

 *      buf_size:       Size of buffer.

 *      pstrZLFileName: Ptr to character buf to hold ZLFileName.

 *      str_zl_file_name: Ptr to character buf to hold ZLFileName.

 *  Returns:

 *      0:                Success.

 *      -EFAULT: pstrZLFileName is invalid or dev_node_obj is invalid.

 *      -EFAULT: str_zl_file_name is invalid or dev_node_obj is invalid.

 *      -ENODATA: couldn't find the ZLFileName.

 *  Requires:

 *      CFG initialized.

 *  Ensures:

 *      0:    Not more than buf_size bytes were copied into

 *                  pstrZLFileName, and *pstrZLFileName contains ZLFileName

 *                  str_zl_file_name, and *str_zl_file_name contains ZLFileName

 *                  for this devnode.

 */

extern int cfg_get_zl_file(IN struct cfg_devnode *dev_node_obj,

				  IN u32 buf_size, OUT char *pstrZLFileName);

				  IN u32 buf_size, OUT char *str_zl_file_name);



/*

 *  ======== cfg_init ========

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

+25 −25
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ extern void cod_close(struct cod_libraryobj *lib); 
 *      using the cod_get_sym_value() function.

 *  Parameters:

 *      manager:        created manager object

 *      pstrZLFile:     ZL DLL filename, of length < COD_MAXPATHLENGTH.

 *      str_zl_file:    ZL DLL filename, of length < COD_MAXPATHLENGTH.

 *      attrs:          attributes to be used by this object. A NULL value

 *                      will cause default attrs to be used.

 *  Returns:
@@ -88,11 +88,11 @@ extern void cod_close(struct cod_libraryobj *lib); 
 *                              non default values of attrs.

 *  Requires:

 *      COD module initialized.

 *      pstrZLFile != NULL

 *      str_zl_file != NULL

 *  Ensures:

 */

extern int cod_create(OUT struct cod_manager **manager,

			     char *pstrZLFile,

			     char *str_zl_file,

			     IN OPTIONAL CONST struct cod_attrs *attrs);



/*
@@ -149,7 +149,7 @@ extern int cod_get_base_lib(struct cod_manager *cod_mgr_obj, 
 *      Get the name of the base image DBL library.

 *  Parameters:

 *      cod_mgr_obj:   handle of manager to be deleted

 *      pszName:    location to store library name on output.

 *      sz_name:    location to store library name on output.

 *      usize:       size of name buffer.

 *  Returns:

 *      0:    Success.
@@ -157,11 +157,11 @@ extern int cod_get_base_lib(struct cod_manager *cod_mgr_obj, 
 *  Requires:

 *      COD module initialized.

 *      valid cod_mgr_obj.

 *      pszName != NULL.

 *      sz_name != NULL.

 *  Ensures:

 */

extern int cod_get_base_name(struct cod_manager *cod_mgr_obj,

				    char *pszName, u32 usize);

				    char *sz_name, u32 usize);



/*

 *  ======== cod_get_entry ========
@@ -206,8 +206,8 @@ extern int cod_get_loader(struct cod_manager *cod_mgr_obj, 
 *      given the section name.

 *  Parameters:

 *      lib         Library handle returned from cod_open().

 *      pstrSect:   name of the section, with or without leading "."

 *      puAddr:     Location to store address.

 *      str_sect:   name of the section, with or without leading "."

 *      addr:       Location to store address.

 *      puLen:      Location to store length.

 *  Returns:

 *      0:                Success
@@ -216,18 +216,18 @@ extern int cod_get_loader(struct cod_manager *cod_mgr_obj, 
 *  Requires:

 *      COD module initialized.

 *      valid cod_mgr_obj.

 *      pstrSect != NULL;

 *      puAddr != NULL;

 *      str_sect != NULL;

 *      addr != NULL;

 *      puLen != NULL;

 *  Ensures:

 *      0:  *puAddr and *puLen contain the address and length of the

 *      0:  *addr and *puLen contain the address and length of the

 *                 section.

 *      else:  *puAddr == 0 and *puLen == 0;

 *      else:  *addr == 0 and *puLen == 0;

 *

 */

extern int cod_get_section(struct cod_libraryobj *lib,

				  IN char *pstrSect,

				  OUT u32 *puAddr, OUT u32 *puLen);

				  IN char *str_sect,

				  OUT u32 *addr, OUT u32 *puLen);



/*

 *  ======== cod_get_sym_value ========
@@ -246,12 +246,12 @@ extern int cod_get_section(struct cod_libraryobj *lib, 
 *  Requires:

 *      COD module initialized.

 *      Valid cod_mgr_obj.

 *      pstrSym != NULL.

 *      str_sym != NULL.

 *      pul_value != NULL.

 *  Ensures:

 */

extern int cod_get_sym_value(struct cod_manager *cod_mgr_obj,

				    IN char *pstrSym, OUT u32 * pul_value);

				    IN char *str_sym, OUT u32 * pul_value);



/*

 *  ======== cod_init ========
@@ -304,7 +304,7 @@ extern int cod_load_base(struct cod_manager *cod_mgr_obj, 
 *      Open a library for reading sections. Does not load or set the base.

 *  Parameters:

 *      hmgr:           manager to load the code with

 *      pszCoffPath:    Coff file to open.

 *      sz_coff_path:   Coff file to open.

 *      flags:          COD_NOLOAD (don't load symbols) or COD_SYMB (load

 *                      symbols).

 *      lib_obj:        Handle returned that can be used in calls to cod_close
@@ -316,11 +316,11 @@ extern int cod_load_base(struct cod_manager *cod_mgr_obj, 
 *      COD module initialized.

 *      hmgr is valid.

 *      flags == COD_NOLOAD || flags == COD_SYMB.

 *      pszCoffPath != NULL.

 *      sz_coff_path != NULL.

 *  Ensures:

 */

extern int cod_open(struct cod_manager *hmgr,

			   IN char *pszCoffPath,

			   IN char *sz_coff_path,

			   u32 flags, OUT struct cod_libraryobj **lib_obj);



/*
@@ -329,7 +329,7 @@ extern int cod_open(struct cod_manager *hmgr, 
 *      Open base image for reading sections. Does not load the base.

 *  Parameters:

 *      hmgr:           manager to load the code with

 *      pszCoffPath:    Coff file to open.

 *      sz_coff_path:   Coff file to open.

 *      flags:          Specifies whether to load symbols.

 *  Returns:

 *      0:            Success.
@@ -337,10 +337,10 @@ extern int cod_open(struct cod_manager *hmgr, 
 *  Requires:

 *      COD module initialized.

 *      hmgr is valid.

 *      pszCoffPath != NULL.

 *      sz_coff_path != NULL.

 *  Ensures:

 */

extern int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath,

extern int cod_open_base(struct cod_manager *hmgr, IN char *sz_coff_path,

				dbll_flags flags);



/*
@@ -349,7 +349,7 @@ extern int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath, 
 *      Retrieve the content of a code section given the section name.

 *  Parameters:

 *      cod_mgr_obj    - manager in which to search for the symbol

 *      pstrSect    - name of the section, with or without leading "."

 *      str_sect    - name of the section, with or without leading "."

 *      str_content - buffer to store content of the section.

 *  Returns:

 *      0: on success, error code on failure
@@ -357,13 +357,13 @@ extern int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath, 
 *  Requires:

 *      COD module initialized.

 *      valid cod_mgr_obj.

 *      pstrSect != NULL;

 *      str_sect != NULL;

 *      str_content != NULL;

 *  Ensures:

 *      0:  *str_content stores the content of the named section.

 */

extern int cod_read_section(struct cod_libraryobj *lib,

				   IN char *pstrSect,

				   IN char *str_sect,

				   OUT char *str_content, IN u32 content_size);



#endif /* COD_ */

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

+12 −12
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
 *      special COFF section called ".dcd_register"

 *  Parameters:

 *      hdcd_mgr:                A DCD manager handle.

 *      pszCoffPath:            Pointer to name of COFF file containing DCD

 *      sz_coff_path:           Pointer to name of COFF file containing DCD

 *                              objects to be registered.

 *  Returns:

 *      0:                Success.
@@ -45,7 +45,7 @@ 
 *      ".dcd_register", which is used for auto registration.

 */

extern int dcd_auto_register(IN struct dcd_manager *hdcd_mgr,

				    IN char *pszCoffPath);

				    IN char *sz_coff_path);



/*

 *  ======== dcd_auto_unregister ========
@@ -54,7 +54,7 @@ extern int dcd_auto_register(IN struct dcd_manager *hdcd_mgr, 
 *      special COFF section called ".dcd_register"

 *  Parameters:

 *      hdcd_mgr:                A DCD manager handle.

 *      pszCoffPath:            Pointer to name of COFF file containing

 *      sz_coff_path:           Pointer to name of COFF file containing

 *                              DCD objects to be unregistered.

 *  Returns:

 *      0:                Success.
@@ -69,14 +69,14 @@ extern int dcd_auto_register(IN struct dcd_manager *hdcd_mgr, 
 *      ".dcd_register", which is used for auto unregistration.

 */

extern int dcd_auto_unregister(IN struct dcd_manager *hdcd_mgr,

				      IN char *pszCoffPath);

				      IN char *sz_coff_path);



/*

 *  ======== dcd_create_manager ========

 *  Purpose:

 *      This function creates a DCD module manager.

 *  Parameters:

 *      pszZlDllName:   Pointer to a DLL name string.

 *      sz_zl_dll_name: Pointer to a DLL name string.

 *      dcd_mgr:        A pointer to a DCD manager handle.

 *  Returns:

 *      0:        Success.
@@ -84,12 +84,12 @@ extern int dcd_auto_unregister(IN struct dcd_manager *hdcd_mgr, 
 *      -EPERM:      General failure.

 *  Requires:

 *      DCD initialized.

 *      pszZlDllName is non-NULL.

 *      sz_zl_dll_name is non-NULL.

 *      dcd_mgr is non-NULL.

 *  Ensures:

 *      A DCD manager handle is created.

 */

extern int dcd_create_manager(IN char *pszZlDllName,

extern int dcd_create_manager(IN char *sz_zl_dll_name,

				     OUT struct dcd_manager **dcd_mgr);



/*
@@ -214,7 +214,7 @@ extern int dcd_get_num_dep_libs(IN struct dcd_manager *hdcd_mgr, 
 *      hdcd_mgr: A DCD manager handle.

 *      uuid_obj:	Pointer to a dsp_uuid that represents a unique DSP/BIOS

 *                      Bridge object.

 *      pstrLibName: Buffer to hold library name.

 *      str_lib_name: Buffer to hold library name.

 *      buff_size: Contains buffer size. Set to string size on output.

 *      phase:          Which phase to load

 *      phase_split:    Are phases in multiple libraries
@@ -224,14 +224,14 @@ extern int dcd_get_num_dep_libs(IN struct dcd_manager *hdcd_mgr, 
 *  Requires:

 *      DCD initialized.

 *      Valid hdcd_mgr.

 *      pstrLibName != NULL.

 *      str_lib_name != NULL.

 *      uuid_obj != NULL

 *      buff_size != NULL.

 *  Ensures:

 */

extern int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr,

				       IN struct dsp_uuid *uuid_obj,

				       IN OUT char *pstrLibName,

				       IN OUT char *str_lib_name,

				       IN OUT u32 *buff_size,

				       IN enum nldr_phase phase,

				       OUT bool *phase_split);
@@ -276,7 +276,7 @@ extern int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr, 
 *      unregister nodes from the node database, and 3) add overlay nodes.

 *  Parameters:

 *      hdcd_mgr:                A DCD manager handle.

 *      pszCoffPath:            Pointer to name of COFF file containing DCD

 *      sz_coff_path:           Pointer to name of COFF file containing DCD

 *                              objects.

 *      registerFxn:            Callback fxn to be applied on each located

 *                              DCD object.
@@ -295,7 +295,7 @@ extern int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr, 
 *      ".dcd_register", which is used for auto registration.

 */

extern int dcd_get_objects(IN struct dcd_manager *hdcd_mgr,

				  IN char *pszCoffPath,

				  IN char *sz_coff_path,

				  dcd_registerfxn registerFxn, void *handle);



/*

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

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ typedef int(*dbll_load_fxn) (struct dbll_library_obj *lib, 
 *  Ensures:

 */

typedef int(*dbll_load_sect_fxn) (struct dbll_library_obj *lib,

					 char *pszSectName,

					 char *sz_sect_name,

					 struct dbll_attrs *attrs);



/*
@@ -471,7 +471,7 @@ typedef void (*dbll_unload_fxn) (struct dbll_library_obj *library, 
 *  Ensures:

 */

typedef int(*dbll_unload_sect_fxn) (struct dbll_library_obj *lib,

					   char *pszSectName,

					   char *sz_sect_name,

					   struct dbll_attrs *attrs);



struct dbll_fxns {