From owner-p4-projects@FreeBSD.ORG  Fri Feb 22 04:22:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6758616A402; Fri, 22 Feb 2008 04:22:16 +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 120A616A401
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 04:22:16 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0387913C458
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 04:22:16 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1M4MFWQ035033
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 04:22:15 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1M4MFI5035030
	for perforce@freebsd.org; Fri, 22 Feb 2008 04:22:15 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 22 Feb 2008 04:22:15 GMT
Message-Id: <200802220422.m1M4MFI5035030@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135937 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: Fri, 22 Feb 2008 04:22:16 -0000

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

Change 135937 by marcel@marcel_xcllnt on 2008/02/22 04:21:47

	Unify <machine/hid.h>
	
	Fork the conflicting HID0_TBEN into HID0_AIM_TBEN
	and HID0_BOOKE_TBEN. Renbame the e500-specific
	defines to include _BOOKE.
	
	None of these were actually used.

Affected files ...

.. //depot/projects/e500/sys/powerpc/include/hid.h#4 edit

Differences ...

==== //depot/projects/e500/sys/powerpc/include/hid.h#4 (text+ko) ====

@@ -70,17 +70,11 @@
 #define HID0_BHT	0x00000004  /* Enable branch history table */
 #define HID0_NOPTI	0x00000001  /* No-op the dcbt(st) */
 
-#if defined(AIM)
+#define HID0_AIM_TBEN	0x04000000  /* Time base enable (7450) */
 
-#define HID0_TBEN	0x04000000  /* Time base enable (7450) */
-
-#elif defined(E500)
-
-#define HID0_TBEN	0x00004000 /* Time Base and decrementer enable */
-#define HID0_SEL_TBCLK	0x00002000 /* Selecte Time Base clock */
-#define HID0_EN_MAS7_UPDATE	0x00000080 /* Enable MAS7 update (e500v2 only) */
-
-#endif
+#define HID0_BOOKE_TBEN		0x00004000 /* Time Base and decr. enable */
+#define HID0_BOOKE_SEL_TBCLK	0x00002000 /* Select Time Base clock */
+#define HID0_BOOKE_MAS7UPDEN	0x00000080 /* Enable MAS7 update (e500v2) */
 
 #define HID0_BITMASK							\
     "\20"								\