Attach com(4) to the built-in modem found on Tadpole SPARCbooks.

5 files changed, 19 insertions, 6 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index d56e7005322..cf62eb849d4 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.83 2005/07/08 12:36:36 miod Exp $
+#	$OpenBSD: GENERIC,v 1.84 2005/07/17 12:21:25 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -117,6 +117,9 @@ sbpp*	at spif?
 
 bpp*	at sbus?					# parallel port
 
+# built-in modem on Tadpole SPARCbook
+com*	at obio?
+
 # SUNW,xbox SBus Expansion Subsystem
 xbox*	at sbus?					# SBus Expansion box
 sbus*	at xbox?
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index f2d78ba7433..943c6110563 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.68 2005/07/08 12:36:36 miod Exp $
+#	$OpenBSD: SUN4M,v 1.69 2005/07/17 12:21:25 miod Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -78,6 +78,9 @@ sbpp*	at spif?
 
 bpp*	at sbus?					# parallel port
 
+# built-in modem on Tadpole SPARCbook
+com*	at obio?
+
 # SUNW,xbox SBus Expansion Subsystem
 xbox*	at sbus?					# SBus Expansion box
 sbus*	at xbox?
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index afbcec9527b..b69fe91b2bf 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.69 2005/07/14 02:09:46 uwe Exp $
+#	$OpenBSD: files.sparc,v 1.70 2005/07/17 12:21:25 miod Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -383,3 +383,7 @@ file	dev/sbus/stp4020.c		stp
 file	arch/sparc/dev/stp_sbus.c	stp_sbus
 
 include	"dev/pcmcia/files.pcmcia"
+
+# built-in modem on Tadpole SPARCbook
+attach	com at obio with com_obio
+file	arch/sparc/dev/com_obio.c	com_obio
diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h
index ca6a9d746b3..00c43d9d719 100644
--- a/sys/arch/sparc/include/conf.h
+++ b/sys/arch/sparc/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.19 2005/03/29 16:26:44 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.20 2005/07/17 12:21:28 miod Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 1996/12/31 07:12:43 mrg Exp $	*/
 
 /*
@@ -85,6 +85,8 @@ cdev_decl(sbpp);
 	(dev_type_mmap((*))) enodev }
 cdev_decl(scf);
 
+cdev_decl(com);
+
 /* open, close, ioctl, read, write */
 #define	cdev_flash_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read),	\
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 64d57a7d9dd..baac63ff72f 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.41 2005/04/19 21:30:20 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.42 2005/07/17 12:21:28 miod Exp $	*/
 /*	$NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
 
 /*
@@ -80,6 +80,7 @@
 #include "flash.h"
 #include "fga.h"
 #include "daadio.h"
+#include "com.h"
 
 #include "wsdisplay.h"
 #include "wskbd.h"
@@ -166,7 +167,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 33 */
 	cdev_notdef(),			/* 34 */
 	cdev_notdef(),			/* 35 */
-	cdev_notdef(),			/* 36 */
+	cdev_tty_init(NCOM,com),	/* 36: SPARCbook modem */
 	cdev_notdef(),			/* 37 */
 	cdev_notdef(),			/* 38 */
 	cdev_notdef(),			/* 39: was /dev/cgfour */