From owner-p4-projects@FreeBSD.ORG  Tue Feb 26 14:11:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 69F2A10657E7; Tue, 26 Feb 2008 14:11:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29AC010657E4
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:11:49 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D5A013C43E
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:11:49 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEBm8b046115
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:11:48 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEBmRE046112
	for perforce@freebsd.org; Tue, 26 Feb 2008 14:11:48 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 26 Feb 2008 14:11:48 GMT
Message-Id: <200802261411.m1QEBmRE046112@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136237 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Feb 2008 14:11:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=136237

Change 136237 by rrs@rrs-mips2-jnpr on 2008/02/26 14:11:29

	correct typo in led display & s9indent.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#18 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#18 (text+ko) ====

@@ -316,21 +316,21 @@
 }
 
 static char progress[15][8] = {
-  {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '}, /* 0 */
-  {' ', ' ', ' ', ' ', ' ', ' ', ' ', 'F'}, /* 1 */
-  {' ', ' ', ' ', ' ', ' ', ' ', 'F', 'r'}, /* 2 */
-  {' ', ' ', ' ', ' ', ' ', 'F', 'r', 'e'}, /* 3 */
-  {' ', ' ', ' ', ' ', 'F', 'r', 'e', 'e'}, /* 4 */
-  {' ', ' ', ' ', 'F', 'r', 'e', 'e', 'B'}, /* 5 */
-  {' ', ' ', 'F', 'r', 'e', 'e', 'B', 'S'}, /* 6 */
-  {' ', 'F', 'r', 'e', 'e', 'B', 'S', 'D'}, /* 7 */
-  {'r', 'e', 'e', 'B', 'S', 'D', '!', ' '}, /* 8 */
-  {'e', 'e', 'B', 'S', 'D', '!', ' ', ' '}, /* 9 */
-  {'e', 'B', 'S', 'D', '!', ' ', ' ', ' '}, /* 10 */
-  {'B', 'S', 'D', '!', ' ', ' ', ' ', ' '}, /* 11 */
-  {'S', 'D', '!', ' ', ' ', ' ', ' ', ' '}, /* 12 */
-  {'D', '!', ' ', ' ', ' ', ' ', ' ', ' '}, /* 13 */
-  {'!', '!', ' ', ' ', ' ', ' ', ' ', ' '}  /* 14 */
+	{' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '},	/* 0 */
+	{' ', ' ', ' ', ' ', ' ', ' ', ' ', 'F'},	/* 1 */
+	{' ', ' ', ' ', ' ', ' ', ' ', 'F', 'r'},	/* 2 */
+	{' ', ' ', ' ', ' ', ' ', 'F', 'r', 'e'},	/* 3 */
+	{' ', ' ', ' ', ' ', 'F', 'r', 'e', 'e'},	/* 4 */
+	{' ', ' ', ' ', 'F', 'r', 'e', 'e', 'B'},	/* 5 */
+	{' ', ' ', 'F', 'r', 'e', 'e', 'B', 'S'},	/* 6 */
+	{' ', 'F', 'r', 'e', 'e', 'B', 'S', 'D'},	/* 7 */
+	{'r', 'e', 'e', 'B', 'S', 'D', '!', ' '},	/* 8 */
+	{'e', 'e', 'B', 'S', 'D', '!', ' ', ' '},	/* 9 */
+	{'e', 'B', 'S', 'D', '!', ' ', ' ', ' '},	/* 10 */
+	{'B', 'S', 'D', '!', ' ', ' ', ' ', ' '},	/* 11 */
+	{'S', 'D', '!', ' ', ' ', ' ', ' ', ' '},	/* 12 */
+	{'D', '!', ' ', ' ', ' ', ' ', ' ', ' '},	/* 13 */
+	{'!', ' ', ' ', ' ', ' ', ' ', ' ', ' '}	/* 14 */
 };
 
 int prog_count = 0;
@@ -338,15 +338,16 @@
 void
 octeon_led_run_wheel(void)
 {
-        int i;
-        if (!octeon_board_real())
+	int i;
+
+	if (!octeon_board_real())
 		return;
 
 	if (prog_count > 14) {
-	  prog_count = 0;
+		prog_count = 0;
 	}
 	for (i = 0; i < 8; i++) {
-	  octeon_led_write_char(i, progress[prog_count][i]);
+		octeon_led_write_char(i, progress[prog_count][i]);
 	}
 	prog_count++;
 }
@@ -643,7 +644,7 @@
 /*
  * ciu_get_int_summary
  */
-uint64_t 
+uint64_t
 ciu_get_int_summary(int core_num, int intx, int enx)
 {
 	uint64_t ciu_intr_sum_reg_addr;
@@ -948,8 +949,8 @@
 
 uint32_t octeon_cpu_clock;
 uint64_t octeon_dram = 0;
-uint32_t octeon_bd_ver = 0, octeon_cvmx_bd_ver = 0, octeon_board_rev_major, octeon_board_rev_minor,
-         octeon_board_type;
+uint32_t octeon_bd_ver = 0, octeon_cvmx_bd_ver = 0, octeon_board_rev_major,
+         octeon_board_rev_minor, octeon_board_type;
 uint8_t octeon_mac_addr[6] = {0};
 int octeon_core_mask, octeon_mac_addr_count;
 int octeon_chip_rev_major = 0, octeon_chip_rev_minor = 0, octeon_chip_type = 0;
@@ -1338,8 +1339,8 @@
 	kernend = round_page((vm_offset_t)&end);
 
 	/*
-	 * Quick Default. To avoid divide-by-0 Later we will
-	 * get it from Bootloader/Rom-Mon
+	 * Quick Default. To avoid divide-by-0 Later we will get it from
+	 * Bootloader/Rom-Mon
 	 */
 	mips_timer_early_init(OCTEON_CLOCK_DEFAULT);
 	cninit();