From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 26 03:02:32 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 01DFA106566B;
	Fri, 26 Mar 2010 03:02:32 +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 E588D8FC12;
	Fri, 26 Mar 2010 03:02:31 +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 o2Q32VTE015861;
	Fri, 26 Mar 2010 03:02:31 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2Q32VLX015858;
	Fri, 26 Mar 2010 03:02:31 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201003260302.o2Q32VLX015858@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 26 Mar 2010 03:02:31 +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: r205666 - in projects/altix/sys: dev/uart 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Mar 2010 03:02:32 -0000

Author: marcel
Date: Fri Mar 26 03:02:31 2010
New Revision: 205666
URL: http://svn.freebsd.org/changeset/base/205666

Log:
  Implement sgisn_probe() and move the SAL prodecure numbers to
  <machine/sal.h>

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

Modified: projects/altix/sys/dev/uart/uart_dev_sgisn.c
==============================================================================
--- projects/altix/sys/dev/uart/uart_dev_sgisn.c	Fri Mar 26 02:29:15 2010	(r205665)
+++ projects/altix/sys/dev/uart/uart_dev_sgisn.c	Fri Mar 26 03:02:31 2010	(r205666)
@@ -41,10 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include "uart_if.h"
 
-#define	SAL_SGISN_PUTC	0x02000021
-#define	SAL_SGISN_GETC	0x02000022
-#define	SAL_SGISN_POLL	0x02000026
-
 /*
  * Low-level UART interface.
  */
@@ -67,9 +63,10 @@ static struct uart_ops uart_sgisn_ops = 
 static int
 sgisn_probe(struct uart_bas *bas)
 {
+	struct ia64_sal_result result;
 
-	/* XXX Check that we're running on the Altix 350 */
-	return (0);
+	result = ia64_sal_entry(SAL_SGISN_INFO, 0, 0, 0, 0, 0, 0, 0);
+	return ((result.sal_status != 0) ? ENXIO : 0);
 }
 
 static void

Modified: projects/altix/sys/ia64/include/sal.h
==============================================================================
--- projects/altix/sys/ia64/include/sal.h	Fri Mar 26 02:29:15 2010	(r205665)
+++ projects/altix/sys/ia64/include/sal.h	Fri Mar 26 03:02:31 2010	(r205666)
@@ -114,6 +114,11 @@ struct sal_ap_wakeup_descriptor {
 #define SAL_FREQ_BASE		0x01000012
 #define SAL_UPDATE_PAL		0x01000020
 
+#define	SAL_SGISN_INFO		0x0200001e
+#define	SAL_SGISN_PUTC		0x02000021
+#define	SAL_SGISN_GETC		0x02000022
+#define	SAL_SGISN_POLL		0x02000026
+
 /* SAL_SET_VECTORS event handler types */
 #define	SAL_OS_MCA		0
 #define	SAL_OS_INIT		1