@@ -51,5 +51,6 @@ extern void dbll_set_attrs(struct dbll_tar_obj *target, extern void dbll_unload(struct dbll_library_obj *lib, struct dbll_attrs *attrs); extern dsp_status dbll_unload_sect(struct dbll_library_obj *lib,
char *sectName, struct dbll_attrs *attrs);
+extern bool symbols_reloaded;
#endif /* DBLL_ */
@@ -67,4 +67,9 @@ extern void dmm_exit(void);
extern dsp_status dmm_create_tables(struct dmm_object *dmm_mgr,
u32 addr, u32 size);
+
+#ifdef DSP_DMM_DEBUG
+u32 dmm_mem_map_dump(struct dmm_object *dmm_mgr); #endif
+
#endif /* DMM_ */
@@ -293,4 +293,15 @@ extern void io_sm_init(void); extern dsp_status print_dsp_trace_buffer(struct wmd_dev_context
*hwmd_context);
+#ifndef DSP_TRACEBUF_DISABLED
+void print_dsp_debug_trace(struct io_mgr *hio_mgr); #endif
+
+#ifdef CONFIG_BRIDGE_DVFS
+/* The maximum number of OPPs that are supported */ extern s32
+dsp_max_opps;
+/* The Vdd1 opp table information */
+extern u32 vdd1_dsp_freq[6][4];
+#endif
+
#endif /* IOSM_ */
@@ -566,4 +566,6 @@ extern dsp_status node_get_uuid_props(void *hprocessor,
OUT struct dsp_ndbprops
*node_props);
+extern enum node_state node_get_state(bhandle hnode);
+
#endif /* NODE_ */
@@ -598,4 +598,6 @@ extern dsp_status proc_un_reserve_memory(void *hprocessor,
void *prsv_addr,
struct process_context *pr_ctxt);
+extern char *iva_img;
+
#endif /* PROC_ */
@@ -143,7 +143,6 @@ struct dbll_symbol {
struct dbll_sym_val value;
char *name;
};
-extern bool symbols_reloaded;
static void dof_close(struct dbll_library_obj *zl_lib); static dsp_status dof_open(struct dbll_library_obj *zl_lib); diff --git a/drivers/dsp/bridge/pmgr/dmm.c b/drivers/dsp/bridge/pmgr/dmm.c index be84c1e..cd47a06 100644
@@ -80,9 +80,6 @@ static u32 table_size; /* The size of virt and phys pages tables */
static struct map_page *get_region(u32 addr); static struct map_page *get_free_region(u32 aSize); static struct map_page *get_mapped_region(u32 aAddr); -#ifdef DSP_DMM_DEBUG
-u32 dmm_mem_map_dump(struct dmm_object *dmm_mgr); -#endif
/* ======== dmm_create_tables ========
* Purpose:
@@ -72,7 +72,6 @@ static dsp_status request_bridge_resources_dsp(u32 dw_context, s32 fRequest);
/* GPP PROCESS CLEANUP CODE */
static dsp_status drv_proc_free_node_res(bhandle hPCtxt); -extern enum node_state node_get_state(bhandle hnode);
/* Allocate and add a node resource element
* This function is called from .Node_Allocate. */ diff --git a/drivers/dsp/bridge/rmgr/node.c b/drivers/dsp/bridge/rmgr/node.c index be68fa7..4c0b6e3 100644
@@ -58,6 +58,7 @@
/* ----------------------------------- This */ #include <dspbridge/nodepriv.h> #include <dspbridge/node.h>
+#include <dspbridge/dmm.h>
/* Static/Dynamic Loader includes */
#include <dspbridge/dbll.h>
@@ -263,9 +264,6 @@ static u32 ovly(void *priv_ref, u32 ulDspRunAddr, u32 ulDspLoadAddr, static u32 mem_write(void *priv_ref, u32 ulDspAddr, void *pbuf,
u32 ul_num_bytes, u32 nMemSpace);
-#ifdef DSP_DMM_DEBUG
-extern u32 dmm_mem_map_dump(struct dmm_object *dmm_mgr); -#endif
static u32 refs; /* module reference count */
@@ -77,8 +77,6 @@
#define RBUF 0x4000 /* Input buffer */
#define WBUF 0x8000 /* Output Buffer */
-extern char *iva_img;
-
/* ----------------------------------- Globals */
/* The proc_object structure. */
@@ -377,4 +377,10 @@ extern dsp_status wmd_tlb_dsp_va_to_mpu_pa(struct wmd_dev_context *dev_context,
*/
dsp_status sm_interrupt_dsp(struct wmd_dev_context *dev_context, u16 mb_val);
+/*
+ * If dsp_debug is true, do not branch to the DSP entry point and wait
+for DSP
+ * to boot
+ */
+extern s32 dsp_debug;
+
#endif /* _TIOMAP_ */
@@ -89,4 +89,10 @@ dsp_status dsp_peripheral_clocks_enable(struct wmd_dev_context *dev_context,
*/
void dsp_clk_wakeup_event_ctrl(u32 ClkId, bool enable);
+#ifdef CONFIG_PM
+extern s32 dsp_test_sleepstate;
+#endif
+
+extern struct mailbox_context mboxsetting;
+
#endif /* _TIOMAP_PWR_ */
@@ -146,21 +146,11 @@ static u32 read_data(struct wmd_dev_context *hDevContext, void *dest, static u32 write_data(struct wmd_dev_context *hDevContext, void *dest,
void *pSrc, u32 usize);
-#ifndef DSP_TRACEBUF_DISABLED
-void print_dsp_debug_trace(struct io_mgr *hio_mgr); -#endif
-
/* Bus Addr (cached kernel) */
static dsp_status register_shm_segs(struct io_mgr *hio_mgr,
struct cod_manager *cod_man,
u32 dw_gpp_base_pa);
-#ifdef CONFIG_BRIDGE_DVFS
-/* The maximum number of OPPs that are supported */ -extern s32 dsp_max_opps;
-/* The Vdd1 opp table information */
-extern u32 vdd1_dsp_freq[6][4];
-#endif
/*
* ======== bridge_io_create ========
@@ -31,4 +31,6 @@ void mmu_fault_dpc(IN unsigned long pRefData);
*/
irqreturn_t mmu_fault_isr(int irq, IN void *pRefData);
+extern u32 fault_addr;
+
#endif /* MMU_FAULT_ */
@@ -162,12 +162,6 @@ struct pg_table_attrs { };
/*
- * If dsp_debug is true, do not branch to the DSP entry point and wait for DSP
- * to boot
- */
-extern s32 dsp_debug;
-
-/*
* This mini driver's function interface table.
*/
static struct bridge_drv_interface drv_interface_fxns = { diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -47,10 +47,6 @@
#include <mach-omap2/prm-regbits-34xx.h> #include <mach-omap2/cm-regbits-34xx.h>
-#ifdef CONFIG_PM
-extern s32 dsp_test_sleepstate;
-#endif
-extern struct mailbox_context mboxsetting;
/*
* ======== handle_constraints_set ======== diff --git a/drivers/dsp/bridge/wmd/tiomap_io.c b/drivers/dsp/bridge/wmd/tiomap_io.c
@@ -465,4 +465,4 @@ dsp_status sm_interrupt_dsp(struct wmd_dev_context *dev_context, u16 mb_val)
}
return DSP_SOK;
-}
\ No newline at end of file
+}
@@ -195,7 +195,6 @@ void bridge_deh_notify(struct deh_mgr *hdeh_mgr, u32 ulEventMask, u32 dwErrInfo)
dsp_status status = DSP_SOK;
u32 mem_physical = 0;
u32 hw_mmu_max_tlb_count = 31;
- extern u32 fault_addr;
struct cfg_hostres resources;
hw_status hw_status_obj;