move octeonreg.h to a more generic location and add multiple inclusion

guards while here.

ok uebayasi@

7 files changed, 17 insertions, 12 deletions

diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c
index 0c2da7e85dc..42bc01f0bb2 100644
--- a/sys/arch/octeon/dev/octcf.c
+++ b/sys/arch/octeon/dev/octcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octcf.c,v 1.10 2013/03/19 16:37:12 jasper Exp $ */
+/*	$OpenBSD: octcf.c,v 1.11 2013/06/02 20:29:36 jasper Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -84,7 +84,7 @@
 #include <dev/ic/wdcvar.h>
 
 #include <octeon/dev/iobusvar.h>
-#include <octeon/dev/octeonreg.h>
+#include <machine/octeonreg.h>
 #include <machine/octeonvar.h>
 
 #define OCTCF_REG_SIZE	8
diff --git a/sys/arch/octeon/dev/octeon_intr.c b/sys/arch/octeon/dev/octeon_intr.c
index e5c7da14cc9..8b6e6d98b13 100644
--- a/sys/arch/octeon/dev/octeon_intr.c
+++ b/sys/arch/octeon/dev/octeon_intr.c
@@ -41,8 +41,8 @@
 #include <machine/autoconf.h>
 #include <machine/atomic.h>
 #include <machine/intr.h>
+#include <machine/octeonreg.h>
 
-#include <octeon/dev/octeonreg.h>
 #include <octeon/dev/iobusvar.h>
 
 extern bus_space_handle_t iobus_h;
diff --git a/sys/arch/octeon/dev/octeon_iobus.c b/sys/arch/octeon/dev/octeon_iobus.c
index 1b36fd30223..65bcbb099dc 100644
--- a/sys/arch/octeon/dev/octeon_iobus.c
+++ b/sys/arch/octeon/dev/octeon_iobus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_iobus.c,v 1.3 2012/10/03 19:42:53 miod Exp $ */
+/*	$OpenBSD: octeon_iobus.c,v 1.4 2013/06/02 20:29:36 jasper Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -43,8 +43,8 @@
 #include <machine/atomic.h>
 #include <machine/intr.h>
 #include <machine/octeonvar.h>
+#include <machine/octeonreg.h>
 
-#include <octeon/dev/octeonreg.h>
 #include <octeon/dev/iobusvar.h>
 #include <octeon/dev/cn30xxgmxreg.h>
 
diff --git a/sys/arch/octeon/dev/octeon_pcibus.h b/sys/arch/octeon/dev/octeon_pcibus.h
index 879350316f1..4ecc6497b17 100644
--- a/sys/arch/octeon/dev/octeon_pcibus.h
+++ b/sys/arch/octeon/dev/octeon_pcibus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_pcibus.h,v 1.1 2010/10/28 22:52:10 syuu Exp $	*/
+/*	$OpenBSD: octeon_pcibus.h,v 1.2 2013/06/02 20:29:36 jasper Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.com).
@@ -30,7 +30,7 @@
 #ifndef ___OCTEON_PCIBUS_H__
 #define ___OCTEON_PCIBUS_H__
 
-#include "octeonreg.h"
+#include <machine/octeonreg.h>
 
 #define OCTEON_PCIBUS_PCIIO_BASE	0x11A0000000000ULL
 
diff --git a/sys/arch/octeon/dev/octeon_uartbus.c b/sys/arch/octeon/dev/octeon_uartbus.c
index 1c4e27c5be0..c0e618c8162 100644
--- a/sys/arch/octeon/dev/octeon_uartbus.c
+++ b/sys/arch/octeon/dev/octeon_uartbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_uartbus.c,v 1.2 2012/10/03 19:42:53 miod Exp $ */
+/*	$OpenBSD: octeon_uartbus.c,v 1.3 2013/06/02 20:29:36 jasper Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -41,8 +41,8 @@
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 #include <machine/atomic.h>
+#include <machine/octeonreg.h>
 
-#include <octeon/dev/octeonreg.h>
 #include <octeon/dev/uartbusvar.h>
 
 #include <dev/ic/comreg.h>
diff --git a/sys/arch/octeon/dev/octeonreg.h b/sys/arch/octeon/include/octeonreg.h
index 1f0aad9f79e..71459dd5a7a 100644
--- a/sys/arch/octeon/dev/octeonreg.h
+++ b/sys/arch/octeon/include/octeonreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeonreg.h,v 1.4 2010/11/23 18:46:29 syuu Exp $	*/
+/*	$OpenBSD: octeonreg.h,v 1.1 2013/06/02 20:29:36 jasper Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.com).
@@ -26,6 +26,9 @@
  *
  */
 
+#ifndef _MACHINE_OCTEONREG_H_
+#define _MACHINE_OCTEONREG_H
+
 #define OCTEON_CF_BASE		0x1D000800ULL
 #define OCTEON_CIU_BASE		0x1070000000000ULL
 #define OCTEON_CIU_SIZE		0xC10
@@ -159,3 +162,5 @@
 #define CIU_INT1_EN4_0          0x00000C90
 #define CIU_INT0_EN4_1          0x00000C88
 #define CIU_INT1_EN4_1          0x00000C98
+
+#endif /* !_MACHINE_OCTEONREG_H_ */
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 64fc34baae4..9018bcd74a7 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.35 2013/06/01 21:25:26 jasper Exp $ */
+/*	$OpenBSD: machdep.c,v 1.36 2013/06/02 20:29:36 jasper Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -79,7 +79,7 @@
 #include <dev/cons.h>
 
 #include <octeon/dev/iobusvar.h>
-#include <octeon/dev/octeonreg.h>
+#include <machine/octeonreg.h>
 #include <machine/octeonvar.h>
 
 /* The following is used externally (sysctl_hw) */