From owner-p4-projects@FreeBSD.ORG Wed Feb 20 22:27:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 715C816A406; Wed, 20 Feb 2008 22:27: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 3600E16A402 for ; Wed, 20 Feb 2008 22:27:16 +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 23C6F13C447 for ; Wed, 20 Feb 2008 22:27:16 +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 m1KMRF5M009573 for ; Wed, 20 Feb 2008 22:27:15 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KMRFjO009570 for perforce@freebsd.org; Wed, 20 Feb 2008 22:27:15 GMT (envelope-from rrs@cisco.com) Date: Wed, 20 Feb 2008 22:27:15 GMT Message-Id: <200802202227.m1KMRFjO009570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 135847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2008 22:27:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=135847 Change 135847 by rrs@rrs-mips2-jnpr on 2008/02/20 22:26:30 s9indent Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_ebt3000_cf.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_ebt3000_cf.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights +Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. Redistribution and use in source and binary forms, with or without @@ -17,25 +17,25 @@ * Neither the name of Cavium Networks nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written - permission. + permission. -This Software, including technical data, may be subject to U.S. export -control laws, including the U.S. Export Administration Act and its -associated regulations, and may be subject to export or import -regulations in other countries. You warrant that You will comply -strictly in all respects with all such regulations and acknowledge that -you have the responsibility to obtain licenses to export, re-export or -import the Software. +This Software, including technical data, may be subject to U.S. export +control laws, including the U.S. Export Administration Act and its +associated regulations, and may be subject to export or import +regulations in other countries. You warrant that You will comply +strictly in all respects with all such regulations and acknowledge that +you have the responsibility to obtain licenses to export, re-export or +import the Software. -TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS -OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT -TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY -REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT -DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF -TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, -LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION -OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR +TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" +AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS +OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT +TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY +REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT +DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF +TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, +LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION +OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU. */ @@ -56,23 +56,21 @@ #define OCTEON_MIO_BOOT_REG_CFGX(offset) (0x8001180000000000ull + ((offset) * 8)) -typedef union -{ - uint64_t word64; - struct - { - uint64_t reserved : 27; /**< Reserved */ - uint64_t sam : 1; /**< Region 0 SAM */ - uint64_t we_ext : 2; /**< Region 0 write enable count extension */ - uint64_t oe_ext : 2; /**< Region 0 output enable count extension */ - uint64_t en : 1; /**< Region 0 enable */ - uint64_t orbit : 1; /**< No function for region 0 */ - uint64_t ale : 1; /**< Region 0 ALE mode */ - uint64_t width : 1; /**< Region 0 bus width */ - uint64_t size : 12; /**< Region 0 size */ - uint64_t base : 16; /**< Region 0 base address */ - } bits; -} octeon_mio_boot_reg_cfgx_t; +typedef union { + uint64_t word64; + struct { + uint64_t reserved:27; /**< Reserved */ + uint64_t sam:1; /**< Region 0 SAM */ + uint64_t we_ext:2; /**< Region 0 write enable count extension */ + uint64_t oe_ext:2; /**< Region 0 output enable count extension */ + uint64_t en:1; /**< Region 0 enable */ + uint64_t orbit:1; /**< No function for region 0 */ + uint64_t ale:1; /**< Region 0 ALE mode */ + uint64_t width:1; /**< Region 0 bus width */ + uint64_t size:12; /**< Region 0 size */ + uint64_t base:16; /**< Region 0 base address */ + } bits; +} octeon_mio_boot_reg_cfgx_t; -#endif /* __OCTEON_EBT3000_H__ */ +#endif /* __OCTEON_EBT3000_H__ */