From owner-svn-src-user@FreeBSD.ORG Wed Apr 21 21:21:20 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45983106566C; Wed, 21 Apr 2010 21:21:20 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 33B3C8FC08; Wed, 21 Apr 2010 21:21:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LLLK13071678; Wed, 21 Apr 2010 21:21:20 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3LLLJqm071665; Wed, 21 Apr 2010 21:21:19 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004212121.o3LLLJqm071665@svn.freebsd.org> From: Juli Mallett Date: Wed, 21 Apr 2010 21:21:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207018 - user/jmallett/octeon/sys/contrib/octeon-sdk X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2010 21:21:20 -0000 Author: jmallett Date: Wed Apr 21 21:21:19 2010 New Revision: 207018 URL: http://svn.freebsd.org/changeset/base/207018 Log: o) Fix for compiles that don't use a config file. It may be that we should juse use config files, but I'm still sort of blundering along with this. o) Get rid of some nested externs and in one case reshuffle include order to avoid the need for it. Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.h user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-errata.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-fpa.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-npi.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-spi.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.h user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-xaui.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.h Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.h ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.h Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.h Wed Apr 21 21:21:19 2010 (r207018) @@ -170,6 +170,8 @@ typedef struct __cvmx_cmd_queue_state_t state[(CVMX_CMD_QUEUE_END>>16) * 256]; } __cvmx_cmd_queue_all_state_t; +extern CVMX_SHARED __cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr; + /** * Initialize a command queue for use. The initial FPA buffer is * allocated and the hardware unit is configured to point to the @@ -248,7 +250,6 @@ static inline int __cvmx_cmd_queue_get_i */ static inline void __cvmx_cmd_queue_lock(cvmx_cmd_queue_id_t queue_id, __cvmx_cmd_queue_state_t *qptr) { - extern CVMX_SHARED __cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr; int tmp; int my_ticket; CVMX_PREFETCH(qptr, 0); @@ -306,7 +307,6 @@ static inline void __cvmx_cmd_queue_unlo */ static inline __cvmx_cmd_queue_state_t *__cvmx_cmd_queue_get_state(cvmx_cmd_queue_id_t queue_id) { - extern CVMX_SHARED __cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr; if (CVMX_ENABLE_PARAMETER_CHECKING) { if (cvmx_unlikely(queue_id >= CVMX_CMD_QUEUE_END)) Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-errata.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-errata.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-errata.c Wed Apr 21 21:21:19 2010 (r207018) @@ -51,9 +51,6 @@ * *
$Revision: 42150 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" - #include "cvmx.h" #include "cvmx-fpa.h" #include "cvmx-pip.h" Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-fpa.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-fpa.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-fpa.c Wed Apr 21 21:21:19 2010 (r207018) @@ -48,8 +48,6 @@ * *
$Revision: 41586 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" #include "cvmx.h" #include "cvmx-bootmem.h" #include "cvmx-fpa.h" Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c Wed Apr 21 21:21:19 2010 (r207018) @@ -49,8 +49,6 @@ * *
$Revision: 41586 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" #ifdef CVMX_ENABLE_PKO_FUNCTIONS #include "cvmx.h" Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-npi.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-npi.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-npi.c Wed Apr 21 21:21:19 2010 (r207018) @@ -49,14 +49,10 @@ * *
$Revision: 41586 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" -#ifdef CVMX_ENABLE_PKO_FUNCTIONS - #include "cvmx.h" #include "cvmx-helper.h" - +#ifdef CVMX_ENABLE_PKO_FUNCTIONS /** * @INTERNAL * Probe a NPI interface and determine the number of ports Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c Wed Apr 21 21:21:19 2010 (r207018) @@ -49,10 +49,6 @@ * *
$Revision: 42417 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" -#ifdef CVMX_ENABLE_PKO_FUNCTIONS - #include "cvmx.h" #include "cvmx-sysinfo.h" #include "cvmx-mdio.h" @@ -60,6 +56,7 @@ #include "cvmx-helper.h" #include "cvmx-helper-board.h" +#ifdef CVMX_ENABLE_PKO_FUNCTIONS /** * @INTERNAL * Probe RGMII ports and determine the number present Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c Wed Apr 21 21:21:19 2010 (r207018) @@ -49,17 +49,13 @@ * *
$Revision: 42417 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" -#ifdef CVMX_ENABLE_PKO_FUNCTIONS - #include "cvmx.h" #include "cvmx-sysinfo.h" #include "cvmx-mdio.h" #include "cvmx-helper.h" #include "cvmx-helper-board.h" - +#ifdef CVMX_ENABLE_PKO_FUNCTIONS /** * @INTERNAL * Perform initialization required only once for an SGMII port. Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-spi.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-spi.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-spi.c Wed Apr 21 21:21:19 2010 (r207018) @@ -49,15 +49,12 @@ * *
$Revision: 42417 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" -#ifdef CVMX_ENABLE_PKO_FUNCTIONS - #include "cvmx.h" #include "cvmx-spi.h" #include "cvmx-sysinfo.h" #include "cvmx-helper.h" +#ifdef CVMX_ENABLE_PKO_FUNCTIONS /* CVMX_HELPER_SPI_TIMEOUT is used to determine how long the SPI initialization routines wait for SPI training. You can override the value using executive-config.h if necessary */ Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.c Wed Apr 21 21:21:19 2010 (r207018) @@ -48,8 +48,6 @@ * *
$Revision: 42493 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" #include "cvmx.h" #include "cvmx-bootmem.h" #include "cvmx-fpa.h" Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.h ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.h Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-util.h Wed Apr 21 21:21:19 2010 (r207018) @@ -157,8 +157,6 @@ static inline int cvmx_helper_get_first_ */ static inline int cvmx_helper_get_last_ipd_port (int interface) { - extern int cvmx_helper_ports_on_interface (int interface); - return (cvmx_helper_get_first_ipd_port (interface) + cvmx_helper_ports_on_interface (interface) - 1); } Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-xaui.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-xaui.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-xaui.c Wed Apr 21 21:21:19 2010 (r207018) @@ -49,14 +49,10 @@ * *
$Revision: 42417 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" -#ifdef CVMX_ENABLE_PKO_FUNCTIONS - #include "cvmx.h" #include "cvmx-helper.h" - +#ifdef CVMX_ENABLE_PKO_FUNCTIONS /** * @INTERNAL * Probe a XAUI interface and determine the number of ports Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.c Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.c Wed Apr 21 21:21:19 2010 (r207018) @@ -48,8 +48,6 @@ * *
$Revision: 42150 $
*/ -#include "executive-config.h" -#include "cvmx-config.h" #include "cvmx.h" #include "cvmx-bootmem.h" #include "cvmx-fpa.h" Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.h ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.h Wed Apr 21 20:05:49 2010 (r207017) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper.h Wed Apr 21 21:21:19 2010 (r207018) @@ -99,7 +99,6 @@ typedef union #include "cvmx-helper-rgmii.h" #include "cvmx-helper-sgmii.h" #include "cvmx-helper-spi.h" -#include "cvmx-helper-util.h" #include "cvmx-helper-xaui.h" /** @@ -252,6 +251,8 @@ extern int cvmx_helper_interface_probe(i */ extern int cvmx_helper_configure_loopback(int ipd_port, int enable_internal, int enable_external); +#include "cvmx-helper-util.h" + #endif /* CVMX_ENABLE_PKO_FUNCTIONS */ #ifdef __cplusplus