[svn-commits] sruffell: branch 1.4 r4579 - in /branches/1.4/kernel: ./ wctdm24xxp/ wcte12xp/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Nov 13 16:19:24 2008
New Revision: 4579

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4579
Log:
Make a message about the host cacheline size being unsupported a debug only
message.  The voicebus interface still works whether the cacheline size is
supported or not, but the message is confusing to users.

Modified:
    branches/1.4/kernel/voicebus.c
    branches/1.4/kernel/voicebus.h
    branches/1.4/kernel/wctdm24xxp/base.c
    branches/1.4/kernel/wcte12xp/base.c

Modified: branches/1.4/kernel/voicebus.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/voicebus.c?view=diff&rev=4579&r1=4578&r2=4579
==============================================================================
--- branches/1.4/kernel/voicebus.c (original)
+++ branches/1.4/kernel/voicebus.c Thu Nov 13 16:19:24 2008
@@ -599,10 +599,11 @@
 		pci_access = DEFAULT_PCI_ACCESS | (0x3 << 14);
 		break;
 	default:
-		VB_PRINTK(vb, WARNING, "Host system set a cache size "\
-		 "of %d which is not supported. " \
-		 "Disabling memory write line and memory read line.",
-		 vb->cache_line_size);
+		if (atomic_read(&vb->debuglevel))
+			VB_PRINTK(vb, WARNING, "Host system set a cache size "\
+			 "of %d which is not supported. " \
+			 "Disabling memory write line and memory read line.",
+			 vb->cache_line_size);
 		pci_access = 0xfe584202;
 		break;
 	}
@@ -1315,6 +1316,7 @@
 		  void (*handle_receive)(void *vbb, void *context),
 		  void (*handle_transmit)(void *vbb, void *context),
 		  void *context, 
+		  u32 debuglevel,
 		  struct voicebus **vbp
 		  )
 {
@@ -1342,6 +1344,7 @@
 	/* \todo make sure there is a note that the caller needs to make sure
 	 * board_name stays in memory until voicebus_release is called.
 	 */
+	voicebus_setdebuglevel(vb, debuglevel);
 	vb->board_name = board_name;
 	spin_lock_init(&vb->lock);
 	init_completion(&vb->stopped_completion);

Modified: branches/1.4/kernel/voicebus.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/voicebus.h?view=diff&rev=4579&r1=4578&r2=4579
==============================================================================
--- branches/1.4/kernel/voicebus.h (original)
+++ branches/1.4/kernel/voicebus.h Thu Nov 13 16:19:24 2008
@@ -40,6 +40,7 @@
 		  void (*handle_receive)(void *buffer, void *context),
 		  void (*handle_transmit)(void *buffer, void *context),
 		  void *context, 
+		  u32 debuglevel,
 		  struct voicebus **vb_p);
 void voicebus_release(struct voicebus *vb);
 int voicebus_start(struct voicebus *vb);

Modified: branches/1.4/kernel/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/base.c?view=diff&rev=4579&r1=4578&r2=4579
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/base.c (original)
+++ branches/1.4/kernel/wctdm24xxp/base.c Thu Nov 13 16:19:24 2008
@@ -3876,7 +3876,7 @@
 	snprintf(wc->board_name, sizeof(wc->board_name)-1, "%s%d",
 		wctdm_driver.name, i);
 	ret = voicebus_init(pdev, SFRAME_SIZE, wc->board_name,
-		handle_receive, handle_transmit, wc, &wc->vb);
+		handle_receive, handle_transmit, wc, debug, &wc->vb);
 	if (ret) {
 		kfree(wc);
 		return ret;

Modified: branches/1.4/kernel/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/base.c?view=diff&rev=4579&r1=4578&r2=4579
==============================================================================
--- branches/1.4/kernel/wcte12xp/base.c (original)
+++ branches/1.4/kernel/wcte12xp/base.c Thu Nov 13 16:19:24 2008
@@ -1610,7 +1610,7 @@
 	init_waitqueue_head(&wc->regq);
 	snprintf(wc->name, sizeof(wc->name)-1, "wcte12xp%d", x);
 	if ((res=voicebus_init(pdev, SFRAME_SIZE, wc->name,
-		t1_handle_receive, t1_handle_transmit, wc, &wc->vb))) 
+		t1_handle_receive, t1_handle_transmit, wc, debug, &wc->vb)))
 	{
 		WARN_ON(1);
 		kfree(wc);