Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09f13304 authored by Rene Sapiens's avatar Rene Sapiens Committed by Omar Ramirez Luna
Browse files

staging: tidspbridge: set5 remove hungarian from structs 



hungarian notation will be removed from the elements inside
structures, the next varibles will be renamed:

Original:                Replacement:
pfn_dev_create           by dev_create
pfn_dev_destroy          dev_destroy
pfn_exit                 exit
pfn_get_fxn_addr         get_fxn_addr
pfn_init                 init
pfn_io_create            io_create
pfn_io_destroy           io_destroy
pfn_io_get_proc_load     io_get_proc_load
pfn_io_on_loaded         io_on_loaded
pfn_load                 load
pfn_msg_create           msg_create
pfn_msg_create_queue     msg_create_queue
pfn_msg_delete           msg_delete
pfn_msg_delete_queue     msg_delete_queue
pfn_msg_get              msg_get
pfn_msg_put              msg_put
pfn_msg_register_notify  msg_register_notify
pfn_msg_set_queue_id     msg_set_queue_id
pfn_ovly                 ovly
pfn_unload               unload

Signed-off-by: default avatarRene Sapiens <rene.sapiens@ti.com>
Signed-off-by: default avatarArmando Uribe <x0095078@ti.com>
Signed-off-by: default avatarOmar Ramirez Luna <omar.ramirez@ti.com>
parent e17ba7f2

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

+14 −14
Original line number Diff line number Diff line
@@ -975,8 +975,8 @@ typedef void (*fxn_msg_setqueueid) (struct msg_queue *msg_queue_obj, 
struct bridge_drv_interface {

	u32 brd_api_major_version;	/* Set to BRD_API_MAJOR_VERSION. */

	u32 brd_api_minor_version;	/* Set to BRD_API_MINOR_VERSION. */

	fxn_dev_create pfn_dev_create;	/* Create device context */

	fxn_dev_destroy pfn_dev_destroy;	/* Destroy device context */

	fxn_dev_create dev_create;	/* Create device context */

	fxn_dev_destroy dev_destroy;	/* Destroy device context */

	fxn_dev_ctrl dev_cntrl;	/* Optional vendor interface */

	fxn_brd_monitor brd_monitor;	/* Load and/or start monitor */

	fxn_brd_start brd_start;	/* Start DSP program. */
@@ -1003,23 +1003,23 @@ struct bridge_drv_interface { 
	fxn_chnl_idle chnl_idle;	/* Idle the channel */

	/* Register for notif. */

	fxn_chnl_registernotify chnl_register_notify;

	fxn_io_create pfn_io_create;	/* Create IO manager */

	fxn_io_destroy pfn_io_destroy;	/* Destroy IO manager */

	fxn_io_onloaded pfn_io_on_loaded;	/* Notify of program loaded */

	fxn_io_create io_create;	/* Create IO manager */

	fxn_io_destroy io_destroy;	/* Destroy IO manager */

	fxn_io_onloaded io_on_loaded;	/* Notify of program loaded */

	/* Get Processor's current and predicted load */

	fxn_io_getprocload pfn_io_get_proc_load;

	fxn_msg_create pfn_msg_create;	/* Create message manager */

	fxn_io_getprocload io_get_proc_load;

	fxn_msg_create msg_create;	/* Create message manager */

	/* Create message queue */

	fxn_msg_createqueue pfn_msg_create_queue;

	fxn_msg_delete pfn_msg_delete;	/* Delete message manager */

	fxn_msg_createqueue msg_create_queue;

	fxn_msg_delete msg_delete;	/* Delete message manager */

	/* Delete message queue */

	fxn_msg_deletequeue pfn_msg_delete_queue;

	fxn_msg_get pfn_msg_get;	/* Get a message */

	fxn_msg_put pfn_msg_put;	/* Send a message */

	fxn_msg_deletequeue msg_delete_queue;

	fxn_msg_get msg_get;	/* Get a message */

	fxn_msg_put msg_put;	/* Send a message */

	/* Register for notif. */

	fxn_msg_registernotify pfn_msg_register_notify;

	fxn_msg_registernotify msg_register_notify;

	/* Set message queue id */

	fxn_msg_setqueueid pfn_msg_set_queue_id;

	fxn_msg_setqueueid msg_set_queue_id;

};



/*

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

+6 −6
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ typedef u32(*nldr_writefxn) (void *priv_ref, 
 *  Attributes passed to nldr_create function.

 */

struct nldr_attrs {

	nldr_ovlyfxn pfn_ovly;

	nldr_ovlyfxn ovly;

	nldr_writefxn pfn_write;

	u16 us_dsp_word_size;

	u16 us_dsp_mau_size;
@@ -283,11 +283,11 @@ struct node_ldr_fxns { 
	nldr_allocatefxn allocate;

	nldr_createfxn create;

	nldr_deletefxn delete;

	nldr_exitfxn pfn_exit;

	nldr_getfxnaddrfxn pfn_get_fxn_addr;

	nldr_initfxn pfn_init;

	nldr_loadfxn pfn_load;

	nldr_unloadfxn pfn_unload;

	nldr_exitfxn exit;

	nldr_getfxnaddrfxn get_fxn_addr;

	nldr_initfxn init;

	nldr_loadfxn load;

	nldr_unloadfxn unload;

};



#endif /* NLDRDEFS_ */

drivers/staging/tidspbridge/pmgr/dev.c

+23 −23
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int dev_create_device(struct dev_object **device_obj, 


			/* Call fxn_dev_create() to get the Bridge's device

			 * context handle. */

			status = (dev_obj->bridge_interface.pfn_dev_create)

			status = (dev_obj->bridge_interface.dev_create)

			    (&dev_obj->hbridge_context, dev_obj,

			     host_res);

			/* Assert bridge_dev_create()'s ensure clause: */
@@ -382,7 +382,7 @@ int dev_destroy_device(struct dev_object *hdev_obj) 
		/* Call the driver's bridge_dev_destroy() function: */

		/* Require of DevDestroy */

		if (dev_obj->hbridge_context) {

			status = (*dev_obj->bridge_interface.pfn_dev_destroy)

			status = (*dev_obj->bridge_interface.dev_destroy)

			    (dev_obj->hbridge_context);

			dev_obj->hbridge_context = NULL;

		} else
@@ -1079,8 +1079,8 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns, 
	intf_fxns->brd_api_minor_version = drv_fxns->brd_api_minor_version;

	/* Install functions up to DSP API version .80 (first alpha): */

	if (bridge_version > 0) {

		STORE_FXN(fxn_dev_create, pfn_dev_create);

		STORE_FXN(fxn_dev_destroy, pfn_dev_destroy);

		STORE_FXN(fxn_dev_create, dev_create);

		STORE_FXN(fxn_dev_destroy, dev_destroy);

		STORE_FXN(fxn_dev_ctrl, dev_cntrl);

		STORE_FXN(fxn_brd_monitor, brd_monitor);

		STORE_FXN(fxn_brd_start, brd_start);
@@ -1105,23 +1105,23 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns, 
		STORE_FXN(fxn_chnl_getmgrinfo, chnl_get_mgr_info);

		STORE_FXN(fxn_chnl_idle, chnl_idle);

		STORE_FXN(fxn_chnl_registernotify, chnl_register_notify);

		STORE_FXN(fxn_io_create, pfn_io_create);

		STORE_FXN(fxn_io_destroy, pfn_io_destroy);

		STORE_FXN(fxn_io_onloaded, pfn_io_on_loaded);

		STORE_FXN(fxn_io_getprocload, pfn_io_get_proc_load);

		STORE_FXN(fxn_msg_create, pfn_msg_create);

		STORE_FXN(fxn_msg_createqueue, pfn_msg_create_queue);

		STORE_FXN(fxn_msg_delete, pfn_msg_delete);

		STORE_FXN(fxn_msg_deletequeue, pfn_msg_delete_queue);

		STORE_FXN(fxn_msg_get, pfn_msg_get);

		STORE_FXN(fxn_msg_put, pfn_msg_put);

		STORE_FXN(fxn_msg_registernotify, pfn_msg_register_notify);

		STORE_FXN(fxn_msg_setqueueid, pfn_msg_set_queue_id);

		STORE_FXN(fxn_io_create, io_create);

		STORE_FXN(fxn_io_destroy, io_destroy);

		STORE_FXN(fxn_io_onloaded, io_on_loaded);

		STORE_FXN(fxn_io_getprocload, io_get_proc_load);

		STORE_FXN(fxn_msg_create, msg_create);

		STORE_FXN(fxn_msg_createqueue, msg_create_queue);

		STORE_FXN(fxn_msg_delete, msg_delete);

		STORE_FXN(fxn_msg_deletequeue, msg_delete_queue);

		STORE_FXN(fxn_msg_get, msg_get);

		STORE_FXN(fxn_msg_put, msg_put);

		STORE_FXN(fxn_msg_registernotify, msg_register_notify);

		STORE_FXN(fxn_msg_setqueueid, msg_set_queue_id);

	}

	/* Add code for any additional functions in newerBridge versions here */

	/* Ensure postcondition: */

	DBC_ENSURE(intf_fxns->pfn_dev_create != NULL);

	DBC_ENSURE(intf_fxns->pfn_dev_destroy != NULL);

	DBC_ENSURE(intf_fxns->dev_create != NULL);

	DBC_ENSURE(intf_fxns->dev_destroy != NULL);

	DBC_ENSURE(intf_fxns->dev_cntrl != NULL);

	DBC_ENSURE(intf_fxns->brd_monitor != NULL);

	DBC_ENSURE(intf_fxns->brd_start != NULL);
@@ -1141,11 +1141,11 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns, 
	DBC_ENSURE(intf_fxns->chnl_get_mgr_info != NULL);

	DBC_ENSURE(intf_fxns->chnl_idle != NULL);

	DBC_ENSURE(intf_fxns->chnl_register_notify != NULL);

	DBC_ENSURE(intf_fxns->pfn_io_create != NULL);

	DBC_ENSURE(intf_fxns->pfn_io_destroy != NULL);

	DBC_ENSURE(intf_fxns->pfn_io_on_loaded != NULL);

	DBC_ENSURE(intf_fxns->pfn_io_get_proc_load != NULL);

	DBC_ENSURE(intf_fxns->pfn_msg_set_queue_id != NULL);

	DBC_ENSURE(intf_fxns->io_create != NULL);

	DBC_ENSURE(intf_fxns->io_destroy != NULL);

	DBC_ENSURE(intf_fxns->io_on_loaded != NULL);

	DBC_ENSURE(intf_fxns->io_get_proc_load != NULL);

	DBC_ENSURE(intf_fxns->msg_set_queue_id != NULL);



#undef  STORE_FXN

}

drivers/staging/tidspbridge/pmgr/io.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int io_create(struct io_mgr **io_man, struct dev_object *hdev_obj, 
		dev_get_intf_fxns(hdev_obj, &intf_fxns);



		/* Let Bridge channel module finish the create: */

		status = (*intf_fxns->pfn_io_create) (&hio_mgr, hdev_obj,

		status = (*intf_fxns->io_create) (&hio_mgr, hdev_obj,

						      mgr_attrts);



		if (!status) {
@@ -99,7 +99,7 @@ int io_destroy(struct io_mgr *hio_mgr) 
	intf_fxns = pio_mgr->intf_fxns;



	/* Let Bridge channel module destroy the io_mgr: */

	status = (*intf_fxns->pfn_io_destroy) (hio_mgr);

	status = (*intf_fxns->io_destroy) (hio_mgr);



	return status;

}

drivers/staging/tidspbridge/pmgr/msg.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int msg_create(struct msg_mgr **msg_man, 


	/* Let Bridge message module finish the create: */

	status =

	    (*intf_fxns->pfn_msg_create) (&hmsg_mgr, hdev_obj, msg_callback);

	    (*intf_fxns->msg_create) (&hmsg_mgr, hdev_obj, msg_callback);



	if (!status) {

		/* Fill in DSP API message module's fields of the msg_mgr
@@ -96,7 +96,7 @@ void msg_delete(struct msg_mgr *hmsg_mgr) 
		intf_fxns = msg_mgr_obj->intf_fxns;



		/* Let Bridge message module destroy the msg_mgr: */

		(*intf_fxns->pfn_msg_delete) (hmsg_mgr);

		(*intf_fxns->msg_delete) (hmsg_mgr);

	} else {

		dev_dbg(bridge, "%s: Error hmsg_mgr handle: %p\n",

			__func__, hmsg_mgr);