From owner-svn-src-all@FreeBSD.ORG Mon Jan 11 04:49:45 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17CC4106566C; Mon, 11 Jan 2010 04:49:45 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 058FB8FC13; Mon, 11 Jan 2010 04:49:45 +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 o0B4niAZ054083; Mon, 11 Jan 2010 04:49:44 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0B4nimU054076; Mon, 11 Jan 2010 04:49:44 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201001110449.o0B4nimU054076@svn.freebsd.org> From: Warner Losh Date: Mon, 11 Jan 2010 04:49:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202066 - in head/sys/mips/rmi: . dev/sec dev/xlr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 04:49:45 -0000 Author: imp Date: Mon Jan 11 04:49:44 2010 New Revision: 202066 URL: http://svn.freebsd.org/changeset/base/202066 Log: Attempt to cope with the dev/rmi -> mips/rmi/dev move. Modified: head/sys/mips/rmi/dev/sec/rmilib.c (contents, props changed) head/sys/mips/rmi/dev/sec/rmilib.h (contents, props changed) head/sys/mips/rmi/dev/sec/rmisec.c (contents, props changed) head/sys/mips/rmi/dev/xlr/rge.c (contents, props changed) head/sys/mips/rmi/files.xlr (contents, props changed) head/sys/mips/rmi/iodi.c (contents, props changed) Directory Properties: head/sys/mips/rmi/Makefile.msgring (props changed) head/sys/mips/rmi/board.c (props changed) head/sys/mips/rmi/board.h (props changed) head/sys/mips/rmi/bus_space_rmi.c (props changed) head/sys/mips/rmi/clock.c (props changed) head/sys/mips/rmi/clock.h (props changed) head/sys/mips/rmi/debug.h (props changed) head/sys/mips/rmi/dev/sec/desc.h (props changed) head/sys/mips/rmi/dev/sec/stats.h (props changed) head/sys/mips/rmi/dev/xlr/atx_cpld.h (props changed) head/sys/mips/rmi/dev/xlr/rge.h (props changed) head/sys/mips/rmi/dev/xlr/xgmac_mdio.h (props changed) Modified: head/sys/mips/rmi/dev/sec/rmilib.c ============================================================================== --- head/sys/mips/rmi/dev/sec/rmilib.c Mon Jan 11 04:40:38 2010 (r202065) +++ head/sys/mips/rmi/dev/sec/rmilib.c Mon Jan 11 04:49:44 2010 (r202066) @@ -26,9 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * RMI_BSD */ + * RMI_BSD + */ #include +__FBSDID("$FreeBSD$"); #include #include @@ -54,8 +56,8 @@ #include #include #include -#include -#include +#include +#include // static int msgrng_stnid_pk0 = MSGRNG_STNID_PK0; Modified: head/sys/mips/rmi/dev/sec/rmilib.h ============================================================================== --- head/sys/mips/rmi/dev/sec/rmilib.h Mon Jan 11 04:40:38 2010 (r202065) +++ head/sys/mips/rmi/dev/sec/rmilib.h Mon Jan 11 04:49:44 2010 (r202066) @@ -26,12 +26,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * RMI_BSD */ + * RMI_BSD + */ #ifndef _RMILIB_H_ #define _RMILIB_H_ -#include +#include +__FBSDID("$FreeBSD$"); + +#include #include /*#define XLR_SEC_CMD_DEBUG*/ Modified: head/sys/mips/rmi/dev/sec/rmisec.c ============================================================================== --- head/sys/mips/rmi/dev/sec/rmisec.c Mon Jan 11 04:40:38 2010 (r202065) +++ head/sys/mips/rmi/dev/sec/rmisec.c Mon Jan 11 04:49:44 2010 (r202066) @@ -26,8 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * RMI_BSD */ + * RMI_BSD + */ +#include +__FBSDID("$FreeBSD$"); #include #include @@ -52,7 +55,7 @@ #include #include -#include +#include /*#define RMI_SEC_DEBUG */ Modified: head/sys/mips/rmi/dev/xlr/rge.c ============================================================================== --- head/sys/mips/rmi/dev/xlr/rge.c Mon Jan 11 04:40:38 2010 (r202065) +++ head/sys/mips/rmi/dev/xlr/rge.c Mon Jan 11 04:49:44 2010 (r202066) @@ -26,7 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * RMI_BSD */ + * RMI_BSD + */ + +#include +__FBSDID("$FreeBSD$"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -90,10 +94,8 @@ #include #include -#include -#include - - +#include +#include #include #include Modified: head/sys/mips/rmi/files.xlr ============================================================================== --- head/sys/mips/rmi/files.xlr Mon Jan 11 04:40:38 2010 (r202065) +++ head/sys/mips/rmi/files.xlr Mon Jan 11 04:49:44 2010 (r202066) @@ -17,10 +17,10 @@ mips/rmi/perfmon_percpu.c optional xlr #mips/rmi/pcibus.c optional pci #mips/rmi/xlr_pci.c optional pci #mips/rmi/xls_ehci.c optional usb ehci -dev/rmi/xlr/rge.c optional rge mips/rmi/bus_space_rmi.c standard +mips/rmi/dev/sec/rmisec.c optional rmisec +mips/rmi/dev/sec/rmilib.c optional rmisec +mips/rmi/dev/xlr/rge.c optional rge dev/iicbus/xlr_rtc.c optional xlr_rtc dev/iicbus/xlr_temperature.c optional xlr_temperature dev/iicbus/xlr_eeprom.c optional xlr_eeprom -dev/rmi/sec/rmisec.c optional rmisec -dev/rmi/sec/rmilib.c optional rmisec Modified: head/sys/mips/rmi/iodi.c ============================================================================== --- head/sys/mips/rmi/iodi.c Mon Jan 11 04:40:38 2010 (r202065) +++ head/sys/mips/rmi/iodi.c Mon Jan 11 04:49:44 2010 (r202066) @@ -26,7 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * RMI_BSD */ + * RMI_BSD + */ + +#include +__FBSDID("$FreeBSD$"); #define __RMAN_RESOURCE_VISIBLE #include @@ -67,8 +71,8 @@ #include #include -#include -#include +#include +#include extern void iodi_activateirqs(void);