Date: Mon, 11 Jan 2010 04:49:44 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r202066 - in head/sys/mips/rmi: . dev/sec dev/xlr Message-ID: <201001110449.o0B4nimU054076@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/types.h> @@ -54,8 +56,8 @@ #include <mips/xlr/iomap.h> #include <mips/xlr/msgring.h> #include <mips/xlr/board.h> -#include <dev/rmi/sec/rmilib.h> -#include <dev/rmi/sec/desc.h> +#include <mips/rmi/dev/sec/rmilib.h> +#include <mips/rmi/dev/sec/desc.h> // 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 <dev/rmi/sec/desc.h> +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <mips/rmi/dev/sec/desc.h> #include <mips/xlr/iomap.h> /*#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 <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> @@ -52,7 +55,7 @@ #include <opencrypto/cryptodev.h> #include <sys/random.h> -#include <dev/rmi/sec/rmilib.h> +#include <mips/rmi/dev/sec/rmilib.h> /*#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 <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -90,10 +94,8 @@ #include <mips/rmi/shared_structs.h> #include <mips/rmi/board.h> -#include <dev/rmi/xlr/atx_cpld.h> -#include <dev/rmi/xlr/xgmac_mdio.h> - - +#include <mips/rmi/dev/xlr/atx_cpld.h> +#include <mips/rmi/dev/xlr/xgmac_mdio.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> 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 <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> @@ -67,8 +71,8 @@ #include <mips/rmi/shared_structs.h> #include <mips/rmi/board.h> -#include <dev/rmi/xlr/atx_cpld.h> -#include <dev/rmi/xlr/xgmac_mdio.h> +#include <mips/rmi/dev/xlr/atx_cpld.h> +#include <mips/rmi/dev/xlr/xgmac_mdio.h> extern void iodi_activateirqs(void);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001110449.o0B4nimU054076>