From owner-svn-src-projects@FreeBSD.ORG  Wed Nov  2 21:13:35 2011
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 10F3C1065670;
	Wed,  2 Nov 2011 21:13:35 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 009AB8FC14;
	Wed,  2 Nov 2011 21:13:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA2LDYSn038670;
	Wed, 2 Nov 2011 21:13:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA2LDYKQ038668;
	Wed, 2 Nov 2011 21:13:34 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201111022113.pA2LDYKQ038668@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 2 Nov 2011 21:13:34 +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: r227037 - projects/pseries/powerpc/pseries
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: Wed, 02 Nov 2011 21:13:35 -0000

Author: nwhitehorn
Date: Wed Nov  2 21:13:34 2011
New Revision: 227037
URL: http://svn.freebsd.org/changeset/base/227037

Log:
  Hypothetical support for hvterm-protocol systems.

Modified:
  projects/pseries/powerpc/pseries/phyp_console.c

Modified: projects/pseries/powerpc/pseries/phyp_console.c
==============================================================================
--- projects/pseries/powerpc/pseries/phyp_console.c	Wed Nov  2 21:03:26 2011	(r227036)
+++ projects/pseries/powerpc/pseries/phyp_console.c	Wed Nov  2 21:13:34 2011	(r227037)
@@ -49,11 +49,22 @@ static union {
 	char str[16];
 } phyp_inbuf;
 static uint64_t			phyp_inbuflen = 0;
+static uint8_t			phyp_outseqno = 0;
 
 enum {
 	HVTERM1, HVTERMPROT
 };
 
+#define VS_DATA_PACKET_HEADER		0xff
+#define VS_CONTROL_PACKET_HEADER	0xfe
+#define  VSV_SET_MODEM_CTL		0x01
+#define  VSV_MODEM_CTL_UPDATE		0x02
+#define  VSV_RENEGOTIATE_CONNECTION	0x03
+#define VS_QUERY_PACKET_HEADER		0xfd
+#define  VSV_SEND_VERSION_NUMBER	0x01
+#define  VSV_SEND_MODEM_CTL_STATUS	0x02
+#define VS_QUERY_RESPONSE_PACKET_HEADER	0xfc
+
 /*
  * Low-level UART interface
  */
@@ -156,10 +167,26 @@ phyp_uart_getc(struct uart_bas *bas, str
 static void
 phyp_uart_putc(struct uart_bas *bas, int c)
 {
-	uint64_t cbuf;
-
-	cbuf = (uint64_t)c << 56;
-	phyp_hcall(H_PUT_TERM_CHAR, (uint64_t)bas->bsh, 1UL, cbuf, 0);
+	uint16_t seqno;
+	union {
+		uint64_t u64;
+		char bytes[8];
+	} cbuf;
+
+	switch (bas->regshft) {
+	case HVTERM1:
+		cbuf.bytes[0] = c;
+		break;
+	case HVTERMPROT:
+		seqno = phyp_outseqno++;
+		cbuf.bytes[0] = VS_DATA_PACKET_HEADER;
+		cbuf.bytes[1] = 5; /* total length */
+		cbuf.bytes[2] = (seqno >> 8) & 0xff;
+		cbuf.bytes[3] = seqno & 0xff;
+		cbuf.bytes[4] = c;
+		break;
+	}
+	phyp_hcall(H_PUT_TERM_CHAR, (uint64_t)bas->bsh, 1UL, cbuf.u64, 0);
 }
 
 static int