From owner-svn-src-projects@FreeBSD.ORG Wed Mar 23 17:11:36 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D5A01065677; Wed, 23 Mar 2011 17:11:36 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 008EA8FC1C; Wed, 23 Mar 2011 17:11:36 +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 p2NHBZL1001637; Wed, 23 Mar 2011 17:11:35 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2NHBZda001632; Wed, 23 Mar 2011 17:11:35 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201103231711.p2NHBZda001632@svn.freebsd.org> From: Marcel Moolenaar Date: Wed, 23 Mar 2011 17:11:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219922 - in projects/altix/sys: dev/uart ia64/ia64 ia64/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2011 17:11:36 -0000 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 #include #include +#include #include #include 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 #include #include +#include #include #ifdef SMP #include 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)