diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2010-07-04 16:36:25 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-08 13:34:54 -0700 |
| commit | 1ceea25372dd6e37c9804f713b6e2c6bdd008d03 (patch) | |
| tree | 0ed8bab516c6ec10409329084b90eb3adf6875ec | |
| parent | ed9ff5d7e864b02fbd4913f087c9d540f0384e1d (diff) | |
staging: ti dspbridge: use _DEBUG for debug trace
Obviously nobody was using DSP_TRACEBUF_DISABLED, since it wasn't even
standarized between TRACEBUF and TRACE_BUF.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/tidspbridge/core/io_sm.c | 16 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/io_sm.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c index ee33abb42fc2..8909c416b7ee 100644 --- a/drivers/staging/tidspbridge/core/io_sm.c +++ b/drivers/staging/tidspbridge/core/io_sm.c @@ -114,7 +114,7 @@ struct io_mgr { struct mgr_processorextinfo ext_proc_info; struct cmm_object *hcmm_mgr; /* Shared Mem Mngr */ struct work_struct io_workq; /* workqueue */ -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG u32 ul_trace_buffer_begin; /* Trace message start address */ u32 ul_trace_buffer_end; /* Trace message end address */ u32 ul_trace_buffer_current; /* Trace message current address */ @@ -210,7 +210,7 @@ int bridge_io_create(OUT struct io_mgr **phIOMgr, } /* Initialize chnl_mgr object */ -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG pio_mgr->pmsg = NULL; #endif pio_mgr->hchnl_mgr = hchnl_mgr; @@ -265,7 +265,7 @@ int bridge_io_destroy(struct io_mgr *hio_mgr) /* Free IO DPC object */ tasklet_kill(&hio_mgr->dpc_tasklet); -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG kfree(hio_mgr->pmsg); #endif dsp_wdt_exit(); @@ -407,7 +407,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr) status = -EFAULT; } if (DSP_SUCCEEDED(status)) { -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG status = cod_get_sym_value(cod_man, DSP_TRACESEC_END, &shm0_end); #else @@ -752,7 +752,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr) hmsg_mgr->max_msgs); memset((void *)hio_mgr->shared_mem, 0, sizeof(struct shm)); -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG /* Get the start address of trace buffer */ status = cod_get_sym_value(cod_man, SYS_PUTCBEG, &hio_mgr->ul_trace_buffer_begin); @@ -949,7 +949,7 @@ void io_dpc(IN OUT unsigned long pRefData) (pio_mgr->intr_val < DEH_LIMIT)) { /* Notify DSP/BIOS exception */ if (hdeh_mgr) { -#ifndef DSP_TRACE_BUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG print_dsp_debug_trace(pio_mgr); #endif bridge_deh_notify(hdeh_mgr, DSP_SYSERROR, @@ -961,7 +961,7 @@ void io_dpc(IN OUT unsigned long pRefData) if (msg_mgr_obj) io_dispatch_msg(pio_mgr, msg_mgr_obj); #endif -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG if (pio_mgr->intr_val & MBX_DBG_SYSPRINTF) { /* Notify DSP Trace message */ print_dsp_debug_trace(pio_mgr); @@ -1810,7 +1810,7 @@ int bridge_io_get_proc_load(IN struct io_mgr *hio_mgr, return 0; } -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG void print_dsp_debug_trace(struct io_mgr *hio_mgr) { u32 ul_new_message_length = 0, ul_gpp_cur_pointer; diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h index c3557efed49e..6e67f10da90a 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h @@ -302,7 +302,7 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context); void dump_dl_modules(struct bridge_dev_context *bridge_context); -#ifndef DSP_TRACEBUF_DISABLED +#ifdef CONFIG_TIDSPBRIDGE_DEBUG void print_dsp_debug_trace(struct io_mgr *hio_mgr); #endif |