X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/1869bdc0699c868766221d2d5b0e0e3901580593..ed554bc5e4201344d7eaad78263566e79428759c:/usr/src/sys/sparc/rcons/rcons_kern.c

diff --git a/usr/src/sys/sparc/rcons/rcons_kern.c b/usr/src/sys/sparc/rcons/rcons_kern.c
index ee7a112d69..09a5b755e3 100644
--- a/usr/src/sys/sparc/rcons/rcons_kern.c
+++ b/usr/src/sys/sparc/rcons/rcons_kern.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
@@ -11,11 +11,37 @@
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
  *
- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
- *	@(#)rcons_kern.c	7.4 (Berkeley) %G%
+ *	@(#)rcons_kern.c	8.2 (Berkeley) 9/27/93
  *
- * from: $Header: rcons_kern.c,v 1.28 93/04/20 11:15:38 torek Exp $
+ * from: $Header: rcons_kern.c,v 1.29 93/09/27 00:52:02 torek Exp $
  */
 
 #include <sys/param.h>
@@ -173,7 +199,6 @@ rcons_init(fb)
 	register struct winsize *ws;
 	register int i;
 	static int row, col;
-	char buf[100];
 
 	myfbdevicep = fb;
 
@@ -232,12 +257,7 @@ rcons_init(fb)
 	fb->fb_emuheight = fb->fb_maxrow * fb->fb_font->height;
 
 	/* Determine addresses of prom emulator row and column */
-	fb->fb_row = fb->fb_col = NULL;
-	sprintf(buf, "' line# >body >user %x !", &fb->fb_row);
-	rominterpret(buf);
-	sprintf(buf, "' column# >body >user %x !", &fb->fb_col);
-	rominterpret(buf);
-	if (fb->fb_row == NULL || fb->fb_col == NULL) {
+	if (romgetcursoraddr(&fb->fb_row, &fb->fb_col)) {
 		/* Can't find addresses; use private copies */
 		fb->fb_row = &row;
 		fb->fb_col = &col;