[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Tue Mar 20 12:06:31 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/eec9992d21ef
changeset: 446:eec9992d21ef
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Tue Mar 20 14:06:36 2012 +0200
description:
Remove debug bits.

diffstat:

 head/sys/mips/bcm47xx/bcm47xx_machdep.c |  46 ++++----------------------------
 1 files changed, 6 insertions(+), 40 deletions(-)

diffs (90 lines):

diff -r 9c3713dfa0b6 -r eec9992d21ef head/sys/mips/bcm47xx/bcm47xx_machdep.c

--- a/head/sys/mips/bcm47xx/bcm47xx_machdep.c	Tue Mar 20 12:55:56 2012 +0200
+++ b/head/sys/mips/bcm47xx/bcm47xx_machdep.c	Tue Mar 20 14:06:36 2012 +0200
@@ -114,36 +114,6 @@
 	/* Nothing special */
 }
 
-#ifndef NO_LL_DEBUG
-static void
-uart_cnputc_local( int c )
-{
-	char chr;
-	int limit = 10000;
-
-	chr = c;
-
-	while (limit > 0)
-	{
-	    limit--;
-	    if ( !(limit % 10) ) limit--;
-	}
-
-	(*((volatile unsigned char *)0xb8000300)) = c;
-
-	*((volatile unsigned int *) 0xb8000000);
-	
-	limit = 10000;
-	while (limit > 0)
-	{
-	    limit--;
-	    if ( !(limit % 10) ) limit--;
-	}
-}
-#else
-#define	uart_cnputc_local(ch)
-#endif
-
 static void
 mips_init(void)
 {
@@ -151,11 +121,9 @@
 
 	printf("entry: mips_init()\n");
 
-	uart_cnputc_local('e');
 #ifdef CFE_ENV
 	cfe_env_init();
 #endif
-	uart_cnputc_local('E');
 
 	TUNABLE_INT_FETCH("boothowto", &boothowto);
 
@@ -204,7 +172,8 @@
 		phys_avail[0] = MIPS_KSEG0_TO_PHYS(kernel_kseg0_end);
 		phys_avail[1] = len;
 		physmem += len;
-		printf("phys_avail[0] = 0x%08x, len = 0x%08x\n", phys_avail[0], phys_avail[1]);
+		printf("phys_avail[0] = 0x%08x, len = 0x%08x\n",
+		    phys_avail[0], phys_avail[1]);
 
 		phys_avail[2] = phys_avail[3] = 0;
 		phys_avail[4] = phys_avail[5] = 0;
@@ -288,15 +257,11 @@
 	 * a3: entry point seal
 	 */
 	nvram_info_t nvram_info;
-	uart_cnputc_local('c');
 	if (a3 == CFE_EPTSEAL) {
 		cfe_init(a0, a2);
-	uart_cnputc_local('1');
-		cfe_ioctl(a0, IOCTL_NVRAM_GETINFO, (unsigned char *)&nvram_info, sizeof(nvram_info), 0, 0);
+		cfe_ioctl(a0, IOCTL_NVRAM_GETINFO,
+		    (unsigned char *)&nvram_info, sizeof(nvram_info), 0, 0);
 	}
-	uart_cnputc_local('C');
-
-
 #endif
 
 	cninit();
@@ -308,7 +273,8 @@
 	nvram_info.nvram_eraseflg);	/* true if we need to erase first */
 #endif
 
-	core_id = (*((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(BCM47XX_EXTIFADR)) & 0xffff);
+	core_id = (*((volatile uint32_t *)
+	    MIPS_PHYS_TO_KSEG1(BCM47XX_EXTIFADR)) & 0xffff);
 
 	switch(core_id)
 	{
