PSARC 2008/261 EOF: Sound Blaster Pro driver sbpro

6709032 EOF sbpro driver
6709321 audio utilities library libaudio.a has unused/unreferenced source files

--HG--
rename : usr/src/cmd/audio/include/AudioDetect.h => deleted_files/usr/src/cmd/audio/include/AudioDetect.h
rename : usr/src/cmd/audio/include/AudioDevice.h => deleted_files/usr/src/cmd/audio/include/AudioDevice.h
rename : usr/src/cmd/audio/include/AudioDevicectl.h => deleted_files/usr/src/cmd/audio/include/AudioDevicectl.h
rename : usr/src/cmd/audio/utilities/AudioDetect.cc => deleted_files/usr/src/cmd/audio/utilities/AudioDetect.cc
rename : usr/src/cmd/audio/utilities/AudioDevice.cc => deleted_files/usr/src/cmd/audio/utilities/AudioDevice.cc
rename : usr/src/cmd/audio/utilities/AudioDevicectl.cc => deleted_files/usr/src/cmd/audio/utilities/AudioDevicectl.cc
rename : usr/src/pkgdefs/SUNWpsdir/preinstall => deleted_files/usr/src/pkgdefs/SUNWpsdir/preinstall

21 files changed, 38 insertions, 47 deletions

diff --git a/usr/src/cmd/audio/include/AudioDetect.h b/deleted_files/usr/src/cmd/audio/include/AudioDetect.h
index 9474240ed5..9474240ed5 100644
--- a/usr/src/cmd/audio/include/AudioDetect.h
+++ b/deleted_files/usr/src/cmd/audio/include/AudioDetect.h
diff --git a/usr/src/cmd/audio/include/AudioDevice.h b/deleted_files/usr/src/cmd/audio/include/AudioDevice.h
index 9f7881537e..9f7881537e 100644
--- a/usr/src/cmd/audio/include/AudioDevice.h
+++ b/deleted_files/usr/src/cmd/audio/include/AudioDevice.h
diff --git a/usr/src/cmd/audio/include/AudioDevicectl.h b/deleted_files/usr/src/cmd/audio/include/AudioDevicectl.h
index f090fcd746..f090fcd746 100644
--- a/usr/src/cmd/audio/include/AudioDevicectl.h
+++ b/deleted_files/usr/src/cmd/audio/include/AudioDevicectl.h
diff --git a/usr/src/cmd/audio/utilities/AudioDetect.cc b/deleted_files/usr/src/cmd/audio/utilities/AudioDetect.cc
index 37a7cff80c..37a7cff80c 100644
--- a/usr/src/cmd/audio/utilities/AudioDetect.cc
+++ b/deleted_files/usr/src/cmd/audio/utilities/AudioDetect.cc
diff --git a/usr/src/cmd/audio/utilities/AudioDevice.cc b/deleted_files/usr/src/cmd/audio/utilities/AudioDevice.cc
index a4b701bf00..a4b701bf00 100644
--- a/usr/src/cmd/audio/utilities/AudioDevice.cc
+++ b/deleted_files/usr/src/cmd/audio/utilities/AudioDevice.cc
diff --git a/usr/src/cmd/audio/utilities/AudioDevicectl.cc b/deleted_files/usr/src/cmd/audio/utilities/AudioDevicectl.cc
index 2b23e13134..2b23e13134 100644
--- a/usr/src/cmd/audio/utilities/AudioDevicectl.cc
+++ b/deleted_files/usr/src/cmd/audio/utilities/AudioDevicectl.cc
diff --git a/usr/src/pkgdefs/SUNWpsdir/preinstall b/deleted_files/usr/src/pkgdefs/SUNWpsdir/preinstall
index 8e19a65317..8e19a65317 100644
--- a/usr/src/pkgdefs/SUNWpsdir/preinstall
+++ b/deleted_files/usr/src/pkgdefs/SUNWpsdir/preinstall
diff --git a/usr/src/cmd/audio/utilities/Makefile b/usr/src/cmd/audio/utilities/Makefile
index ffda9c05ee..2b6097c0e6 100644
--- a/usr/src/cmd/audio/utilities/Makefile
+++ b/usr/src/cmd/audio/utilities/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -56,9 +55,6 @@ LIBCCSRCS	= Audio.cc \
 		  AudioBuffer.cc \
 		  AudioCopy.cc \
 		  AudioDebug.cc \
-		  AudioDetect.cc \
-		  AudioDevice.cc \
-		  AudioDevicectl.cc \
 		  AudioError.cc \
 		  AudioExtent.cc \
 		  AudioFile.cc \
diff --git a/usr/src/cmd/devfsadm/audio_link.c b/usr/src/cmd/devfsadm/audio_link.c
index 75568ff46e..6b3e08a66f 100644
--- a/usr/src/cmd/devfsadm/audio_link.c
+++ b/usr/src/cmd/devfsadm/audio_link.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -90,7 +90,7 @@ minor_init(void)
 {
 	if (0 != regcomp(&isdn_re, ISDN_RE, REG_EXTENDED)) {
 		devfsadm_errprint("SUNW_audio_link: minor_init: regular "
-				    "expression bad: '%s'\n", ISDN_RE);
+		    "expression bad: '%s'\n", ISDN_RE);
 		return (DEVFSADM_FAILURE);
 	} else {
 		return (DEVFSADM_SUCCESS);
@@ -172,15 +172,13 @@ audio_process(di_minor_t minor, di_node_t node)
 
 		/* if this is a minor node, tack on the correct suffix */
 		au_mn = strchr(mn, ',');
-		if (strcmp(++au_mn, "audio") != 0 &&
-		    strcmp(au_mn, "sbpro") != 0) {
+		if (strcmp(++au_mn, "audio") != 0) {
 
 			/*
-			 * audioctl/sbproctl are special cases. They are handled
-			 * by stripping off the audio/sbpro from the node name
+			 * audioctl is a special case. It is handled
+			 * by stripping off the audio from the node name
 			 */
-			if (strcmp(au_mn, "audioctl") == 0 ||
-			    strcmp(au_mn, "sbproctl") == 0)
+			if (strcmp(au_mn, "audioctl") == 0)
 				au_mn = strstr(au_mn, "ctl");
 			(void) strcat(path, au_mn);
 		}
@@ -208,7 +206,7 @@ audio_process(di_minor_t minor, di_node_t node)
 
 	if (path[0] == '\0') {
 		devfsadm_errprint("SUNW_audio_link: audio_process: can't find"
-			" match for'%s'\n", mn);
+		    " match for'%s'\n", mn);
 		return (DEVFSADM_CONTINUE);
 	}
 
@@ -239,7 +237,7 @@ check_audio_link(char *secondary_link, const char *primary_link_format)
 		(void) sprintf(primary_link, primary_link_format, i);
 		if (devfsadm_link_valid(primary_link) == DEVFSADM_TRUE) {
 			(void) devfsadm_secondary_link(secondary_link,
-						primary_link, flags);
+			    primary_link, flags);
 			break;
 		}
 	}
diff --git a/usr/src/pkgdefs/SUNWpsdir/postinstall b/usr/src/pkgdefs/SUNWpsdir/postinstall
index 181d393652..3f02b15a96 100644
--- a/usr/src/pkgdefs/SUNWpsdir/postinstall
+++ b/usr/src/pkgdefs/SUNWpsdir/postinstall
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# All Rights Reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 
 #
 # postinstall script for SUNWpsdir package.
@@ -185,7 +185,6 @@ drvclasses_updates()
 case "${ARCH}" in
 i386)
 	drvclasses_updates
-	check_add_drv -b "${BASEDIR}" -i '"mwss"' sbpro
 	check_add_drv -b "${BASEDIR}" pci-ide
 	check_add_drv -b "${BASEDIR}" -i '"ide"' ata
 	;;
diff --git a/usr/src/pkgdefs/SUNWpsdir/postremove b/usr/src/pkgdefs/SUNWpsdir/postremove
index 7dfa90f9ca..c2445d6cfe 100644
--- a/usr/src/pkgdefs/SUNWpsdir/postremove
+++ b/usr/src/pkgdefs/SUNWpsdir/postremove
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,8 +21,8 @@
 #
 # postremove script for SUNWpsdir package.
 #
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# All Rights Reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -35,7 +34,6 @@
 # Platform-specific drivers
 case "${ARCH}" in
 i386)
-	rem_drv -b "${BASEDIR}" sbpro
 	rem_drv -b "${BASEDIR}" ata
 	rem_drv -b "${BASEDIR}" pci-ide
 	;;
diff --git a/usr/src/pkgdefs/SUNWpsdir/prototype_i386 b/usr/src/pkgdefs/SUNWpsdir/prototype_i386
index 4501487d88..e8d6e7286e 100644
--- a/usr/src/pkgdefs/SUNWpsdir/prototype_i386
+++ b/usr/src/pkgdefs/SUNWpsdir/prototype_i386
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -43,7 +43,6 @@ i i.ataconf
 i pkginfo
 i postinstall
 i postremove
-i preinstall
 #
 # Path names are relative to the prototype root directory
 #
@@ -56,8 +55,6 @@ f none kernel/drv/ata 755 root sys
 e ataconf kernel/drv/ata.conf 644 root sys
 f none kernel/drv/mscsi 755 root sys
 f none kernel/drv/mscsi.conf 644 root sys
-f none kernel/drv/sbpro 755 root sys
-f none kernel/drv/sbpro.conf 644 root sys
 d none kernel/drv/amd64 755 root sys
 f none kernel/drv/amd64/ata 755 root sys
 
diff --git a/usr/src/pkgdefs/SUNWpsh/prototype_i386 b/usr/src/pkgdefs/SUNWpsh/prototype_i386
index 6c78b812e5..db14530ace 100644
--- a/usr/src/pkgdefs/SUNWpsh/prototype_i386
+++ b/usr/src/pkgdefs/SUNWpsh/prototype_i386
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -70,5 +70,4 @@ f none usr/include/sys/fdmedia.h 644 root bin
 f none usr/include/sys/mii.h 644 root bin
 f none usr/include/sys/miipriv.h 644 root bin
 f none usr/include/sys/mse.h 644 root bin
-f none usr/include/sys/sbpro.h 644 root bin
 f none usr/include/sys/vuidmice.h 644 root bin
diff --git a/usr/src/pkgdefs/common_files/i.minorperm_i386 b/usr/src/pkgdefs/common_files/i.minorperm_i386
index e7b002bf05..1e9533a4eb 100644
--- a/usr/src/pkgdefs/common_files/i.minorperm_i386
+++ b/usr/src/pkgdefs/common_files/i.minorperm_i386
@@ -69,8 +69,6 @@ make_chattr_list()
 cat > /tmp/chattr.$$ << EOF
 vol:volctl		0600 root sys 0666 root sys	/dev/volctl
 clone:llc1		0600 root sys 0666 root sys	/dev/llc1
-clone:sound,sbpro	0666 root sys 0600 root sys	/dev/sound/*
-sbpro:*			0666 root sys 0600 root sys	/dev/sound/*
 log:conslog		0620 root sys 0666 root sys	/dev/conslog
 sy:tty			0666 root sys 0666 root tty	/dev/tty
 icmp:icmp		0600 root sys 0666 root sys	/dev/rawip
@@ -179,7 +177,9 @@ clone:ipsecesp
 clone:keysock
 clone:smc
 clone:tr
+clone:sbpro
 elx:*
+sbpro:*
 win:*
 cmtp:*
 profile:profile
diff --git a/usr/src/pkgdefs/common_files/i.nametomajor b/usr/src/pkgdefs/common_files/i.nametomajor
index 000093b23e..12cb51d1aa 100644
--- a/usr/src/pkgdefs/common_files/i.nametomajor
+++ b/usr/src/pkgdefs/common_files/i.nametomajor
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -156,6 +156,7 @@ obsolete_i386()
 		obs["profile"] = 1;
 		obs["riles"] = 1;
 		obs["rip"] = 1;
+		obs["sbpro"] = 1;
 		obs["smartii"] = 1;
 		obs["smc"] = 1;
 		obs["smce"] = 1;
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index 746119681d..9e050d4488 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -6756,6 +6756,17 @@ mondo_loop() {
 	fi
 
 	#
+	# Remove EOF sbpro driver and supporting header file
+	# (Note that .conf file may also appear in /platform)
+	#
+	if [ $target_isa = i386 ]; then
+		rm -f $root/kernel/drv/sbpro
+		rm -f $root/kernel/drv/sbpro.conf
+		rm -f $root/platform/i86pc/kernel/drv/sbpro.conf
+		rm -f $usr/include/sys/sbpro.h
+	fi
+
+	#
 	# Diskless clients have already extracted /usr so don't delete this
 	# Non-global zones never extracts /usr so don't delete these
 	#
diff --git a/usr/src/tools/scripts/bindrop.sh b/usr/src/tools/scripts/bindrop.sh
index a94d86251a..511dbc7697 100644
--- a/usr/src/tools/scripts/bindrop.sh
+++ b/usr/src/tools/scripts/bindrop.sh
@@ -195,8 +195,6 @@ delete="$delete
 	kernel/drv/ifp.conf
 	kernel/drv/pcn
 	kernel/drv/pcn.conf
-	kernel/drv/sbpro
-	kernel/drv/sbpro.conf
 	kernel/drv/sparcv9/audioens
 	kernel/drv/sparcv9/ifp
 	kernel/drv/sparcv9/isp
@@ -218,7 +216,6 @@ delete="$delete
 	usr/include/smartcard/
 	usr/include/sys/audio/audioens.h
 	usr/include/sys/phx.h
-	usr/include/sys/sbpro.h
 	usr/include/sys/scsi/adapters/ifpcmd.h
 	usr/include/sys/scsi/adapters/ifpio.h
 	usr/include/sys/scsi/adapters/ifpmail.h
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index bd3095e4cf..552fd26a4d 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -348,7 +348,6 @@ $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= mpt
 $(CLOSED_BUILD)CLOSED_DRV_KMODS_32	+= ncrs
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= pcn
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= rtls
-$(CLOSED_BUILD)CLOSED_DRV_KMODS_32	+= sbpro
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= atiatom
 
 #
diff --git a/usr/src/uts/intel/os/minor_perm b/usr/src/uts/intel/os/minor_perm
index fdc12ce007..352cb1d132 100644
--- a/usr/src/uts/intel/os/minor_perm
+++ b/usr/src/uts/intel/os/minor_perm
@@ -22,7 +22,6 @@ clone:llc1 0666 root sys
 clone:loop 0666 root sys
 clone:ptmx 0666 root sys
 rts:rts 0666 root sys
-clone:sound,sbpro 0600 root sys
 tcp:tcp 0666 root sys
 tcp6:tcp6 0666 root sys
 clone:ticlts 0666 root sys
@@ -73,7 +72,6 @@ sad:user 0666 root sys
 sgen:* 0600 root sys
 cmdk:* 0640 root sys
 st:* 0666 root sys
-sbpro:* 0600 root sys
 sdt:sdt 0644 root sys
 sy:tty 0666 root tty
 sysmsg:msglog 0600 root sys
diff --git a/usr/src/uts/intel/os/name_to_major b/usr/src/uts/intel/os/name_to_major
index 96e4046eb9..1077fee3c7 100644
--- a/usr/src/uts/intel/os/name_to_major
+++ b/usr/src/uts/intel/os/name_to_major
@@ -53,7 +53,6 @@ ata 112
 logi 114
 msm 115
 mouse8042 116
-sbpro 118
 isa 120
 eisa 121
 vdi 123
diff --git a/usr/src/uts/intel/sys/Makefile b/usr/src/uts/intel/sys/Makefile
index 0777bf72ec..07a709ba57 100644
--- a/usr/src/uts/intel/sys/Makefile
+++ b/usr/src/uts/intel/sys/Makefile
@@ -96,8 +96,7 @@ HDRS	=			\
 	xen_errno.h
 
 CLOSEDHDRS = \
-	memtest.h \
-	sbpro.h
+	memtest.h
 
 SUBHDRS	=			\
 	dktp/mscsi.h