From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 22:25:14 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF47316A405; Wed, 20 Feb 2008 22:25:13 +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 B4C4216A403
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:25:13 +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 A2CC813C455
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:25:13 +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 m1KMPDfS009463
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:25:13 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KMPDJc009460
	for perforce@freebsd.org; Wed, 20 Feb 2008 22:25:13 GMT
	(envelope-from rrs@cisco.com)
Date: Wed, 20 Feb 2008 22:25:13 GMT
Message-Id: <200802202225.m1KMPDJc009460@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 135845 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: Wed, 20 Feb 2008 22:25:14 -0000

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

Change 135845 by rrs@rrs-mips2-jnpr on 2008/02/20 22:24:36

	get rid of // and fix byteswap bug 

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_ebt3000_cf.c#2 edit

Differences ...

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

@@ -101,7 +101,7 @@
 #define NR_TRIES		1000
 #define SWAP_SHORT(x)		((x << 8) | (x >> 8))
 #define SWAP_LONG(x)		(((x << 24) & 0xFF000000) | ((x <<  8) & 0x00FF0000) | \
-				 ((x >> 8) & 0x0000FF00)  | ((x << 24) & 0x000000FF) )
+				 ((x >> 8) & 0x0000FF00)  | ((x >> 24) & 0x000000FF) )
 #define MODEL_STR_SIZE		40
 
 
@@ -238,7 +238,7 @@
 	uint16_t *ptr_16;
 	uint8_t  *ptr_8;
 
-//#define OCTEON_VISUAL_CF_0 1
+	/*#define OCTEON_VISUAL_CF_0 1*/
 #ifdef OCTEON_VISUAL_CF_0
         octeon_led_write_char(0, 'R');
 #endif
@@ -290,7 +290,7 @@
 	uint16_t *ptr_16;
 	uint8_t  *ptr_8;
 	
-//#define OCTEON_VISUAL_CF_1 1
+	/*#define OCTEON_VISUAL_CF_1 1*/
 #ifdef OCTEON_VISUAL_CF_1
         octeon_led_write_char(1, 'W');
 #endif
@@ -392,7 +392,7 @@
 
 	cf_swap_ascii(drive_param.u.driveid.model, drive_param.model);
 
-	drive_param.sector_size =  512;   //=  SWAP_SHORT (drive_param.u.driveid.sector_bytes);
+	drive_param.sector_size =  512;   /*  SWAP_SHORT (drive_param.u.driveid.sector_bytes); */
 	drive_param.heads 	=  SWAP_SHORT (drive_param.u.driveid.cur_heads);
 	drive_param.tracks	=  SWAP_SHORT (drive_param.u.driveid.cur_cyls); 
 	drive_param.sec_track   =  SWAP_SHORT (drive_param.u.driveid.cur_sectors);
@@ -461,7 +461,7 @@
 {
 	uint8_t status;
 
-//#define OCTEON_VISUAL_CF_2 1
+	/*#define OCTEON_VISUAL_CF_2 1*/
 #ifdef OCTEON_VISUAL_CF_2
         static int where0 = 0;