From 41d7c0fe9a1156650fcfa3dac890cfcfd9e290df Mon Sep 17 00:00:00 2001
From: Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
Date: Tue, 27 May 2008 10:34:55 +0000
Subject: speed inprovements in mpc83xx tsec driver

---
 c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c | 4 ++++
 c/src/lib/libcpu/powerpc/ChangeLog                  | 8 ++++++++
 c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c     | 6 +++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'c/src')

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
index 141fdb679c..e4d35dbfd5 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
@@ -18,7 +18,11 @@
 \*===============================================================*/
 
 /*
+<<<<<<< bspstart.c
  *  $Id$
+=======
+ *  $Id$
+>>>>>>> 1.11
  */
 
 #include <bsp.h>
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 2cd277880f..a65bb87ae7 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,10 @@
+<<<<<<< ChangeLog
+2008-05-23	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+	* mpc83xx/network/tsec.c:
+	disabled debugging output, reduced rx interrupt coalescing
+
+=======
 2008-05-22	Till Straumann <strauman@slac.stanford.edu>
 
 	* ppc403/tty_drv/tty_drv.c, ppc403/console/console405.c:
@@ -8,6 +15,7 @@
 	* mpc83xx/include/mpc83xx.h: or is not a good name for any name in
 	C/C++. See iso646.h for the reason.
 
+>>>>>>> 1.282
 2008-05-15	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* mpc83xx/i2c/mpc83xx_i2cdrv.c:
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c b/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
index 95fca9f81d..501b31e4ec 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
+++ b/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
@@ -256,9 +256,13 @@ static void mpc83xx_tsec_hwinit
   /*
    * init receive interrupt coalescing register
    */
+#if 0
   reg_ptr->rxic = (M83xx_TSEC_RXIC_ICEN
 		   | M83xx_TSEC_RXIC_ICFCT(2)
 		   | M83xx_TSEC_RXIC_ICTT(32));
+#else
+  reg_ptr->rxic = 0;
+#endif
   /*
    * init MACCFG1 register
    */
@@ -1546,7 +1550,7 @@ static void mpc83xx_tsec_stats
     rtems_ifmedia2str(media,NULL,0);
     printf ("\n");
   }
-#if 1 /* print all PHY registers */
+#if 0 /* print all PHY registers */
   {
     int reg;
     uint32_t reg_val;
-- 
cgit v1.2.3