svn commit: r219922 - in projects/altix/sys: dev/uart ia64/ia64 ia64/include

[Marcel Moolenaar]

Author: marcel
Date: Wed Mar 23 17:11:35 2011
New Revision: 219922
URL: http://svn.freebsd.org/changeset/base/219922

Log:
  Move SAL function numbers specific to SGI Altix from sal.h to sgisn.h.

Modified:
  projects/altix/sys/dev/uart/uart_dev_sgisn.c
  projects/altix/sys/ia64/ia64/machdep.c
  projects/altix/sys/ia64/include/sal.h
  projects/altix/sys/ia64/include/sgisn.h

Modified: projects/altix/sys/dev/uart/uart_dev_sgisn.c
==============================================================================
--- projects/altix/sys/dev/uart/uart_dev_sgisn.c	Wed Mar 23 16:58:04 2011	(r219921)
+++ projects/altix/sys/dev/uart/uart_dev_sgisn.c	Wed Mar 23 17:11:35 2011	(r219922)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 #include <machine/bus.h>
 #include <machine/sal.h>
+#include <machine/sgisn.h>
 
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>

Modified: projects/altix/sys/ia64/ia64/machdep.c
==============================================================================
--- projects/altix/sys/ia64/ia64/machdep.c	Wed Mar 23 16:58:04 2011	(r219921)
+++ projects/altix/sys/ia64/ia64/machdep.c	Wed Mar 23 17:11:35 2011	(r219922)
@@ -91,6 +91,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/pcb.h>
 #include <machine/reg.h>
 #include <machine/sal.h>
+#include <machine/sgisn.h>
 #include <machine/sigframe.h>
 #ifdef SMP
 #include <machine/smp.h>

Modified: projects/altix/sys/ia64/include/sal.h
==============================================================================
--- projects/altix/sys/ia64/include/sal.h	Wed Mar 23 16:58:04 2011	(r219921)
+++ projects/altix/sys/ia64/include/sal.h	Wed Mar 23 17:11:35 2011	(r219922)
@@ -114,15 +114,6 @@ struct sal_ap_wakeup_descriptor {
 #define SAL_FREQ_BASE		0x01000012
 #define SAL_UPDATE_PAL		0x01000020
 
-#define	SAL_SGISN_SAPIC_INFO	0x0200001d
-#define	SAL_SGISN_SN_INFO	0x0200001e
-#define	SAL_SGISN_PUTC		0x02000021
-#define	SAL_SGISN_GETC		0x02000022
-#define	SAL_SGISN_POLL		0x02000026
-#define	SAL_SGISN_TXBUF		0x02000028
-#define	SAL_SGISN_IOHUB_INFO	0x02000055
-#define	SAL_SGISN_IOBUS_INFO	0x02000056
-
 /* SAL_SET_VECTORS event handler types */
 #define	SAL_OS_MCA		0
 #define	SAL_OS_INIT		1

Modified: projects/altix/sys/ia64/include/sgisn.h
==============================================================================
--- projects/altix/sys/ia64/include/sgisn.h	Wed Mar 23 16:58:04 2011	(r219921)
+++ projects/altix/sys/ia64/include/sgisn.h	Wed Mar 23 17:11:35 2011	(r219922)
@@ -28,6 +28,17 @@
 #ifndef _MACHINE_SGISN_H_
 #define _MACHINE_SGISN_H_
 
+/* SAL functions */
+#define	SAL_SGISN_SAPIC_INFO		0x0200001d
+#define	SAL_SGISN_SN_INFO		0x0200001e
+#define	SAL_SGISN_PUTC			0x02000021
+#define	SAL_SGISN_GETC			0x02000022
+#define	SAL_SGISN_POLL			0x02000026
+#define	SAL_SGISN_TXBUF			0x02000028
+#define	SAL_SGISN_IOHUB_INFO		0x02000055
+#define	SAL_SGISN_IOBUS_INFO		0x02000056
+#define	SAL_SGISN_IODEV_INFO		0x02000057
+
 #define	SGISN_GEOID_MODULE(id)		(((id) >> 0) & 0xffffffffu)
 #define	SGISN_GEOID_TYPE(id)		(((id) >> 32) & 0xff)
 #define	SGISN_GEOID_SLAB(id)		(((id) >> 40) & 0xff)