Date: Fri, 22 Feb 2008 04:22:15 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135937 for review Message-ID: <200802220422.m1M4MFI5035030@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802220422.m1M4MFI5035030>