* [PATCH 01/11] DSPBRIDGE: Rename wmd_dev_context structure by bridge_dev_context
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-09 4:30 ` Ramirez Luna, Omar
2010-05-01 0:45 ` [PATCH 02/11] DSPBRIDGE: Rename the device context handle variables Ivan Gomez Castellanos
` (9 subsequent siblings)
10 siblings, 1 reply; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
This change is done because "wmd" refers to Windows OS.
wmd = windows mini driver
And the new name "bridge_dev_context" make more sense.
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/dev.h | 2 +-
arch/arm/plat-omap/include/dspbridge/io_sm.h | 14 ++--
arch/arm/plat-omap/include/dspbridge/wmd.h | 30 ++++----
drivers/dsp/bridge/pmgr/dev.c | 4 +-
drivers/dsp/bridge/pmgr/ioobj.h | 3 +-
drivers/dsp/bridge/rmgr/node.c | 4 +-
drivers/dsp/bridge/rmgr/proc.c | 2 +-
drivers/dsp/bridge/rmgr/pwr.c | 16 ++--
drivers/dsp/bridge/wmd/_deh.h | 3 +-
drivers/dsp/bridge/wmd/_tiomap.h | 12 ++--
drivers/dsp/bridge/wmd/_tiomap_mmu.h | 2 +-
drivers/dsp/bridge/wmd/_tiomap_pwr.h | 26 ++++---
drivers/dsp/bridge/wmd/_tiomap_util.h | 2 +-
drivers/dsp/bridge/wmd/io_sm.c | 18 ++--
drivers/dsp/bridge/wmd/mmu_fault.c | 8 +-
drivers/dsp/bridge/wmd/tiomap3430.c | 116 +++++++++++++-------------
drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 19 ++--
drivers/dsp/bridge/wmd/tiomap_io.h | 12 ++--
drivers/dsp/bridge/wmd/ue_deh.c | 8 +-
19 files changed, 154 insertions(+), 147 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/dev.h b/arch/arm/plat-omap/include/dspbridge/dev.h
index 13b0cad..6df8db7 100644
--- a/arch/arm/plat-omap/include/dspbridge/dev.h
+++ b/arch/arm/plat-omap/include/dspbridge/dev.h
@@ -526,7 +526,7 @@ extern dsp_status dev_get_symbol(struct dev_object *hdev_obj,
* else: *phWmdContext is NULL;
*/
extern dsp_status dev_get_wmd_context(struct dev_object *hdev_obj,
- OUT struct wmd_dev_context
+ OUT struct bridge_dev_context
**phWmdContext);
/*
diff --git a/arch/arm/plat-omap/include/dspbridge/io_sm.h b/arch/arm/plat-omap/include/dspbridge/io_sm.h
index bebf011..177bfeb 100644
--- a/arch/arm/plat-omap/include/dspbridge/io_sm.h
+++ b/arch/arm/plat-omap/include/dspbridge/io_sm.h
@@ -263,21 +263,21 @@ extern dsp_status io_sh_msetting(struct io_mgr *hio_mgr, u8 desc, void *pargs);
/* Maximum channel bufsize that can be used. */
extern u32 io_buf_size(struct io_mgr *hio_mgr);
-extern u32 io_read_value(struct wmd_dev_context *hDevContext, u32 dwDSPAddr);
+extern u32 io_read_value(struct bridge_dev_context *hDevContext, u32 dwDSPAddr);
-extern void io_write_value(struct wmd_dev_context *hDevContext,
+extern void io_write_value(struct bridge_dev_context *hDevContext,
u32 dwDSPAddr, u32 dwValue);
-extern u32 io_read_value_long(struct wmd_dev_context *hDevContext,
+extern u32 io_read_value_long(struct bridge_dev_context *hDevContext,
u32 dwDSPAddr);
-extern void io_write_value_long(struct wmd_dev_context *hDevContext,
+extern void io_write_value_long(struct bridge_dev_context *hDevContext,
u32 dwDSPAddr, u32 dwValue);
-extern void io_or_set_value(struct wmd_dev_context *hDevContext,
+extern void io_or_set_value(struct bridge_dev_context *hDevContext,
u32 dwDSPAddr, u32 dwValue);
-extern void io_and_set_value(struct wmd_dev_context *hDevContext,
+extern void io_and_set_value(struct bridge_dev_context *hDevContext,
u32 dwDSPAddr, u32 dwValue);
extern void io_intr_dsp2(IN struct io_mgr *pio_mgr, IN u16 mb_val);
@@ -288,7 +288,7 @@ extern void io_sm_init(void);
* ========print_dsp_trace_buffer ========
* Print DSP tracebuffer.
*/
-extern dsp_status print_dsp_trace_buffer(struct wmd_dev_context
+extern dsp_status print_dsp_trace_buffer(struct bridge_dev_context
*hwmd_context);
#endif /* IOSM_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h
index 6a41975..40be6da 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmd.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmd.h
@@ -44,7 +44,7 @@
#define WMD_RESERVEDIOCTLBASE 0x8000
/* Handle to mini-driver's private device context. */
-struct wmd_dev_context;
+struct bridge_dev_context;
/*--------------------------------------------------------------------------- */
/* 'Bridge MINI DRIVER FUNCTION TYPES */
@@ -67,7 +67,7 @@ struct wmd_dev_context;
* DSP_SOK: Board is in BRD_IDLE state;
* else: Board state is indeterminate.
*/
-typedef dsp_status(*fxn_brd_monitor) (struct wmd_dev_context *hDevContext);
+typedef dsp_status(*fxn_brd_monitor) (struct bridge_dev_context *hDevContext);
/*
* ======== fxn_brd_setstate ========
@@ -86,7 +86,7 @@ typedef dsp_status(*fxn_brd_monitor) (struct wmd_dev_context *hDevContext);
* ulBrdState <= BRD_LASTSTATE.
* Update the Board state to the specified state.
*/
-typedef dsp_status(*fxn_brd_setstate) (struct wmd_dev_context
+typedef dsp_status(*fxn_brd_setstate) (struct bridge_dev_context
* hDevContext, u32 ulBrdState);
/*
@@ -108,7 +108,7 @@ typedef dsp_status(*fxn_brd_setstate) (struct wmd_dev_context
* Interrupts to the PC are enabled.
* else: Board state is indeterminate.
*/
-typedef dsp_status(*fxn_brd_start) (struct wmd_dev_context
+typedef dsp_status(*fxn_brd_start) (struct bridge_dev_context
* hDevContext, u32 dwDSPAddr);
/*
@@ -131,7 +131,7 @@ typedef dsp_status(*fxn_brd_start) (struct wmd_dev_context
* Interrupts to the PC are enabled.
* else: Board state is indeterminate.
*/
-typedef dsp_status(*fxn_brd_memcopy) (struct wmd_dev_context
+typedef dsp_status(*fxn_brd_memcopy) (struct bridge_dev_context
* hDevContext,
u32 ulDspDestAddr,
u32 ulDspSrcAddr,
@@ -156,7 +156,7 @@ typedef dsp_status(*fxn_brd_memcopy) (struct wmd_dev_context
* pHostBuf != NULL.
* Ensures:
*/
-typedef dsp_status(*fxn_brd_memwrite) (struct wmd_dev_context
+typedef dsp_status(*fxn_brd_memwrite) (struct bridge_dev_context
* hDevContext,
IN u8 *pHostBuf,
u32 dwDSPAddr, u32 ul_num_bytes,
@@ -179,7 +179,7 @@ typedef dsp_status(*fxn_brd_memwrite) (struct wmd_dev_context
* hDevContext != NULL;
* Ensures:
*/
-typedef dsp_status(*fxn_brd_memmap) (struct wmd_dev_context
+typedef dsp_status(*fxn_brd_memmap) (struct bridge_dev_context
* hDevContext, u32 ul_mpu_addr,
u32 ulVirtAddr, u32 ul_num_bytes,
u32 ulMapAttrs);
@@ -199,7 +199,7 @@ typedef dsp_status(*fxn_brd_memmap) (struct wmd_dev_context
* hDevContext != NULL;
* Ensures:
*/
-typedef dsp_status(*fxn_brd_memunmap) (struct wmd_dev_context
+typedef dsp_status(*fxn_brd_memunmap) (struct bridge_dev_context
* hDevContext,
u32 ulVirtAddr, u32 ul_num_bytes);
@@ -220,7 +220,7 @@ typedef dsp_status(*fxn_brd_memunmap) (struct wmd_dev_context
* Interrupts to the PC are disabled.
* else: Board state is indeterminate.
*/
-typedef dsp_status(*fxn_brd_stop) (struct wmd_dev_context *hDevContext);
+typedef dsp_status(*fxn_brd_stop) (struct bridge_dev_context *hDevContext);
/*
* ======== bridge_brd_status ========
@@ -237,7 +237,7 @@ typedef dsp_status(*fxn_brd_stop) (struct wmd_dev_context *hDevContext);
* Ensures:
* *pdwState is one of {BRD_STOPPED, BRD_IDLE, BRD_RUNNING, BRD_UNKNOWN};
*/
-typedef dsp_status(*fxn_brd_status) (struct wmd_dev_context *hDevContext,
+typedef dsp_status(*fxn_brd_status) (struct bridge_dev_context *hDevContext,
int *pdwState);
/*
@@ -261,7 +261,7 @@ typedef dsp_status(*fxn_brd_status) (struct wmd_dev_context *hDevContext,
* Ensures:
* Will not write more than ul_num_bytes bytes into pHostBuf.
*/
-typedef dsp_status(*fxn_brd_read) (struct wmd_dev_context *hDevContext,
+typedef dsp_status(*fxn_brd_read) (struct bridge_dev_context *hDevContext,
OUT u8 *pHostBuf,
u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType);
@@ -286,7 +286,7 @@ typedef dsp_status(*fxn_brd_read) (struct wmd_dev_context *hDevContext,
* pHostBuf != NULL.
* Ensures:
*/
-typedef dsp_status(*fxn_brd_write) (struct wmd_dev_context *hDevContext,
+typedef dsp_status(*fxn_brd_write) (struct bridge_dev_context *hDevContext,
IN u8 *pHostBuf,
u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType);
@@ -685,7 +685,7 @@ typedef dsp_status(*fxn_chnl_registernotify)
* function returns, they must not be stored into the device context
* structure.
*/
-typedef dsp_status(*fxn_dev_create) (OUT struct wmd_dev_context
+typedef dsp_status(*fxn_dev_create) (OUT struct bridge_dev_context
**phDevContext,
struct dev_object
* hdev_obj,
@@ -709,7 +709,7 @@ typedef dsp_status(*fxn_dev_create) (OUT struct wmd_dev_context
* IOCTL completion routines provided.
* Ensures:
*/
-typedef dsp_status(*fxn_dev_ctrl) (struct wmd_dev_context *hDevContext,
+typedef dsp_status(*fxn_dev_ctrl) (struct bridge_dev_context *hDevContext,
u32 dw_cmd, IN OUT void *pargs);
/*
@@ -729,7 +729,7 @@ typedef dsp_status(*fxn_dev_ctrl) (struct wmd_dev_context *hDevContext,
* Ensures:
* DSP_SOK: Device context is freed.
*/
-typedef dsp_status(*fxn_dev_destroy) (struct wmd_dev_context *hDevContext);
+typedef dsp_status(*fxn_dev_destroy) (struct bridge_dev_context *hDevContext);
/*
* ======== bridge_deh_create ========
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index e32757f..62ff655 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -64,7 +64,7 @@ struct dev_object {
struct list_head link; /* Link to next dev_object. */
u32 dev_type; /* Device Type */
struct cfg_devnode *dev_node_obj; /* Platform specific dev id */
- struct wmd_dev_context *hwmd_context; /* WMD Context Handle */
+ struct bridge_dev_context *hwmd_context; /* WMD Context Handle */
struct bridge_drv_interface wmd_interface; /* Function interface to WMD. */
struct brd_object *lock_owner; /* Client with exclusive access. */
struct cod_manager *cod_mgr; /* Code manager handle. */
@@ -715,7 +715,7 @@ dsp_status dev_get_symbol(struct dev_object *hdev_obj,
* Retrieve the WMD Context handle, as returned by the WMD_Create fxn.
*/
dsp_status dev_get_wmd_context(struct dev_object *hdev_obj,
- OUT struct wmd_dev_context **phWmdContext)
+ OUT struct bridge_dev_context **phWmdContext)
{
dsp_status status = DSP_SOK;
struct dev_object *dev_obj = hdev_obj;
diff --git a/drivers/dsp/bridge/pmgr/ioobj.h b/drivers/dsp/bridge/pmgr/ioobj.h
index f481765..5dd02bf 100644
--- a/drivers/dsp/bridge/pmgr/ioobj.h
+++ b/drivers/dsp/bridge/pmgr/ioobj.h
@@ -30,7 +30,8 @@
*/
struct io_mgr_ {
/* These must be the first fields in a io_mgr struct: */
- struct wmd_dev_context *hwmd_context; /* WMD device context. */
+ /* WMD device context. */
+ struct bridge_dev_context *hwmd_context;
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD. */
struct dev_object *hdev_obj; /* Device this board represents. */
};
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 0475a09..0edf6ae 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -3132,7 +3132,7 @@ static u32 ovly(void *priv_ref, u32 ulDspRunAddr, u32 ulDspLoadAddr,
u32 ul_size;
u32 ul_timeout;
dsp_status status = DSP_SOK;
- struct wmd_dev_context *hwmd_context;
+ struct bridge_dev_context *hwmd_context;
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
DBC_REQUIRE(hnode);
@@ -3174,7 +3174,7 @@ static u32 mem_write(void *priv_ref, u32 ulDspAddr, void *pbuf,
u16 mem_sect_type;
u32 ul_timeout;
dsp_status status = DSP_SOK;
- struct wmd_dev_context *hwmd_context;
+ struct bridge_dev_context *hwmd_context;
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
DBC_REQUIRE(hnode);
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index 884d0f5..bdcb862 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -95,7 +95,7 @@ struct proc_object {
* GPP Client attached
*/
struct ntfy_object *ntfy_obj; /* Manages notifications */
- struct wmd_dev_context *hwmd_context; /* WMD Context Handle */
+ struct bridge_dev_context *hwmd_context; /* WMD Context Handle */
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
char *psz_last_coff;
struct list_head proc_list;
diff --git a/drivers/dsp/bridge/rmgr/pwr.c b/drivers/dsp/bridge/rmgr/pwr.c
index 51d8f44..e70f676 100644
--- a/drivers/dsp/bridge/rmgr/pwr.c
+++ b/drivers/dsp/bridge/rmgr/pwr.c
@@ -39,7 +39,7 @@
dsp_status pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout)
{
struct bridge_drv_interface *intf_fxns;
- struct wmd_dev_context *dw_context;
+ struct bridge_dev_context *dw_context;
dsp_status status = DSP_EFAIL;
struct dev_object *hdev_obj = NULL;
u32 ioctlcode = 0;
@@ -50,7 +50,7 @@ dsp_status pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout)
hdev_obj =
(struct dev_object *)drv_get_next_dev_object((u32) hdev_obj)) {
if (DSP_FAILED(dev_get_wmd_context(hdev_obj,
- (struct wmd_dev_context **)
+ (struct bridge_dev_context **)
&dw_context))) {
continue;
}
@@ -82,7 +82,7 @@ dsp_status pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout)
dsp_status pwr_wake_dsp(IN CONST u32 timeout)
{
struct bridge_drv_interface *intf_fxns;
- struct wmd_dev_context *dw_context;
+ struct bridge_dev_context *dw_context;
dsp_status status = DSP_EFAIL;
struct dev_object *hdev_obj = NULL;
u32 arg = timeout;
@@ -92,7 +92,7 @@ dsp_status pwr_wake_dsp(IN CONST u32 timeout)
hdev_obj = (struct dev_object *)drv_get_next_dev_object
((u32) hdev_obj)) {
if (DSP_SUCCEEDED(dev_get_wmd_context(hdev_obj,
- (struct wmd_dev_context
+ (struct bridge_dev_context
**)&dw_context))) {
if (DSP_SUCCEEDED
(dev_get_intf_fxns
@@ -115,7 +115,7 @@ dsp_status pwr_wake_dsp(IN CONST u32 timeout)
dsp_status pwr_pm_pre_scale(IN u16 voltage_domain, u32 level)
{
struct bridge_drv_interface *intf_fxns;
- struct wmd_dev_context *dw_context;
+ struct bridge_dev_context *dw_context;
dsp_status status = DSP_EFAIL;
struct dev_object *hdev_obj = NULL;
u32 arg[2];
@@ -128,7 +128,7 @@ dsp_status pwr_pm_pre_scale(IN u16 voltage_domain, u32 level)
hdev_obj = (struct dev_object *)drv_get_next_dev_object
((u32) hdev_obj)) {
if (DSP_SUCCEEDED(dev_get_wmd_context(hdev_obj,
- (struct wmd_dev_context
+ (struct bridge_dev_context
**)&dw_context))) {
if (DSP_SUCCEEDED
(dev_get_intf_fxns
@@ -151,7 +151,7 @@ dsp_status pwr_pm_pre_scale(IN u16 voltage_domain, u32 level)
dsp_status pwr_pm_post_scale(IN u16 voltage_domain, u32 level)
{
struct bridge_drv_interface *intf_fxns;
- struct wmd_dev_context *dw_context;
+ struct bridge_dev_context *dw_context;
dsp_status status = DSP_EFAIL;
struct dev_object *hdev_obj = NULL;
u32 arg[2];
@@ -164,7 +164,7 @@ dsp_status pwr_pm_post_scale(IN u16 voltage_domain, u32 level)
hdev_obj = (struct dev_object *)drv_get_next_dev_object
((u32) hdev_obj)) {
if (DSP_SUCCEEDED(dev_get_wmd_context(hdev_obj,
- (struct wmd_dev_context
+ (struct bridge_dev_context
**)&dw_context))) {
if (DSP_SUCCEEDED
(dev_get_intf_fxns
diff --git a/drivers/dsp/bridge/wmd/_deh.h b/drivers/dsp/bridge/wmd/_deh.h
index d7f2ef4..faa7a2e 100644
--- a/drivers/dsp/bridge/wmd/_deh.h
+++ b/drivers/dsp/bridge/wmd/_deh.h
@@ -24,7 +24,8 @@
/* DEH Manager: only one created per board: */
struct deh_mgr {
- struct wmd_dev_context *hwmd_context; /* WMD device context. */
+ /* Bridge device context. */
+ struct bridge_dev_context *hwmd_context;
struct ntfy_object *ntfy_obj; /* NTFY object */
struct dsp_errorinfo err_info; /* DSP exception info. */
diff --git a/drivers/dsp/bridge/wmd/_tiomap.h b/drivers/dsp/bridge/wmd/_tiomap.h
index a23c373..4cbf1d3 100644
--- a/drivers/dsp/bridge/wmd/_tiomap.h
+++ b/drivers/dsp/bridge/wmd/_tiomap.h
@@ -310,7 +310,7 @@ static const struct bpwr_clk_t bpwr_clks[] = {
#define CLEAR_BIT_INDEX(reg, index) (reg &= ~(1 << (index)))
/* This mini driver's device context: */
-struct wmd_dev_context {
+struct bridge_dev_context {
struct dev_object *hdev_obj; /* Handle to WCD device object. */
u32 dw_dsp_base_addr; /* Arm's API to DSP virt base addr */
/*
@@ -355,10 +355,10 @@ struct wmd_dev_context {
* Given a DSP virtual address, traverse the page table and return
* a corresponding MPU physical address and size.
*/
-extern dsp_status wmd_tlb_dsp_va_to_mpu_pa(struct wmd_dev_context *dev_context,
- IN u32 ulVirtAddr,
- OUT u32 *ulPhysAddr,
- OUT u32 *sizeTlb);
+extern dsp_status wmd_tlb_dsp_va_to_mpu_pa(struct bridge_dev_context
+ *dev_context, IN u32 ulVirtAddr,
+ OUT u32 *ulPhysAddr,
+ OUT u32 *sizeTlb);
/*
* ======== sm_interrupt_dsp ========
@@ -375,6 +375,6 @@ extern dsp_status wmd_tlb_dsp_va_to_mpu_pa(struct wmd_dev_context *dev_context,
* Requires:
* Ensures:
*/
-dsp_status sm_interrupt_dsp(struct wmd_dev_context *dev_context, u16 mb_val);
+dsp_status sm_interrupt_dsp(struct bridge_dev_context *dev_context, u16 mb_val);
#endif /* _TIOMAP_ */
diff --git a/drivers/dsp/bridge/wmd/_tiomap_mmu.h b/drivers/dsp/bridge/wmd/_tiomap_mmu.h
index 7af9e5e..66c1249 100644
--- a/drivers/dsp/bridge/wmd/_tiomap_mmu.h
+++ b/drivers/dsp/bridge/wmd/_tiomap_mmu.h
@@ -29,7 +29,7 @@
* SECTION = 1MB, LARGE_PAGE = 64KB, SMALL_PAGE = 4KB, TINY_PAGE = 1KB.
* DSP Byte address 0x40_0000 is word addr 0x20_0000.
*/
-extern void configure_dsp_mmu(struct wmd_dev_context *dev_context,
+extern void configure_dsp_mmu(struct bridge_dev_context *dev_context,
u32 dataBasePhys,
u32 dspBaseVirt,
u32 sizeInBytes,
diff --git a/drivers/dsp/bridge/wmd/_tiomap_pwr.h b/drivers/dsp/bridge/wmd/_tiomap_pwr.h
index a7a4fc2..cfe3e56 100644
--- a/drivers/dsp/bridge/wmd/_tiomap_pwr.h
+++ b/drivers/dsp/bridge/wmd/_tiomap_pwr.h
@@ -23,46 +23,50 @@
* ======== wake_dsp =========
* Wakes up the DSP from DeepSleep
*/
-extern dsp_status wake_dsp(struct wmd_dev_context *dev_context, IN void *pargs);
+extern dsp_status wake_dsp(struct bridge_dev_context *dev_context,
+ IN void *pargs);
/*
* ======== sleep_dsp =========
* Places the DSP in DeepSleep.
*/
-extern dsp_status sleep_dsp(struct wmd_dev_context *dev_context,
+extern dsp_status sleep_dsp(struct bridge_dev_context *dev_context,
IN u32 dw_cmd, IN void *pargs);
/*
* ========interrupt_dsp========
* Sends an interrupt to DSP unconditionally.
*/
-extern void interrupt_dsp(struct wmd_dev_context *dev_context, IN u16 mb_val);
+extern void interrupt_dsp(struct bridge_dev_context *dev_context,
+ IN u16 mb_val);
/*
* ======== wake_dsp =========
* Wakes up the DSP from DeepSleep
*/
-extern dsp_status dsp_peripheral_clk_ctrl(struct wmd_dev_context *dev_context,
- IN void *pargs);
+extern dsp_status dsp_peripheral_clk_ctrl(struct bridge_dev_context
+ *dev_context, IN void *pargs);
/*
* ======== handle_hibernation_from_dsp ========
* Handle Hibernation requested from DSP
*/
-dsp_status handle_hibernation_from_dsp(struct wmd_dev_context *dev_context);
+dsp_status handle_hibernation_from_dsp(struct bridge_dev_context *dev_context);
/*
* ======== post_scale_dsp ========
* Handle Post Scale notification to DSP
*/
-dsp_status post_scale_dsp(struct wmd_dev_context *dev_context, IN void *pargs);
+dsp_status post_scale_dsp(struct bridge_dev_context *dev_context,
+ IN void *pargs);
/*
* ======== pre_scale_dsp ========
* Handle Pre Scale notification to DSP
*/
-dsp_status pre_scale_dsp(struct wmd_dev_context *dev_context, IN void *pargs);
+dsp_status pre_scale_dsp(struct bridge_dev_context *dev_context,
+ IN void *pargs);
/*
* ======== handle_constraints_set ========
* Handle constraints request from DSP
*/
-dsp_status handle_constraints_set(struct wmd_dev_context *dev_context,
+dsp_status handle_constraints_set(struct bridge_dev_context *dev_context,
IN void *pargs);
/*
* ======== dsp_peripheral_clocks_disable ========
@@ -71,7 +75,7 @@ dsp_status handle_constraints_set(struct wmd_dev_context *dev_context,
* DSP is entering Hibernation or when DSP is in
* Error state
*/
-dsp_status dsp_peripheral_clocks_disable(struct wmd_dev_context *dev_context,
+dsp_status dsp_peripheral_clocks_disable(struct bridge_dev_context *dev_context,
IN void *pargs);
/*
@@ -79,7 +83,7 @@ dsp_status dsp_peripheral_clocks_disable(struct wmd_dev_context *dev_context,
* This function enables all the peripheral clocks that
* were requested by DSP.
*/
-dsp_status dsp_peripheral_clocks_enable(struct wmd_dev_context *dev_context,
+dsp_status dsp_peripheral_clocks_enable(struct bridge_dev_context *dev_context,
IN void *pargs);
/*
diff --git a/drivers/dsp/bridge/wmd/_tiomap_util.h b/drivers/dsp/bridge/wmd/_tiomap_util.h
index e449946..ccdd678 100644
--- a/drivers/dsp/bridge/wmd/_tiomap_util.h
+++ b/drivers/dsp/bridge/wmd/_tiomap_util.h
@@ -37,7 +37,7 @@
* The argument dw_sync_addr is set to 1 before releasing the DSP.
* If the DSP starts running, it will clear this location.
*/
-extern bool wait_for_start(struct wmd_dev_context *dev_context,
+extern bool wait_for_start(struct bridge_dev_context *dev_context,
u32 dw_sync_addr);
#endif /* _TIOMAP_UTIL_ */
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index 5744b03..d452f98 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -83,7 +83,7 @@
/* IO Manager: only one created per board */
struct io_mgr {
/* These four fields must be the first fields in a io_mgr_ struct */
- struct wmd_dev_context *hwmd_context; /* WMD device context */
+ struct bridge_dev_context *hwmd_context; /* WMD device context */
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
struct dev_object *hdev_obj; /* Device this board represents */
@@ -140,9 +140,9 @@ static void input_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr);
static void output_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr);
static u32 find_ready_output(struct chnl_mgr *chnl_mgr_obj,
struct chnl_object *pchnl, u32 dwMask);
-static u32 read_data(struct wmd_dev_context *hDevContext, void *dest,
+static u32 read_data(struct bridge_dev_context *hDevContext, void *dest,
void *pSrc, u32 usize);
-static u32 write_data(struct wmd_dev_context *hDevContext, void *dest,
+static u32 write_data(struct bridge_dev_context *hDevContext, void *dest,
void *pSrc, u32 usize);
#ifndef DSP_TRACEBUF_DISABLED
@@ -172,7 +172,7 @@ dsp_status bridge_io_create(OUT struct io_mgr **phIOMgr,
dsp_status status = DSP_SOK;
struct io_mgr *pio_mgr = NULL;
struct shm *shared_mem = NULL;
- struct wmd_dev_context *hwmd_context = NULL;
+ struct bridge_dev_context *hwmd_context = NULL;
struct cfg_hostres host_res;
struct cfg_devnode *dev_node_obj;
struct chnl_mgr *hchnl_mgr;
@@ -270,7 +270,7 @@ func_end:
dsp_status bridge_io_destroy(struct io_mgr *hio_mgr)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *hwmd_context;
+ struct bridge_dev_context *hwmd_context;
if (hio_mgr) {
status = dev_get_wmd_context(hio_mgr->hdev_obj, &hwmd_context);
@@ -1692,7 +1692,7 @@ func_end:
* ======== read_data ========
* Copies buffers from the shared memory to the host buffer.
*/
-static u32 read_data(struct wmd_dev_context *hDevContext, void *dest,
+static u32 read_data(struct bridge_dev_context *hDevContext, void *dest,
void *pSrc, u32 usize)
{
memcpy(dest, pSrc, usize);
@@ -1703,7 +1703,7 @@ static u32 read_data(struct wmd_dev_context *hDevContext, void *dest,
* ======== write_data ========
* Copies buffers from the host side buffer to the shared memory.
*/
-static u32 write_data(struct wmd_dev_context *hDevContext, void *dest,
+static u32 write_data(struct bridge_dev_context *hDevContext, void *dest,
void *pSrc, u32 usize)
{
memcpy(dest, pSrc, usize);
@@ -1939,7 +1939,7 @@ static dsp_status pack_trace_buffer(char *lpBuf, u32 bytes, u32 ul_num_words)
* Requires:
* hdeh_mgr muse be valid. Checked in bridge_deh_notify.
*/
-dsp_status print_dsp_trace_buffer(struct wmd_dev_context *hwmd_context)
+dsp_status print_dsp_trace_buffer(struct bridge_dev_context *hwmd_context)
{
dsp_status status = DSP_SOK;
struct cod_manager *cod_mgr;
@@ -1952,7 +1952,7 @@ dsp_status print_dsp_trace_buffer(struct wmd_dev_context *hwmd_context)
char *psz_buf;
u16 *lpsz_buf;
- struct wmd_dev_context *pwmd_context = (struct wmd_dev_context *)
+ struct bridge_dev_context *pwmd_context = (struct bridge_dev_context *)
hwmd_context;
struct bridge_drv_interface *intf_fxns;
struct dev_object *dev_obj = (struct dev_object *)
diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/wmd/mmu_fault.c
index 2b82818..30ab29a 100644
--- a/drivers/dsp/bridge/wmd/mmu_fault.c
+++ b/drivers/dsp/bridge/wmd/mmu_fault.c
@@ -45,7 +45,7 @@
static u32 dmmu_event_mask;
u32 fault_addr;
-static bool mmu_check_if_fault(struct wmd_dev_context *dev_context);
+static bool mmu_check_if_fault(struct bridge_dev_context *dev_context);
/*
* ======== mmu_fault_dpc ========
@@ -67,7 +67,7 @@ void mmu_fault_dpc(IN unsigned long pRefData)
irqreturn_t mmu_fault_isr(int irq, IN void *pRefData)
{
struct deh_mgr *deh_mgr_obj = (struct deh_mgr *)pRefData;
- struct wmd_dev_context *dev_context;
+ struct bridge_dev_context *dev_context;
struct cfg_hostres resources;
dsp_status status = DSP_SOK;
@@ -77,7 +77,7 @@ irqreturn_t mmu_fault_isr(int irq, IN void *pRefData)
if (deh_mgr_obj) {
dev_context =
- (struct wmd_dev_context *)deh_mgr_obj->hwmd_context;
+ (struct bridge_dev_context *)deh_mgr_obj->hwmd_context;
status = cfg_get_host_resources((struct cfg_devnode *)
drv_get_first_dev_extension(),
&resources);
@@ -118,7 +118,7 @@ irqreturn_t mmu_fault_isr(int irq, IN void *pRefData)
* Check to see if MMU Fault is valid TLB miss from DSP
* Note: This function is called from an ISR
*/
-static bool mmu_check_if_fault(struct wmd_dev_context *dev_context)
+static bool mmu_check_if_fault(struct bridge_dev_context *dev_context)
{
bool ret = false;
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index 407e926..29519bf 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -78,47 +78,47 @@
#define MMU_GFLUSH 0x60
/* Forward Declarations: */
-static dsp_status bridge_brd_monitor(struct wmd_dev_context *dev_context);
-static dsp_status bridge_brd_read(struct wmd_dev_context *dev_context,
+static dsp_status bridge_brd_monitor(struct bridge_dev_context *dev_context);
+static dsp_status bridge_brd_read(struct bridge_dev_context *dev_context,
OUT u8 *pbHostBuf,
u32 dwDSPAddr, u32 ul_num_bytes,
u32 ulMemType);
-static dsp_status bridge_brd_start(struct wmd_dev_context *dev_context,
+static dsp_status bridge_brd_start(struct bridge_dev_context *dev_context,
u32 dwDSPAddr);
-static dsp_status bridge_brd_status(struct wmd_dev_context *dev_context,
+static dsp_status bridge_brd_status(struct bridge_dev_context *dev_context,
int *pdwState);
-static dsp_status bridge_brd_stop(struct wmd_dev_context *dev_context);
-static dsp_status bridge_brd_write(struct wmd_dev_context *dev_context,
+static dsp_status bridge_brd_stop(struct bridge_dev_context *dev_context);
+static dsp_status bridge_brd_write(struct bridge_dev_context *dev_context,
IN u8 *pbHostBuf,
u32 dwDSPAddr, u32 ul_num_bytes,
u32 ulMemType);
-static dsp_status bridge_brd_set_state(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_set_state(struct bridge_dev_context *hDevContext,
u32 ulBrdState);
-static dsp_status bridge_brd_mem_copy(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_mem_copy(struct bridge_dev_context *hDevContext,
u32 ulDspDestAddr, u32 ulDspSrcAddr,
u32 ul_num_bytes, u32 ulMemType);
-static dsp_status bridge_brd_mem_write(struct wmd_dev_context *dev_context,
+static dsp_status bridge_brd_mem_write(struct bridge_dev_context *dev_context,
IN u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType);
-static dsp_status bridge_brd_mem_map(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_mem_map(struct bridge_dev_context *hDevContext,
u32 ul_mpu_addr, u32 ulVirtAddr,
u32 ul_num_bytes, u32 ul_map_attr);
-static dsp_status bridge_brd_mem_un_map(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_mem_un_map(struct bridge_dev_context *hDevContext,
u32 ulVirtAddr, u32 ul_num_bytes);
-static dsp_status bridge_dev_create(OUT struct wmd_dev_context **ppDevContext,
- struct dev_object *hdev_obj,
- IN CONST struct cfg_hostres *pConfig,
- IN CONST struct cfg_dspres *pDspConfig);
-static dsp_status bridge_dev_ctrl(struct wmd_dev_context *dev_context,
+static dsp_status bridge_dev_create(OUT struct bridge_dev_context
+ **ppDevContext, struct dev_object *hdev_obj,
+ IN CONST struct cfg_hostres *pConfig,
+ IN CONST struct cfg_dspres *pDspConfig);
+static dsp_status bridge_dev_ctrl(struct bridge_dev_context *dev_context,
u32 dw_cmd, IN OUT void *pargs);
-static dsp_status bridge_dev_destroy(struct wmd_dev_context *dev_context);
+static dsp_status bridge_dev_destroy(struct bridge_dev_context *dev_context);
static u32 user_va2_pa(struct mm_struct *mm, u32 address);
-static dsp_status pte_update(struct wmd_dev_context *hDevContext, u32 pa,
+static dsp_status pte_update(struct bridge_dev_context *hDevContext, u32 pa,
u32 va, u32 size,
struct hw_mmu_map_attrs_t *map_attrs);
static dsp_status pte_set(struct pg_table_attrs *pt, u32 pa, u32 va,
u32 size, struct hw_mmu_map_attrs_t *attrs);
-static dsp_status mem_map_vmalloc(struct wmd_dev_context *hDevContext,
+static dsp_status mem_map_vmalloc(struct bridge_dev_context *hDevContext,
u32 ul_mpu_addr, u32 ulVirtAddr,
u32 ul_num_bytes,
struct hw_mmu_map_attrs_t *hw_attrs);
@@ -228,7 +228,7 @@ static inline void tlb_flush_all(const void __iomem *base)
__raw_writeb(__raw_readb(base + MMU_GFLUSH) | 1, base + MMU_GFLUSH);
}
-static inline void flush_all(struct wmd_dev_context *dev_context)
+static inline void flush_all(struct bridge_dev_context *dev_context)
{
if (dev_context->dw_brd_state == BRD_DSP_HIBERNATION ||
dev_context->dw_brd_state == BRD_HIBERNATION)
@@ -278,10 +278,10 @@ void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
* Preconditions:
* Device in 'OFF' state.
*/
-static dsp_status bridge_brd_monitor(struct wmd_dev_context *hDevContext)
+static dsp_status bridge_brd_monitor(struct bridge_dev_context *hDevContext)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
u32 temp;
struct dspbridge_platform_data *pdata =
omap_dspbridge_dev->dev.platform_data;
@@ -321,12 +321,12 @@ static dsp_status bridge_brd_monitor(struct wmd_dev_context *hDevContext)
* purpose:
* Reads buffers for DSP memory.
*/
-static dsp_status bridge_brd_read(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_read(struct bridge_dev_context *hDevContext,
OUT u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
u32 offset;
u32 dsp_base_addr = hDevContext->dw_dsp_base_addr;
@@ -353,11 +353,11 @@ static dsp_status bridge_brd_read(struct wmd_dev_context *hDevContext,
* purpose:
* This routine updates the Board status.
*/
-static dsp_status bridge_brd_set_state(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_set_state(struct bridge_dev_context *hDevContext,
u32 ulBrdState)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
dev_context->dw_brd_state = ulBrdState;
return status;
@@ -373,11 +373,11 @@ static dsp_status bridge_brd_set_state(struct wmd_dev_context *hDevContext,
* b) DSP_RST1 is asserted.
* b) DSP_RST2 is released.
*/
-static dsp_status bridge_brd_start(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_start(struct bridge_dev_context *hDevContext,
u32 dwDSPAddr)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
u32 dw_sync_addr = 0;
u32 ul_shm_base; /* Gpp Phys SM base addr(byte) */
u32 ul_shm_base_virt; /* Dsp Virt SM base addr */
@@ -706,10 +706,10 @@ static dsp_status bridge_brd_start(struct wmd_dev_context *hDevContext,
* Preconditions :
* a) None
*/
-static dsp_status bridge_brd_stop(struct wmd_dev_context *hDevContext)
+static dsp_status bridge_brd_stop(struct bridge_dev_context *hDevContext)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
struct pg_table_attrs *pt_attrs;
u32 dsp_pwr_state;
dsp_status clk_status;
@@ -780,10 +780,10 @@ static dsp_status bridge_brd_stop(struct wmd_dev_context *hDevContext)
* Preconditions :
* a) None
*/
-static dsp_status wmd_brd_delete(struct wmd_dev_context *hDevContext)
+static dsp_status wmd_brd_delete(struct bridge_dev_context *hDevContext)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
struct cfg_hostres resources;
struct pg_table_attrs *pt_attrs;
dsp_status clk_status;
@@ -838,10 +838,10 @@ static dsp_status wmd_brd_delete(struct wmd_dev_context *hDevContext)
* ======== bridge_brd_status ========
* Returns the board status.
*/
-static dsp_status bridge_brd_status(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_status(struct bridge_dev_context *hDevContext,
int *pdwState)
{
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
*pdwState = dev_context->dw_brd_state;
return DSP_SOK;
}
@@ -850,12 +850,12 @@ static dsp_status bridge_brd_status(struct wmd_dev_context *hDevContext,
* ======== bridge_brd_write ========
* Copies the buffers to DSP internal or external memory.
*/
-static dsp_status bridge_brd_write(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_write(struct bridge_dev_context *hDevContext,
IN u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
if (dwDSPAddr < dev_context->dw_dsp_start_add) {
status = DSP_EFAIL;
@@ -877,13 +877,13 @@ static dsp_status bridge_brd_write(struct wmd_dev_context *hDevContext,
* ======== bridge_dev_create ========
* Creates a driver object. Puts DSP in self loop.
*/
-static dsp_status bridge_dev_create(OUT struct wmd_dev_context **ppDevContext,
- struct dev_object *hdev_obj,
- IN CONST struct cfg_hostres *pConfig,
- IN CONST struct cfg_dspres *pDspConfig)
+static dsp_status bridge_dev_create(OUT struct bridge_dev_context
+ **ppDevContext, struct dev_object *hdev_obj,
+ IN CONST struct cfg_hostres *pConfig,
+ IN CONST struct cfg_dspres *pDspConfig)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = NULL;
+ struct bridge_dev_context *dev_context = NULL;
s32 entry_ndx;
s32 tc_word_swap;
u32 tc_word_swap_size = sizeof(tc_word_swap);
@@ -895,7 +895,7 @@ static dsp_status bridge_dev_create(OUT struct wmd_dev_context **ppDevContext,
/* Allocate and initialize a data structure to contain the mini driver
* state, which becomes the context for later calls into this WMD. */
- dev_context = kzalloc(sizeof(struct wmd_dev_context), GFP_KERNEL);
+ dev_context = kzalloc(sizeof(struct bridge_dev_context), GFP_KERNEL);
if (!dev_context) {
status = DSP_EMEMORY;
goto func_end;
@@ -1058,7 +1058,7 @@ func_end:
* ======== bridge_dev_ctrl ========
* Receives device specific commands.
*/
-static dsp_status bridge_dev_ctrl(struct wmd_dev_context *dev_context,
+static dsp_status bridge_dev_ctrl(struct bridge_dev_context *dev_context,
u32 dw_cmd, IN OUT void *pargs)
{
dsp_status status = DSP_SOK;
@@ -1112,11 +1112,11 @@ static dsp_status bridge_dev_ctrl(struct wmd_dev_context *dev_context,
* ======== bridge_dev_destroy ========
* Destroys the driver object.
*/
-static dsp_status bridge_dev_destroy(struct wmd_dev_context *hDevContext)
+static dsp_status bridge_dev_destroy(struct bridge_dev_context *hDevContext)
{
struct pg_table_attrs *pt_attrs;
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = (struct wmd_dev_context *)
+ struct bridge_dev_context *dev_context = (struct bridge_dev_context *)
hDevContext;
/* It should never happen */
@@ -1147,7 +1147,7 @@ static dsp_status bridge_dev_destroy(struct wmd_dev_context *hDevContext)
return status;
}
-static dsp_status bridge_brd_mem_copy(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_mem_copy(struct bridge_dev_context *hDevContext,
u32 ulDspDestAddr, u32 ulDspSrcAddr,
u32 ul_num_bytes, u32 ulMemType)
{
@@ -1157,7 +1157,7 @@ static dsp_status bridge_brd_mem_copy(struct wmd_dev_context *hDevContext,
u32 copy_bytes = 0;
u32 total_bytes = ul_num_bytes;
u8 host_buf[BUFFERSIZE];
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
while ((total_bytes > 0) && DSP_SUCCEEDED(status)) {
copy_bytes =
total_bytes > BUFFERSIZE ? BUFFERSIZE : total_bytes;
@@ -1187,12 +1187,12 @@ static dsp_status bridge_brd_mem_copy(struct wmd_dev_context *hDevContext,
}
/* Mem Write does not halt the DSP to write unlike bridge_brd_write */
-static dsp_status bridge_brd_mem_write(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_mem_write(struct bridge_dev_context *hDevContext,
IN u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
u32 ul_remain_bytes = 0;
u32 ul_bytes = 0;
ul_remain_bytes = ul_num_bytes;
@@ -1225,13 +1225,13 @@ static dsp_status bridge_brd_mem_write(struct wmd_dev_context *hDevContext,
*
* TODO: Disable MMU while updating the page tables (but that'll stall DSP)
*/
-static dsp_status bridge_brd_mem_map(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_mem_map(struct bridge_dev_context *hDevContext,
u32 ul_mpu_addr, u32 ulVirtAddr,
u32 ul_num_bytes, u32 ul_map_attr)
{
u32 attrs;
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
struct hw_mmu_map_attrs_t hw_attrs;
struct vm_area_struct *vma;
struct mm_struct *mm = current->mm;
@@ -1445,7 +1445,7 @@ func_cont:
* So, instead of looking up the PTE address for every 4K block,
* we clear consecutive PTEs until we unmap all the bytes
*/
-static dsp_status bridge_brd_mem_un_map(struct wmd_dev_context *hDevContext,
+static dsp_status bridge_brd_mem_un_map(struct bridge_dev_context *hDevContext,
u32 ulVirtAddr, u32 ul_num_bytes)
{
u32 l1_base_va;
@@ -1462,7 +1462,7 @@ static dsp_status bridge_brd_mem_un_map(struct wmd_dev_context *hDevContext,
u32 va_curr;
struct page *pg = NULL;
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
struct pg_table_attrs *pt = dev_context->pt_attrs;
u32 temp;
u32 paddr;
@@ -1670,7 +1670,7 @@ static u32 user_va2_pa(struct mm_struct *mm, u32 address)
* This function calculates the optimum page-aligned addresses and sizes
* Caller must pass page-aligned values
*/
-static dsp_status pte_update(struct wmd_dev_context *hDevContext, u32 pa,
+static dsp_status pte_update(struct bridge_dev_context *hDevContext, u32 pa,
u32 va, u32 size,
struct hw_mmu_map_attrs_t *map_attrs)
{
@@ -1679,7 +1679,7 @@ static dsp_status pte_update(struct wmd_dev_context *hDevContext, u32 pa,
u32 pa_curr = pa;
u32 va_curr = va;
u32 num_bytes = size;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
dsp_status status = DSP_SOK;
u32 page_size[] = { HW_PAGE_SIZE16MB, HW_PAGE_SIZE1MB,
HW_PAGE_SIZE64KB, HW_PAGE_SIZE4KB
@@ -1808,7 +1808,7 @@ static dsp_status pte_set(struct pg_table_attrs *pt, u32 pa, u32 va,
}
/* Memory map kernel VA -- memory allocated with vmalloc */
-static dsp_status mem_map_vmalloc(struct wmd_dev_context *dev_context,
+static dsp_status mem_map_vmalloc(struct bridge_dev_context *dev_context,
u32 ul_mpu_addr, u32 ulVirtAddr,
u32 ul_num_bytes,
struct hw_mmu_map_attrs_t *hw_attrs)
@@ -1894,7 +1894,7 @@ static dsp_status mem_map_vmalloc(struct wmd_dev_context *dev_context,
* ======== configure_dsp_mmu ========
* Make DSP MMU page table entries.
*/
-void configure_dsp_mmu(struct wmd_dev_context *dev_context, u32 dataBasePhys,
+void configure_dsp_mmu(struct bridge_dev_context *dev_context, u32 dataBasePhys,
u32 dspBaseVirt, u32 sizeInBytes, s32 nEntryStart,
enum hw_endianism_t endianism,
enum hw_element_size_t elem_size,
@@ -1918,7 +1918,7 @@ void configure_dsp_mmu(struct wmd_dev_context *dev_context, u32 dataBasePhys,
* ======== wait_for_start ========
* Wait for the singal from DSP that it has started, or time out.
*/
-bool wait_for_start(struct wmd_dev_context *dev_context, u32 dw_sync_addr)
+bool wait_for_start(struct bridge_dev_context *dev_context, u32 dw_sync_addr)
{
u16 timeout = TIHELEN_ACKTIMEOUT;
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
index 004c246..d9defcc 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -54,7 +54,7 @@ extern struct mailbox_context mboxsetting;
* ======== handle_constraints_set ========
* Sets new DSP constraint
*/
-dsp_status handle_constraints_set(struct wmd_dev_context *dev_context,
+dsp_status handle_constraints_set(struct bridge_dev_context *dev_context,
IN void *pargs)
{
#ifdef CONFIG_BRIDGE_DVFS
@@ -78,7 +78,7 @@ dsp_status handle_constraints_set(struct wmd_dev_context *dev_context,
* ======== handle_hibernation_from_dsp ========
* Handle Hibernation requested from DSP
*/
-dsp_status handle_hibernation_from_dsp(struct wmd_dev_context *dev_context)
+dsp_status handle_hibernation_from_dsp(struct bridge_dev_context *dev_context)
{
dsp_status status = DSP_SOK;
#ifdef CONFIG_PM
@@ -145,7 +145,7 @@ dsp_status handle_hibernation_from_dsp(struct wmd_dev_context *dev_context)
* ======== sleep_dsp ========
* Put DSP in low power consuming state.
*/
-dsp_status sleep_dsp(struct wmd_dev_context *dev_context, IN u32 dw_cmd,
+dsp_status sleep_dsp(struct bridge_dev_context *dev_context, IN u32 dw_cmd,
IN void *pargs)
{
dsp_status status = DSP_SOK;
@@ -255,7 +255,7 @@ dsp_status sleep_dsp(struct wmd_dev_context *dev_context, IN u32 dw_cmd,
* ======== wake_dsp ========
* Wake up DSP from sleep.
*/
-dsp_status wake_dsp(struct wmd_dev_context *dev_context, IN void *pargs)
+dsp_status wake_dsp(struct bridge_dev_context *dev_context, IN void *pargs)
{
dsp_status status = DSP_SOK;
#ifdef CONFIG_PM
@@ -281,7 +281,7 @@ dsp_status wake_dsp(struct wmd_dev_context *dev_context, IN void *pargs)
* ======== dsp_peripheral_clk_ctrl ========
* Enable/Disable the DSP peripheral clocks as needed..
*/
-dsp_status dsp_peripheral_clk_ctrl(struct wmd_dev_context *dev_context,
+dsp_status dsp_peripheral_clk_ctrl(struct bridge_dev_context *dev_context,
IN void *pargs)
{
u32 ext_clk = 0;
@@ -379,7 +379,7 @@ dsp_status dsp_peripheral_clk_ctrl(struct wmd_dev_context *dev_context,
* Sends prescale notification to DSP
*
*/
-dsp_status pre_scale_dsp(struct wmd_dev_context *dev_context, IN void *pargs)
+dsp_status pre_scale_dsp(struct bridge_dev_context *dev_context, IN void *pargs)
{
#ifdef CONFIG_BRIDGE_DVFS
u32 level;
@@ -412,7 +412,8 @@ dsp_status pre_scale_dsp(struct wmd_dev_context *dev_context, IN void *pargs)
* Sends postscale notification to DSP
*
*/
-dsp_status post_scale_dsp(struct wmd_dev_context *dev_context, IN void *pargs)
+dsp_status post_scale_dsp(struct bridge_dev_context *dev_context,
+ IN void *pargs)
{
dsp_status status = DSP_SOK;
#ifdef CONFIG_BRIDGE_DVFS
@@ -453,7 +454,7 @@ dsp_status post_scale_dsp(struct wmd_dev_context *dev_context, IN void *pargs)
* ========dsp_peripheral_clocks_disable========
* Disables all the peripheral clocks that were requested by DSP
*/
-dsp_status dsp_peripheral_clocks_disable(struct wmd_dev_context *dev_context,
+dsp_status dsp_peripheral_clocks_disable(struct bridge_dev_context *dev_context,
IN void *pargs)
{
u32 clk_idx;
@@ -498,7 +499,7 @@ dsp_status dsp_peripheral_clocks_disable(struct wmd_dev_context *dev_context,
* ========dsp_peripheral_clocks_enable========
* Enables all the peripheral clocks that were requested by DSP
*/
-dsp_status dsp_peripheral_clocks_enable(struct wmd_dev_context *dev_context,
+dsp_status dsp_peripheral_clocks_enable(struct bridge_dev_context *dev_context,
IN void *pargs)
{
u32 clk_idx;
diff --git a/drivers/dsp/bridge/wmd/tiomap_io.h b/drivers/dsp/bridge/wmd/tiomap_io.h
index ac78538..0f30fe7 100644
--- a/drivers/dsp/bridge/wmd/tiomap_io.h
+++ b/drivers/dsp/bridge/wmd/tiomap_io.h
@@ -47,14 +47,14 @@
* Reads it from DSP External memory. The external memory for the DSP
* is configured by the combination of DSP MMU and shm Memory manager in the CDB
*/
-extern dsp_status read_ext_dsp_data(struct wmd_dev_context *dev_context,
+extern dsp_status read_ext_dsp_data(struct bridge_dev_context *dev_context,
OUT u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType);
/*
* ======== write_dsp_data ========
*/
-extern dsp_status write_dsp_data(struct wmd_dev_context *dev_context,
+extern dsp_status write_dsp_data(struct bridge_dev_context *dev_context,
OUT u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType);
@@ -64,7 +64,7 @@ extern dsp_status write_dsp_data(struct wmd_dev_context *dev_context,
* The ext mem for progra is configured by the combination of DSP MMU and
* shm Memory manager in the CDB
*/
-extern dsp_status write_ext_dsp_data(struct wmd_dev_context *dev_context,
+extern dsp_status write_ext_dsp_data(struct bridge_dev_context *dev_context,
IN u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType,
bool bDynamicLoad);
@@ -74,8 +74,8 @@ extern dsp_status write_ext_dsp_data(struct wmd_dev_context *dev_context,
* Writes 32 bit data to the external memory
*/
extern inline void write_ext32_bit_dsp_data(IN const
- struct wmd_dev_context *dev_context,
- IN u32 dwDSPAddr, IN u32 val)
+ struct bridge_dev_context *dev_context,
+ IN u32 dwDSPAddr, IN u32 val)
{
*(u32 *) dwDSPAddr = ((dev_context->tc_word_swap_on) ? (((val << 16) &
0xFFFF0000) |
@@ -88,7 +88,7 @@ extern inline void write_ext32_bit_dsp_data(IN const
* ======== read_ext32_bit_dsp_data ========
* Reads 32 bit data from the external memory
*/
-extern inline u32 read_ext32_bit_dsp_data(IN const struct wmd_dev_context
+extern inline u32 read_ext32_bit_dsp_data(IN const struct bridge_dev_context
*dev_context, IN u32 dwDSPAddr)
{
u32 ret;
diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c
index f10d185..3ef7f97 100644
--- a/drivers/dsp/bridge/wmd/ue_deh.c
+++ b/drivers/dsp/bridge/wmd/ue_deh.c
@@ -71,7 +71,7 @@ dsp_status bridge_deh_create(OUT struct deh_mgr **phDehMgr,
struct deh_mgr *deh_mgr_obj = NULL;
struct cfg_hostres cfg_host_res;
struct cfg_devnode *dev_node_obj;
- struct wmd_dev_context *hwmd_context = NULL;
+ struct bridge_dev_context *hwmd_context = NULL;
/* Message manager will be created when a file is loaded, since
* size of message buffer in shared memory is configurable in
@@ -191,7 +191,7 @@ dsp_status bridge_deh_register_notify(struct deh_mgr *hdeh_mgr, u32 event_mask,
void bridge_deh_notify(struct deh_mgr *hdeh_mgr, u32 ulEventMask, u32 dwErrInfo)
{
struct deh_mgr *deh_mgr_obj = (struct deh_mgr *)hdeh_mgr;
- struct wmd_dev_context *dev_context;
+ struct bridge_dev_context *dev_context;
dsp_status status = DSP_SOK;
u32 mem_physical = 0;
u32 hw_mmu_max_tlb_count = 31;
@@ -208,7 +208,7 @@ void bridge_deh_notify(struct deh_mgr *hdeh_mgr, u32 ulEventMask, u32 dwErrInfo)
"bridge_deh_notify: ********** DEVICE EXCEPTION "
"**********\n");
dev_context =
- (struct wmd_dev_context *)deh_mgr_obj->hwmd_context;
+ (struct bridge_dev_context *)deh_mgr_obj->hwmd_context;
switch (ulEventMask) {
case DSP_SYSERROR:
@@ -243,7 +243,7 @@ void bridge_deh_notify(struct deh_mgr *hdeh_mgr, u32 ulEventMask, u32 dwErrInfo)
mem_physical =
VIRT_TO_PHYS(PG_ALIGN_LOW
((u32) dummy_va_addr, PG_SIZE4K));
- dev_context = (struct wmd_dev_context *)
+ dev_context = (struct bridge_dev_context *)
deh_mgr_obj->hwmd_context;
/* Reset the dynamic mmu index to fixed count if it
* exceeds 31. So that the dynmmuindex is always
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* RE: [PATCH 01/11] DSPBRIDGE: Rename wmd_dev_context structure by bridge_dev_context
2010-05-01 0:45 ` [PATCH 01/11] DSPBRIDGE: Rename wmd_dev_context structure by bridge_dev_context Ivan Gomez Castellanos
@ 2010-05-09 4:30 ` Ramirez Luna, Omar
0 siblings, 0 replies; 13+ messages in thread
From: Ramirez Luna, Omar @ 2010-05-09 4:30 UTC (permalink / raw)
To: Gomez Castellanos, Ivan, linux-omap@vger.kernel.org
Cc: Hiroshi.DOYU@nokia.com, ameya.palande@nokia.com,
felipe.contreras@nokia.com
>Subject: [PATCH 01/11] DSPBRIDGE: Rename wmd_dev_context structure by bridge_dev_context
>
>This change is done because "wmd" refers to Windows OS.
>
>wmd = windows mini driver
>
>And the new name "bridge_dev_context" make more sense.
>
>Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
>---
> arch/arm/plat-omap/include/dspbridge/dev.h | 2 +-
> arch/arm/plat-omap/include/dspbridge/io_sm.h | 14 ++--
> arch/arm/plat-omap/include/dspbridge/wmd.h | 30 ++++----
> drivers/dsp/bridge/pmgr/dev.c | 4 +-
> drivers/dsp/bridge/pmgr/ioobj.h | 3 +-
> drivers/dsp/bridge/rmgr/node.c | 4 +-
> drivers/dsp/bridge/rmgr/proc.c | 2 +-
> drivers/dsp/bridge/rmgr/pwr.c | 16 ++--
> drivers/dsp/bridge/wmd/_deh.h | 3 +-
> drivers/dsp/bridge/wmd/_tiomap.h | 12 ++--
> drivers/dsp/bridge/wmd/_tiomap_mmu.h | 2 +-
> drivers/dsp/bridge/wmd/_tiomap_pwr.h | 26 ++++---
> drivers/dsp/bridge/wmd/_tiomap_util.h | 2 +-
> drivers/dsp/bridge/wmd/io_sm.c | 18 ++--
> drivers/dsp/bridge/wmd/mmu_fault.c | 8 +-
> drivers/dsp/bridge/wmd/tiomap3430.c | 116 +++++++++++++-------------
> drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 19 ++--
> drivers/dsp/bridge/wmd/tiomap_io.h | 12 ++--
> drivers/dsp/bridge/wmd/ue_deh.c | 8 +-
> 19 files changed, 154 insertions(+), 147 deletions(-)
>
Pushed the entire series to dspbridge.
- omar
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 02/11] DSPBRIDGE: Rename the device context handle variables
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 01/11] DSPBRIDGE: Rename wmd_dev_context structure by bridge_dev_context Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 03/11] DSPBRIDGE: Rename variables and structures which contain "wmd" Ivan Gomez Castellanos
` (8 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
The name of these variables contains "wmd", which refers to Windows OS,
So they are renamed as follows:
hwmd_context ==> hbridge_context
pwmd_context ==> pbridge_context
phWmdContext ==> phbridge_context
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/dev.h | 10 +-
arch/arm/plat-omap/include/dspbridge/io_sm.h | 2 +-
drivers/dsp/bridge/pmgr/dev.c | 33 +++---
drivers/dsp/bridge/pmgr/ioobj.h | 2 +-
drivers/dsp/bridge/rmgr/node.c | 19 ++--
drivers/dsp/bridge/rmgr/proc.c | 34 +++---
drivers/dsp/bridge/wmd/_deh.h | 2 +-
drivers/dsp/bridge/wmd/chnl_sm.c | 4 +-
drivers/dsp/bridge/wmd/io_sm.c | 136 +++++++++++++-------------
drivers/dsp/bridge/wmd/mmu_fault.c | 2 +-
drivers/dsp/bridge/wmd/tiomap_io.c | 10 +-
drivers/dsp/bridge/wmd/ue_deh.c | 14 ++--
12 files changed, 135 insertions(+), 133 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/dev.h b/arch/arm/plat-omap/include/dspbridge/dev.h
index 6df8db7..5bff0b8 100644
--- a/arch/arm/plat-omap/include/dspbridge/dev.h
+++ b/arch/arm/plat-omap/include/dspbridge/dev.h
@@ -514,20 +514,20 @@ extern dsp_status dev_get_symbol(struct dev_object *hdev_obj,
* Retrieve the WMD Context handle, as returned by the WMD_Create fxn.
* Parameters:
* hdev_obj: Handle to device object created with dev_create_device()
- * *phWmdContext: Ptr to location to store context handle.
+ * *phbridge_context: Ptr to location to store context handle.
* Returns:
* DSP_SOK: Success.
* DSP_EHANDLE: Invalid hdev_obj.
* Requires:
- * phWmdContext != NULL.
+ * phbridge_context != NULL.
* DEV Initialized.
* Ensures:
- * DSP_SOK: *phWmdContext contains context handle;
- * else: *phWmdContext is NULL;
+ * DSP_SOK: *phbridge_context contains context handle;
+ * else: *phbridge_context is NULL;
*/
extern dsp_status dev_get_wmd_context(struct dev_object *hdev_obj,
OUT struct bridge_dev_context
- **phWmdContext);
+ **phbridge_context);
/*
* ======== dev_exit ========
diff --git a/arch/arm/plat-omap/include/dspbridge/io_sm.h b/arch/arm/plat-omap/include/dspbridge/io_sm.h
index 177bfeb..1df7664 100644
--- a/arch/arm/plat-omap/include/dspbridge/io_sm.h
+++ b/arch/arm/plat-omap/include/dspbridge/io_sm.h
@@ -289,6 +289,6 @@ extern void io_sm_init(void);
* Print DSP tracebuffer.
*/
extern dsp_status print_dsp_trace_buffer(struct bridge_dev_context
- *hwmd_context);
+ *hbridge_context);
#endif /* IOSM_ */
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index 62ff655..164b65d 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -64,7 +64,7 @@ struct dev_object {
struct list_head link; /* Link to next dev_object. */
u32 dev_type; /* Device Type */
struct cfg_devnode *dev_node_obj; /* Platform specific dev id */
- struct bridge_dev_context *hwmd_context; /* WMD Context Handle */
+ struct bridge_dev_context *hbridge_context; /* WMD Context Handle */
struct bridge_drv_interface wmd_interface; /* Function interface to WMD. */
struct brd_object *lock_owner; /* Client with exclusive access. */
struct cod_manager *cod_mgr; /* Code manager handle. */
@@ -108,11 +108,10 @@ u32 dev_brd_write_fxn(void *pArb, u32 ulDspAddr, void *pHostBuf,
DBC_REQUIRE(pHostBuf != NULL); /* Required of BrdWrite(). */
if (dev_obj) {
/* Require of BrdWrite() */
- DBC_ASSERT(dev_obj->hwmd_context != NULL);
- status =
- (*dev_obj->wmd_interface.
- pfn_brd_write) (dev_obj->hwmd_context, pHostBuf, ulDspAddr,
- ul_num_bytes, nMemSpace);
+ DBC_ASSERT(dev_obj->hbridge_context != NULL);
+ status = (*dev_obj->wmd_interface.pfn_brd_write)
+ (dev_obj->hbridge_context, pHostBuf, ulDspAddr,
+ ul_num_bytes, nMemSpace);
/* Special case of getting the address only */
if (ul_num_bytes == 0)
ul_num_bytes = 1;
@@ -177,11 +176,11 @@ dsp_status dev_create_device(OUT struct dev_object **phDevObject,
/* Call fxn_dev_create() to get the WMD's device
* context handle. */
status = (dev_obj->wmd_interface.pfn_dev_create)
- (&dev_obj->hwmd_context, dev_obj,
+ (&dev_obj->hbridge_context, dev_obj,
pHostConfig, pDspConfig);
/* Assert bridge_dev_create()'s ensure clause: */
DBC_ASSERT(DSP_FAILED(status)
- || (dev_obj->hwmd_context != NULL));
+ || (dev_obj->hbridge_context != NULL));
} else {
status = DSP_EMEMORY;
}
@@ -381,10 +380,10 @@ dsp_status dev_destroy_device(struct dev_object *hdev_obj)
/* Call the driver's bridge_dev_destroy() function: */
/* Require of DevDestroy */
- if (dev_obj->hwmd_context) {
+ if (dev_obj->hbridge_context) {
status = (*dev_obj->wmd_interface.pfn_dev_destroy)
- (dev_obj->hwmd_context);
- dev_obj->hwmd_context = NULL;
+ (dev_obj->hbridge_context);
+ dev_obj->hbridge_context = NULL;
} else
status = DSP_EFAIL;
if (DSP_SUCCEEDED(status)) {
@@ -715,23 +714,23 @@ dsp_status dev_get_symbol(struct dev_object *hdev_obj,
* Retrieve the WMD Context handle, as returned by the WMD_Create fxn.
*/
dsp_status dev_get_wmd_context(struct dev_object *hdev_obj,
- OUT struct bridge_dev_context **phWmdContext)
+ OUT struct bridge_dev_context **phbridge_context)
{
dsp_status status = DSP_SOK;
struct dev_object *dev_obj = hdev_obj;
DBC_REQUIRE(refs > 0);
- DBC_REQUIRE(phWmdContext != NULL);
+ DBC_REQUIRE(phbridge_context != NULL);
if (hdev_obj) {
- *phWmdContext = dev_obj->hwmd_context;
+ *phbridge_context = dev_obj->hbridge_context;
} else {
- *phWmdContext = NULL;
+ *phbridge_context = NULL;
status = DSP_EHANDLE;
}
- DBC_ENSURE(DSP_SUCCEEDED(status) || ((phWmdContext != NULL) &&
- (*phWmdContext == NULL)));
+ DBC_ENSURE(DSP_SUCCEEDED(status) || ((phbridge_context != NULL) &&
+ (*phbridge_context == NULL)));
return status;
}
diff --git a/drivers/dsp/bridge/pmgr/ioobj.h b/drivers/dsp/bridge/pmgr/ioobj.h
index 5dd02bf..8717f8a 100644
--- a/drivers/dsp/bridge/pmgr/ioobj.h
+++ b/drivers/dsp/bridge/pmgr/ioobj.h
@@ -31,7 +31,7 @@
struct io_mgr_ {
/* These must be the first fields in a io_mgr struct: */
/* WMD device context. */
- struct bridge_dev_context *hwmd_context;
+ struct bridge_dev_context *hbridge_context;
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD. */
struct dev_object *hdev_obj; /* Device this board represents. */
};
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 0edf6ae..80a54d4 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -3132,7 +3132,7 @@ static u32 ovly(void *priv_ref, u32 ulDspRunAddr, u32 ulDspLoadAddr,
u32 ul_size;
u32 ul_timeout;
dsp_status status = DSP_SOK;
- struct bridge_dev_context *hwmd_context;
+ struct bridge_dev_context *hbridge_context;
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
DBC_REQUIRE(hnode);
@@ -3144,12 +3144,11 @@ static u32 ovly(void *priv_ref, u32 ulDspRunAddr, u32 ulDspLoadAddr,
/* Call new MemCopy function */
intf_fxns = hnode_mgr->intf_fxns;
- status = dev_get_wmd_context(hnode_mgr->hdev_obj, &hwmd_context);
+ status = dev_get_wmd_context(hnode_mgr->hdev_obj, &hbridge_context);
if (DSP_SUCCEEDED(status)) {
- status =
- (*intf_fxns->pfn_brd_mem_copy) (hwmd_context, ulDspRunAddr,
- ulDspLoadAddr, ul_num_bytes,
- (u32) nMemSpace);
+ status = (*intf_fxns->pfn_brd_mem_copy) (hbridge_context,
+ ulDspRunAddr, ulDspLoadAddr,
+ ul_num_bytes, (u32) nMemSpace);
if (DSP_SUCCEEDED(status))
ul_bytes = ul_num_bytes;
else
@@ -3174,7 +3173,7 @@ static u32 mem_write(void *priv_ref, u32 ulDspAddr, void *pbuf,
u16 mem_sect_type;
u32 ul_timeout;
dsp_status status = DSP_SOK;
- struct bridge_dev_context *hwmd_context;
+ struct bridge_dev_context *hbridge_context;
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
DBC_REQUIRE(hnode);
@@ -3187,9 +3186,9 @@ static u32 mem_write(void *priv_ref, u32 ulDspAddr, void *pbuf,
/* Call new MemWrite function */
intf_fxns = hnode_mgr->intf_fxns;
- status = dev_get_wmd_context(hnode_mgr->hdev_obj, &hwmd_context);
- status = (*intf_fxns->pfn_brd_mem_write) (hwmd_context, pbuf, ulDspAddr,
- ul_num_bytes, mem_sect_type);
+ status = dev_get_wmd_context(hnode_mgr->hdev_obj, &hbridge_context);
+ status = (*intf_fxns->pfn_brd_mem_write) (hbridge_context, pbuf,
+ ulDspAddr, ul_num_bytes, mem_sect_type);
return ul_num_bytes;
}
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index bdcb862..e3b9be0 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -95,7 +95,7 @@ struct proc_object {
* GPP Client attached
*/
struct ntfy_object *ntfy_obj; /* Manages notifications */
- struct bridge_dev_context *hwmd_context; /* WMD Context Handle */
+ struct bridge_dev_context *hbridge_context; /* WMD Context Handle */
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
char *psz_last_coff;
struct list_head proc_list;
@@ -175,7 +175,7 @@ proc_attach(u32 processor_id,
status = dev_get_intf_fxns(hdev_obj, &p_proc_object->intf_fxns);
if (DSP_SUCCEEDED(status)) {
status = dev_get_wmd_context(hdev_obj,
- &p_proc_object->hwmd_context);
+ &p_proc_object->hbridge_context);
if (DSP_FAILED(status))
kfree(p_proc_object);
} else
@@ -296,7 +296,7 @@ dsp_status proc_auto_start(struct cfg_devnode *dev_node_obj,
status = dev_get_intf_fxns(hdev_obj, &p_proc_object->intf_fxns);
if (DSP_SUCCEEDED(status))
status = dev_get_wmd_context(hdev_obj,
- &p_proc_object->hwmd_context);
+ &p_proc_object->hbridge_context);
if (DSP_FAILED(status))
goto func_cont;
@@ -369,7 +369,7 @@ dsp_status proc_ctrl(void *hprocessor, u32 dw_cmd, IN struct dsp_cbdata * arg)
status = pwr_wake_dsp(timeout);
} else
if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_dev_cntrl)
- (p_proc_object->hwmd_context, dw_cmd,
+ (p_proc_object->hbridge_context, dw_cmd,
arg))) {
status = DSP_SOK;
} else {
@@ -717,7 +717,7 @@ dsp_status proc_get_state(void *hprocessor,
if (p_proc_object) {
/* First, retrieve BRD state information */
status = (*p_proc_object->intf_fxns->pfn_brd_status)
- (p_proc_object->hwmd_context, &brd_status);
+ (p_proc_object->hbridge_context, &brd_status);
if (DSP_SUCCEEDED(status)) {
switch (brd_status) {
case BRD_STOPPED:
@@ -986,7 +986,7 @@ dsp_status proc_load(void *hprocessor, IN CONST s32 argc_index,
if (DSP_SUCCEEDED(status)) {
/* Update the Processor status to loaded */
status = (*p_proc_object->intf_fxns->pfn_brd_set_state)
- (p_proc_object->hwmd_context, BRD_LOADED);
+ (p_proc_object->hbridge_context, BRD_LOADED);
if (DSP_SUCCEEDED(status)) {
p_proc_object->proc_state = PROC_LOADED;
if (p_proc_object->ntfy_obj)
@@ -1026,7 +1026,7 @@ dsp_status proc_load(void *hprocessor, IN CONST s32 argc_index,
user_args[0] = pargv0;
if (DSP_SUCCEEDED(status)) {
if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_brd_status)
- (p_proc_object->hwmd_context, &brd_state))) {
+ (p_proc_object->hbridge_context, &brd_state))) {
pr_info("%s: Processor Loaded %s\n", __func__, pargv0);
reg_set_value(DEFEXEC, (u8 *)pargv0,
strlen(pargv0) + 1);
@@ -1101,7 +1101,7 @@ dsp_status proc_map(void *hprocessor, void *pmpu_addr, u32 ul_size,
if (DSP_SUCCEEDED(status)) {
status = (*p_proc_object->intf_fxns->pfn_brd_mem_map)
- (p_proc_object->hwmd_context, pa_align, va_align,
+ (p_proc_object->hbridge_context, pa_align, va_align,
size_align, ul_map_attr);
}
if (DSP_SUCCEEDED(status)) {
@@ -1295,7 +1295,7 @@ dsp_status proc_start(void *hprocessor)
goto func_cont;
status = (*p_proc_object->intf_fxns->pfn_brd_start)
- (p_proc_object->hwmd_context, dw_dsp_addr);
+ (p_proc_object->hbridge_context, dw_dsp_addr);
if (DSP_FAILED(status))
goto func_cont;
@@ -1315,13 +1315,13 @@ dsp_status proc_start(void *hprocessor)
/* Failed to Create Node Manager and DISP Object
* Stop the Processor from running. Put it in STOPPED State */
(void)(*p_proc_object->intf_fxns->
- pfn_brd_stop) (p_proc_object->hwmd_context);
+ pfn_brd_stop) (p_proc_object->hbridge_context);
p_proc_object->proc_state = PROC_STOPPED;
}
func_cont:
if (DSP_SUCCEEDED(status)) {
if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_brd_status)
- (p_proc_object->hwmd_context, &brd_state))) {
+ (p_proc_object->hbridge_context, &brd_state))) {
pr_info("%s: dsp in running state\n", __func__);
DBC_ASSERT(brd_state != BRD_HIBERNATION);
}
@@ -1358,7 +1358,7 @@ dsp_status proc_stop(void *hprocessor)
goto func_end;
}
if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_brd_status)
- (p_proc_object->hwmd_context, &brd_state))) {
+ (p_proc_object->hbridge_context, &brd_state))) {
if (brd_state == BRD_ERROR)
bridge_deh_release_dummy_mem();
}
@@ -1377,7 +1377,7 @@ dsp_status proc_stop(void *hprocessor)
/* It is OK to stop a device that does n't have nodes OR not started */
status =
(*p_proc_object->intf_fxns->
- pfn_brd_stop) (p_proc_object->hwmd_context);
+ pfn_brd_stop) (p_proc_object->hbridge_context);
if (DSP_SUCCEEDED(status)) {
dev_dbg(bridge, "%s: processor in standby mode\n", __func__);
p_proc_object->proc_state = PROC_STOPPED;
@@ -1392,7 +1392,7 @@ dsp_status proc_stop(void *hprocessor)
if (DSP_SUCCEEDED
((*p_proc_object->
intf_fxns->pfn_brd_status) (p_proc_object->
- hwmd_context,
+ hbridge_context,
&brd_state)))
DBC_ASSERT(brd_state == BRD_STOPPED);
}
@@ -1439,7 +1439,7 @@ dsp_status proc_un_map(void *hprocessor, void *map_addr,
/* Remove mapping from the page tables. */
if (DSP_SUCCEEDED(status)) {
status = (*p_proc_object->intf_fxns->pfn_brd_mem_un_map)
- (p_proc_object->hwmd_context, va_align, size_align);
+ (p_proc_object->hbridge_context, va_align, size_align);
}
mutex_unlock(&proc_lock);
if (DSP_FAILED(status))
@@ -1552,10 +1552,10 @@ static dsp_status proc_monitor(struct proc_object *p_proc_object)
}
/* Place the Board in the Monitor State */
if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_brd_monitor)
- (p_proc_object->hwmd_context))) {
+ (p_proc_object->hbridge_context))) {
status = DSP_SOK;
if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_brd_status)
- (p_proc_object->hwmd_context, &brd_state)))
+ (p_proc_object->hbridge_context, &brd_state)))
DBC_ASSERT(brd_state == BRD_IDLE);
}
diff --git a/drivers/dsp/bridge/wmd/_deh.h b/drivers/dsp/bridge/wmd/_deh.h
index faa7a2e..a7e74b0 100644
--- a/drivers/dsp/bridge/wmd/_deh.h
+++ b/drivers/dsp/bridge/wmd/_deh.h
@@ -25,7 +25,7 @@
/* DEH Manager: only one created per board: */
struct deh_mgr {
/* Bridge device context. */
- struct bridge_dev_context *hwmd_context;
+ struct bridge_dev_context *hbridge_context;
struct ntfy_object *ntfy_obj; /* NTFY object */
struct dsp_errorinfo err_info; /* DSP exception info. */
diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c
index 600710d..199a33e 100644
--- a/drivers/dsp/bridge/wmd/chnl_sm.c
+++ b/drivers/dsp/bridge/wmd/chnl_sm.c
@@ -96,7 +96,7 @@ dsp_status bridge_chnl_add_io_req(struct chnl_object *chnl_obj, void *pHostBuf,
dsp_status status = DSP_SOK;
struct chnl_object *pchnl = (struct chnl_object *)chnl_obj;
struct chnl_irp *chnl_packet_obj = NULL;
- struct wmd_dev_context *dev_ctxt;
+ struct bridge_dev_context *dev_ctxt;
struct dev_object *dev_obj;
u32 dw_state;
bool is_eos;
@@ -579,7 +579,7 @@ dsp_status bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 dwTimeOut,
bool dequeue_ioc = true;
struct chnl_ioc ioc = { NULL, 0, 0, 0, 0 };
u8 *host_sys_buf = NULL;
- struct wmd_dev_context *dev_ctxt;
+ struct bridge_dev_context *dev_ctxt;
struct dev_object *dev_obj;
/* Check args: */
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index d452f98..aff0898 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -83,7 +83,7 @@
/* IO Manager: only one created per board */
struct io_mgr {
/* These four fields must be the first fields in a io_mgr_ struct */
- struct bridge_dev_context *hwmd_context; /* WMD device context */
+ struct bridge_dev_context *hbridge_context; /* WMD device context */
struct bridge_drv_interface *intf_fxns; /* Function interface to WMD */
struct dev_object *hdev_obj; /* Device this board represents */
@@ -172,7 +172,7 @@ dsp_status bridge_io_create(OUT struct io_mgr **phIOMgr,
dsp_status status = DSP_SOK;
struct io_mgr *pio_mgr = NULL;
struct shm *shared_mem = NULL;
- struct bridge_dev_context *hwmd_context = NULL;
+ struct bridge_dev_context *hbridge_context = NULL;
struct cfg_hostres host_res;
struct cfg_devnode *dev_node_obj;
struct chnl_mgr *hchnl_mgr;
@@ -193,8 +193,8 @@ dsp_status bridge_io_create(OUT struct io_mgr **phIOMgr,
* size of message buffer in shared memory is configurable in
* the base image.
*/
- dev_get_wmd_context(hdev_obj, &hwmd_context);
- if (!hwmd_context) {
+ dev_get_wmd_context(hdev_obj, &hbridge_context);
+ if (!hbridge_context) {
status = DSP_EHANDLE;
goto func_end;
}
@@ -241,7 +241,7 @@ dsp_status bridge_io_create(OUT struct io_mgr **phIOMgr,
&host_res);
}
if (DSP_SUCCEEDED(status)) {
- pio_mgr->hwmd_context = hwmd_context;
+ pio_mgr->hbridge_context = hbridge_context;
pio_mgr->shared_irq = pMgrAttrs->irq_shared;
if (dsp_wdt_init())
status = DSP_EFAIL;
@@ -270,9 +270,10 @@ func_end:
dsp_status bridge_io_destroy(struct io_mgr *hio_mgr)
{
dsp_status status = DSP_SOK;
- struct bridge_dev_context *hwmd_context;
+ struct bridge_dev_context *hbridge_context;
if (hio_mgr) {
- status = dev_get_wmd_context(hio_mgr->hdev_obj, &hwmd_context);
+ status = dev_get_wmd_context(hio_mgr->hdev_obj,
+ &hbridge_context);
/* Free IO DPC object */
tasklet_kill(&hio_mgr->dpc_tasklet);
@@ -504,7 +505,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
1)) == 0)) {
status =
hio_mgr->intf_fxns->
- pfn_brd_mem_map(hio_mgr->hwmd_context,
+ pfn_brd_mem_map(hio_mgr->hbridge_context,
pa_curr, va_curr,
page_size[i], map_attrs);
if (DSP_FAILED(status))
@@ -569,7 +570,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
} else {
status =
hio_mgr->intf_fxns->
- pfn_brd_mem_map(hio_mgr->hwmd_context,
+ pfn_brd_mem_map(hio_mgr->hbridge_context,
pa_curr, va_curr,
page_size[i], map_attrs);
dev_dbg(bridge,
@@ -636,7 +637,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
ndx++;
} else {
status = hio_mgr->intf_fxns->pfn_brd_mem_map
- (hio_mgr->hwmd_context,
+ (hio_mgr->hbridge_context,
hio_mgr->ext_proc_info.ty_tlb[i].
ul_gpp_phys,
hio_mgr->ext_proc_info.ty_tlb[i].
@@ -657,7 +658,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
i = 0;
while (l4_peripheral_table[i].phys_addr) {
status = hio_mgr->intf_fxns->pfn_brd_mem_map
- (hio_mgr->hwmd_context, l4_peripheral_table[i].phys_addr,
+ (hio_mgr->hbridge_context, l4_peripheral_table[i].phys_addr,
l4_peripheral_table[i].dsp_virt_addr, HW_PAGE_SIZE4KB,
map_attrs);
if (DSP_FAILED(status))
@@ -702,7 +703,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
*/
status =
- hio_mgr->intf_fxns->pfn_dev_cntrl(hio_mgr->hwmd_context,
+ hio_mgr->intf_fxns->pfn_dev_cntrl(hio_mgr->hbridge_context,
WMDIOCTL_SETMMUCONFIG,
ae_proc);
if (DSP_FAILED(status))
@@ -824,10 +825,10 @@ void io_cancel_chnl(struct io_mgr *hio_mgr, u32 ulChnl)
sm = hio_mgr->shared_mem;
/* Inform DSP that we have no more buffers on this channel */
- IO_AND_VALUE(pio_mgr->hwmd_context, struct shm, sm, host_free_mask,
+ IO_AND_VALUE(pio_mgr->hbridge_context, struct shm, sm, host_free_mask,
(~(1 << ulChnl)));
- sm_interrupt_dsp(pio_mgr->hwmd_context, MBX_PCPY_CLASS);
+ sm_interrupt_dsp(pio_mgr->hbridge_context, MBX_PCPY_CLASS);
func_end:
return;
}
@@ -885,7 +886,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
if (parg[0] == MBX_PM_HIBERNATE_EN) {
dev_dbg(bridge, "PM: Hibernate command\n");
status = pio_mgr->intf_fxns->
- pfn_dev_cntrl(pio_mgr->hwmd_context,
+ pfn_dev_cntrl(pio_mgr->hbridge_context,
WMDIOCTL_PWR_HIBERNATE, parg);
if (DSP_FAILED(status))
pr_err("%s: hibernate cmd failed 0x%x\n",
@@ -894,7 +895,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
parg[1] = pio_mgr->shared_mem->opp_request.rqst_opp_pt;
dev_dbg(bridge, "PM: Requested OPP = 0x%x\n", parg[1]);
status = pio_mgr->intf_fxns->
- pfn_dev_cntrl(pio_mgr->hwmd_context,
+ pfn_dev_cntrl(pio_mgr->hbridge_context,
WMDIOCTL_CONSTRAINT_REQUEST, parg);
if (DSP_FAILED(status))
dev_dbg(bridge, "PM: Failed to set constraint "
@@ -903,7 +904,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
dev_dbg(bridge, "PM: clk control value of msg = 0x%x\n",
parg[0]);
status = pio_mgr->intf_fxns->
- pfn_dev_cntrl(pio_mgr->hwmd_context,
+ pfn_dev_cntrl(pio_mgr->hbridge_context,
WMDIOCTL_CLK_CTRL, parg);
if (DSP_FAILED(status))
dev_dbg(bridge, "PM: Failed to ctrl the DSP clk"
@@ -1025,7 +1026,7 @@ void io_request_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
DBC_ASSERT((pchnl->dw_state == CHNL_STATEREADY) ||
(pchnl->dw_state == CHNL_STATEEOS));
/* Indicate to the DSP we have a buffer available for input */
- IO_OR_VALUE(pio_mgr->hwmd_context, struct shm, sm,
+ IO_OR_VALUE(pio_mgr->hbridge_context, struct shm, sm,
host_free_mask, (1 << pchnl->chnl_id));
*pwMbVal = MBX_PCPY_CLASS;
} else if (iMode == IO_OUTPUT) {
@@ -1125,14 +1126,15 @@ static void input_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
chnl_mgr_obj = pio_mgr->hchnl_mgr;
/* Attempt to perform input */
- if (!IO_GET_VALUE(pio_mgr->hwmd_context, struct shm, sm, input_full))
+ if (!IO_GET_VALUE(pio_mgr->hbridge_context, struct shm, sm, input_full))
goto func_end;
bytes =
- IO_GET_VALUE(pio_mgr->hwmd_context, struct shm, sm,
+ IO_GET_VALUE(pio_mgr->hbridge_context, struct shm, sm,
input_size) * chnl_mgr_obj->word_size;
- chnl_id = IO_GET_VALUE(pio_mgr->hwmd_context, struct shm, sm, input_id);
- dw_arg = IO_GET_LONG(pio_mgr->hwmd_context, struct shm, sm, arg);
+ chnl_id = IO_GET_VALUE(pio_mgr->hbridge_context, struct shm, sm,
+ input_id);
+ dw_arg = IO_GET_LONG(pio_mgr->hbridge_context, struct shm, sm, arg);
if (chnl_id >= CHNL_MAXCHANNELS) {
/* Shouldn't be here: would indicate corrupted shm. */
DBC_ASSERT(chnl_id);
@@ -1156,7 +1158,7 @@ static void input_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
*/
bytes = min(bytes, chnl_packet_obj->byte_size);
/* Transfer buffer from DSP side */
- bytes = read_data(pio_mgr->hwmd_context,
+ bytes = read_data(pio_mgr->hbridge_context,
chnl_packet_obj->host_sys_buf,
pio_mgr->input, bytes);
pchnl->bytes_moved += bytes;
@@ -1191,7 +1193,7 @@ static void input_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
if (!pchnl->pio_requests)
goto func_end;
if (LST_IS_EMPTY(pchnl->pio_requests)) {
- IO_AND_VALUE(pio_mgr->hwmd_context,
+ IO_AND_VALUE(pio_mgr->hbridge_context,
struct shm, sm,
host_free_mask,
~(1 << pchnl->chnl_id));
@@ -1217,9 +1219,9 @@ static void input_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
}
if (clear_chnl) {
/* Indicate to the DSP we have read the input */
- IO_SET_VALUE(pio_mgr->hwmd_context, struct shm, sm, input_full,
- 0);
- sm_interrupt_dsp(pio_mgr->hwmd_context, MBX_PCPY_CLASS);
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct shm, sm,
+ input_full, 0);
+ sm_interrupt_dsp(pio_mgr->hbridge_context, MBX_PCPY_CLASS);
}
if (notify_client) {
/* Notify client with IO completion record */
@@ -1248,10 +1250,10 @@ static void input_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
msg_ctr_obj = pio_mgr->msg_input_ctrl;
/* Get the number of input messages to be read */
input_empty =
- IO_GET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl, msg_ctr_obj,
+ IO_GET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl, msg_ctr_obj,
buf_empty);
num_msgs =
- IO_GET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl, msg_ctr_obj,
+ IO_GET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl, msg_ctr_obj,
size);
if (input_empty)
goto func_end;
@@ -1261,16 +1263,16 @@ static void input_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
/* Read the next message */
addr = (u32) &(((struct msg_dspmsg *)msg_input)->msg.dw_cmd);
msg.msg.dw_cmd =
- read_ext32_bit_dsp_data(pio_mgr->hwmd_context, addr);
+ read_ext32_bit_dsp_data(pio_mgr->hbridge_context, addr);
addr = (u32) &(((struct msg_dspmsg *)msg_input)->msg.dw_arg1);
msg.msg.dw_arg1 =
- read_ext32_bit_dsp_data(pio_mgr->hwmd_context, addr);
+ read_ext32_bit_dsp_data(pio_mgr->hbridge_context, addr);
addr = (u32) &(((struct msg_dspmsg *)msg_input)->msg.dw_arg2);
msg.msg.dw_arg2 =
- read_ext32_bit_dsp_data(pio_mgr->hwmd_context, addr);
+ read_ext32_bit_dsp_data(pio_mgr->hbridge_context, addr);
addr = (u32) &(((struct msg_dspmsg *)msg_input)->msgq_id);
msg.msgq_id =
- read_ext32_bit_dsp_data(pio_mgr->hwmd_context, addr);
+ read_ext32_bit_dsp_data(pio_mgr->hbridge_context, addr);
msg_input += sizeof(struct msg_dspmsg);
if (!hmsg_mgr->queue_list)
goto func_end;
@@ -1342,11 +1344,11 @@ static void input_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
/* Set the post SWI flag */
if (num_msgs > 0) {
/* Tell the DSP we've read the messages */
- IO_SET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl,
msg_ctr_obj, buf_empty, true);
- IO_SET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl,
msg_ctr_obj, post_swi, true);
- sm_interrupt_dsp(pio_mgr->hwmd_context, MBX_PCPY_CLASS);
+ sm_interrupt_dsp(pio_mgr->hbridge_context, MBX_PCPY_CLASS);
}
func_end:
return;
@@ -1407,14 +1409,14 @@ static void output_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
chnl_mgr_obj = pio_mgr->hchnl_mgr;
sm = pio_mgr->shared_mem;
/* Attempt to perform output */
- if (IO_GET_VALUE(pio_mgr->hwmd_context, struct shm, sm, output_full))
+ if (IO_GET_VALUE(pio_mgr->hbridge_context, struct shm, sm, output_full))
goto func_end;
if (pchnl && !((pchnl->dw_state & ~CHNL_STATEEOS) == CHNL_STATEREADY))
goto func_end;
/* Look to see if both a PC and DSP output channel are ready */
- dw_dsp_f_mask = IO_GET_VALUE(pio_mgr->hwmd_context, struct shm, sm,
+ dw_dsp_f_mask = IO_GET_VALUE(pio_mgr->hbridge_context, struct shm, sm,
dsp_free_mask);
chnl_id =
find_ready_output(chnl_mgr_obj, pchnl,
@@ -1442,29 +1444,30 @@ static void output_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
/* Transfer buffer to DSP side */
chnl_packet_obj->byte_size =
- write_data(pio_mgr->hwmd_context, pio_mgr->output,
+ write_data(pio_mgr->hbridge_context, pio_mgr->output,
chnl_packet_obj->host_sys_buf, min(pio_mgr->usm_buf_size,
chnl_packet_obj->byte_size));
pchnl->bytes_moved += chnl_packet_obj->byte_size;
/* Write all 32 bits of arg */
- IO_SET_LONG(pio_mgr->hwmd_context, struct shm, sm, arg,
+ IO_SET_LONG(pio_mgr->hbridge_context, struct shm, sm, arg,
chnl_packet_obj->dw_arg);
#if _CHNL_WORDSIZE == 2
- IO_SET_VALUE(pio_mgr->hwmd_context, struct shm, sm, output_id,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct shm, sm, output_id,
(u16) chnl_id);
- IO_SET_VALUE(pio_mgr->hwmd_context, struct shm, sm, output_size,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct shm, sm, output_size,
(u16) (chnl_packet_obj->byte_size +
(chnl_mgr_obj->word_size -
1)) / (u16) chnl_mgr_obj->word_size);
#else
- IO_SET_VALUE(pio_mgr->hwmd_context, struct shm, sm, output_id, chnl_id);
- IO_SET_VALUE(pio_mgr->hwmd_context, struct shm, sm, output_size,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct shm, sm, output_id,
+ chnl_id);
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct shm, sm, output_size,
(chnl_packet_obj->byte_size +
(chnl_mgr_obj->word_size - 1)) / chnl_mgr_obj->word_size);
#endif
- IO_SET_VALUE(pio_mgr->hwmd_context, struct shm, sm, output_full, 1);
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct shm, sm, output_full, 1);
/* Indicate to the DSP we have written the output */
- sm_interrupt_dsp(pio_mgr->hwmd_context, MBX_PCPY_CLASS);
+ sm_interrupt_dsp(pio_mgr->hbridge_context, MBX_PCPY_CLASS);
/* Notify client with IO completion record (keep EOS) */
chnl_packet_obj->status &= CHNL_IOCSTATEOS;
notify_chnl_complete(pchnl, chnl_packet_obj);
@@ -1495,7 +1498,7 @@ static void output_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
/* Check if output has been cleared */
output_empty =
- IO_GET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl, msg_ctr_obj,
+ IO_GET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl, msg_ctr_obj,
buf_empty);
if (output_empty) {
num_msgs = (hmsg_mgr->msgs_pending > hmsg_mgr->max_msgs) ?
@@ -1514,23 +1517,23 @@ static void output_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
val = (pmsg->msg_data).msgq_id;
addr = (u32) &(((struct msg_dspmsg *)
msg_output)->msgq_id);
- write_ext32_bit_dsp_data(pio_mgr->hwmd_context,
- addr, val);
+ write_ext32_bit_dsp_data(pio_mgr->
+ hbridge_context, addr, val);
val = (pmsg->msg_data).msg.dw_cmd;
addr = (u32) &((((struct msg_dspmsg *)
msg_output)->msg).dw_cmd);
- write_ext32_bit_dsp_data(pio_mgr->hwmd_context,
- addr, val);
+ write_ext32_bit_dsp_data(pio_mgr->
+ hbridge_context, addr, val);
val = (pmsg->msg_data).msg.dw_arg1;
addr = (u32) &((((struct msg_dspmsg *)
msg_output)->msg).dw_arg1);
- write_ext32_bit_dsp_data(pio_mgr->hwmd_context,
- addr, val);
+ write_ext32_bit_dsp_data(pio_mgr->
+ hbridge_context, addr, val);
val = (pmsg->msg_data).msg.dw_arg2;
addr = (u32) &((((struct msg_dspmsg *)
msg_output)->msg).dw_arg2);
- write_ext32_bit_dsp_data(pio_mgr->hwmd_context,
- addr, val);
+ write_ext32_bit_dsp_data(pio_mgr->
+ hbridge_context, addr, val);
msg_output += sizeof(struct msg_dspmsg);
if (!hmsg_mgr->msg_free_list)
goto func_end;
@@ -1543,19 +1546,20 @@ static void output_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
if (num_msgs > 0) {
hmsg_mgr->msgs_pending -= num_msgs;
#if _CHNL_WORDSIZE == 2
- IO_SET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl,
msg_ctr_obj, size, (u16) num_msgs);
#else
- IO_SET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl,
msg_ctr_obj, size, num_msgs);
#endif
- IO_SET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl,
msg_ctr_obj, buf_empty, false);
/* Set the post SWI flag */
- IO_SET_VALUE(pio_mgr->hwmd_context, struct msg_ctrl,
+ IO_SET_VALUE(pio_mgr->hbridge_context, struct msg_ctrl,
msg_ctr_obj, post_swi, true);
/* Tell the DSP we have written the output. */
- sm_interrupt_dsp(pio_mgr->hwmd_context, MBX_PCPY_CLASS);
+ sm_interrupt_dsp(pio_mgr->hbridge_context,
+ MBX_PCPY_CLASS);
}
}
func_end:
@@ -1713,7 +1717,7 @@ static u32 write_data(struct bridge_dev_context *hDevContext, void *dest,
/* ZCPY IO routines. */
void io_intr_dsp2(IN struct io_mgr *pio_mgr, IN u16 mb_val)
{
- sm_interrupt_dsp(pio_mgr->hwmd_context, mb_val);
+ sm_interrupt_dsp(pio_mgr->hbridge_context, mb_val);
}
/*
@@ -1939,7 +1943,7 @@ static dsp_status pack_trace_buffer(char *lpBuf, u32 bytes, u32 ul_num_words)
* Requires:
* hdeh_mgr muse be valid. Checked in bridge_deh_notify.
*/
-dsp_status print_dsp_trace_buffer(struct bridge_dev_context *hwmd_context)
+dsp_status print_dsp_trace_buffer(struct bridge_dev_context *hbridge_context)
{
dsp_status status = DSP_SOK;
struct cod_manager *cod_mgr;
@@ -1952,11 +1956,11 @@ dsp_status print_dsp_trace_buffer(struct bridge_dev_context *hwmd_context)
char *psz_buf;
u16 *lpsz_buf;
- struct bridge_dev_context *pwmd_context = (struct bridge_dev_context *)
- hwmd_context;
+ struct bridge_dev_context *pbridge_context =
+ (struct bridge_dev_context *) hbridge_context;
struct bridge_drv_interface *intf_fxns;
struct dev_object *dev_obj = (struct dev_object *)
- pwmd_context->hdev_obj;
+ pbridge_context->hdev_obj;
status = dev_get_cod_mgr(dev_obj, &cod_mgr);
@@ -1989,7 +1993,7 @@ dsp_status print_dsp_trace_buffer(struct bridge_dev_context *hwmd_context)
lpsz_buf = kzalloc(ul_num_bytes * 2, GFP_ATOMIC);
if (psz_buf != NULL) {
/* Read bytes from the DSP trace buffer... */
- status = (*intf_fxns->pfn_brd_read) (hwmd_context,
+ status = (*intf_fxns->pfn_brd_read) (hbridge_context,
(u8 *) psz_buf,
(u32)
ul_trace_begin,
diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/wmd/mmu_fault.c
index 30ab29a..0e6387a 100644
--- a/drivers/dsp/bridge/wmd/mmu_fault.c
+++ b/drivers/dsp/bridge/wmd/mmu_fault.c
@@ -77,7 +77,7 @@ irqreturn_t mmu_fault_isr(int irq, IN void *pRefData)
if (deh_mgr_obj) {
dev_context =
- (struct bridge_dev_context *)deh_mgr_obj->hwmd_context;
+ (struct bridge_dev_context *)deh_mgr_obj->hbridge_context;
status = cfg_get_host_resources((struct cfg_devnode *)
drv_get_first_dev_extension(),
&resources);
diff --git a/drivers/dsp/bridge/wmd/tiomap_io.c b/drivers/dsp/bridge/wmd/tiomap_io.c
index 03e1028..378cc60 100644
--- a/drivers/dsp/bridge/wmd/tiomap_io.c
+++ b/drivers/dsp/bridge/wmd/tiomap_io.c
@@ -51,12 +51,12 @@ bool symbols_reloaded = true;
* ======== read_ext_dsp_data ========
* Copies DSP external memory buffers to the host side buffers.
*/
-dsp_status read_ext_dsp_data(struct wmd_dev_context *hDevContext,
+dsp_status read_ext_dsp_data(struct bridge_dev_context *hDevContext,
OUT u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType)
{
dsp_status status = DSP_SOK;
- struct wmd_dev_context *dev_context = hDevContext;
+ struct bridge_dev_context *dev_context = hDevContext;
u32 offset;
u32 ul_tlb_base_virt = 0;
u32 ul_shm_offset_virt = 0;
@@ -179,7 +179,7 @@ dsp_status read_ext_dsp_data(struct wmd_dev_context *hDevContext,
* purpose:
* Copies buffers to the DSP internal/external memory.
*/
-dsp_status write_dsp_data(struct wmd_dev_context *hDevContext,
+dsp_status write_dsp_data(struct bridge_dev_context *hDevContext,
IN u8 *pbHostBuf, u32 dwDSPAddr, u32 ul_num_bytes,
u32 ulMemType)
{
@@ -229,7 +229,7 @@ dsp_status write_dsp_data(struct wmd_dev_context *hDevContext,
* Copies buffers to the external memory.
*
*/
-dsp_status write_ext_dsp_data(struct wmd_dev_context *dev_context,
+dsp_status write_ext_dsp_data(struct bridge_dev_context *dev_context,
IN u8 *pbHostBuf, u32 dwDSPAddr,
u32 ul_num_bytes, u32 ulMemType,
bool bDynamicLoad)
@@ -394,7 +394,7 @@ dsp_status write_ext_dsp_data(struct wmd_dev_context *dev_context,
return ret;
}
-dsp_status sm_interrupt_dsp(struct wmd_dev_context *dev_context, u16 mb_val)
+dsp_status sm_interrupt_dsp(struct bridge_dev_context *dev_context, u16 mb_val)
{
#ifdef CONFIG_BRIDGE_DVFS
u32 opplevel = 0;
diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c
index 3ef7f97..fa8fc57 100644
--- a/drivers/dsp/bridge/wmd/ue_deh.c
+++ b/drivers/dsp/bridge/wmd/ue_deh.c
@@ -71,14 +71,14 @@ dsp_status bridge_deh_create(OUT struct deh_mgr **phDehMgr,
struct deh_mgr *deh_mgr_obj = NULL;
struct cfg_hostres cfg_host_res;
struct cfg_devnode *dev_node_obj;
- struct bridge_dev_context *hwmd_context = NULL;
+ struct bridge_dev_context *hbridge_context = NULL;
/* Message manager will be created when a file is loaded, since
* size of message buffer in shared memory is configurable in
* the base image. */
/* Get WMD context info. */
- dev_get_wmd_context(hdev_obj, &hwmd_context);
- DBC_ASSERT(hwmd_context);
+ dev_get_wmd_context(hdev_obj, &hbridge_context);
+ DBC_ASSERT(hbridge_context);
dummy_va_addr = 0;
/* Allocate IO manager object: */
deh_mgr_obj = kzalloc(sizeof(struct deh_mgr), GFP_KERNEL);
@@ -106,7 +106,7 @@ dsp_status bridge_deh_create(OUT struct deh_mgr **phDehMgr,
if (DSP_SUCCEEDED(status)) {
/* Fill in context structure */
- deh_mgr_obj->hwmd_context = hwmd_context;
+ deh_mgr_obj->hbridge_context = hbridge_context;
deh_mgr_obj->err_info.dw_err_mask = 0L;
deh_mgr_obj->err_info.dw_val1 = 0L;
deh_mgr_obj->err_info.dw_val2 = 0L;
@@ -208,7 +208,7 @@ void bridge_deh_notify(struct deh_mgr *hdeh_mgr, u32 ulEventMask, u32 dwErrInfo)
"bridge_deh_notify: ********** DEVICE EXCEPTION "
"**********\n");
dev_context =
- (struct bridge_dev_context *)deh_mgr_obj->hwmd_context;
+ (struct bridge_dev_context *)deh_mgr_obj->hbridge_context;
switch (ulEventMask) {
case DSP_SYSERROR:
@@ -244,7 +244,7 @@ void bridge_deh_notify(struct deh_mgr *hdeh_mgr, u32 ulEventMask, u32 dwErrInfo)
VIRT_TO_PHYS(PG_ALIGN_LOW
((u32) dummy_va_addr, PG_SIZE4K));
dev_context = (struct bridge_dev_context *)
- deh_mgr_obj->hwmd_context;
+ deh_mgr_obj->hbridge_context;
/* Reset the dynamic mmu index to fixed count if it
* exceeds 31. So that the dynmmuindex is always
* between the range of standard/fixed entries
@@ -307,7 +307,7 @@ void bridge_deh_notify(struct deh_mgr *hdeh_mgr, u32 ulEventMask, u32 dwErrInfo)
/* Disable all the clocks that were enabled by DSP */
(void)dsp_peripheral_clocks_disable(dev_context, NULL);
/* Call DSP Trace Buffer */
- print_dsp_trace_buffer(hdeh_mgr->hwmd_context);
+ print_dsp_trace_buffer(hdeh_mgr->hbridge_context);
/*
* Avoid the subsequent WDT if it happens once,
* also If fatal error occurs
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 03/11] DSPBRIDGE: Rename variables and structures which contain "wmd"
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 01/11] DSPBRIDGE: Rename wmd_dev_context structure by bridge_dev_context Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 02/11] DSPBRIDGE: Rename the device context handle variables Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 04/11] DSPBRIDGE: Rename functions which contain "wmd" and remove unused prototypes Ivan Gomez Castellanos
` (7 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
This patch removes code that refers to Windows OS (wmd = windows
mini driver). The following are renamed:
wmd_interface ==> bridge_interface
sz_wmd_file_name ==> bridge_file_name
dw_wmd_version ==> version
wmdioct_extproc ==> bridge_ioctl_extproc
pstrWMDFileName ==> driver_file_name
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/dev.h | 12 ++++----
arch/arm/plat-omap/include/dspbridge/wmd.h | 2 +-
arch/arm/plat-omap/include/dspbridge/wmdioctl.h | 2 +-
drivers/dsp/bridge/pmgr/dev.c | 35 ++++++++++++-----------
drivers/dsp/bridge/wmd/_tiomap.h | 4 +-
drivers/dsp/bridge/wmd/io_sm.c | 2 +-
drivers/dsp/bridge/wmd/tiomap3430.c | 9 +++--
7 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/dev.h b/arch/arm/plat-omap/include/dspbridge/dev.h
index 5bff0b8..d86ecd8 100644
--- a/arch/arm/plat-omap/include/dspbridge/dev.h
+++ b/arch/arm/plat-omap/include/dspbridge/dev.h
@@ -65,7 +65,7 @@ extern u32 dev_brd_write_fxn(void *pArb,
* 'Bridge device.
* Parameters:
* phDevObject: Ptr to location to receive the device object handle.
- * pstrWMDFileName: Name of WMD PE DLL file to load. If the absolute
+ * driver_file_name: Name of WMD PE DLL file to load. If the absolute
* path is not provided, the file is loaded through
* 'Bridge's module search path.
* pHostConfig: Host configuration information, to be passed down
@@ -88,7 +88,7 @@ extern u32 dev_brd_write_fxn(void *pArb,
* Requires:
* DEV Initialized.
* phDevObject != NULL.
- * pstrWMDFileName != NULL.
+ * driver_file_name != NULL.
* pHostConfig != NULL.
* pDspConfig != NULL.
* Ensures:
@@ -98,7 +98,7 @@ extern u32 dev_brd_write_fxn(void *pArb,
*/
extern dsp_status dev_create_device(OUT struct dev_object
**phDevObject,
- IN CONST char *pstrWMDFileName,
+ IN CONST char *driver_file_name,
IN CONST struct cfg_hostres
*pHostConfig, IN CONST struct cfg_dspres
*pDspConfig,
@@ -110,7 +110,7 @@ extern dsp_status dev_create_device(OUT struct dev_object
* Called by the operating system to load the 'Bridge Mini Driver for IVA.
* Parameters:
* phDevObject: Ptr to location to receive the device object handle.
- * pstrWMDFileName: Name of WMD PE DLL file to load. If the absolute
+ * driver_file_name: Name of WMD PE DLL file to load. If the absolute
* path is not provided, the file is loaded through
* 'Bridge's module search path.
* pHostConfig: Host configuration information, to be passed down
@@ -133,7 +133,7 @@ extern dsp_status dev_create_device(OUT struct dev_object
* Requires:
* DEV Initialized.
* phDevObject != NULL.
- * pstrWMDFileName != NULL.
+ * driver_file_name != NULL.
* pHostConfig != NULL.
* pDspConfig != NULL.
* Ensures:
@@ -143,7 +143,7 @@ extern dsp_status dev_create_device(OUT struct dev_object
*/
extern dsp_status dev_create_iva_device(OUT struct dev_object
**phDevObject,
- IN CONST char *pstrWMDFileName,
+ IN CONST char *driver_file_name,
IN CONST struct cfg_hostres
*pHostConfig,
IN CONST struct cfg_dspres *pDspConfig,
diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h
index 40be6da..4355590 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmd.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmd.h
@@ -1130,6 +1130,6 @@ struct bridge_drv_interface {
* Win95: Called during the Device_Init phase.
*/
void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
- IN CONST char *pstrWMDFileName);
+ IN CONST char *driver_file_name);
#endif /* WMD_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/wmdioctl.h b/arch/arm/plat-omap/include/dspbridge/wmdioctl.h
index 6547e38..ba921bc 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmdioctl.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmdioctl.h
@@ -59,7 +59,7 @@
/* Number of actual DSP-MMU TLB entrries */
#define WMDIOCTL_NUMOFMMUTLB 32
-struct wmdioctl_extproc {
+struct bridge_ioctl_extproc {
u32 ul_dsp_va; /* DSP virtual address */
u32 ul_gpp_pa; /* GPP physical address */
/* GPP virtual address. __va does not work for ioremapped addresses */
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index 164b65d..14e0b49 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -65,7 +65,8 @@ struct dev_object {
u32 dev_type; /* Device Type */
struct cfg_devnode *dev_node_obj; /* Platform specific dev id */
struct bridge_dev_context *hbridge_context; /* WMD Context Handle */
- struct bridge_drv_interface wmd_interface; /* Function interface to WMD. */
+ /* Function interface to WMD. */
+ struct bridge_drv_interface bridge_interface;
struct brd_object *lock_owner; /* Client with exclusive access. */
struct cod_manager *cod_mgr; /* Code manager handle. */
struct chnl_mgr *hchnl_mgr; /* Channel manager. */
@@ -109,7 +110,7 @@ u32 dev_brd_write_fxn(void *pArb, u32 ulDspAddr, void *pHostBuf,
if (dev_obj) {
/* Require of BrdWrite() */
DBC_ASSERT(dev_obj->hbridge_context != NULL);
- status = (*dev_obj->wmd_interface.pfn_brd_write)
+ status = (*dev_obj->bridge_interface.pfn_brd_write)
(dev_obj->hbridge_context, pHostBuf, ulDspAddr,
ul_num_bytes, nMemSpace);
/* Special case of getting the address only */
@@ -129,7 +130,7 @@ u32 dev_brd_write_fxn(void *pArb, u32 ulDspAddr, void *pHostBuf,
* PM board (device).
*/
dsp_status dev_create_device(OUT struct dev_object **phDevObject,
- IN CONST char *pstrWMDFileName,
+ IN CONST char *driver_file_name,
IN CONST struct cfg_hostres *pHostConfig,
IN CONST struct cfg_dspres *pDspConfig,
struct cfg_devnode *dev_node_obj)
@@ -144,12 +145,12 @@ dsp_status dev_create_device(OUT struct dev_object **phDevObject,
dsp_status status = DSP_SOK;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(phDevObject != NULL);
- DBC_REQUIRE(pstrWMDFileName != NULL);
+ DBC_REQUIRE(driver_file_name != NULL);
DBC_REQUIRE(pHostConfig != NULL);
DBC_REQUIRE(pDspConfig != NULL);
/* Get the WMD interface functions */
- bridge_drv_entry(&drv_fxns, pstrWMDFileName);
+ bridge_drv_entry(&drv_fxns, driver_file_name);
if (DSP_FAILED(cfg_get_object((u32 *) &hdrv_obj, REG_DRV_OBJECT))) {
/* don't propogate CFG errors from this PROC function */
status = DSP_EFAIL;
@@ -172,10 +173,11 @@ dsp_status dev_create_device(OUT struct dev_object **phDevObject,
dev_obj->dev_type = DSP_UNIT;
/* Store this WMD's interface functions, based on its
* version. */
- store_interface_fxns(drv_fxns, &dev_obj->wmd_interface);
+ store_interface_fxns(drv_fxns,
+ &dev_obj->bridge_interface);
/* Call fxn_dev_create() to get the WMD's device
* context handle. */
- status = (dev_obj->wmd_interface.pfn_dev_create)
+ status = (dev_obj->bridge_interface.pfn_dev_create)
(&dev_obj->hbridge_context, dev_obj,
pHostConfig, pDspConfig);
/* Assert bridge_dev_create()'s ensure clause: */
@@ -228,7 +230,7 @@ dsp_status dev_create_device(OUT struct dev_object **phDevObject,
/* Only create DEH manager if we have an IO manager */
if (DSP_SUCCEEDED(status)) {
/* Instantiate the DEH module */
- status = (*dev_obj->wmd_interface.pfn_deh_create)
+ status = (*dev_obj->bridge_interface.pfn_deh_create)
(&dev_obj->hdeh_mgr, dev_obj);
}
/* Create DMM mgr . */
@@ -364,7 +366,7 @@ dsp_status dev_destroy_device(struct dev_object *hdev_obj)
if (dev_obj->hdeh_mgr) {
/* Uninitialize DEH module. */
- (*dev_obj->wmd_interface.pfn_deh_destroy)
+ (*dev_obj->bridge_interface.pfn_deh_destroy)
(dev_obj->hdeh_mgr);
dev_obj->hdeh_mgr = NULL;
}
@@ -381,7 +383,7 @@ dsp_status 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->wmd_interface.pfn_dev_destroy)
+ status = (*dev_obj->bridge_interface.pfn_dev_destroy)
(dev_obj->hbridge_context);
dev_obj->hbridge_context = NULL;
} else
@@ -591,7 +593,7 @@ dsp_status dev_get_intf_fxns(struct dev_object *hdev_obj,
DBC_REQUIRE(ppIntfFxns != NULL);
if (hdev_obj) {
- *ppIntfFxns = &dev_obj->wmd_interface;
+ *ppIntfFxns = &dev_obj->bridge_interface;
} else {
*ppIntfFxns = NULL;
status = DSP_EHANDLE;
@@ -877,8 +879,7 @@ dsp_status dev_start_device(struct cfg_devnode *dev_node_obj)
struct dev_object *hdev_obj = NULL; /* handle to 'Bridge Device */
struct cfg_hostres host_res; /* resources struct. */
struct cfg_dspres dsp_res; /* DSP resources struct */
- /* wmd filename */
- char sz_wmd_file_name[CFG_MAXSEARCHPATHLEN] = "UMA";
+ char bridge_file_name[CFG_MAXSEARCHPATHLEN] = "UMA";
dsp_status status;
struct mgr_object *hmgr_obj = NULL;
@@ -892,7 +893,7 @@ dsp_status dev_start_device(struct cfg_devnode *dev_node_obj)
if (DSP_SUCCEEDED(status)) {
/* Given all resources, create a device object. */
status =
- dev_create_device(&hdev_obj, sz_wmd_file_name, &host_res,
+ dev_create_device(&hdev_obj, bridge_file_name, &host_res,
&dsp_res, dev_node_obj);
if (DSP_SUCCEEDED(status)) {
/* Store away the hdev_obj with the DEVNODE */
@@ -1078,7 +1079,7 @@ dsp_status dev_get_dev_type(struct dev_object *hdevObject, u32 *dev_type)
static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
OUT struct bridge_drv_interface *intf_fxns)
{
- u32 dw_wmd_version;
+ u32 version;
/* Local helper macro: */
#define STORE_FXN(cast, pfn) \
@@ -1089,12 +1090,12 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
DBC_REQUIRE(drv_fxns != NULL);
DBC_REQUIRE(MAKEVERSION(drv_fxns->dw_wcd_major_version,
drv_fxns->dw_wcd_minor_version) <= WCDVERSION);
- dw_wmd_version = MAKEVERSION(drv_fxns->dw_wcd_major_version,
+ version = MAKEVERSION(drv_fxns->dw_wcd_major_version,
drv_fxns->dw_wcd_minor_version);
intf_fxns->dw_wcd_major_version = drv_fxns->dw_wcd_major_version;
intf_fxns->dw_wcd_minor_version = drv_fxns->dw_wcd_minor_version;
/* Install functions up to WCD version .80 (first alpha): */
- if (dw_wmd_version > 0) {
+ if (version > 0) {
STORE_FXN(fxn_dev_create, pfn_dev_create);
STORE_FXN(fxn_dev_destroy, pfn_dev_destroy);
STORE_FXN(fxn_dev_ctrl, pfn_dev_cntrl);
diff --git a/drivers/dsp/bridge/wmd/_tiomap.h b/drivers/dsp/bridge/wmd/_tiomap.h
index 4cbf1d3..9e27e1c 100644
--- a/drivers/dsp/bridge/wmd/_tiomap.h
+++ b/drivers/dsp/bridge/wmd/_tiomap.h
@@ -25,7 +25,7 @@
#include <mach-omap2/cm-regbits-34xx.h>
#include <dspbridge/devdefs.h>
#include <hw_defs.h>
-#include <dspbridge/wmdioctl.h> /* for wmdioctl_extproc defn */
+#include <dspbridge/wmdioctl.h> /* for bridge_ioctl_extproc defn */
#include <dspbridge/sync.h>
#include <dspbridge/clk.h>
@@ -337,7 +337,7 @@ struct bridge_dev_context {
* [See WMD_BRD_Ctrl()] PROC info contains DSP-MMU TLB entries.
*/
/* DMMU TLB entries */
- struct wmdioctl_extproc atlb_entry[WMDIOCTL_NUMOFMMUTLB];
+ struct bridge_ioctl_extproc atlb_entry[WMDIOCTL_NUMOFMMUTLB];
u32 dw_brd_state; /* Last known board state. */
u32 ul_int_mask; /* int mask */
u16 io_base; /* Board I/O base */
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index aff0898..edb03d1 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -322,7 +322,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
u32 num_procs = 0;
s32 ndx = 0;
/* DSP MMU setup table */
- struct wmdioctl_extproc ae_proc[WMDIOCTL_NUMOFMMUTLB];
+ struct bridge_ioctl_extproc ae_proc[WMDIOCTL_NUMOFMMUTLB];
struct cfg_hostres host_res;
u32 map_attrs;
u32 shm0_end;
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index 29519bf..c9be788 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -255,14 +255,14 @@ static void bad_page_dump(u32 pa, struct page *pg)
* Mini Driver entry point.
*/
void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
- IN CONST char *pstrWMDFileName)
+ IN CONST char *driver_file_name)
{
- DBC_REQUIRE(pstrWMDFileName != NULL);
+ DBC_REQUIRE(driver_file_name != NULL);
io_sm_init(); /* Initialization of io_sm module */
- if (strcmp(pstrWMDFileName, "UMA") == 0)
+ if (strcmp(driver_file_name, "UMA") == 0)
*ppDrvInterface = &drv_interface_fxns;
else
dev_dbg(bridge, "%s Unknown WMD file name", __func__);
@@ -1062,7 +1062,8 @@ static dsp_status bridge_dev_ctrl(struct bridge_dev_context *dev_context,
u32 dw_cmd, IN OUT void *pargs)
{
dsp_status status = DSP_SOK;
- struct wmdioctl_extproc *pa_ext_proc = (struct wmdioctl_extproc *)pargs;
+ struct bridge_ioctl_extproc *pa_ext_proc =
+ (struct bridge_ioctl_extproc *)pargs;
s32 ndx;
switch (dw_cmd) {
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 04/11] DSPBRIDGE: Rename functions which contain "wmd" and remove unused prototypes
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (2 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 03/11] DSPBRIDGE: Rename variables and structures which contain "wmd" Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 05/11] DSPBRIDGE: Replace code containing "WMD" Ivan Gomez Castellanos
` (6 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
Since the "wmd" (windows mini driver) refers to Windows OS, the
following functions are renamed:
wmd_brd_delete ==> bridge_brd_delete
dev_get_wmd_context ==> dev_get_bridge_context
And the folowing prototypes are removed because they are not used:
cfg_get_wmd_file_name
wmd_tlb_dsp_va_to_mpu_pa
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/cfg.h | 23 -----------------------
arch/arm/plat-omap/include/dspbridge/dev.h | 7 ++++---
drivers/dsp/bridge/pmgr/dev.c | 7 ++++---
drivers/dsp/bridge/rmgr/node.c | 4 ++--
drivers/dsp/bridge/rmgr/proc.c | 4 ++--
drivers/dsp/bridge/rmgr/pwr.c | 8 ++++----
drivers/dsp/bridge/wmd/_tiomap.h | 10 ----------
drivers/dsp/bridge/wmd/chnl_sm.c | 4 ++--
drivers/dsp/bridge/wmd/io_sm.c | 4 ++--
drivers/dsp/bridge/wmd/tiomap3430.c | 6 +++---
drivers/dsp/bridge/wmd/ue_deh.c | 2 +-
11 files changed, 24 insertions(+), 55 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/cfg.h b/arch/arm/plat-omap/include/dspbridge/cfg.h
index 80c8fde..e99d4b4 100644
--- a/arch/arm/plat-omap/include/dspbridge/cfg.h
+++ b/arch/arm/plat-omap/include/dspbridge/cfg.h
@@ -194,29 +194,6 @@ extern dsp_status cfg_get_object(OUT u32 *pdwValue, u32 dw_type);
extern void cfg_get_perf_value(OUT bool *pfEnablePerf);
/*
- * ======== cfg_get_wmd_file_name ========
- * Purpose:
- * Get the mini-driver file name for a given device.
- * Parameters:
- * dev_node_obj: Handle to the dev_node who's WMD we are querying.
- * buf_size: Size of buffer.
- * pWMDFileName: Ptr to a character buffer to hold the WMD filename.
- * Returns:
- * DSP_SOK: On success.
- * CFG_E_INVALIDHDEVNODE: dev_node_obj is invalid.
- * CFG_E_RESOURCENOTAVAIL: The filename is not available.
- * Requires:
- * CFG initialized.
- * Ensures:
- * DSP_SOK: Not more than buf_size bytes were copied
- * into pWMDFileName.
- *
- */
-extern dsp_status cfg_get_wmd_file_name(IN struct cfg_devnode *dev_node_obj,
- IN u32 buf_size,
- OUT char *pWMDFileName);
-
-/*
* ======== cfg_get_zl_file ========
* Purpose:
* Retreive the ZLFile, if any, for this board.
diff --git a/arch/arm/plat-omap/include/dspbridge/dev.h b/arch/arm/plat-omap/include/dspbridge/dev.h
index d86ecd8..c26e9d0 100644
--- a/arch/arm/plat-omap/include/dspbridge/dev.h
+++ b/arch/arm/plat-omap/include/dspbridge/dev.h
@@ -509,9 +509,10 @@ extern dsp_status dev_get_symbol(struct dev_object *hdev_obj,
IN CONST char *pstrSym, OUT u32 * pul_value);
/*
- * ======== dev_get_wmd_context ========
+ * ======== dev_get_bridge_context ========
* Purpose:
- * Retrieve the WMD Context handle, as returned by the WMD_Create fxn.
+ * Retrieve the Bridge Context handle, as returned by the
+ * bridge_dev_create fxn.
* Parameters:
* hdev_obj: Handle to device object created with dev_create_device()
* *phbridge_context: Ptr to location to store context handle.
@@ -525,7 +526,7 @@ extern dsp_status dev_get_symbol(struct dev_object *hdev_obj,
* DSP_SOK: *phbridge_context contains context handle;
* else: *phbridge_context is NULL;
*/
-extern dsp_status dev_get_wmd_context(struct dev_object *hdev_obj,
+extern dsp_status dev_get_bridge_context(struct dev_object *hdev_obj,
OUT struct bridge_dev_context
**phbridge_context);
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index 14e0b49..e1ebb5d 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -711,11 +711,12 @@ dsp_status dev_get_symbol(struct dev_object *hdev_obj,
}
/*
- * ======== dev_get_wmd_context ========
+ * ======== dev_get_bridge_context ========
* Purpose:
- * Retrieve the WMD Context handle, as returned by the WMD_Create fxn.
+ * Retrieve the Bridge Context handle, as returned by the
+ * bridge_dev_create fxn.
*/
-dsp_status dev_get_wmd_context(struct dev_object *hdev_obj,
+dsp_status dev_get_bridge_context(struct dev_object *hdev_obj,
OUT struct bridge_dev_context **phbridge_context)
{
dsp_status status = DSP_SOK;
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index 80a54d4..ddf54df 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -3144,7 +3144,7 @@ static u32 ovly(void *priv_ref, u32 ulDspRunAddr, u32 ulDspLoadAddr,
/* Call new MemCopy function */
intf_fxns = hnode_mgr->intf_fxns;
- status = dev_get_wmd_context(hnode_mgr->hdev_obj, &hbridge_context);
+ status = dev_get_bridge_context(hnode_mgr->hdev_obj, &hbridge_context);
if (DSP_SUCCEEDED(status)) {
status = (*intf_fxns->pfn_brd_mem_copy) (hbridge_context,
ulDspRunAddr, ulDspLoadAddr,
@@ -3186,7 +3186,7 @@ static u32 mem_write(void *priv_ref, u32 ulDspAddr, void *pbuf,
/* Call new MemWrite function */
intf_fxns = hnode_mgr->intf_fxns;
- status = dev_get_wmd_context(hnode_mgr->hdev_obj, &hbridge_context);
+ status = dev_get_bridge_context(hnode_mgr->hdev_obj, &hbridge_context);
status = (*intf_fxns->pfn_brd_mem_write) (hbridge_context, pbuf,
ulDspAddr, ul_num_bytes, mem_sect_type);
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index e3b9be0..6e32ad6 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -174,7 +174,7 @@ proc_attach(u32 processor_id,
status = dev_get_intf_fxns(hdev_obj, &p_proc_object->intf_fxns);
if (DSP_SUCCEEDED(status)) {
- status = dev_get_wmd_context(hdev_obj,
+ status = dev_get_bridge_context(hdev_obj,
&p_proc_object->hbridge_context);
if (DSP_FAILED(status))
kfree(p_proc_object);
@@ -295,7 +295,7 @@ dsp_status proc_auto_start(struct cfg_devnode *dev_node_obj,
p_proc_object->hmgr_obj = hmgr_obj;
status = dev_get_intf_fxns(hdev_obj, &p_proc_object->intf_fxns);
if (DSP_SUCCEEDED(status))
- status = dev_get_wmd_context(hdev_obj,
+ status = dev_get_bridge_context(hdev_obj,
&p_proc_object->hbridge_context);
if (DSP_FAILED(status))
goto func_cont;
diff --git a/drivers/dsp/bridge/rmgr/pwr.c b/drivers/dsp/bridge/rmgr/pwr.c
index e70f676..51eeb65 100644
--- a/drivers/dsp/bridge/rmgr/pwr.c
+++ b/drivers/dsp/bridge/rmgr/pwr.c
@@ -49,7 +49,7 @@ dsp_status pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout)
hdev_obj != NULL;
hdev_obj =
(struct dev_object *)drv_get_next_dev_object((u32) hdev_obj)) {
- if (DSP_FAILED(dev_get_wmd_context(hdev_obj,
+ if (DSP_FAILED(dev_get_bridge_context(hdev_obj,
(struct bridge_dev_context **)
&dw_context))) {
continue;
@@ -91,7 +91,7 @@ dsp_status pwr_wake_dsp(IN CONST u32 timeout)
hdev_obj != NULL;
hdev_obj = (struct dev_object *)drv_get_next_dev_object
((u32) hdev_obj)) {
- if (DSP_SUCCEEDED(dev_get_wmd_context(hdev_obj,
+ if (DSP_SUCCEEDED(dev_get_bridge_context(hdev_obj,
(struct bridge_dev_context
**)&dw_context))) {
if (DSP_SUCCEEDED
@@ -127,7 +127,7 @@ dsp_status pwr_pm_pre_scale(IN u16 voltage_domain, u32 level)
hdev_obj != NULL;
hdev_obj = (struct dev_object *)drv_get_next_dev_object
((u32) hdev_obj)) {
- if (DSP_SUCCEEDED(dev_get_wmd_context(hdev_obj,
+ if (DSP_SUCCEEDED(dev_get_bridge_context(hdev_obj,
(struct bridge_dev_context
**)&dw_context))) {
if (DSP_SUCCEEDED
@@ -163,7 +163,7 @@ dsp_status pwr_pm_post_scale(IN u16 voltage_domain, u32 level)
hdev_obj != NULL;
hdev_obj = (struct dev_object *)drv_get_next_dev_object
((u32) hdev_obj)) {
- if (DSP_SUCCEEDED(dev_get_wmd_context(hdev_obj,
+ if (DSP_SUCCEEDED(dev_get_bridge_context(hdev_obj,
(struct bridge_dev_context
**)&dw_context))) {
if (DSP_SUCCEEDED
diff --git a/drivers/dsp/bridge/wmd/_tiomap.h b/drivers/dsp/bridge/wmd/_tiomap.h
index 9e27e1c..b670b02 100644
--- a/drivers/dsp/bridge/wmd/_tiomap.h
+++ b/drivers/dsp/bridge/wmd/_tiomap.h
@@ -350,16 +350,6 @@ struct bridge_dev_context {
u32 dsp_per_clks;
};
- /*
- * ======== wmd_tlb_dsp_va_to_mpu_pa ========
- * Given a DSP virtual address, traverse the page table and return
- * a corresponding MPU physical address and size.
- */
-extern dsp_status wmd_tlb_dsp_va_to_mpu_pa(struct bridge_dev_context
- *dev_context, IN u32 ulVirtAddr,
- OUT u32 *ulPhysAddr,
- OUT u32 *sizeTlb);
-
/*
* ======== sm_interrupt_dsp ========
* Purpose:
diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/wmd/chnl_sm.c
index 199a33e..51017f1 100644
--- a/drivers/dsp/bridge/wmd/chnl_sm.c
+++ b/drivers/dsp/bridge/wmd/chnl_sm.c
@@ -133,7 +133,7 @@ dsp_status bridge_chnl_add_io_req(struct chnl_object *chnl_obj, void *pHostBuf,
}
dev_obj = dev_get_first();
- dev_get_wmd_context(dev_obj, &dev_ctxt);
+ dev_get_bridge_context(dev_obj, &dev_ctxt);
if (!dev_ctxt)
status = DSP_EHANDLE;
@@ -594,7 +594,7 @@ dsp_status bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 dwTimeOut,
}
dev_obj = dev_get_first();
- dev_get_wmd_context(dev_obj, &dev_ctxt);
+ dev_get_bridge_context(dev_obj, &dev_ctxt);
if (!dev_ctxt)
status = DSP_EHANDLE;
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index edb03d1..62624ad 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -193,7 +193,7 @@ dsp_status bridge_io_create(OUT struct io_mgr **phIOMgr,
* size of message buffer in shared memory is configurable in
* the base image.
*/
- dev_get_wmd_context(hdev_obj, &hbridge_context);
+ dev_get_bridge_context(hdev_obj, &hbridge_context);
if (!hbridge_context) {
status = DSP_EHANDLE;
goto func_end;
@@ -272,7 +272,7 @@ dsp_status bridge_io_destroy(struct io_mgr *hio_mgr)
dsp_status status = DSP_SOK;
struct bridge_dev_context *hbridge_context;
if (hio_mgr) {
- status = dev_get_wmd_context(hio_mgr->hdev_obj,
+ status = dev_get_bridge_context(hio_mgr->hdev_obj,
&hbridge_context);
/* Free IO DPC object */
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index c9be788..a8a2d02 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -773,14 +773,14 @@ static dsp_status bridge_brd_stop(struct bridge_dev_context *hDevContext)
}
/*
- * ======== wmd_brd_delete ========
+ * ======== bridge_brd_delete ========
* purpose:
* Puts DSP in Low power mode
*
* Preconditions :
* a) None
*/
-static dsp_status wmd_brd_delete(struct bridge_dev_context *hDevContext)
+static dsp_status bridge_brd_delete(struct bridge_dev_context *hDevContext)
{
dsp_status status = DSP_SOK;
struct bridge_dev_context *dev_context = hDevContext;
@@ -1125,7 +1125,7 @@ static dsp_status bridge_dev_destroy(struct bridge_dev_context *hDevContext)
return DSP_EHANDLE;
/* first put the device to stop state */
- wmd_brd_delete(dev_context);
+ bridge_brd_delete(dev_context);
if (dev_context->pt_attrs) {
pt_attrs = dev_context->pt_attrs;
kfree(pt_attrs->pg_info);
diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/wmd/ue_deh.c
index fa8fc57..2473d3d 100644
--- a/drivers/dsp/bridge/wmd/ue_deh.c
+++ b/drivers/dsp/bridge/wmd/ue_deh.c
@@ -77,7 +77,7 @@ dsp_status bridge_deh_create(OUT struct deh_mgr **phDehMgr,
* size of message buffer in shared memory is configurable in
* the base image. */
/* Get WMD context info. */
- dev_get_wmd_context(hdev_obj, &hbridge_context);
+ dev_get_bridge_context(hdev_obj, &hbridge_context);
DBC_ASSERT(hbridge_context);
dummy_va_addr = 0;
/* Allocate IO manager object: */
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 05/11] DSPBRIDGE: Replace code containing "WMD"
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (3 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 04/11] DSPBRIDGE: Rename functions which contain "wmd" and remove unused prototypes Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 06/11] DSPBRIDGE: Replace code containing "wcd" Ivan Gomez Castellanos
` (5 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
This patch removes references to Windows OS, and since "WMD" means
windows mini driver, then it is replaced by "BRD" which means Bridge.
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/errbase.h | 12 +++---
arch/arm/plat-omap/include/dspbridge/wmd.h | 2 +-
arch/arm/plat-omap/include/dspbridge/wmdioctl.h | 38 +++++++++++-----------
drivers/dsp/bridge/rmgr/node.c | 2 +-
drivers/dsp/bridge/rmgr/proc.c | 6 ++--
drivers/dsp/bridge/rmgr/pwr.c | 10 +++---
drivers/dsp/bridge/wmd/_tiomap.h | 2 +-
drivers/dsp/bridge/wmd/io_sm.c | 14 ++++----
drivers/dsp/bridge/wmd/tiomap3430.c | 32 +++++++++---------
drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 4 +-
10 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/errbase.h b/arch/arm/plat-omap/include/dspbridge/errbase.h
index d43ff86..ff0c2de 100644
--- a/arch/arm/plat-omap/include/dspbridge/errbase.h
+++ b/arch/arm/plat-omap/include/dspbridge/errbase.h
@@ -268,10 +268,10 @@
#define DEV_EBASE (DSP_COMP_EBASE + 0x000)
/* The mini-driver expected a newer version of the class driver. */
-#define DEV_E_NEWWMD (DEV_EBASE + 0x00)
+#define DEV_E_NEWBRD (DEV_EBASE + 0x00)
/* bridge_drv_entry function returned a NULL function interface table. */
-#define DEV_E_NULLWMDINTF (DEV_EBASE + 0x01)
+#define DEV_E_NULLBRDINTF (DEV_EBASE + 0x01)
/* FAILURE Codes : LDR */
#define LDR_EBASE (DSP_COMP_EBASE + 0x100)
@@ -417,16 +417,16 @@
#define SYNC_E_TIMEOUT (SYNC_EBASE + 0x01)
/* FAILURE Codes : WMD */
-#define WMD_EBASE (DSP_COMP_EBASE + 0x700)
+#define BRD_EBASE (DSP_COMP_EBASE + 0x700)
/* A test of hardware assumptions or integrity failed. */
-#define WMD_E_HARDWARE (WMD_EBASE + 0x00)
+#define BRD_E_HARDWARE (BRD_EBASE + 0x00)
/* One or more configuration parameters violated WMD hardware assumptions. */
-#define WMD_E_BADCONFIG (WMD_EBASE + 0x01)
+#define BRD_E_BADCONFIG (BRD_EBASE + 0x01)
/* Timeout occurred waiting for a response from the hardware. */
-#define WMD_E_TIMEOUT (WMD_EBASE + 0x02)
+#define BRD_E_TIMEOUT (BRD_EBASE + 0x02)
/* FAILURE Codes : REG */
#define REG_EBASE (DSP_COMP_EBASE + 0x800)
diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h
index 4355590..cebc8c5 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmd.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmd.h
@@ -41,7 +41,7 @@
* Any IOCTLS at or above this value are reserved for standard WMD
* interfaces.
*/
-#define WMD_RESERVEDIOCTLBASE 0x8000
+#define BRD_RESERVEDIOCTLBASE 0x8000
/* Handle to mini-driver's private device context. */
struct bridge_dev_context;
diff --git a/arch/arm/plat-omap/include/dspbridge/wmdioctl.h b/arch/arm/plat-omap/include/dspbridge/wmdioctl.h
index ba921bc..9fe5543 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmdioctl.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmdioctl.h
@@ -27,37 +27,37 @@
* Any IOCTLS at or above this value are reserved for standard WMD
* interfaces.
*/
-#define WMDIOCTL_RESERVEDBASE 0x8000
+#define BRDIOCTL_RESERVEDBASE 0x8000
-#define WMDIOCTL_CHNLREAD (WMDIOCTL_RESERVEDBASE + 0x10)
-#define WMDIOCTL_CHNLWRITE (WMDIOCTL_RESERVEDBASE + 0x20)
-#define WMDIOCTL_GETINTRCOUNT (WMDIOCTL_RESERVEDBASE + 0x30)
-#define WMDIOCTL_RESETINTRCOUNT (WMDIOCTL_RESERVEDBASE + 0x40)
-#define WMDIOCTL_INTERRUPTDSP (WMDIOCTL_RESERVEDBASE + 0x50)
+#define BRDIOCTL_CHNLREAD (BRDIOCTL_RESERVEDBASE + 0x10)
+#define BRDIOCTL_CHNLWRITE (BRDIOCTL_RESERVEDBASE + 0x20)
+#define BRDIOCTL_GETINTRCOUNT (BRDIOCTL_RESERVEDBASE + 0x30)
+#define BRDIOCTL_RESETINTRCOUNT (BRDIOCTL_RESERVEDBASE + 0x40)
+#define BRDIOCTL_INTERRUPTDSP (BRDIOCTL_RESERVEDBASE + 0x50)
/* DMMU */
-#define WMDIOCTL_SETMMUCONFIG (WMDIOCTL_RESERVEDBASE + 0x60)
+#define BRDIOCTL_SETMMUCONFIG (BRDIOCTL_RESERVEDBASE + 0x60)
/* PWR */
-#define WMDIOCTL_PWRCONTROL (WMDIOCTL_RESERVEDBASE + 0x70)
+#define BRDIOCTL_PWRCONTROL (BRDIOCTL_RESERVEDBASE + 0x70)
/* attention, modifiers:
* Some of these control enumerations are made visible to user for power
* control, so any changes to this list, should also be updated in the user
* header file 'dbdefs.h' ***/
/* These ioctls are reserved for PWR power commands for the DSP */
-#define WMDIOCTL_DEEPSLEEP (WMDIOCTL_PWRCONTROL + 0x0)
-#define WMDIOCTL_EMERGENCYSLEEP (WMDIOCTL_PWRCONTROL + 0x1)
-#define WMDIOCTL_WAKEUP (WMDIOCTL_PWRCONTROL + 0x2)
-#define WMDIOCTL_PWRENABLE (WMDIOCTL_PWRCONTROL + 0x3)
-#define WMDIOCTL_PWRDISABLE (WMDIOCTL_PWRCONTROL + 0x4)
-#define WMDIOCTL_CLK_CTRL (WMDIOCTL_PWRCONTROL + 0x7)
+#define BRDIOCTL_DEEPSLEEP (BRDIOCTL_PWRCONTROL + 0x0)
+#define BRDIOCTL_EMERGENCYSLEEP (BRDIOCTL_PWRCONTROL + 0x1)
+#define BRDIOCTL_WAKEUP (BRDIOCTL_PWRCONTROL + 0x2)
+#define BRDIOCTL_PWRENABLE (BRDIOCTL_PWRCONTROL + 0x3)
+#define BRDIOCTL_PWRDISABLE (BRDIOCTL_PWRCONTROL + 0x4)
+#define BRDIOCTL_CLK_CTRL (BRDIOCTL_PWRCONTROL + 0x7)
/* DSP Initiated Hibernate */
-#define WMDIOCTL_PWR_HIBERNATE (WMDIOCTL_PWRCONTROL + 0x8)
-#define WMDIOCTL_PRESCALE_NOTIFY (WMDIOCTL_PWRCONTROL + 0x9)
-#define WMDIOCTL_POSTSCALE_NOTIFY (WMDIOCTL_PWRCONTROL + 0xA)
-#define WMDIOCTL_CONSTRAINT_REQUEST (WMDIOCTL_PWRCONTROL + 0xB)
+#define BRDIOCTL_PWR_HIBERNATE (BRDIOCTL_PWRCONTROL + 0x8)
+#define BRDIOCTL_PRESCALE_NOTIFY (BRDIOCTL_PWRCONTROL + 0x9)
+#define BRDIOCTL_POSTSCALE_NOTIFY (BRDIOCTL_PWRCONTROL + 0xA)
+#define BRDIOCTL_CONSTRAINT_REQUEST (BRDIOCTL_PWRCONTROL + 0xB)
/* Number of actual DSP-MMU TLB entrries */
-#define WMDIOCTL_NUMOFMMUTLB 32
+#define BRDIOCTL_NUMOFMMUTLB 32
struct bridge_ioctl_extproc {
u32 ul_dsp_va; /* DSP virtual address */
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index ddf54df..be641bc 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -3155,7 +3155,7 @@ static u32 ovly(void *priv_ref, u32 ulDspRunAddr, u32 ulDspLoadAddr,
pr_debug("%s: failed to copy brd memory, status 0x%x\n",
__func__, status);
} else {
- pr_debug("%s: failed to get WMD context, status 0x%x\n",
+ pr_debug("%s: failed to get Bridge context, status 0x%x\n",
__func__, status);
}
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index 6e32ad6..0a95355 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -348,12 +348,12 @@ dsp_status proc_ctrl(void *hprocessor, u32 dw_cmd, IN struct dsp_cbdata * arg)
if (p_proc_object) {
/* intercept PWR deep sleep command */
- if (dw_cmd == WMDIOCTL_DEEPSLEEP) {
+ if (dw_cmd == BRDIOCTL_DEEPSLEEP) {
timeout = arg->cb_data;
status = pwr_sleep_dsp(PWR_DEEPSLEEP, timeout);
}
/* intercept PWR emergency sleep command */
- else if (dw_cmd == WMDIOCTL_EMERGENCYSLEEP) {
+ else if (dw_cmd == BRDIOCTL_EMERGENCYSLEEP) {
timeout = arg->cb_data;
status = pwr_sleep_dsp(PWR_EMERGENCYDEEPSLEEP, timeout);
} else if (dw_cmd == PWR_DEEPSLEEP) {
@@ -361,7 +361,7 @@ dsp_status proc_ctrl(void *hprocessor, u32 dw_cmd, IN struct dsp_cbdata * arg)
status = pwr_sleep_dsp(PWR_DEEPSLEEP, timeout);
}
/* intercept PWR wake commands */
- else if (dw_cmd == WMDIOCTL_WAKEUP) {
+ else if (dw_cmd == BRDIOCTL_WAKEUP) {
timeout = arg->cb_data;
status = pwr_wake_dsp(timeout);
} else if (dw_cmd == PWR_WAKEUP) {
diff --git a/drivers/dsp/bridge/rmgr/pwr.c b/drivers/dsp/bridge/rmgr/pwr.c
index 51eeb65..ff8c0c3 100644
--- a/drivers/dsp/bridge/rmgr/pwr.c
+++ b/drivers/dsp/bridge/rmgr/pwr.c
@@ -60,9 +60,9 @@ dsp_status pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout)
continue;
}
if (sleepCode == PWR_DEEPSLEEP)
- ioctlcode = WMDIOCTL_DEEPSLEEP;
+ ioctlcode = BRDIOCTL_DEEPSLEEP;
else if (sleepCode == PWR_EMERGENCYDEEPSLEEP)
- ioctlcode = WMDIOCTL_EMERGENCYSLEEP;
+ ioctlcode = BRDIOCTL_EMERGENCYSLEEP;
else
status = DSP_EINVALIDARG;
@@ -100,7 +100,7 @@ dsp_status pwr_wake_dsp(IN CONST u32 timeout)
(struct bridge_drv_interface **)&intf_fxns))) {
status =
(*intf_fxns->pfn_dev_cntrl) (dw_context,
- WMDIOCTL_WAKEUP,
+ BRDIOCTL_WAKEUP,
(void *)&arg);
}
}
@@ -136,7 +136,7 @@ dsp_status pwr_pm_pre_scale(IN u16 voltage_domain, u32 level)
(struct bridge_drv_interface **)&intf_fxns))) {
status =
(*intf_fxns->pfn_dev_cntrl) (dw_context,
- WMDIOCTL_PRESCALE_NOTIFY,
+ BRDIOCTL_PRESCALE_NOTIFY,
(void *)&arg);
}
}
@@ -172,7 +172,7 @@ dsp_status pwr_pm_post_scale(IN u16 voltage_domain, u32 level)
(struct bridge_drv_interface **)&intf_fxns))) {
status =
(*intf_fxns->pfn_dev_cntrl) (dw_context,
- WMDIOCTL_POSTSCALE_NOTIFY,
+ BRDIOCTL_POSTSCALE_NOTIFY,
(void *)&arg);
}
}
diff --git a/drivers/dsp/bridge/wmd/_tiomap.h b/drivers/dsp/bridge/wmd/_tiomap.h
index b670b02..b539641 100644
--- a/drivers/dsp/bridge/wmd/_tiomap.h
+++ b/drivers/dsp/bridge/wmd/_tiomap.h
@@ -337,7 +337,7 @@ struct bridge_dev_context {
* [See WMD_BRD_Ctrl()] PROC info contains DSP-MMU TLB entries.
*/
/* DMMU TLB entries */
- struct bridge_ioctl_extproc atlb_entry[WMDIOCTL_NUMOFMMUTLB];
+ struct bridge_ioctl_extproc atlb_entry[BRDIOCTL_NUMOFMMUTLB];
u32 dw_brd_state; /* Last known board state. */
u32 ul_int_mask; /* int mask */
u16 io_base; /* Board I/O base */
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/wmd/io_sm.c
index 62624ad..e917c51 100644
--- a/drivers/dsp/bridge/wmd/io_sm.c
+++ b/drivers/dsp/bridge/wmd/io_sm.c
@@ -322,7 +322,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
u32 num_procs = 0;
s32 ndx = 0;
/* DSP MMU setup table */
- struct bridge_ioctl_extproc ae_proc[WMDIOCTL_NUMOFMMUTLB];
+ struct bridge_ioctl_extproc ae_proc[BRDIOCTL_NUMOFMMUTLB];
struct cfg_hostres host_res;
u32 map_attrs;
u32 shm0_end;
@@ -600,7 +600,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
* Copy remaining entries from CDB. All entries are 1 MB and
* should not conflict with shm entries on MPU or DSP side.
*/
- for (i = 3; i < 7 && ndx < WMDIOCTL_NUMOFMMUTLB; i++) {
+ for (i = 3; i < 7 && ndx < BRDIOCTL_NUMOFMMUTLB; i++) {
if (hio_mgr->ext_proc_info.ty_tlb[i].ul_gpp_phys == 0)
continue;
@@ -666,7 +666,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
i++;
}
- for (i = ndx; i < WMDIOCTL_NUMOFMMUTLB; i++) {
+ for (i = ndx; i < BRDIOCTL_NUMOFMMUTLB; i++) {
ae_proc[i].ul_dsp_va = 0;
ae_proc[i].ul_gpp_pa = 0;
ae_proc[i].ul_gpp_va = 0;
@@ -704,7 +704,7 @@ dsp_status bridge_io_on_loaded(struct io_mgr *hio_mgr)
status =
hio_mgr->intf_fxns->pfn_dev_cntrl(hio_mgr->hbridge_context,
- WMDIOCTL_SETMMUCONFIG,
+ BRDIOCTL_SETMMUCONFIG,
ae_proc);
if (DSP_FAILED(status))
goto func_end;
@@ -887,7 +887,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
dev_dbg(bridge, "PM: Hibernate command\n");
status = pio_mgr->intf_fxns->
pfn_dev_cntrl(pio_mgr->hbridge_context,
- WMDIOCTL_PWR_HIBERNATE, parg);
+ BRDIOCTL_PWR_HIBERNATE, parg);
if (DSP_FAILED(status))
pr_err("%s: hibernate cmd failed 0x%x\n",
__func__, status);
@@ -896,7 +896,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
dev_dbg(bridge, "PM: Requested OPP = 0x%x\n", parg[1]);
status = pio_mgr->intf_fxns->
pfn_dev_cntrl(pio_mgr->hbridge_context,
- WMDIOCTL_CONSTRAINT_REQUEST, parg);
+ BRDIOCTL_CONSTRAINT_REQUEST, parg);
if (DSP_FAILED(status))
dev_dbg(bridge, "PM: Failed to set constraint "
"= 0x%x \n", parg[1]);
@@ -905,7 +905,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
parg[0]);
status = pio_mgr->intf_fxns->
pfn_dev_cntrl(pio_mgr->hbridge_context,
- WMDIOCTL_CLK_CTRL, parg);
+ BRDIOCTL_CLK_CTRL, parg);
if (DSP_FAILED(status))
dev_dbg(bridge, "PM: Failed to ctrl the DSP clk"
"= 0x%x\n", *parg);
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index a8a2d02..d01cd63 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -265,7 +265,7 @@ void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
if (strcmp(driver_file_name, "UMA") == 0)
*ppDrvInterface = &drv_interface_fxns;
else
- dev_dbg(bridge, "%s Unknown WMD file name", __func__);
+ dev_dbg(bridge, "%s Unknown Bridge driver file name", __func__);
}
@@ -464,7 +464,7 @@ static dsp_status bridge_brd_start(struct bridge_dev_context *hDevContext,
hw_mmu_twl_disable(resources.dw_dmmu_base);
/* Only make TLB entry if both addresses are non-zero */
- for (entry_ndx = 0; entry_ndx < WMDIOCTL_NUMOFMMUTLB;
+ for (entry_ndx = 0; entry_ndx < BRDIOCTL_NUMOFMMUTLB;
entry_ndx++) {
if ((dev_context->atlb_entry[entry_ndx].ul_gpp_pa != 0)
&& (dev_context->atlb_entry[entry_ndx].ul_dsp_va !=
@@ -674,7 +674,7 @@ static dsp_status bridge_brd_start(struct bridge_dev_context *hDevContext,
/* Wait for DSP to clear word in shared memory */
/* Read the Location */
if (!wait_for_start(dev_context, dw_sync_addr))
- status = WMD_E_TIMEOUT;
+ status = BRD_E_TIMEOUT;
/* Start wdt */
dsp_wdt_sm_set((void *)ul_shm_base);
@@ -914,7 +914,7 @@ static dsp_status bridge_dev_create(OUT struct bridge_dev_context
dev_context->dw_internal_size = OMAP_DSP_SIZE;
/* Clear dev context MMU table entries.
* These get set on WMD_BRD_IOCTL() call after program loaded. */
- for (entry_ndx = 0; entry_ndx < WMDIOCTL_NUMOFMMUTLB; entry_ndx++) {
+ for (entry_ndx = 0; entry_ndx < BRDIOCTL_NUMOFMMUTLB; entry_ndx++) {
dev_context->atlb_entry[entry_ndx].ul_gpp_pa =
dev_context->atlb_entry[entry_ndx].ul_dsp_va = 0;
}
@@ -1067,39 +1067,39 @@ static dsp_status bridge_dev_ctrl(struct bridge_dev_context *dev_context,
s32 ndx;
switch (dw_cmd) {
- case WMDIOCTL_CHNLREAD:
+ case BRDIOCTL_CHNLREAD:
break;
- case WMDIOCTL_CHNLWRITE:
+ case BRDIOCTL_CHNLWRITE:
break;
- case WMDIOCTL_SETMMUCONFIG:
+ case BRDIOCTL_SETMMUCONFIG:
/* store away dsp-mmu setup values for later use */
- for (ndx = 0; ndx < WMDIOCTL_NUMOFMMUTLB; ndx++, pa_ext_proc++)
+ for (ndx = 0; ndx < BRDIOCTL_NUMOFMMUTLB; ndx++, pa_ext_proc++)
dev_context->atlb_entry[ndx] = *pa_ext_proc;
break;
- case WMDIOCTL_DEEPSLEEP:
- case WMDIOCTL_EMERGENCYSLEEP:
+ case BRDIOCTL_DEEPSLEEP:
+ case BRDIOCTL_EMERGENCYSLEEP:
/* Currently only DSP Idle is supported Need to update for
* later releases */
status = sleep_dsp(dev_context, PWR_DEEPSLEEP, pargs);
break;
- case WMDIOCTL_WAKEUP:
+ case BRDIOCTL_WAKEUP:
status = wake_dsp(dev_context, pargs);
break;
- case WMDIOCTL_CLK_CTRL:
+ case BRDIOCTL_CLK_CTRL:
status = DSP_SOK;
/* Looking For Baseport Fix for Clocks */
status = dsp_peripheral_clk_ctrl(dev_context, pargs);
break;
- case WMDIOCTL_PWR_HIBERNATE:
+ case BRDIOCTL_PWR_HIBERNATE:
status = handle_hibernation_from_dsp(dev_context);
break;
- case WMDIOCTL_PRESCALE_NOTIFY:
+ case BRDIOCTL_PRESCALE_NOTIFY:
status = pre_scale_dsp(dev_context, pargs);
break;
- case WMDIOCTL_POSTSCALE_NOTIFY:
+ case BRDIOCTL_POSTSCALE_NOTIFY:
status = post_scale_dsp(dev_context, pargs);
break;
- case WMDIOCTL_CONSTRAINT_REQUEST:
+ case BRDIOCTL_CONSTRAINT_REQUEST:
status = handle_constraints_set(dev_context, pargs);
break;
default:
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
index d9defcc..8563dad 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -104,7 +104,7 @@ dsp_status handle_hibernation_from_dsp(struct bridge_dev_context *dev_context)
}
if (timeout == 0) {
pr_err("%s: Timed out waiting for DSP off mode\n", __func__);
- status = WMD_E_TIMEOUT;
+ status = BRD_E_TIMEOUT;
return status;
} else {
@@ -219,7 +219,7 @@ dsp_status sleep_dsp(struct bridge_dev_context *dev_context, IN u32 dw_cmd,
dev_get_deh_mgr(dev_context->hdev_obj, &hdeh_mgr);
bridge_deh_notify(hdeh_mgr, DSP_PWRERROR, 0);
#endif /* CONFIG_BRIDGE_NTFY_PWRERR */
- return WMD_E_TIMEOUT;
+ return BRD_E_TIMEOUT;
} else {
/* Update the Bridger Driver state */
if (dsp_test_sleepstate == PWRDM_POWER_OFF)
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 06/11] DSPBRIDGE: Replace code containing "wcd"
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (4 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 05/11] DSPBRIDGE: Replace code containing "WMD" Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 07/11] DSPBRIDGE: Rename "wmd" directory by "core" Ivan Gomez Castellanos
` (4 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
This patch gets rid of code refering to Windows OS. Since "wcd" means
"windows class driver", it is changed to a name refering to Bridge API,
because in Windows the wcd acts as an interface between the different
layers of its driver model architecture.
The following changes are done:
wcd_call_dev_io_ctl ==> api_call_dev_ioctl
wcd_exit ==> api_exit
wcd_init ==> api_init
wcd_init_complete2 ==> api_init_complete2
wcd_cmd ==> api_cmd
wcd_c_refs ==> api_c_refs
dw_wcd_major_version ==> brd_api_major_version
dw_wcd_minor_version ==> brd_api_minor_version
WCD_MAJOR_VERSION ==> BRD_API_MAJOR_VERSION
WCD_MINOR_VERSION ==> BRD_API_MINOR_VERSION
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/_dcd.h | 36 ++++++++--------
arch/arm/plat-omap/include/dspbridge/dev.h | 2 +-
arch/arm/plat-omap/include/dspbridge/wcd.h | 6 +-
arch/arm/plat-omap/include/dspbridge/wmd.h | 4 +-
drivers/dsp/bridge/pmgr/dev.c | 17 ++++----
drivers/dsp/bridge/pmgr/wcd.c | 58 +++++++++++++-------------
drivers/dsp/bridge/rmgr/drv_interface.c | 2 +-
drivers/dsp/bridge/rmgr/dspdrv.c | 14 +++---
drivers/dsp/bridge/wmd/tiomap3430.c | 6 +-
9 files changed, 73 insertions(+), 72 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/_dcd.h b/arch/arm/plat-omap/include/dspbridge/_dcd.h
index 1350feb..589cd42 100644
--- a/arch/arm/plat-omap/include/dspbridge/_dcd.h
+++ b/arch/arm/plat-omap/include/dspbridge/_dcd.h
@@ -23,9 +23,9 @@
#include <dspbridge/wcdioctl.h>
/*
- * ======== wcd_call_dev_io_ctl ========
+ * ======== api_call_dev_ioctl ========
* Purpose:
- * Call the (wrapper) function for the corresponding WCD IOCTL.
+ * Call the (wrapper) function for the corresponding API IOCTL.
* Parameters:
* cmd: IOCTL id, base 0.
* args: Argument structure.
@@ -36,28 +36,28 @@
* Requires:
* Ensures:
*/
-extern dsp_status wcd_call_dev_io_ctl(unsigned int cmd,
+extern dsp_status api_call_dev_ioctl(unsigned int cmd,
union Trapped_Args *args,
u32 *pResult, void *pr_ctxt);
/*
- * ======== wcd_init ========
+ * ======== api_init ========
* Purpose:
- * Initialize WCD modules, and export WCD services to WMD's.
- * This procedure is called when the class driver is loaded.
+ * Initialize modules used by Bridge API.
+ * This procedure is called when the driver is loaded.
* Parameters:
* Returns:
* TRUE if success; FALSE otherwise.
* Requires:
* Ensures:
*/
-extern bool wcd_init(void);
+extern bool api_init(void);
/*
- * ======== wcd_init_complete2 ========
+ * ======== api_init_complete2 ========
* Purpose:
- * Perform any required WCD, and WMD initialization which
- * cannot not be performed in wcd_init(void) or dev_start_device() due
+ * Perform any required bridge initialization which cannot
+ * be performed in api_init() or dev_start_device() due
* to the fact that some services are not yet
* completely initialized.
* Parameters:
@@ -65,24 +65,24 @@ extern bool wcd_init(void);
* DSP_SOK: Allow this device to load
* DSP_EFAIL: Failure.
* Requires:
- * WCD initialized.
+ * Bridge API initialized.
* Ensures:
*/
-extern dsp_status wcd_init_complete2(void);
+extern dsp_status api_init_complete2(void);
/*
- * ======== wcd_exit ========
+ * ======== api_exit ========
* Purpose:
- * Exit all modules initialized in wcd_init(void).
- * This procedure is called when the class driver is unloaded.
+ * Exit all modules initialized in api_init(void).
+ * This procedure is called when the driver is unloaded.
* Parameters:
* Returns:
* Requires:
- * wcd_init(void) was previously called.
+ * api_init(void) was previously called.
* Ensures:
- * Resources acquired in wcd_init(void) are freed.
+ * Resources acquired in api_init(void) are freed.
*/
-extern void wcd_exit(void);
+extern void api_exit(void);
/* MGR wrapper functions */
extern u32 mgrwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt);
diff --git a/arch/arm/plat-omap/include/dspbridge/dev.h b/arch/arm/plat-omap/include/dspbridge/dev.h
index c26e9d0..3ada31d 100644
--- a/arch/arm/plat-omap/include/dspbridge/dev.h
+++ b/arch/arm/plat-omap/include/dspbridge/dev.h
@@ -152,7 +152,7 @@ extern dsp_status dev_create_iva_device(OUT struct dev_object
/*
* ======== dev_create2 ========
* Purpose:
- * After successful loading of the image from wcd_init_complete2
+ * After successful loading of the image from api_init_complete2
* (PROC Auto_Start) or proc_load this fxn is called. This creates
* the Node Manager and updates the DEV Object.
* Parameters:
diff --git a/arch/arm/plat-omap/include/dspbridge/wcd.h b/arch/arm/plat-omap/include/dspbridge/wcd.h
index f609627..1a68baa 100644
--- a/arch/arm/plat-omap/include/dspbridge/wcd.h
+++ b/arch/arm/plat-omap/include/dspbridge/wcd.h
@@ -29,8 +29,8 @@
#ifndef WCD_
#define WCD_
-/* This WCD Library Version: */
-#define WCD_MAJOR_VERSION (u32)8 /* .8x - Alpha, .9x - Beta, 1.x FCS */
-#define WCD_MINOR_VERSION (u32)0
+/* This BRD API Library Version: */
+#define BRD_API_MAJOR_VERSION (u32)8 /* .8x - Alpha, .9x - Beta, 1.x FCS */
+#define BRD_API_MINOR_VERSION (u32)0
#endif /* WCD_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/wmd.h
index cebc8c5..d861cdf 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmd.h
+++ b/arch/arm/plat-omap/include/dspbridge/wmd.h
@@ -1055,8 +1055,8 @@ typedef void (*fxn_msg_setqueueid) (struct msg_queue *msg_queue_obj,
* the WMD_CHNL_* entries must be set to NULL.
*/
struct bridge_drv_interface {
- u32 dw_wcd_major_version; /* Set to WCD_MAJOR_VERSION. */
- u32 dw_wcd_minor_version; /* Set to WCD_MINOR_VERSION. */
+ 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_ctrl pfn_dev_cntrl; /* Optional vendor interface */
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index e1ebb5d..f94eebc 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -56,7 +56,8 @@
/* ----------------------------------- Defines, Data Structures, Typedefs */
#define MAKEVERSION(major, minor) (major * 10 + minor)
-#define WCDVERSION MAKEVERSION(WCD_MAJOR_VERSION, WCD_MINOR_VERSION)
+#define BRD_API_VERSION MAKEVERSION(BRD_API_MAJOR_VERSION, \
+ BRD_API_MINOR_VERSION)
/* The WMD device object: */
struct dev_object {
@@ -277,7 +278,7 @@ dsp_status dev_create_device(OUT struct dev_object **phDevObject,
/*
* ======== dev_create2 ========
* Purpose:
- * After successful loading of the image from wcd_init_complete2
+ * After successful loading of the image from api_init_complete2
* (PROC Auto_Start) or proc_load this fxn is called. This creates
* the Node Manager and updates the DEV Object.
*/
@@ -1089,12 +1090,12 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
DBC_REQUIRE(intf_fxns != NULL);
DBC_REQUIRE(drv_fxns != NULL);
- DBC_REQUIRE(MAKEVERSION(drv_fxns->dw_wcd_major_version,
- drv_fxns->dw_wcd_minor_version) <= WCDVERSION);
- version = MAKEVERSION(drv_fxns->dw_wcd_major_version,
- drv_fxns->dw_wcd_minor_version);
- intf_fxns->dw_wcd_major_version = drv_fxns->dw_wcd_major_version;
- intf_fxns->dw_wcd_minor_version = drv_fxns->dw_wcd_minor_version;
+ DBC_REQUIRE(MAKEVERSION(drv_fxns->brd_api_major_version,
+ drv_fxns->brd_api_minor_version) <= BRD_API_VERSION);
+ version = MAKEVERSION(drv_fxns->brd_api_major_version,
+ drv_fxns->brd_api_minor_version);
+ intf_fxns->brd_api_major_version = drv_fxns->brd_api_major_version;
+ intf_fxns->brd_api_minor_version = drv_fxns->brd_api_minor_version;
/* Install functions up to WCD version .80 (first alpha): */
if (version > 0) {
STORE_FXN(fxn_dev_create, pfn_dev_create);
diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c
index 9f734ab..a63ae8f 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/wcd.c
@@ -69,13 +69,13 @@
#define DB_GET_IOC_TABLE(cmd) (DB_GET_MODULE(cmd) >> DB_MODULE_SHIFT)
/* Device IOCtl function pointer */
-struct wcd_cmd {
+struct api_cmd {
u32(*fxn) (union Trapped_Args *args, void *pr_ctxt);
u32 dw_index;
};
/* ----------------------------------- Globals */
-static u32 wcd_c_refs;
+static u32 api_c_refs;
/*
* Function tables.
@@ -85,7 +85,7 @@ static u32 wcd_c_refs;
*/
/* MGR wrapper functions */
-static struct wcd_cmd mgr_cmd[] = {
+static struct api_cmd mgr_cmd[] = {
{mgrwrap_enum_node_info}, /* MGR_ENUMNODE_INFO */
{mgrwrap_enum_proc_info}, /* MGR_ENUMPROC_INFO */
{mgrwrap_register_object}, /* MGR_REGISTEROBJECT */
@@ -95,7 +95,7 @@ static struct wcd_cmd mgr_cmd[] = {
};
/* PROC wrapper functions */
-static struct wcd_cmd proc_cmd[] = {
+static struct api_cmd proc_cmd[] = {
{procwrap_attach}, /* PROC_ATTACH */
{procwrap_ctrl}, /* PROC_CTRL */
{procwrap_detach}, /* PROC_DETACH */
@@ -116,7 +116,7 @@ static struct wcd_cmd proc_cmd[] = {
};
/* NODE wrapper functions */
-static struct wcd_cmd node_cmd[] = {
+static struct api_cmd node_cmd[] = {
{nodewrap_allocate}, /* NODE_ALLOCATE */
{nodewrap_alloc_msg_buf}, /* NODE_ALLOCMSGBUF */
{nodewrap_change_priority}, /* NODE_CHANGEPRIORITY */
@@ -135,7 +135,7 @@ static struct wcd_cmd node_cmd[] = {
};
/* STRM wrapper functions */
-static struct wcd_cmd strm_cmd[] = {
+static struct api_cmd strm_cmd[] = {
{strmwrap_allocate_buffer}, /* STRM_ALLOCATEBUFFER */
{strmwrap_close}, /* STRM_CLOSE */
{strmwrap_free_buffer}, /* STRM_FREEBUFFER */
@@ -150,7 +150,7 @@ static struct wcd_cmd strm_cmd[] = {
};
/* CMM wrapper functions */
-static struct wcd_cmd cmm_cmd[] = {
+static struct api_cmd cmm_cmd[] = {
{cmmwrap_calloc_buf}, /* CMM_ALLOCBUF */
{cmmwrap_free_buf}, /* CMM_FREEBUF */
{cmmwrap_get_handle}, /* CMM_GETHANDLE */
@@ -203,11 +203,11 @@ static inline void _cp_to_usr(void __user *to, const void *from,
_cp_to_usr(to, from, &(err), (n) * sizeof(*(from)))
/*
- * ======== wcd_call_dev_io_ctl ========
+ * ======== api_call_dev_ioctl ========
* Purpose:
- * Call the (wrapper) function for the corresponding WCD IOCTL.
+ * Call the (wrapper) function for the corresponding API IOCTL.
*/
-inline dsp_status wcd_call_dev_io_ctl(u32 cmd, union Trapped_Args *args,
+inline dsp_status api_call_dev_ioctl(u32 cmd, union Trapped_Args *args,
u32 *result, void *pr_ctxt)
{
u32(*ioctl_cmd) (union Trapped_Args *args, void *pr_ctxt) = NULL;
@@ -263,15 +263,15 @@ err:
}
/*
- * ======== wcd_exit ========
+ * ======== api_exit ========
*/
-void wcd_exit(void)
+void api_exit(void)
{
- DBC_REQUIRE(wcd_c_refs > 0);
- wcd_c_refs--;
+ DBC_REQUIRE(api_c_refs > 0);
+ api_c_refs--;
- if (wcd_c_refs == 0) {
- /* Release all WCD modules initialized in wcd_init(). */
+ if (api_c_refs == 0) {
+ /* Release all modules initialized in api_init(). */
cod_exit();
dev_exit();
chnl_exit();
@@ -285,22 +285,22 @@ void wcd_exit(void)
rmm_exit();
drv_exit();
}
- DBC_ENSURE(wcd_c_refs >= 0);
+ DBC_ENSURE(api_c_refs >= 0);
}
/*
- * ======== wcd_init ========
+ * ======== api_init ========
* Purpose:
- * Module initialization is done by SERVICES Init.
+ * Module initialization used by Bridge API.
*/
-bool wcd_init(void)
+bool api_init(void)
{
bool ret = true;
bool fdrv, fdev, fcod, fchnl, fmsg, fio;
bool fmgr, fproc, fnode, fdisp, fstrm, frmm;
- if (wcd_c_refs == 0) {
- /* initialize class driver and other modules */
+ if (api_c_refs == 0) {
+ /* initialize driver and other modules */
fdrv = drv_init();
fmgr = mgr_init();
fproc = proc_init();
@@ -355,16 +355,16 @@ bool wcd_init(void)
}
}
if (ret)
- wcd_c_refs++;
+ api_c_refs++;
return ret;
}
/*
- * ======== wcd_init_complete2 ========
+ * ======== api_init_complete2 ========
* Purpose:
- * Perform any required WCD, and WMD initialization which
- * cannot not be performed in wcd_init() or dev_start_device() due
+ * Perform any required bridge initialization which cannot
+ * be performed in api_init() or dev_start_device() due
* to the fact that some services are not yet
* completely initialized.
* Parameters:
@@ -372,17 +372,17 @@ bool wcd_init(void)
* DSP_SOK: Allow this device to load
* DSP_EFAIL: Failure.
* Requires:
- * WCD initialized.
+ * Bridge API initialized.
* Ensures:
*/
-dsp_status wcd_init_complete2(void)
+dsp_status api_init_complete2(void)
{
dsp_status status = DSP_SOK;
struct cfg_devnode *dev_node;
struct dev_object *hdev_obj;
u32 dev_type, tmp;
- DBC_REQUIRE(wcd_c_refs > 0);
+ DBC_REQUIRE(api_c_refs > 0);
/* Walk the list of DevObjects, get each devnode, and attempting to
* autostart the board. Note that this requires COF loading, which
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index f53e02d..dd2fe8b 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -562,7 +562,7 @@ static long bridge_ioctl(struct file *filp, unsigned int code,
sizeof(union Trapped_Args));
if (!status) {
- status = wcd_call_dev_io_ctl(code, &buf_in, &retval,
+ status = api_call_dev_ioctl(code, &buf_in, &retval,
filp->private_data);
if (DSP_SUCCEEDED(status)) {
diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c
index 94f7605..175582a 100644
--- a/drivers/dsp/bridge/rmgr/dspdrv.c
+++ b/drivers/dsp/bridge/rmgr/dspdrv.c
@@ -54,12 +54,12 @@ u32 dsp_init(OUT u32 *init_status)
u32 device_node;
u32 device_node_string;
- if (!wcd_init())
+ if (!api_init())
goto func_cont;
status = drv_create(&drv_obj);
if (DSP_FAILED(status)) {
- wcd_exit();
+ api_exit();
goto func_cont;
}
@@ -83,7 +83,7 @@ u32 dsp_init(OUT u32 *init_status)
/* irrespective of the status of dev_remove_device we conitinue
* unloading. Get the Driver Object iterate through and remove.
* Reset the status to E_FAIL to avoid going through
- * wcd_init_complete2. */
+ * api_init_complete2. */
for (device_node = drv_get_first_dev_extension();
device_node != 0;
device_node = drv_get_next_dev_extension(device_node)) {
@@ -94,7 +94,7 @@ u32 dsp_init(OUT u32 *init_status)
/* Remove the Driver Object */
(void)drv_destroy(drv_obj);
drv_obj = NULL;
- wcd_exit();
+ api_exit();
dev_dbg(bridge, "%s: Logical device failed init\n", __func__);
} /* Unwinding the loaded drivers */
func_cont:
@@ -103,10 +103,10 @@ func_cont:
/* BRD_AutoStart could fail if the dsp execuetable is not the
* correct one. We should not propagate that error
* into the device loader. */
- (void)wcd_init_complete2();
+ (void)api_init_complete2();
} else {
dev_dbg(bridge, "%s: Failed\n", __func__);
- } /* End wcd_init_complete2 */
+ } /* End api_init_complete2 */
DBC_ENSURE((DSP_SUCCEEDED(status) && drv_obj != NULL) ||
(DSP_FAILED(status) && drv_obj == NULL));
*init_status = status;
@@ -138,7 +138,7 @@ bool dsp_deinit(u32 deviceContext)
if (DSP_SUCCEEDED(cfg_get_object((u32 *) &mgr_obj, REG_MGR_OBJECT)))
(void)mgr_destroy(mgr_obj);
- wcd_exit();
+ api_exit();
return ret;
}
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/wmd/tiomap3430.c
index d01cd63..d2c4691 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430.c
@@ -171,9 +171,9 @@ extern s32 dsp_debug;
* This mini driver's function interface table.
*/
static struct bridge_drv_interface drv_interface_fxns = {
- /* WCD ver. for which this mini driver is built. */
- WCD_MAJOR_VERSION,
- WCD_MINOR_VERSION,
+ /* Bridge API ver. for which this bridge driver is built. */
+ BRD_API_MAJOR_VERSION,
+ BRD_API_MINOR_VERSION,
bridge_dev_create,
bridge_dev_destroy,
bridge_dev_ctrl,
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 07/11] DSPBRIDGE: Rename "wmd" directory by "core"
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (5 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 06/11] DSPBRIDGE: Replace code containing "wcd" Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 08/11] DSPBRIDGE: Rename files that refer to Windows OS Ivan Gomez Castellanos
` (3 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
Since "wmd" (windows mini driver) refers to Windows OS, then this
directory is renamed by "core"
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
drivers/dsp/bridge/Makefile | 10 +++++-----
drivers/dsp/bridge/{wmd => core}/_cmm.h | 0
drivers/dsp/bridge/{wmd => core}/_deh.h | 0
drivers/dsp/bridge/{wmd => core}/_msg_sm.h | 0
drivers/dsp/bridge/{wmd => core}/_tiomap.h | 0
drivers/dsp/bridge/{wmd => core}/_tiomap_mmu.h | 0
drivers/dsp/bridge/{wmd => core}/_tiomap_pwr.h | 0
drivers/dsp/bridge/{wmd => core}/_tiomap_util.h | 0
drivers/dsp/bridge/{wmd => core}/chnl_sm.c | 0
drivers/dsp/bridge/{wmd => core}/io_sm.c | 0
drivers/dsp/bridge/{wmd => core}/mmu_fault.c | 0
drivers/dsp/bridge/{wmd => core}/mmu_fault.h | 0
drivers/dsp/bridge/{wmd => core}/msg_sm.c | 0
drivers/dsp/bridge/{wmd => core}/tiomap3430.c | 0
drivers/dsp/bridge/{wmd => core}/tiomap3430_pwr.c | 0
drivers/dsp/bridge/{wmd => core}/tiomap_io.c | 0
drivers/dsp/bridge/{wmd => core}/tiomap_io.h | 0
drivers/dsp/bridge/{wmd => core}/ue_deh.c | 0
drivers/dsp/bridge/{wmd => core}/wdt.c | 0
19 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/dsp/bridge/{wmd => core}/_cmm.h (100%)
rename drivers/dsp/bridge/{wmd => core}/_deh.h (100%)
rename drivers/dsp/bridge/{wmd => core}/_msg_sm.h (100%)
rename drivers/dsp/bridge/{wmd => core}/_tiomap.h (100%)
rename drivers/dsp/bridge/{wmd => core}/_tiomap_mmu.h (100%)
rename drivers/dsp/bridge/{wmd => core}/_tiomap_pwr.h (100%)
rename drivers/dsp/bridge/{wmd => core}/_tiomap_util.h (100%)
rename drivers/dsp/bridge/{wmd => core}/chnl_sm.c (100%)
rename drivers/dsp/bridge/{wmd => core}/io_sm.c (100%)
rename drivers/dsp/bridge/{wmd => core}/mmu_fault.c (100%)
rename drivers/dsp/bridge/{wmd => core}/mmu_fault.h (100%)
rename drivers/dsp/bridge/{wmd => core}/msg_sm.c (100%)
rename drivers/dsp/bridge/{wmd => core}/tiomap3430.c (100%)
rename drivers/dsp/bridge/{wmd => core}/tiomap3430_pwr.c (100%)
rename drivers/dsp/bridge/{wmd => core}/tiomap_io.c (100%)
rename drivers/dsp/bridge/{wmd => core}/tiomap_io.h (100%)
rename drivers/dsp/bridge/{wmd => core}/ue_deh.c (100%)
rename drivers/dsp/bridge/{wmd => core}/wdt.c (100%)
diff --git a/drivers/dsp/bridge/Makefile b/drivers/dsp/bridge/Makefile
index c6f2551..97e7ec1 100644
--- a/drivers/dsp/bridge/Makefile
+++ b/drivers/dsp/bridge/Makefile
@@ -5,9 +5,9 @@ libservices = services/sync.o \
services/clk.o services/cfg.o services/reg.o \
services/regsup.o services/ntfy.o \
services/services.o
-libwmd = wmd/chnl_sm.o wmd/msg_sm.o wmd/io_sm.o wmd/tiomap3430.o \
- wmd/tiomap3430_pwr.o wmd/tiomap_io.o \
- wmd/mmu_fault.o wmd/ue_deh.o wmd/wdt.o
+libcore = core/chnl_sm.o core/msg_sm.o core/io_sm.o core/tiomap3430.o \
+ core/tiomap3430_pwr.o core/tiomap_io.o \
+ core/mmu_fault.o core/ue_deh.o core/wdt.o
libpmgr = pmgr/chnl.o pmgr/io.o pmgr/msg.o pmgr/cod.o pmgr/dev.o pmgr/wcd.o \
pmgr/dmm.o pmgr/cmm.o pmgr/dbll.o
librmgr = rmgr/dbdcd.o rmgr/disp.o rmgr/drv.o rmgr/mgr.o rmgr/node.o \
@@ -17,7 +17,7 @@ libdload = dynload/cload.o dynload/getsection.o dynload/reloc.o \
dynload/tramp.o
libhw = hw/hw_mmu.o
-bridgedriver-objs = $(libgen) $(libservices) $(libwmd) $(libpmgr) $(librmgr) \
+bridgedriver-objs = $(libgen) $(libservices) $(libcore) $(libpmgr) $(librmgr) \
$(libdload) $(libhw)
#Machine dependent
@@ -27,7 +27,7 @@ ccflags-y += -D_TI_ -D_DB_TIOMAP -DTMS32060 \
#Header files
ccflags-y += -Idrivers/dsp/bridge/services
-ccflags-y += -Idrivers/dsp/bridge/wmd
+ccflags-y += -Idrivers/dsp/bridge/core
ccflags-y += -Idrivers/dsp/bridge/pmgr
ccflags-y += -Idrivers/dsp/bridge/rmgr
ccflags-y += -Idrivers/dsp/bridge/hw
diff --git a/drivers/dsp/bridge/wmd/_cmm.h b/drivers/dsp/bridge/core/_cmm.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/_cmm.h
rename to drivers/dsp/bridge/core/_cmm.h
diff --git a/drivers/dsp/bridge/wmd/_deh.h b/drivers/dsp/bridge/core/_deh.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/_deh.h
rename to drivers/dsp/bridge/core/_deh.h
diff --git a/drivers/dsp/bridge/wmd/_msg_sm.h b/drivers/dsp/bridge/core/_msg_sm.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/_msg_sm.h
rename to drivers/dsp/bridge/core/_msg_sm.h
diff --git a/drivers/dsp/bridge/wmd/_tiomap.h b/drivers/dsp/bridge/core/_tiomap.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/_tiomap.h
rename to drivers/dsp/bridge/core/_tiomap.h
diff --git a/drivers/dsp/bridge/wmd/_tiomap_mmu.h b/drivers/dsp/bridge/core/_tiomap_mmu.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/_tiomap_mmu.h
rename to drivers/dsp/bridge/core/_tiomap_mmu.h
diff --git a/drivers/dsp/bridge/wmd/_tiomap_pwr.h b/drivers/dsp/bridge/core/_tiomap_pwr.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/_tiomap_pwr.h
rename to drivers/dsp/bridge/core/_tiomap_pwr.h
diff --git a/drivers/dsp/bridge/wmd/_tiomap_util.h b/drivers/dsp/bridge/core/_tiomap_util.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/_tiomap_util.h
rename to drivers/dsp/bridge/core/_tiomap_util.h
diff --git a/drivers/dsp/bridge/wmd/chnl_sm.c b/drivers/dsp/bridge/core/chnl_sm.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/chnl_sm.c
rename to drivers/dsp/bridge/core/chnl_sm.c
diff --git a/drivers/dsp/bridge/wmd/io_sm.c b/drivers/dsp/bridge/core/io_sm.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/io_sm.c
rename to drivers/dsp/bridge/core/io_sm.c
diff --git a/drivers/dsp/bridge/wmd/mmu_fault.c b/drivers/dsp/bridge/core/mmu_fault.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/mmu_fault.c
rename to drivers/dsp/bridge/core/mmu_fault.c
diff --git a/drivers/dsp/bridge/wmd/mmu_fault.h b/drivers/dsp/bridge/core/mmu_fault.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/mmu_fault.h
rename to drivers/dsp/bridge/core/mmu_fault.h
diff --git a/drivers/dsp/bridge/wmd/msg_sm.c b/drivers/dsp/bridge/core/msg_sm.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/msg_sm.c
rename to drivers/dsp/bridge/core/msg_sm.c
diff --git a/drivers/dsp/bridge/wmd/tiomap3430.c b/drivers/dsp/bridge/core/tiomap3430.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/tiomap3430.c
rename to drivers/dsp/bridge/core/tiomap3430.c
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/core/tiomap3430_pwr.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/tiomap3430_pwr.c
rename to drivers/dsp/bridge/core/tiomap3430_pwr.c
diff --git a/drivers/dsp/bridge/wmd/tiomap_io.c b/drivers/dsp/bridge/core/tiomap_io.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/tiomap_io.c
rename to drivers/dsp/bridge/core/tiomap_io.c
diff --git a/drivers/dsp/bridge/wmd/tiomap_io.h b/drivers/dsp/bridge/core/tiomap_io.h
similarity index 100%
rename from drivers/dsp/bridge/wmd/tiomap_io.h
rename to drivers/dsp/bridge/core/tiomap_io.h
diff --git a/drivers/dsp/bridge/wmd/ue_deh.c b/drivers/dsp/bridge/core/ue_deh.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/ue_deh.c
rename to drivers/dsp/bridge/core/ue_deh.c
diff --git a/drivers/dsp/bridge/wmd/wdt.c b/drivers/dsp/bridge/core/wdt.c
similarity index 100%
rename from drivers/dsp/bridge/wmd/wdt.c
rename to drivers/dsp/bridge/core/wdt.c
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 08/11] DSPBRIDGE: Rename files that refer to Windows OS
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (6 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 07/11] DSPBRIDGE: Rename "wmd" directory by "core" Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 09/11] DSPBRIDGE: Append the content of _dcd.h into dspapi.h Ivan Gomez Castellanos
` (2 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
Since "wmd" (windows mini driver) and "wcd" (windows class driver)
refers to Windows OS, the following files are renamed:
wmd.h ==> dspdefs.h
wmdchnl.h ==> dspchnl.h
wmddeh.h ==> dspdeh.h
wmdio.h ==> dspio.h
wmdioctl.h ==> dspioctl.h
wmdmsg.h ==> dspmsg.h
wcd.h ==> dspapi.h
wcdioctl.h ==> dspapi-ioctl.h
wcd.c ==> dspapi.c
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/_chnl_sm.h | 4 ++--
arch/arm/plat-omap/include/dspbridge/_dcd.h | 2 +-
arch/arm/plat-omap/include/dspbridge/dev.h | 2 +-
arch/arm/plat-omap/include/dspbridge/devdefs.h | 2 +-
arch/arm/plat-omap/include/dspbridge/drvdefs.h | 2 +-
.../dspbridge/{wcdioctl.h => dspapi-ioctl.h} | 2 +-
.../include/dspbridge/{wcd.h => dspapi.h} | 2 +-
.../include/dspbridge/{wmdchnl.h => dspchnl.h} | 4 ++--
.../include/dspbridge/{wmd.h => dspdefs.h} | 2 +-
.../include/dspbridge/{wmddeh.h => dspdeh.h} | 4 ++--
.../include/dspbridge/{wmdio.h => dspio.h} | 4 ++--
.../include/dspbridge/{wmdioctl.h => dspioctl.h} | 2 +-
.../include/dspbridge/{wmdmsg.h => dspmsg.h} | 4 ++--
drivers/dsp/bridge/Makefile | 2 +-
drivers/dsp/bridge/core/_deh.h | 2 +-
drivers/dsp/bridge/core/_tiomap.h | 2 +-
drivers/dsp/bridge/core/chnl_sm.c | 4 ++--
drivers/dsp/bridge/core/io_sm.c | 6 +++---
drivers/dsp/bridge/core/mmu_fault.c | 2 +-
drivers/dsp/bridge/core/msg_sm.c | 2 +-
drivers/dsp/bridge/core/tiomap3430.c | 12 ++++++------
drivers/dsp/bridge/core/tiomap3430_pwr.c | 2 +-
drivers/dsp/bridge/core/ue_deh.c | 4 ++--
drivers/dsp/bridge/core/wdt.c | 2 +-
drivers/dsp/bridge/pmgr/chnlobj.h | 2 +-
drivers/dsp/bridge/pmgr/dev.c | 2 +-
drivers/dsp/bridge/pmgr/{wcd.c => dspapi.c} | 4 ++--
drivers/dsp/bridge/pmgr/ioobj.h | 2 +-
drivers/dsp/bridge/pmgr/msg.c | 2 +-
drivers/dsp/bridge/pmgr/msgobj.h | 2 +-
drivers/dsp/bridge/rmgr/disp.c | 2 +-
drivers/dsp/bridge/rmgr/drv.c | 2 +-
drivers/dsp/bridge/rmgr/drv_interface.c | 2 +-
drivers/dsp/bridge/rmgr/node.c | 4 ++--
drivers/dsp/bridge/rmgr/proc.c | 6 +++---
drivers/dsp/bridge/rmgr/pwr.c | 2 +-
drivers/dsp/bridge/rmgr/strm.c | 2 +-
37 files changed, 55 insertions(+), 55 deletions(-)
rename arch/arm/plat-omap/include/dspbridge/{wcdioctl.h => dspapi-ioctl.h} (99%)
rename arch/arm/plat-omap/include/dspbridge/{wcd.h => dspapi.h} (99%)
rename arch/arm/plat-omap/include/dspbridge/{wmdchnl.h => dspchnl.h} (97%)
rename arch/arm/plat-omap/include/dspbridge/{wmd.h => dspdefs.h} (99%)
rename arch/arm/plat-omap/include/dspbridge/{wmddeh.h => dspdeh.h} (98%)
rename arch/arm/plat-omap/include/dspbridge/{wmdio.h => dspio.h} (95%)
rename arch/arm/plat-omap/include/dspbridge/{wmdioctl.h => dspioctl.h} (99%)
rename arch/arm/plat-omap/include/dspbridge/{wmdmsg.h => dspmsg.h} (96%)
rename drivers/dsp/bridge/pmgr/{wcd.c => dspapi.c} (99%)
diff --git a/arch/arm/plat-omap/include/dspbridge/_chnl_sm.h b/arch/arm/plat-omap/include/dspbridge/_chnl_sm.h
index 8bba33f..cc998de 100644
--- a/arch/arm/plat-omap/include/dspbridge/_chnl_sm.h
+++ b/arch/arm/plat-omap/include/dspbridge/_chnl_sm.h
@@ -23,8 +23,8 @@
#ifndef _CHNL_SM_
#define _CHNL_SM_
-#include <dspbridge/wcd.h>
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspapi.h>
+#include <dspbridge/dspdefs.h>
#include <dspbridge/list.h>
#include <dspbridge/ntfy.h>
diff --git a/arch/arm/plat-omap/include/dspbridge/_dcd.h b/arch/arm/plat-omap/include/dspbridge/_dcd.h
index 589cd42..4c3f701 100644
--- a/arch/arm/plat-omap/include/dspbridge/_dcd.h
+++ b/arch/arm/plat-omap/include/dspbridge/_dcd.h
@@ -20,7 +20,7 @@
#ifndef _WCD_
#define _WCD_
-#include <dspbridge/wcdioctl.h>
+#include <dspbridge/dspapi-ioctl.h>
/*
* ======== api_call_dev_ioctl ========
diff --git a/arch/arm/plat-omap/include/dspbridge/dev.h b/arch/arm/plat-omap/include/dspbridge/dev.h
index 3ada31d..ac011cd 100644
--- a/arch/arm/plat-omap/include/dspbridge/dev.h
+++ b/arch/arm/plat-omap/include/dspbridge/dev.h
@@ -26,7 +26,7 @@
#include <dspbridge/dehdefs.h>
#include <dspbridge/nodedefs.h>
#include <dspbridge/dispdefs.h>
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
#include <dspbridge/dmm.h>
#include <dspbridge/host_os.h>
diff --git a/arch/arm/plat-omap/include/dspbridge/devdefs.h b/arch/arm/plat-omap/include/dspbridge/devdefs.h
index 8c0adc1..600be0e 100644
--- a/arch/arm/plat-omap/include/dspbridge/devdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/devdefs.h
@@ -3,7 +3,7 @@
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
- * Definition of common include typedef between wmd.h and dev.h. Required
+ * Definition of common include typedef between dspdefs.h and dev.h. Required
* to break circular dependency between WMD and DEV include files.
*
* Copyright (C) 2008 Texas Instruments, Inc.
diff --git a/arch/arm/plat-omap/include/dspbridge/drvdefs.h b/arch/arm/plat-omap/include/dspbridge/drvdefs.h
index f084207..c0dea57 100644
--- a/arch/arm/plat-omap/include/dspbridge/drvdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/drvdefs.h
@@ -3,7 +3,7 @@
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
- * Definition of common struct between wmd.h and drv.h.
+ * Definition of common struct between dspdefs.h and drv.h.
*
* Copyright (C) 2005-2006 Texas Instruments, Inc.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wcdioctl.h b/arch/arm/plat-omap/include/dspbridge/dspapi-ioctl.h
similarity index 99%
rename from arch/arm/plat-omap/include/dspbridge/wcdioctl.h
rename to arch/arm/plat-omap/include/dspbridge/dspapi-ioctl.h
index 49bec37..c214ea6 100644
--- a/arch/arm/plat-omap/include/dspbridge/wcdioctl.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspapi-ioctl.h
@@ -1,5 +1,5 @@
/*
- * wcdioctl.h
+ * dspapi-ioctl.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wcd.h b/arch/arm/plat-omap/include/dspbridge/dspapi.h
similarity index 99%
rename from arch/arm/plat-omap/include/dspbridge/wcd.h
rename to arch/arm/plat-omap/include/dspbridge/dspapi.h
index 1a68baa..232aab0 100644
--- a/arch/arm/plat-omap/include/dspbridge/wcd.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspapi.h
@@ -1,5 +1,5 @@
/*
- * wcd.h
+ * dspapi.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wmdchnl.h b/arch/arm/plat-omap/include/dspbridge/dspchnl.h
similarity index 97%
rename from arch/arm/plat-omap/include/dspbridge/wmdchnl.h
rename to arch/arm/plat-omap/include/dspbridge/dspchnl.h
index 0d874ab..3c6f29d 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmdchnl.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspchnl.h
@@ -1,5 +1,5 @@
/*
- * wmdchnl.h
+ * dspchnl.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
@@ -8,7 +8,7 @@
* by every class of WMD channel library.
*
* Notes:
- * The function comment headers reside in wmd.h.
+ * The function comment headers reside in dspdefs.h.
*
* Copyright (C) 2005-2006 Texas Instruments, Inc.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wmd.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
similarity index 99%
rename from arch/arm/plat-omap/include/dspbridge/wmd.h
rename to arch/arm/plat-omap/include/dspbridge/dspdefs.h
index d861cdf..8a1d38c 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmd.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
@@ -1,5 +1,5 @@
/*
- * wmd.h
+ * dspdefs.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wmddeh.h b/arch/arm/plat-omap/include/dspbridge/dspdeh.h
similarity index 98%
rename from arch/arm/plat-omap/include/dspbridge/wmddeh.h
rename to arch/arm/plat-omap/include/dspbridge/dspdeh.h
index 0152c43..f6a747f 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmddeh.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspdeh.h
@@ -1,5 +1,5 @@
/*
- * wmddeh.h
+ * dspdeh.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
@@ -7,7 +7,7 @@
* interface tables.
*
* Notes:
- * Function comment headers reside with the function typedefs in wmd.h.
+ * Function comment headers reside with the function typedefs in dspdefs.h.
*
* Copyright (C) 2005-2006 Texas Instruments, Inc.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wmdio.h b/arch/arm/plat-omap/include/dspbridge/dspio.h
similarity index 95%
rename from arch/arm/plat-omap/include/dspbridge/wmdio.h
rename to arch/arm/plat-omap/include/dspbridge/dspio.h
index c566350..b010d2a 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmdio.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspio.h
@@ -1,5 +1,5 @@
/*
- * wmdio.h
+ * dspio.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
@@ -7,7 +7,7 @@
* driver interface tables.
*
* Notes:
- * Function comment headers reside in wmd.h.
+ * Function comment headers reside in dspdefs.h.
*
* Copyright (C) 2005-2006 Texas Instruments, Inc.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wmdioctl.h b/arch/arm/plat-omap/include/dspbridge/dspioctl.h
similarity index 99%
rename from arch/arm/plat-omap/include/dspbridge/wmdioctl.h
rename to arch/arm/plat-omap/include/dspbridge/dspioctl.h
index 9fe5543..3f7a787 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmdioctl.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspioctl.h
@@ -1,5 +1,5 @@
/*
- * wmdioctl.h
+ * dspioctl.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
diff --git a/arch/arm/plat-omap/include/dspbridge/wmdmsg.h b/arch/arm/plat-omap/include/dspbridge/dspmsg.h
similarity index 96%
rename from arch/arm/plat-omap/include/dspbridge/wmdmsg.h
rename to arch/arm/plat-omap/include/dspbridge/dspmsg.h
index f8005ea..86db728 100644
--- a/arch/arm/plat-omap/include/dspbridge/wmdmsg.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspmsg.h
@@ -1,5 +1,5 @@
/*
- * wmdmsg.h
+ * dspmsg.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
@@ -8,7 +8,7 @@
* implemented by every class of WMD channel library.
*
* Notes:
- * Function comment headers reside in wmd.h.
+ * Function comment headers reside in dspdefs.h.
*
* Copyright (C) 2005-2006 Texas Instruments, Inc.
*
diff --git a/drivers/dsp/bridge/Makefile b/drivers/dsp/bridge/Makefile
index 97e7ec1..db2027f 100644
--- a/drivers/dsp/bridge/Makefile
+++ b/drivers/dsp/bridge/Makefile
@@ -8,7 +8,7 @@ libservices = services/sync.o \
libcore = core/chnl_sm.o core/msg_sm.o core/io_sm.o core/tiomap3430.o \
core/tiomap3430_pwr.o core/tiomap_io.o \
core/mmu_fault.o core/ue_deh.o core/wdt.o
-libpmgr = pmgr/chnl.o pmgr/io.o pmgr/msg.o pmgr/cod.o pmgr/dev.o pmgr/wcd.o \
+libpmgr = pmgr/chnl.o pmgr/io.o pmgr/msg.o pmgr/cod.o pmgr/dev.o pmgr/dspapi.o \
pmgr/dmm.o pmgr/cmm.o pmgr/dbll.o
librmgr = rmgr/dbdcd.o rmgr/disp.o rmgr/drv.o rmgr/mgr.o rmgr/node.o \
rmgr/proc.o rmgr/pwr.o rmgr/rmm.o rmgr/strm.o rmgr/dspdrv.o \
diff --git a/drivers/dsp/bridge/core/_deh.h b/drivers/dsp/bridge/core/_deh.h
index a7e74b0..631746e 100644
--- a/drivers/dsp/bridge/core/_deh.h
+++ b/drivers/dsp/bridge/core/_deh.h
@@ -20,7 +20,7 @@
#define _DEH_
#include <dspbridge/ntfy.h>
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
/* DEH Manager: only one created per board: */
struct deh_mgr {
diff --git a/drivers/dsp/bridge/core/_tiomap.h b/drivers/dsp/bridge/core/_tiomap.h
index b539641..c420295 100644
--- a/drivers/dsp/bridge/core/_tiomap.h
+++ b/drivers/dsp/bridge/core/_tiomap.h
@@ -25,7 +25,7 @@
#include <mach-omap2/cm-regbits-34xx.h>
#include <dspbridge/devdefs.h>
#include <hw_defs.h>
-#include <dspbridge/wmdioctl.h> /* for bridge_ioctl_extproc defn */
+#include <dspbridge/dspioctl.h> /* for bridge_ioctl_extproc defn */
#include <dspbridge/sync.h>
#include <dspbridge/clk.h>
diff --git a/drivers/dsp/bridge/core/chnl_sm.c b/drivers/dsp/bridge/core/chnl_sm.c
index 51017f1..9befa77 100644
--- a/drivers/dsp/bridge/core/chnl_sm.c
+++ b/drivers/dsp/bridge/core/chnl_sm.c
@@ -58,8 +58,8 @@
#include <dspbridge/sync.h>
/* ----------------------------------- Mini-Driver */
-#include <dspbridge/wmd.h>
-#include <dspbridge/wmdchnl.h>
+#include <dspbridge/dspdefs.h>
+#include <dspbridge/dspchnl.h>
#include "_tiomap.h"
/* ----------------------------------- Platform Manager */
diff --git a/drivers/dsp/bridge/core/io_sm.c b/drivers/dsp/bridge/core/io_sm.c
index e917c51..35da0b9 100644
--- a/drivers/dsp/bridge/core/io_sm.c
+++ b/drivers/dsp/bridge/core/io_sm.c
@@ -47,9 +47,9 @@
#include <hw_mmu.h>
/* Mini Driver */
-#include <dspbridge/wmddeh.h>
-#include <dspbridge/wmdio.h>
-#include <dspbridge/wmdioctl.h>
+#include <dspbridge/dspdeh.h>
+#include <dspbridge/dspio.h>
+#include <dspbridge/dspioctl.h>
#include <dspbridge/wdt.h>
#include <_tiomap.h>
#include <tiomap_io.h>
diff --git a/drivers/dsp/bridge/core/mmu_fault.c b/drivers/dsp/bridge/core/mmu_fault.c
index 0e6387a..cdd2908 100644
--- a/drivers/dsp/bridge/core/mmu_fault.c
+++ b/drivers/dsp/bridge/core/mmu_fault.c
@@ -29,7 +29,7 @@
#include <dspbridge/drv.h>
/* ----------------------------------- Link Driver */
-#include <dspbridge/wmddeh.h>
+#include <dspbridge/dspdeh.h>
/* ------------------------------------ Hardware Abstraction Layer */
#include <hw_defs.h>
diff --git a/drivers/dsp/bridge/core/msg_sm.c b/drivers/dsp/bridge/core/msg_sm.c
index e52e56a..e12884b 100644
--- a/drivers/dsp/bridge/core/msg_sm.c
+++ b/drivers/dsp/bridge/core/msg_sm.c
@@ -36,7 +36,7 @@
/* ----------------------------------- This */
#include <_msg_sm.h>
-#include <dspbridge/wmdmsg.h>
+#include <dspbridge/dspmsg.h>
/* ----------------------------------- Function Prototypes */
static dsp_status add_new_msg(struct lst_list *msgList);
diff --git a/drivers/dsp/bridge/core/tiomap3430.c b/drivers/dsp/bridge/core/tiomap3430.c
index d2c4691..1ccec2d 100644
--- a/drivers/dsp/bridge/core/tiomap3430.c
+++ b/drivers/dsp/bridge/core/tiomap3430.c
@@ -41,17 +41,17 @@
#include <hw_mmu.h>
/* ----------------------------------- Link Driver */
-#include <dspbridge/wmd.h>
-#include <dspbridge/wmdchnl.h>
-#include <dspbridge/wmddeh.h>
-#include <dspbridge/wmdio.h>
-#include <dspbridge/wmdmsg.h>
+#include <dspbridge/dspdefs.h>
+#include <dspbridge/dspchnl.h>
+#include <dspbridge/dspdeh.h>
+#include <dspbridge/dspio.h>
+#include <dspbridge/dspmsg.h>
#include <dspbridge/pwr.h>
#include <dspbridge/io_sm.h>
/* ----------------------------------- Platform Manager */
#include <dspbridge/dev.h>
-#include <dspbridge/wcd.h>
+#include <dspbridge/dspapi.h>
#include <dspbridge/dmm.h>
#include <dspbridge/wdt.h>
diff --git a/drivers/dsp/bridge/core/tiomap3430_pwr.c b/drivers/dsp/bridge/core/tiomap3430_pwr.c
index 8563dad..73355c6 100644
--- a/drivers/dsp/bridge/core/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/core/tiomap3430_pwr.c
@@ -35,7 +35,7 @@
#include <dspbridge/pwr_sh.h>
/* ----------------------------------- Mini Driver */
-#include <dspbridge/wmddeh.h>
+#include <dspbridge/dspdeh.h>
#include <dspbridge/wdt.h>
/* ----------------------------------- specific to this file */
diff --git a/drivers/dsp/bridge/core/ue_deh.c b/drivers/dsp/bridge/core/ue_deh.c
index 2473d3d..8a13c14 100644
--- a/drivers/dsp/bridge/core/ue_deh.c
+++ b/drivers/dsp/bridge/core/ue_deh.c
@@ -33,11 +33,11 @@
#include <dspbridge/drv.h>
/* ----------------------------------- Link Driver */
-#include <dspbridge/wmddeh.h>
+#include <dspbridge/dspdeh.h>
/* ----------------------------------- Platform Manager */
#include <dspbridge/dev.h>
-#include <dspbridge/wcd.h>
+#include <dspbridge/dspapi.h>
#include <dspbridge/wdt.h>
/* ------------------------------------ Hardware Abstraction Layer */
diff --git a/drivers/dsp/bridge/core/wdt.c b/drivers/dsp/bridge/core/wdt.c
index 7a007f2..4637afb 100644
--- a/drivers/dsp/bridge/core/wdt.c
+++ b/drivers/dsp/bridge/core/wdt.c
@@ -19,7 +19,7 @@
#include <dspbridge/std.h>
#include <dspbridge/dbdefs.h>
#include <dspbridge/errbase.h>
-#include <dspbridge/wmddeh.h>
+#include <dspbridge/dspdeh.h>
#include <dspbridge/dev.h>
#include <dspbridge/_chnl_sm.h>
#include <dspbridge/wdt.h>
diff --git a/drivers/dsp/bridge/pmgr/chnlobj.h b/drivers/dsp/bridge/pmgr/chnlobj.h
index 2cc7c22..39ce007 100644
--- a/drivers/dsp/bridge/pmgr/chnlobj.h
+++ b/drivers/dsp/bridge/pmgr/chnlobj.h
@@ -21,7 +21,7 @@
#define CHNLOBJ_
#include <dspbridge/chnldefs.h>
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
/*
* This struct is the first field in a chnl_mgr struct, as implemented in
diff --git a/drivers/dsp/bridge/pmgr/dev.c b/drivers/dsp/bridge/pmgr/dev.c
index f94eebc..109e343 100644
--- a/drivers/dsp/bridge/pmgr/dev.c
+++ b/drivers/dsp/bridge/pmgr/dev.c
@@ -43,7 +43,7 @@
#include <dspbridge/node.h>
/* ----------------------------------- Others */
-#include <dspbridge/wcd.h> /* WCD version info. */
+#include <dspbridge/dspapi.h> /* WCD version info. */
#include <dspbridge/chnl.h>
#include <dspbridge/io.h>
diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/dspapi.c
similarity index 99%
rename from drivers/dsp/bridge/pmgr/wcd.c
rename to drivers/dsp/bridge/pmgr/dspapi.c
index a63ae8f..1ac7e78 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/dspapi.c
@@ -1,5 +1,5 @@
/*
- * wcd.c
+ * dspapi.c
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
@@ -80,7 +80,7 @@ static u32 api_c_refs;
/*
* Function tables.
* The order of these functions MUST be the same as the order of the command
- * numbers defined in wcdioctl.h This is how an IOCTL number in user mode
+ * numbers defined in dspapi-ioctl.h This is how an IOCTL number in user mode
* turns into a function call in kernel mode.
*/
diff --git a/drivers/dsp/bridge/pmgr/ioobj.h b/drivers/dsp/bridge/pmgr/ioobj.h
index 8717f8a..8f9d871 100644
--- a/drivers/dsp/bridge/pmgr/ioobj.h
+++ b/drivers/dsp/bridge/pmgr/ioobj.h
@@ -21,7 +21,7 @@
#define IOOBJ_
#include <dspbridge/devdefs.h>
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
/*
* This struct is the first field in a io_mgr struct, as implemented in
diff --git a/drivers/dsp/bridge/pmgr/msg.c b/drivers/dsp/bridge/pmgr/msg.c
index 63cadf6..f1e178a 100644
--- a/drivers/dsp/bridge/pmgr/msg.c
+++ b/drivers/dsp/bridge/pmgr/msg.c
@@ -28,7 +28,7 @@
#include <dspbridge/dbc.h>
/* ----------------------------------- Mini Driver */
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
/* ----------------------------------- Platform Manager */
#include <dspbridge/dev.h>
diff --git a/drivers/dsp/bridge/pmgr/msgobj.h b/drivers/dsp/bridge/pmgr/msgobj.h
index 3eb1098..d19e26b 100644
--- a/drivers/dsp/bridge/pmgr/msgobj.h
+++ b/drivers/dsp/bridge/pmgr/msgobj.h
@@ -20,7 +20,7 @@
#ifndef MSGOBJ_
#define MSGOBJ_
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
#include <dspbridge/msgdefs.h>
diff --git a/drivers/dsp/bridge/rmgr/disp.c b/drivers/dsp/bridge/rmgr/disp.c
index 9418f50..bffedef 100644
--- a/drivers/dsp/bridge/rmgr/disp.c
+++ b/drivers/dsp/bridge/rmgr/disp.c
@@ -32,7 +32,7 @@
#include <dspbridge/sync.h>
/* ----------------------------------- Link Driver */
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
/* ----------------------------------- Platform Manager */
#include <dspbridge/dev.h>
diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index 3df27d9..c3df5f5 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -40,7 +40,7 @@
#include <dspbridge/proc.h>
#include <dspbridge/strm.h>
#include <dspbridge/nodepriv.h>
-#include <dspbridge/wmdchnl.h>
+#include <dspbridge/dspchnl.h>
#include <dspbridge/resourcecleanup.h>
/* ----------------------------------- Defines, Data Structures, Typedefs */
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index dd2fe8b..70e1a3a 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -45,7 +45,7 @@
#include <dspbridge/reg.h>
/* ----------------------------------- Platform Manager */
-#include <dspbridge/wcdioctl.h>
+#include <dspbridge/dspapi-ioctl.h>
#include <dspbridge/_dcd.h>
#include <dspbridge/dspdrv.h>
diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c
index be641bc..0b187dc 100644
--- a/drivers/dsp/bridge/rmgr/node.c
+++ b/drivers/dsp/bridge/rmgr/node.c
@@ -48,8 +48,8 @@
#include <dspbridge/rms_sh.h>
/* ----------------------------------- Link Driver */
-#include <dspbridge/wmd.h>
-#include <dspbridge/wmdioctl.h>
+#include <dspbridge/dspdefs.h>
+#include <dspbridge/dspioctl.h>
/* ----------------------------------- Others */
#include <dspbridge/gb.h>
diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index 0a95355..4cdc7e3 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -33,8 +33,8 @@
#include <dspbridge/ntfy.h>
#include <dspbridge/sync.h>
/* ----------------------------------- Mini Driver */
-#include <dspbridge/wmd.h>
-#include <dspbridge/wmddeh.h>
+#include <dspbridge/dspdefs.h>
+#include <dspbridge/dspdeh.h>
/* ----------------------------------- Platform Manager */
#include <dspbridge/cod.h>
#include <dspbridge/dev.h>
@@ -50,7 +50,7 @@
/* ----------------------------------- Others */
#include <dspbridge/dbdcd.h>
#include <dspbridge/msg.h>
-#include <dspbridge/wmdioctl.h>
+#include <dspbridge/dspioctl.h>
#include <dspbridge/drv.h>
#include <dspbridge/reg.h>
diff --git a/drivers/dsp/bridge/rmgr/pwr.c b/drivers/dsp/bridge/rmgr/pwr.c
index ff8c0c3..c479a68 100644
--- a/drivers/dsp/bridge/rmgr/pwr.c
+++ b/drivers/dsp/bridge/rmgr/pwr.c
@@ -30,7 +30,7 @@
#include <dspbridge/dev.h>
/* ----------------------------------- Link Driver */
-#include <dspbridge/wmdioctl.h>
+#include <dspbridge/dspioctl.h>
/*
* ======== pwr_sleep_dsp ========
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index 76107c9..da26df9 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -31,7 +31,7 @@
#include <dspbridge/sync.h>
/* ----------------------------------- Mini Driver */
-#include <dspbridge/wmd.h>
+#include <dspbridge/dspdefs.h>
/* ----------------------------------- Resource Manager */
#include <dspbridge/nodepriv.h>
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 09/11] DSPBRIDGE: Append the content of _dcd.h into dspapi.h
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (7 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 08/11] DSPBRIDGE: Rename files that refer to Windows OS Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 10/11] DSPBRIDGE: Remove OS specific comments Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 11/11] DSPBRIDGE: Rename header file guard macros that cointain WMD or WCD Ivan Gomez Castellanos
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
The header file _dcd.h contained the function prototypes of dspapi.c,
so _dcd.h file is removed and its content is placed into dspapi.h.
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/_dcd.h | 152 -------------------------
arch/arm/plat-omap/include/dspbridge/dspapi.h | 151 +++++++++++++++++++++++--
drivers/dsp/bridge/pmgr/dspapi.c | 2 +-
drivers/dsp/bridge/rmgr/drv_interface.c | 2 +-
drivers/dsp/bridge/rmgr/dspdrv.c | 2 +-
5 files changed, 144 insertions(+), 165 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/dspbridge/_dcd.h
diff --git a/arch/arm/plat-omap/include/dspbridge/_dcd.h b/arch/arm/plat-omap/include/dspbridge/_dcd.h
deleted file mode 100644
index 4c3f701..0000000
--- a/arch/arm/plat-omap/include/dspbridge/_dcd.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * _dcd.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Includes the wrapper functions called directly by the
- * DeviceIOControl interface.
- *
- * Copyright (C) 2005-2006 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 _WCD_
-#define _WCD_
-
-#include <dspbridge/dspapi-ioctl.h>
-
-/*
- * ======== api_call_dev_ioctl ========
- * Purpose:
- * Call the (wrapper) function for the corresponding API IOCTL.
- * Parameters:
- * cmd: IOCTL id, base 0.
- * args: Argument structure.
- * pResult:
- * Returns:
- * DSP_SOK if command called; DSP_EINVALIDARG if command not in IOCTL
- * table.
- * Requires:
- * Ensures:
- */
-extern dsp_status api_call_dev_ioctl(unsigned int cmd,
- union Trapped_Args *args,
- u32 *pResult, void *pr_ctxt);
-
-/*
- * ======== api_init ========
- * Purpose:
- * Initialize modules used by Bridge API.
- * This procedure is called when the driver is loaded.
- * Parameters:
- * Returns:
- * TRUE if success; FALSE otherwise.
- * Requires:
- * Ensures:
- */
-extern bool api_init(void);
-
-/*
- * ======== api_init_complete2 ========
- * Purpose:
- * Perform any required bridge initialization which cannot
- * be performed in api_init() or dev_start_device() due
- * to the fact that some services are not yet
- * completely initialized.
- * Parameters:
- * Returns:
- * DSP_SOK: Allow this device to load
- * DSP_EFAIL: Failure.
- * Requires:
- * Bridge API initialized.
- * Ensures:
- */
-extern dsp_status api_init_complete2(void);
-
-/*
- * ======== api_exit ========
- * Purpose:
- * Exit all modules initialized in api_init(void).
- * This procedure is called when the driver is unloaded.
- * Parameters:
- * Returns:
- * Requires:
- * api_init(void) was previously called.
- * Ensures:
- * Resources acquired in api_init(void) are freed.
- */
-extern void api_exit(void);
-
-/* MGR wrapper functions */
-extern u32 mgrwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt);
-extern u32 mgrwrap_enum_proc_info(union Trapped_Args *args, void *pr_ctxt);
-extern u32 mgrwrap_register_object(union Trapped_Args *args, void *pr_ctxt);
-extern u32 mgrwrap_unregister_object(union Trapped_Args *args, void *pr_ctxt);
-extern u32 mgrwrap_wait_for_bridge_events(union Trapped_Args *args,
- void *pr_ctxt);
-
-extern u32 mgrwrap_get_process_resources_info(union Trapped_Args *args,
- void *pr_ctxt);
-
-/* CPRC (Processor) wrapper Functions */
-extern u32 procwrap_attach(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_ctrl(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_detach(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_enum_resources(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_get_state(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_get_trace(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_load(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_start(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_reserve_memory(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_un_reserve_memory(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_map(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_un_map(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_flush_memory(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_stop(union Trapped_Args *args, void *pr_ctxt);
-extern u32 procwrap_invalidate_memory(union Trapped_Args *args, void *pr_ctxt);
-
-/* NODE wrapper functions */
-extern u32 nodewrap_allocate(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_alloc_msg_buf(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_change_priority(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_connect(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_create(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_delete(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_free_msg_buf(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_get_attr(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_get_message(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_pause(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_put_message(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_run(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_terminate(union Trapped_Args *args, void *pr_ctxt);
-extern u32 nodewrap_get_uuid_props(union Trapped_Args *args, void *pr_ctxt);
-
-/* STRM wrapper functions */
-extern u32 strmwrap_allocate_buffer(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_close(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_free_buffer(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_get_event_handle(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_get_info(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_idle(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_issue(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_open(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_reclaim(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
-extern u32 strmwrap_select(union Trapped_Args *args, void *pr_ctxt);
-
-extern u32 cmmwrap_calloc_buf(union Trapped_Args *args, void *pr_ctxt);
-extern u32 cmmwrap_free_buf(union Trapped_Args *args, void *pr_ctxt);
-extern u32 cmmwrap_get_handle(union Trapped_Args *args, void *pr_ctxt);
-extern u32 cmmwrap_get_info(union Trapped_Args *args, void *pr_ctxt);
-
-#endif /* _WCD_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/dspapi.h b/arch/arm/plat-omap/include/dspbridge/dspapi.h
index 232aab0..9589574 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspapi.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspapi.h
@@ -3,17 +3,17 @@
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
- * Bridge class driver library functions, object definitions, and
- * return error/status codes. To be included by Bridge mini drivers.
+ * Includes the wrapper functions called directly by the
+ * DeviceIOControl interface.
*
* Notes:
- * Bridge Class Driver services exported to WMD's are initialized by the
- * WCD on behalf of the WMD. WMD's must not call module Init/Exit
+ * Bridge services exported to Bridge driver are initialized by the DSPAPI on
+ * behalf of the Bridge driver. Bridge driver must not call module Init/Exit
* functions.
*
- * To ensure WMD binary compatibility across different platforms,
- * for the same processor, a WMD must restrict its usage of system
- * services to those exported by the 'Bridge class library.
+ * To ensure Bridge driver binary compatibility across different platforms,
+ * for the same processor, a Bridge driver must restrict its usage of system
+ * services to those exported by the DSPAPI library.
*
* Copyright (C) 2005-2006 Texas Instruments, Inc.
*
@@ -26,11 +26,142 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WCD_
-#define WCD_
+#ifndef DSPAPI_
+#define DSPAPI_
+
+#include <dspbridge/dspapi-ioctl.h>
/* This BRD API Library Version: */
#define BRD_API_MAJOR_VERSION (u32)8 /* .8x - Alpha, .9x - Beta, 1.x FCS */
#define BRD_API_MINOR_VERSION (u32)0
-#endif /* WCD_ */
+
+/*
+ * ======== api_call_dev_ioctl ========
+ * Purpose:
+ * Call the (wrapper) function for the corresponding API IOCTL.
+ * Parameters:
+ * cmd: IOCTL id, base 0.
+ * args: Argument structure.
+ * pResult:
+ * Returns:
+ * DSP_SOK if command called; DSP_EINVALIDARG if command not in IOCTL
+ * table.
+ * Requires:
+ * Ensures:
+ */
+extern dsp_status api_call_dev_ioctl(unsigned int cmd,
+ union Trapped_Args *args,
+ u32 *pResult, void *pr_ctxt);
+
+/*
+ * ======== api_init ========
+ * Purpose:
+ * Initialize modules used by Bridge API.
+ * This procedure is called when the driver is loaded.
+ * Parameters:
+ * Returns:
+ * TRUE if success; FALSE otherwise.
+ * Requires:
+ * Ensures:
+ */
+extern bool api_init(void);
+
+/*
+ * ======== api_init_complete2 ========
+ * Purpose:
+ * Perform any required bridge initialization which cannot
+ * be performed in api_init() or dev_start_device() due
+ * to the fact that some services are not yet
+ * completely initialized.
+ * Parameters:
+ * Returns:
+ * DSP_SOK: Allow this device to load
+ * DSP_EFAIL: Failure.
+ * Requires:
+ * Bridge API initialized.
+ * Ensures:
+ */
+extern dsp_status api_init_complete2(void);
+
+/*
+ * ======== api_exit ========
+ * Purpose:
+ * Exit all modules initialized in api_init(void).
+ * This procedure is called when the driver is unloaded.
+ * Parameters:
+ * Returns:
+ * Requires:
+ * api_init(void) was previously called.
+ * Ensures:
+ * Resources acquired in api_init(void) are freed.
+ */
+extern void api_exit(void);
+
+/* MGR wrapper functions */
+extern u32 mgrwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt);
+extern u32 mgrwrap_enum_proc_info(union Trapped_Args *args, void *pr_ctxt);
+extern u32 mgrwrap_register_object(union Trapped_Args *args, void *pr_ctxt);
+extern u32 mgrwrap_unregister_object(union Trapped_Args *args, void *pr_ctxt);
+extern u32 mgrwrap_wait_for_bridge_events(union Trapped_Args *args,
+ void *pr_ctxt);
+
+extern u32 mgrwrap_get_process_resources_info(union Trapped_Args *args,
+ void *pr_ctxt);
+
+/* CPRC (Processor) wrapper Functions */
+extern u32 procwrap_attach(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_ctrl(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_detach(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_enum_node_info(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_enum_resources(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_get_state(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_get_trace(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_load(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_start(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_reserve_memory(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_un_reserve_memory(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_map(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_un_map(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_flush_memory(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_stop(union Trapped_Args *args, void *pr_ctxt);
+extern u32 procwrap_invalidate_memory(union Trapped_Args *args, void *pr_ctxt);
+
+/* NODE wrapper functions */
+extern u32 nodewrap_allocate(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_alloc_msg_buf(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_change_priority(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_connect(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_create(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_delete(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_free_msg_buf(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_get_attr(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_get_message(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_pause(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_put_message(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_run(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_terminate(union Trapped_Args *args, void *pr_ctxt);
+extern u32 nodewrap_get_uuid_props(union Trapped_Args *args, void *pr_ctxt);
+
+/* STRM wrapper functions */
+extern u32 strmwrap_allocate_buffer(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_close(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_free_buffer(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_get_event_handle(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_get_info(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_idle(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_issue(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_open(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_reclaim(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_register_notify(union Trapped_Args *args, void *pr_ctxt);
+extern u32 strmwrap_select(union Trapped_Args *args, void *pr_ctxt);
+
+extern u32 cmmwrap_calloc_buf(union Trapped_Args *args, void *pr_ctxt);
+extern u32 cmmwrap_free_buf(union Trapped_Args *args, void *pr_ctxt);
+extern u32 cmmwrap_get_handle(union Trapped_Args *args, void *pr_ctxt);
+extern u32 cmmwrap_get_info(union Trapped_Args *args, void *pr_ctxt);
+
+
+#endif /* DSPAPI_ */
diff --git a/drivers/dsp/bridge/pmgr/dspapi.c b/drivers/dsp/bridge/pmgr/dspapi.c
index 1ac7e78..2274e21 100644
--- a/drivers/dsp/bridge/pmgr/dspapi.c
+++ b/drivers/dsp/bridge/pmgr/dspapi.c
@@ -53,7 +53,7 @@
#include <dspbridge/io.h>
/* ----------------------------------- This */
-#include <dspbridge/_dcd.h>
+#include <dspbridge/dspapi.h>
#include <dspbridge/dbdcd.h>
#include <dspbridge/resourcecleanup.h>
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 70e1a3a..bf1e562 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -46,7 +46,7 @@
/* ----------------------------------- Platform Manager */
#include <dspbridge/dspapi-ioctl.h>
-#include <dspbridge/_dcd.h>
+#include <dspbridge/dspapi.h>
#include <dspbridge/dspdrv.h>
/* ----------------------------------- Resource Manager */
diff --git a/drivers/dsp/bridge/rmgr/dspdrv.c b/drivers/dsp/bridge/rmgr/dspdrv.c
index 175582a..cbdfa73 100644
--- a/drivers/dsp/bridge/rmgr/dspdrv.c
+++ b/drivers/dsp/bridge/rmgr/dspdrv.c
@@ -34,7 +34,7 @@
/* ----------------------------------- Platform Manager */
#include <dspbridge/drv.h>
#include <dspbridge/dev.h>
-#include <dspbridge/_dcd.h>
+#include <dspbridge/dspapi.h>
/* ----------------------------------- Resource Manager */
#include <dspbridge/mgr.h>
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/11] DSPBRIDGE: Remove OS specific comments
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (8 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 09/11] DSPBRIDGE: Append the content of _dcd.h into dspapi.h Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
2010-05-01 0:45 ` [PATCH 11/11] DSPBRIDGE: Rename header file guard macros that cointain WMD or WCD Ivan Gomez Castellanos
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras, Omar Ramirez Luna
From: Omar Ramirez Luna <omar.ramirez@ti.com>
As this is generic to Linux, remove obvious references to
this and other OS.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
arch/arm/plat-omap/include/dspbridge/dev.h | 14 +++++++-------
arch/arm/plat-omap/include/dspbridge/dspdefs.h | 4 ++--
arch/arm/plat-omap/include/dspbridge/mgr.h | 2 +-
drivers/dsp/bridge/core/chnl_sm.c | 2 +-
drivers/dsp/bridge/core/tiomap3430.c | 6 ++----
drivers/dsp/bridge/rmgr/drv.c | 4 ++--
6 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/dev.h b/arch/arm/plat-omap/include/dspbridge/dev.h
index ac011cd..70eb55d 100644
--- a/arch/arm/plat-omap/include/dspbridge/dev.h
+++ b/arch/arm/plat-omap/include/dspbridge/dev.h
@@ -72,7 +72,7 @@ extern u32 dev_brd_write_fxn(void *pArb,
* to the WMD when bridge_dev_create() is called.
* pDspConfig: DSP resources, to be passed down to the WMD when
* bridge_dev_create() is called.
- * dev_node_obj: Platform (Windows) specific device node.
+ * dev_node_obj: Platform specific device node.
* Returns:
* DSP_SOK: Module is loaded, device object has been created
* DSP_EMEMORY: Insufficient memory to create needed resources.
@@ -117,7 +117,7 @@ extern dsp_status dev_create_device(OUT struct dev_object
* to the WMD when bridge_dev_create() is called.
* pDspConfig: DSP resources, to be passed down to the WMD when
* bridge_dev_create() is called.
- * dev_node_obj: Platform (Windows) specific device node.
+ * dev_node_obj: Platform specific device node.
* Returns:
* DSP_SOK: Module is loaded, device object has been created
* DSP_EMEMORY: Insufficient memory to create needed resources.
@@ -324,7 +324,7 @@ extern dsp_status dev_get_deh_mgr(struct dev_object *hdev_obj,
* dev_create_device().
* phDevNode: Ptr to location to get the device node handle.
* Returns:
- * DSP_SOK: In Win95, returns a DEVNODE in *dev_node_obj; In NT, ???
+ * DSP_SOK: Returns a DEVNODE in *dev_node_obj.
* DSP_EHANDLE: Invalid hdev_obj.
* Requires:
* phDevNode != NULL.
@@ -700,10 +700,10 @@ extern void dev_set_msg_mgr(struct dev_object *hdev_obj, struct msg_mgr *hmgr);
/*
* ======== dev_start_device ========
* Purpose:
- * Initializes the new device with the WinBRIDGE environment. This
- * involves querying CM for allocated resources, querying the registry
- * for necessary dsp resources (requested in the INF file), and using
- * this information to create a WinBRIDGE device object.
+ * Initializes the new device with bridge environment. This involves
+ * querying CM for allocated resources, querying the registry for
+ * necessary dsp resources (requested in the INF file), and using this
+ * information to create a bridge device object.
* Parameters:
* dev_node_obj: Device node as it is know to OS.
* Returns:
diff --git a/arch/arm/plat-omap/include/dspbridge/dspdefs.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
index 8a1d38c..26a9988 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
@@ -653,7 +653,7 @@ typedef dsp_status(*fxn_chnl_registernotify)
* Parameters:
* phDevContext: Ptr to location to store a WMD device context.
* hdev_obj: Handle to a Device Object, created and managed by WCD.
- * pConfig: Ptr to configuration parameters provided by the Windows
+ * pConfig: Ptr to configuration parameters provided by the
* Configuration Manager during device loading.
* pDspConfig: DSP resources, as specified in the registry key for this
* device.
@@ -1127,7 +1127,7 @@ struct bridge_drv_interface {
* ppDrvInterface pointer initialized to WMD's function interface.
* No system resources are acquired by this function.
* Details:
- * Win95: Called during the Device_Init phase.
+ * Called during the Device_Init phase.
*/
void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
IN CONST char *driver_file_name);
diff --git a/arch/arm/plat-omap/include/dspbridge/mgr.h b/arch/arm/plat-omap/include/dspbridge/mgr.h
index feb1b61..193e5e0 100644
--- a/arch/arm/plat-omap/include/dspbridge/mgr.h
+++ b/arch/arm/plat-omap/include/dspbridge/mgr.h
@@ -50,7 +50,7 @@ dsp_status mgr_wait_for_bridge_events(struct dsp_notification
* There is only one Manager Object in the DSP/BIOS Bridge.
* Parameters:
* phMgrObject: Location to store created MGR Object handle.
- * dev_node_obj: Device object as known to Windows system.
+ * dev_node_obj: Device object as known to the system.
* Returns:
* DSP_SOK: Success
* DSP_EMEMORY: Failed to Create the Object
diff --git a/drivers/dsp/bridge/core/chnl_sm.c b/drivers/dsp/bridge/core/chnl_sm.c
index 9befa77..8b7e0a8 100644
--- a/drivers/dsp/bridge/core/chnl_sm.c
+++ b/drivers/dsp/bridge/core/chnl_sm.c
@@ -853,7 +853,7 @@ dsp_status bridge_chnl_open(OUT struct chnl_object **phChnl,
pchnl->chnl_mgr_obj = chnl_mgr_obj;
pchnl->chnl_id = uChnlId;
pchnl->chnl_mode = chnl_mode;
- pchnl->user_event = sync_event; /* for Linux */
+ pchnl->user_event = sync_event;
pchnl->sync_event = sync_event;
/* Get the process handle */
pchnl->process = current->tgid;
diff --git a/drivers/dsp/bridge/core/tiomap3430.c b/drivers/dsp/bridge/core/tiomap3430.c
index 1ccec2d..3555de2 100644
--- a/drivers/dsp/bridge/core/tiomap3430.c
+++ b/drivers/dsp/bridge/core/tiomap3430.c
@@ -1019,7 +1019,7 @@ static dsp_status bridge_dev_create(OUT struct bridge_dev_context
dev_context->tc_word_swap_on = tc_word_swap;
}
if (DSP_SUCCEEDED(status)) {
- /* 24xx-Linux MMU address is obtained from the host
+ /* MMU address is obtained from the host
* resources struct */
dev_context->dw_dsp_mmu_base = resources.dw_dmmu_base;
}
@@ -1413,7 +1413,6 @@ static dsp_status bridge_brd_mem_map(struct bridge_dev_context *hDevContext,
}
up_read(&mm->mmap_sem);
func_cont:
- /* Don't propogate Linux or HW status to upper layers */
if (DSP_SUCCEEDED(status)) {
status = DSP_SOK;
} else {
@@ -1641,7 +1640,7 @@ EXIT_LOOP:
/*
* ======== user_va2_pa ========
* Purpose:
- * This function walks through the Linux page tables to convert a userland
+ * This function walks through the page tables to convert a userland
* virtual address to physical address
*/
static u32 user_va2_pa(struct mm_struct *mm, u32 address)
@@ -1874,7 +1873,6 @@ static dsp_status mem_map_vmalloc(struct bridge_dev_context *dev_context,
hw_attrs);
va_curr += size_curr;
}
- /* Don't propogate Linux or HW status to upper layers */
if (DSP_SUCCEEDED(status))
status = DSP_SOK;
else
diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index c3df5f5..9d3d0c1 100644
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -947,7 +947,7 @@ static dsp_status request_bridge_resources(u32 dw_context, s32 bRequest)
* internal memory TODO Do a ioremap here */
/* Second window is for DSP external memory shared with MPU */
- /* For Linux, these are hard-coded values */
+ /* These are hard-coded values */
host_res->birq_registers = 0;
host_res->birq_attrib = 0;
host_res->dw_offset_for_monitor = 0;
@@ -1050,7 +1050,7 @@ static dsp_status request_bridge_resources_dsp(u32 dw_context, s32 bRequest)
}
}
if (DSP_SUCCEEDED(status)) {
- /* for Linux, these are hard-coded values */
+ /* These are hard-coded values */
host_res->birq_registers = 0;
host_res->birq_attrib = 0;
host_res->dw_offset_for_monitor = 0;
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 11/11] DSPBRIDGE: Rename header file guard macros that cointain WMD or WCD
2010-05-01 0:45 [PATCH 00/11] DSPBRIDGE: Remove code and comments refering to other OS Ivan Gomez Castellanos
` (9 preceding siblings ...)
2010-05-01 0:45 ` [PATCH 10/11] DSPBRIDGE: Remove OS specific comments Ivan Gomez Castellanos
@ 2010-05-01 0:45 ` Ivan Gomez Castellanos
10 siblings, 0 replies; 13+ messages in thread
From: Ivan Gomez Castellanos @ 2010-05-01 0:45 UTC (permalink / raw)
To: linux-omap
Cc: Hiroshi.DOYU, ameya.palande, felipe.contreras,
Ivan Gomez Castellanos
The patch "DSPBRIDGE: Rename files that refer to Windows OS", renamed
header files, and this patch renames its include guard macros by the
corresponding new header names.
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
---
.../arm/plat-omap/include/dspbridge/dspapi-ioctl.h | 6 +++---
arch/arm/plat-omap/include/dspbridge/dspchnl.h | 6 +++---
arch/arm/plat-omap/include/dspbridge/dspdefs.h | 6 +++---
arch/arm/plat-omap/include/dspbridge/dspdeh.h | 6 +++---
arch/arm/plat-omap/include/dspbridge/dspio.h | 6 +++---
arch/arm/plat-omap/include/dspbridge/dspioctl.h | 6 +++---
arch/arm/plat-omap/include/dspbridge/dspmsg.h | 6 +++---
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/dspapi-ioctl.h b/arch/arm/plat-omap/include/dspbridge/dspapi-ioctl.h
index c214ea6..f6a146e 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspapi-ioctl.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspapi-ioctl.h
@@ -17,8 +17,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WCDIOCTL_
-#define WCDIOCTL_
+#ifndef DSPAPIIOCTL_
+#define DSPAPIIOCTL_
#include <dspbridge/cmm.h>
#include <dspbridge/strmdefs.h>
@@ -463,4 +463,4 @@ union Trapped_Args {
#define CMM_GETHANDLE _IOR(DB, DB_IOC(DB_CMM, 2), unsigned long)
#define CMM_GETINFO _IOR(DB, DB_IOC(DB_CMM, 3), unsigned long)
-#endif /* WCDIOCTL_ */
+#endif /* DSPAPIIOCTL_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/dspchnl.h b/arch/arm/plat-omap/include/dspbridge/dspchnl.h
index 3c6f29d..acb0691 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspchnl.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspchnl.h
@@ -21,8 +21,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WMDCHNL_
-#define WMDCHNL_
+#ifndef DSPCHNL_
+#define DSPCHNL_
extern dsp_status bridge_chnl_create(OUT struct chnl_mgr **phChnlMgr,
struct dev_object *hdev_obj,
@@ -69,4 +69,4 @@ extern dsp_status bridge_chnl_register_notify(struct chnl_object *chnl_obj,
struct dsp_notification
*hnotification);
-#endif /* WMDCHNL_ */
+#endif /* DSPCHNL_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/dspdefs.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
index 26a9988..b25f4b2 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
@@ -26,8 +26,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WMD_
-#define WMD_
+#ifndef DSPDEFS_
+#define DSPDEFS_
#include <dspbridge/brddefs.h>
#include <dspbridge/cfgdefs.h>
@@ -1132,4 +1132,4 @@ struct bridge_drv_interface {
void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
IN CONST char *driver_file_name);
-#endif /* WMD_ */
+#endif /* DSPDEFS_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/dspdeh.h b/arch/arm/plat-omap/include/dspbridge/dspdeh.h
index f6a747f..81d3459 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspdeh.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspdeh.h
@@ -20,8 +20,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WMDDEH_
-#define WMDDEH_
+#ifndef DSPDEH_
+#define DSPDEH_
#include <dspbridge/devdefs.h>
@@ -45,4 +45,4 @@ extern void bridge_deh_notify(struct deh_mgr *hdeh_mgr,
u32 ulEventMask, u32 dwErrInfo);
extern void bridge_deh_release_dummy_mem(void);
-#endif /* WMDDEH_ */
+#endif /* DSPDEH_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/dspio.h b/arch/arm/plat-omap/include/dspbridge/dspio.h
index b010d2a..a826d9d 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspio.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspio.h
@@ -20,8 +20,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WMDIO_
-#define WMDIO_
+#ifndef DSPIO_
+#define DSPIO_
#include <dspbridge/devdefs.h>
#include <dspbridge/iodefs.h>
@@ -38,4 +38,4 @@ extern dsp_status iva_io_on_loaded(struct io_mgr *hio_mgr);
extern dsp_status bridge_io_get_proc_load(IN struct io_mgr *hio_mgr,
OUT struct dsp_procloadstat *pProcStat);
-#endif /* WMDIO_ */
+#endif /* DSPIO_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/dspioctl.h b/arch/arm/plat-omap/include/dspbridge/dspioctl.h
index 3f7a787..380fff5 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspioctl.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspioctl.h
@@ -16,8 +16,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WMDIOCTL_
-#define WMDIOCTL_
+#ifndef DSPIOCTL_
+#define DSPIOCTL_
/* ------------------------------------ Hardware Abstraction Layer */
#include <hw_defs.h>
@@ -70,4 +70,4 @@ struct bridge_ioctl_extproc {
enum hw_element_size_t elem_size;
};
-#endif /* WMDIOCTL_ */
+#endif /* DSPIOCTL_ */
diff --git a/arch/arm/plat-omap/include/dspbridge/dspmsg.h b/arch/arm/plat-omap/include/dspbridge/dspmsg.h
index 86db728..e1acf90 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspmsg.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspmsg.h
@@ -21,8 +21,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef WMDMSG_
-#define WMDMSG_
+#ifndef DSPMSG_
+#define DSPMSG_
#include <dspbridge/msgdefs.h>
@@ -52,4 +52,4 @@ extern dsp_status bridge_msg_register_notify(struct msg_queue *msg_queue_obj,
extern void bridge_msg_set_queue_id(struct msg_queue *msg_queue_obj, u32 msgq_id);
-#endif /* WMDMSG_ */
+#endif /* DSPMSG_ */
--
1.7.0.3
^ permalink raw reply related [flat|nested] 13+ messages in thread