From patchwork Sun Jul 4 13:36:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 110145 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o64Dadsl004743 for ; Sun, 4 Jul 2010 13:36:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757863Ab0GDNgj (ORCPT ); Sun, 4 Jul 2010 09:36:39 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:65451 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757856Ab0GDNgi (ORCPT ); Sun, 4 Jul 2010 09:36:38 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so2295721bwz.19 for ; Sun, 04 Jul 2010 06:36:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=xwI0EGI4mBywNHDWxZaIUQGMl87BHOW3r3gpADy42jE=; b=kupf2lKYEuP6RboOsaTIYXPkAGHa6Hc4iMgkiytWjxBkS+curQB6sFdrxQYQ+Csqd5 Y9rJ/v9PWgaVbLeSfLS5brytYS7lzdnuFEM8c/GtSrYFS81jAsPUD1CkVAfK6qSpC1it 0IWDM6fk7EZ6VtG311Xe5H0M+sTKMc//3AotY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Ue/nlPdTfgEGBcvabtZFthAh3iKc0wmzmP8WmTra7zZJM32ENkvVh5WHQKskfnUYxL 4tDAVFmONWzWnY3oHH7CJPvBj13McGSthwxMHyP22b3dYRJjYeH6FXcagae1pRGIzTlF /IMocU+JZBNK3s/M1gq+M55ORCj5valhgvhlw= Received: by 10.204.9.146 with SMTP id l18mr1355410bkl.16.1278250597374; Sun, 04 Jul 2010 06:36:37 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id y2sm11387820bkx.20.2010.07.04.06.36.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 04 Jul 2010 06:36:37 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Ohad Ben-Cohen , Omar Ramirez Luna , Greg KH , Felipe Contreras Subject: [PATCH 4/5] staging: ti dspbridge: use _DEBUG for debug trace Date: Sun, 4 Jul 2010 16:36:25 +0300 Message-Id: <1278250586-17062-5-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278250586-17062-1-git-send-email-felipe.contreras@gmail.com> References: <1278250586-17062-1-git-send-email-felipe.contreras@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 04 Jul 2010 13:36:40 +0000 (UTC) diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c index ee33abb..8909c41 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 c3557ef..6e67f10 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