diff options
author | Rene Sapiens <rene.sapiens@ti.com> | 2011-01-17 22:19:03 -0500 |
---|---|---|
committer | Omar Ramirez Luna <omar.ramirez@ti.com> | 2011-02-04 21:12:07 -0500 |
commit | b4da7fc381c51d42c231f97de912b89dbabe8928 (patch) | |
tree | bb34871696f7b51faf209c711a884cfa173cee45 /drivers/staging/tidspbridge/rmgr | |
parent | 92d0293038e49151367e38f751f327c8f2c066f6 (diff) |
staging: tidspbridge: set1 remove hungarian from structs
hungarian notation will be removed from the elements inside
structures, the next varibles will be renamed:
dw_api_reg_base api_reg_base
dw_brd_state brd_state
dw_chnl_buf_size chnl_buf_size
dw_chnl_offset chnl_offset
dw_cmd cmd
dw_core_pm_base core_pm_base
dw_dsp_base dsp_base
dw_dsp_base_va dsp_base_va
dw_dsp_bufs dsp_bufs
dw_dsp_buf_size dsp_buf_size
dw_dsp_clk_m2_base dsp_clk_m2_base
dw_dsp_ext_base_addr dsp_ext_base_addr
dw_dsp_phys_addr_offset dsp_phys_addr_offset
dw_dsp_start_add dsp_start_add
dw_err_mask err_mask
dw_gpp_base_pa gpp_base_pa
dw_api_clk_base api_clk_base
dw_api_reg_base api_reg_base
dw_arg arg
dw_arg1 arg1
dw_arg2 arg2
dw_chnl_buf_size chnl_buf_size
Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Armando Uribe <x0095078@ti.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr')
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/drv.c | 10 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/node.c | 28 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/strm.c | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c index e0fc8956a96..2e7330272b1 100644 --- a/drivers/staging/tidspbridge/rmgr/drv.c +++ b/drivers/staging/tidspbridge/rmgr/drv.c | |||
@@ -699,10 +699,10 @@ static int request_bridge_resources(struct cfg_hostres *res) | |||
699 | host_res->birq_registers = 0; | 699 | host_res->birq_registers = 0; |
700 | host_res->birq_attrib = 0; | 700 | host_res->birq_attrib = 0; |
701 | host_res->dw_offset_for_monitor = 0; | 701 | host_res->dw_offset_for_monitor = 0; |
702 | host_res->dw_chnl_offset = 0; | 702 | host_res->chnl_offset = 0; |
703 | /* CHNL_MAXCHANNELS */ | 703 | /* CHNL_MAXCHANNELS */ |
704 | host_res->dw_num_chnls = CHNL_MAXCHANNELS; | 704 | host_res->dw_num_chnls = CHNL_MAXCHANNELS; |
705 | host_res->dw_chnl_buf_size = 0x400; | 705 | host_res->chnl_buf_size = 0x400; |
706 | 706 | ||
707 | return 0; | 707 | return 0; |
708 | } | 708 | } |
@@ -741,7 +741,7 @@ int drv_request_bridge_res_dsp(void **phost_resources) | |||
741 | OMAP_PER_CM_SIZE); | 741 | OMAP_PER_CM_SIZE); |
742 | host_res->dw_per_pm_base = (u32) ioremap(OMAP_PER_PRM_BASE, | 742 | host_res->dw_per_pm_base = (u32) ioremap(OMAP_PER_PRM_BASE, |
743 | OMAP_PER_PRM_SIZE); | 743 | OMAP_PER_PRM_SIZE); |
744 | host_res->dw_core_pm_base = (u32) ioremap(OMAP_CORE_PRM_BASE, | 744 | host_res->core_pm_base = (u32) ioremap(OMAP_CORE_PRM_BASE, |
745 | OMAP_CORE_PRM_SIZE); | 745 | OMAP_CORE_PRM_SIZE); |
746 | host_res->dw_dmmu_base = ioremap(OMAP_DMMU_BASE, | 746 | host_res->dw_dmmu_base = ioremap(OMAP_DMMU_BASE, |
747 | OMAP_DMMU_SIZE); | 747 | OMAP_DMMU_SIZE); |
@@ -783,10 +783,10 @@ int drv_request_bridge_res_dsp(void **phost_resources) | |||
783 | host_res->birq_registers = 0; | 783 | host_res->birq_registers = 0; |
784 | host_res->birq_attrib = 0; | 784 | host_res->birq_attrib = 0; |
785 | host_res->dw_offset_for_monitor = 0; | 785 | host_res->dw_offset_for_monitor = 0; |
786 | host_res->dw_chnl_offset = 0; | 786 | host_res->chnl_offset = 0; |
787 | /* CHNL_MAXCHANNELS */ | 787 | /* CHNL_MAXCHANNELS */ |
788 | host_res->dw_num_chnls = CHNL_MAXCHANNELS; | 788 | host_res->dw_num_chnls = CHNL_MAXCHANNELS; |
789 | host_res->dw_chnl_buf_size = 0x400; | 789 | host_res->chnl_buf_size = 0x400; |
790 | dw_buff_size = sizeof(struct cfg_hostres); | 790 | dw_buff_size = sizeof(struct cfg_hostres); |
791 | } | 791 | } |
792 | *phost_resources = host_res; | 792 | *phost_resources = host_res; |
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 27af99d512d..5a045c75c56 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c | |||
@@ -1795,12 +1795,12 @@ int node_get_message(struct node_object *hnode, | |||
1795 | status = | 1795 | status = |
1796 | (*intf_fxns->pfn_msg_get) (hnode->msg_queue_obj, message, utimeout); | 1796 | (*intf_fxns->pfn_msg_get) (hnode->msg_queue_obj, message, utimeout); |
1797 | /* Check if message contains SM descriptor */ | 1797 | /* Check if message contains SM descriptor */ |
1798 | if (status || !(message->dw_cmd & DSP_RMSBUFDESC)) | 1798 | if (status || !(message->cmd & DSP_RMSBUFDESC)) |
1799 | goto func_end; | 1799 | goto func_end; |
1800 | 1800 | ||
1801 | /* Translate DSP byte addr to GPP Va. */ | 1801 | /* Translate DSP byte addr to GPP Va. */ |
1802 | tmp_buf = cmm_xlator_translate(hnode->xlator, | 1802 | tmp_buf = cmm_xlator_translate(hnode->xlator, |
1803 | (void *)(message->dw_arg1 * | 1803 | (void *)(message->arg1 * |
1804 | hnode->hnode_mgr-> | 1804 | hnode->hnode_mgr-> |
1805 | udsp_word_size), CMM_DSPPA2PA); | 1805 | udsp_word_size), CMM_DSPPA2PA); |
1806 | if (tmp_buf != NULL) { | 1806 | if (tmp_buf != NULL) { |
@@ -1809,8 +1809,8 @@ int node_get_message(struct node_object *hnode, | |||
1809 | CMM_PA2VA); | 1809 | CMM_PA2VA); |
1810 | if (tmp_buf != NULL) { | 1810 | if (tmp_buf != NULL) { |
1811 | /* Adjust SM size in msg */ | 1811 | /* Adjust SM size in msg */ |
1812 | message->dw_arg1 = (u32) tmp_buf; | 1812 | message->arg1 = (u32) tmp_buf; |
1813 | message->dw_arg2 *= hnode->hnode_mgr->udsp_word_size; | 1813 | message->arg2 *= hnode->hnode_mgr->udsp_word_size; |
1814 | } else { | 1814 | } else { |
1815 | status = -ESRCH; | 1815 | status = -ESRCH; |
1816 | } | 1816 | } |
@@ -2100,19 +2100,19 @@ int node_put_message(struct node_object *hnode, | |||
2100 | /* assign pmsg values to new msg */ | 2100 | /* assign pmsg values to new msg */ |
2101 | new_msg = *pmsg; | 2101 | new_msg = *pmsg; |
2102 | /* Now, check if message contains a SM buffer descriptor */ | 2102 | /* Now, check if message contains a SM buffer descriptor */ |
2103 | if (pmsg->dw_cmd & DSP_RMSBUFDESC) { | 2103 | if (pmsg->cmd & DSP_RMSBUFDESC) { |
2104 | /* Translate GPP Va to DSP physical buf Ptr. */ | 2104 | /* Translate GPP Va to DSP physical buf Ptr. */ |
2105 | tmp_buf = cmm_xlator_translate(hnode->xlator, | 2105 | tmp_buf = cmm_xlator_translate(hnode->xlator, |
2106 | (void *)new_msg.dw_arg1, | 2106 | (void *)new_msg.arg1, |
2107 | CMM_VA2DSPPA); | 2107 | CMM_VA2DSPPA); |
2108 | if (tmp_buf != NULL) { | 2108 | if (tmp_buf != NULL) { |
2109 | /* got translation, convert to MAUs in msg */ | 2109 | /* got translation, convert to MAUs in msg */ |
2110 | if (hnode->hnode_mgr->udsp_word_size != 0) { | 2110 | if (hnode->hnode_mgr->udsp_word_size != 0) { |
2111 | new_msg.dw_arg1 = | 2111 | new_msg.arg1 = |
2112 | (u32) tmp_buf / | 2112 | (u32) tmp_buf / |
2113 | hnode->hnode_mgr->udsp_word_size; | 2113 | hnode->hnode_mgr->udsp_word_size; |
2114 | /* MAUs */ | 2114 | /* MAUs */ |
2115 | new_msg.dw_arg2 /= hnode->hnode_mgr-> | 2115 | new_msg.arg2 /= hnode->hnode_mgr-> |
2116 | udsp_word_size; | 2116 | udsp_word_size; |
2117 | } else { | 2117 | } else { |
2118 | pr_err("%s: udsp_word_size is zero!\n", | 2118 | pr_err("%s: udsp_word_size is zero!\n", |
@@ -2378,10 +2378,10 @@ int node_terminate(struct node_object *hnode, int *pstatus) | |||
2378 | goto func_cont; | 2378 | goto func_cont; |
2379 | } | 2379 | } |
2380 | 2380 | ||
2381 | msg.dw_cmd = RMS_EXIT; | 2381 | msg.cmd = RMS_EXIT; |
2382 | msg.dw_arg1 = hnode->node_env; | 2382 | msg.arg1 = hnode->node_env; |
2383 | killmsg.dw_cmd = RMS_KILLTASK; | 2383 | killmsg.cmd = RMS_KILLTASK; |
2384 | killmsg.dw_arg1 = hnode->node_env; | 2384 | killmsg.arg1 = hnode->node_env; |
2385 | intf_fxns = hnode_mgr->intf_fxns; | 2385 | intf_fxns = hnode_mgr->intf_fxns; |
2386 | 2386 | ||
2387 | if (hnode->utimeout > MAXTIMEOUT) | 2387 | if (hnode->utimeout > MAXTIMEOUT) |
@@ -2902,8 +2902,8 @@ static int get_proc_props(struct node_mgr *hnode_mgr, | |||
2902 | host_res = pbridge_context->resources; | 2902 | host_res = pbridge_context->resources; |
2903 | if (!host_res) | 2903 | if (!host_res) |
2904 | return -EPERM; | 2904 | return -EPERM; |
2905 | hnode_mgr->ul_chnl_offset = host_res->dw_chnl_offset; | 2905 | hnode_mgr->ul_chnl_offset = host_res->chnl_offset; |
2906 | hnode_mgr->ul_chnl_buf_size = host_res->dw_chnl_buf_size; | 2906 | hnode_mgr->ul_chnl_buf_size = host_res->chnl_buf_size; |
2907 | hnode_mgr->ul_num_chnls = host_res->dw_num_chnls; | 2907 | hnode_mgr->ul_num_chnls = host_res->dw_num_chnls; |
2908 | 2908 | ||
2909 | /* | 2909 | /* |
diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c index 2e427149fb6..d36b3165989 100644 --- a/drivers/staging/tidspbridge/rmgr/strm.c +++ b/drivers/staging/tidspbridge/rmgr/strm.c | |||
@@ -639,7 +639,7 @@ int strm_reclaim(struct strm_object *stream_obj, u8 ** buf_ptr, | |||
639 | if (buff_size) | 639 | if (buff_size) |
640 | *buff_size = chnl_ioc_obj.buf_size; | 640 | *buff_size = chnl_ioc_obj.buf_size; |
641 | 641 | ||
642 | *pdw_arg = chnl_ioc_obj.dw_arg; | 642 | *pdw_arg = chnl_ioc_obj.arg; |
643 | if (!CHNL_IS_IO_COMPLETE(chnl_ioc_obj)) { | 643 | if (!CHNL_IS_IO_COMPLETE(chnl_ioc_obj)) { |
644 | if (CHNL_IS_TIMED_OUT(chnl_ioc_obj)) { | 644 | if (CHNL_IS_TIMED_OUT(chnl_ioc_obj)) { |
645 | status = -ETIME; | 645 | status = -ETIME; |