6491439 warlock support on x86

--HG--
rename : usr/src/uts/sparc/audio1575/audio1575.wlcmd => usr/src/uts/common/io/warlock/audio1575.wlcmd
rename : usr/src/uts/sparc/audio1575/audio1575_with_sada.wlcmd => usr/src/uts/common/io/warlock/audio1575_with_sada.wlcmd
rename : usr/src/uts/sparc/audio810/audio810.wlcmd => usr/src/uts/common/io/warlock/audio810.wlcmd
rename : usr/src/uts/sparc/audio810/audio810_with_sada.wlcmd => usr/src/uts/common/io/warlock/audio810_with_sada.wlcmd
rename : usr/src/uts/sparc/audiocs/audiocs.wlcmd => usr/src/uts/common/io/warlock/audiocs.wlcmd
rename : usr/src/uts/sparc/audiocs/audiocs_with_sada.wlcmd => usr/src/uts/common/io/warlock/audiocs_with_sada.wlcmd
rename : usr/src/uts/sparc/audiohd/audiohd.wlcmd => usr/src/uts/common/io/warlock/audiohd.wlcmd
rename : usr/src/uts/sparc/audiohd/audiohd_with_sada.wlcmd => usr/src/uts/common/io/warlock/audiohd_with_sada.wlcmd
rename : usr/src/uts/sparc/audioixp/audioixp.wlcmd => usr/src/uts/common/io/warlock/audioixp.wlcmd
rename : usr/src/uts/sparc/audioixp/audioixp_with_sada.wlcmd => usr/src/uts/common/io/warlock/audioixp_with_sada.wlcmd
rename : usr/src/uts/sparc/audiosup/audiosup.wlcmd => usr/src/uts/common/io/warlock/audiosup.wlcmd
rename : usr/src/uts/sparc/audiots/audiots.wlcmd => usr/src/uts/common/io/warlock/audiots.wlcmd
rename : usr/src/uts/sparc/audiots/audiots_with_sada.wlcmd => usr/src/uts/common/io/warlock/audiots_with_sada.wlcmd
rename : usr/src/uts/sparc/av1394/av1394.wlcmd => usr/src/uts/common/io/warlock/av1394.wlcmd
rename : usr/src/uts/sparc/ecpp/ecpp.wlcmd => usr/src/uts/common/io/warlock/ecpp.wlcmd
rename : usr/src/uts/sparc/ehci/ehci.wlcmd => usr/src/uts/common/io/warlock/ehci.wlcmd
rename : usr/src/uts/sparc/esp/esp.wlcmd => usr/src/uts/common/io/warlock/esp.wlcmd
rename : usr/src/uts/sparc/fas/fas.wlcmd => usr/src/uts/common/io/warlock/fas.wlcmd
rename : usr/src/uts/sparc/hci1394/hci1394.wlcmd => usr/src/uts/common/io/warlock/hci1394.wlcmd
rename : usr/src/uts/sparc/hid/hid.wlcmd => usr/src/uts/common/io/warlock/hid.wlcmd
rename : usr/src/uts/sparc/hid/hid_with_usba.wlcmd => usr/src/uts/common/io/warlock/hid_with_usba.wlcmd
rename : usr/src/uts/sparc/ib/ib.wlcmd => usr/src/uts/common/io/warlock/ib.wlcmd
rename : usr/src/uts/sparc/ibcm/ibcm.wlcmd => usr/src/uts/common/io/warlock/ibcm.wlcmd
rename : usr/src/uts/sparc/ibd/ibd.wlcmd => usr/src/uts/common/io/warlock/ibd.wlcmd
rename : usr/src/uts/sparc/ibmf/ibmf.wlcmd => usr/src/uts/common/io/warlock/ibmf.wlcmd
rename : usr/src/uts/sparc/ibtl/ibtl.wlcmd => usr/src/uts/common/io/warlock/ibtl.wlcmd
rename : usr/src/uts/sparc/mixer/mixer.wlcmd => usr/src/uts/common/io/warlock/mixer.wlcmd
rename : usr/src/uts/sparc/mixer/mixer_with_audiosup.wlcmd => usr/src/uts/common/io/warlock/mixer_with_audiosup.wlcmd
rename : usr/src/uts/sparc/ohci/ohci.wlcmd => usr/src/uts/common/io/warlock/ohci.wlcmd
rename : usr/src/uts/sparc/sbp2/sbp2.wlcmd => usr/src/uts/common/io/warlock/sbp2.wlcmd
rename : usr/src/uts/sparc/scsa1394/scsa1394.wlcmd => usr/src/uts/common/io/warlock/scsa1394.wlcmd
rename : usr/src/uts/sparc/scsa2usb/scsa2usb.wlcmd => usr/src/uts/common/io/warlock/scsa2usb.wlcmd
rename : usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd => usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd
rename : usr/src/uts/sparc/sd/sd.wlcmd => usr/src/uts/common/io/warlock/sd.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_esp.wlcmd => usr/src/uts/common/io/warlock/sd_with_esp.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_fas.wlcmd => usr/src/uts/common/io/warlock/sd_with_fas.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_glm.wlcmd => usr/src/uts/common/io/warlock/sd_with_glm.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_isp.wlcmd => usr/src/uts/common/io/warlock/sd_with_isp.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_mpt.wlcmd => usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_uata.wlcmd => usr/src/uts/common/io/warlock/sd_with_uata.wlcmd
rename : usr/src/uts/sparc/ses/ses.wlcmd => usr/src/uts/common/io/warlock/ses.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_esp.wlcmd => usr/src/uts/common/io/warlock/ses_with_esp.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_fas.wlcmd => usr/src/uts/common/io/warlock/ses_with_fas.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_glm.wlcmd => usr/src/uts/common/io/warlock/ses_with_glm.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_isp.wlcmd => usr/src/uts/common/io/warlock/ses_with_isp.wlcmd
rename : usr/src/uts/sparc/si3124/si3124.wlcmd => usr/src/uts/common/io/warlock/si3124.wlcmd
rename : usr/src/uts/sparc/ssd/ssd.wlcmd => usr/src/uts/common/io/warlock/ssd.wlcmd
rename : usr/src/uts/sparc/st/st.wlcmd => usr/src/uts/common/io/warlock/st.wlcmd
rename : usr/src/uts/sparc/st/st_with_esp.wlcmd => usr/src/uts/common/io/warlock/st_with_esp.wlcmd
rename : usr/src/uts/sparc/st/st_with_fas.wlcmd => usr/src/uts/common/io/warlock/st_with_fas.wlcmd
rename : usr/src/uts/sparc/st/st_with_glm.wlcmd => usr/src/uts/common/io/warlock/st_with_glm.wlcmd
rename : usr/src/uts/sparc/st/st_with_isp.wlcmd => usr/src/uts/common/io/warlock/st_with_isp.wlcmd
rename : usr/src/uts/sparc/ugen/ugen.wlcmd => usr/src/uts/common/io/warlock/ugen.wlcmd
rename : usr/src/uts/sparc/ugen/ugen_with_usba.wlcmd => usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd
rename : usr/src/uts/sparc/uhci/uhci.wlcmd => usr/src/uts/common/io/warlock/uhci.wlcmd
rename : usr/src/uts/sparc/usb_ac/usb_ac.wlcmd => usr/src/uts/common/io/warlock/usb_ac.wlcmd
rename : usr/src/uts/sparc/usb_ac/usb_ac_with_sada.wlcmd => usr/src/uts/common/io/warlock/usb_ac_with_sada.wlcmd
rename : usr/src/uts/sparc/usb_ac/usb_ac_with_usba.wlcmd => usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd
rename : usr/src/uts/sparc/usb_ah/usb_ah.wlcmd => usr/src/uts/common/io/warlock/usb_ah.wlcmd
rename : usr/src/uts/sparc/usb_as/usb_as.wlcmd => usr/src/uts/common/io/warlock/usb_as.wlcmd
rename : usr/src/uts/sparc/usb_as/usb_as_with_sada.wlcmd => usr/src/uts/common/io/warlock/usb_as_with_sada.wlcmd
rename : usr/src/uts/sparc/usb_as/usb_as_with_usba.wlcmd => usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd
rename : usr/src/uts/sparc/usb_mid/usb_mid.wlcmd => usr/src/uts/common/io/warlock/usb_mid.wlcmd
rename : usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd => usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd
rename : usr/src/uts/sparc/usbprn/usbprn.wlcmd => usr/src/uts/common/io/warlock/usbprn.wlcmd
rename : usr/src/uts/sparc/usbprn/usbprn_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd
rename : usr/src/uts/sparc/usbser/usbser.wlcmd => usr/src/uts/common/io/warlock/usbser.wlcmd
rename : usr/src/uts/sparc/usbsksp/usbser_keyspan.wlcmd => usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd
rename : usr/src/uts/sparc/usbsksp/usbser_keyspan_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd
rename : usr/src/uts/sparc/usbskel/usbskel.wlcmd => usr/src/uts/common/io/warlock/usbskel.wlcmd
rename : usr/src/uts/sparc/usbskel/usbskel_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd
rename : usr/src/uts/sparc/usbsprl/usbsprl.wlcmd => usr/src/uts/common/io/warlock/usbsprl.wlcmd
rename : usr/src/uts/sparc/usbsprl/usbsprl_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd

6 files changed, 18 insertions, 317 deletions

diff --git a/usr/src/uts/sparc/st/Makefile b/usr/src/uts/sparc/st/Makefile
index 5244d9173e..3e186fdf7e 100644
--- a/usr/src/uts/sparc/st/Makefile
+++ b/usr/src/uts/sparc/st/Makefile
@@ -45,6 +45,7 @@ ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/sun/io/scsi/targets
 WARLOCK_OUT     = $(ST_OBJS:%.o=%.ll)
 WARLOCK_OK      = $(MODULE).ok
+WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -81,10 +82,10 @@ all:		$(ALL_DEPS)
 
 def:		$(DEF_DEPS)
 
-clean:		$(CLEAN_DEPS); \
+clean:		$(CLEAN_DEPS)
 		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
-clobber:	$(CLOBBER_DEPS); \
+clobber:	$(CLOBBER_DEPS)
 		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
@@ -117,40 +118,39 @@ TEST		= test
 # any loaded after the first are ignored.
 
 SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
-ST_FILES = $(ST_OBJS:%.o=%.ll)
 
 warlock: warlock_alone warlock_with_esp warlock_with_isp warlock_with_fas \
 	warlock_with_glm
 
-warlock_alone: $(MODULE).ok
+warlock_alone: $(WARLOCK_OK)
 
 %.wlcmd:
-	$(TEST) -f $@  || $(SCCS) get $@
+	cd $(WLCMD_DIR); $(TEST) -f $@  || $(SCCS) get $@
 
-warlock_with_esp: st_with_esp.wlcmd $(ST_FILES) scsi_files esp_files \
+warlock_with_esp: st_with_esp.wlcmd $(WARLOCK_OUT) scsi_files esp_files \
 	warlock_ddi.files
-	$(WARLOCK) -c ./st_with_esp.wlcmd \
-		$(ST_FILES) ../esp/esp $(SCSI_FILES)  \
+	$(WARLOCK) -c $(WLCMD_DIR)/st_with_esp.wlcmd \
+		$(WARLOCK_OUT) ../esp/esp $(SCSI_FILES)  \
 		-l ../warlock/ddi_dki_impl.ll
 
-warlock_with_fas: st_with_fas.wlcmd $(ST_FILES) scsi_files fas_files \
+warlock_with_fas: st_with_fas.wlcmd $(WARLOCK_OUT) scsi_files fas_files \
 	warlock_ddi.files
-	$(WARLOCK) -c ./st_with_fas.wlcmd \
-		$(ST_FILES) \
+	$(WARLOCK) -c $(WLCMD_DIR)/st_with_fas.wlcmd \
+		$(WARLOCK_OUT) \
 		../fas/fas ../fas/fas_callbacks \
 		$(SCSI_FILES)  \
 		-l ../warlock/ddi_dki_impl.ll
 
-warlock_with_isp: st_with_isp.wlcmd $(ST_FILES) scsi_files isp_files \
+warlock_with_isp: st_with_isp.wlcmd $(WARLOCK_OUT) scsi_files isp_files \
 	warlock_ddi.files
-	$(WARLOCK) -c ./st_with_isp.wlcmd \
-		$(ST_FILES) $(CLOSED)/uts/sparc/isp/isp $(SCSI_FILES)  \
+	$(WARLOCK) -c $(WLCMD_DIR)/st_with_isp.wlcmd \
+		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/isp/isp $(SCSI_FILES)  \
 		-l ../warlock/ddi_dki_impl.ll
 
-warlock_with_glm: st_with_glm.wlcmd $(ST_FILES) scsi_files glm_files \
+warlock_with_glm: st_with_glm.wlcmd $(WARLOCK_OUT) scsi_files glm_files \
 	warlock_ddi.files
-	$(WARLOCK) -c ./st_with_glm.wlcmd \
-		$(ST_FILES) $(CLOSED)/uts/sparc/glm/glm $(SCSI_FILES) \
+	$(WARLOCK) -c $(WLCMD_DIR)/st_with_glm.wlcmd \
+		$(WARLOCK_OUT) $(CLOSED)/uts/sparc/glm/glm $(SCSI_FILES) \
 		-l ../warlock/ddi_dki_impl.ll
 
 scsi_files:
@@ -169,7 +169,7 @@ glm_files:
 	@cd $(CLOSED)/uts/sparc/glm; pwd; $(MAKE) warlock
 
 st.ok: st.wlcmd st.ll st_conf.ll  scsi_files warlock_ddi.files
-	$(WARLOCK) -c ./st.wlcmd $(ST_FILES) $(SCSI_FILES) \
+	$(WARLOCK) -c $(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \
 	-l ../warlock/ddi_dki_impl.ll
 	$(TOUCH) $@
 
diff --git a/usr/src/uts/sparc/st/st.wlcmd b/usr/src/uts/sparc/st/st.wlcmd
deleted file mode 100644
index 6980fd317d..0000000000
--- a/usr/src/uts/sparc/st/st.wlcmd
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-one scsi_device 
-root scsi_hba_post_event scsi_hba_remove_eventcall scsi_hba_add_eventcall scsi_hba_get_eventcookie
-
-### Give warlock a dummy target for each of the function
-### pointers in the scsi_hba_tran structure.
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-	add $ptr target warlock_dummy
-done
-
-add scsi_watch_request::swr_callback targets st_media_watch_cb
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-        st_get_default_conf  
-
-root    scsi_hba_bus_power
-ignore  delay
-
diff --git a/usr/src/uts/sparc/st/st_with_esp.wlcmd b/usr/src/uts/sparc/st/st_with_esp.wlcmd
deleted file mode 100644
index 8713315773..0000000000
--- a/usr/src/uts/sparc/st/st_with_esp.wlcmd
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add esp_cmd::cmd_pkt.pkt_comp targets \
-	st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr
-
-add st.c:st_known_tape_type/config_funct targets \
-	st_get_conf_from_st_dot_conf \
-	st_get_conf_from_st_conf_dot_c \
-	st_get_default_conf
-
-one scsi_device
-one esp 
-
-root 	esp_kmem_cache_constructor esp_kmem_cache_destructor
-root  	esp.c:esp_scsi_dmafree esp.c:esp_scsi_sync_pkt
-root  	esp.c:esp_abort esp.c:esp_scsi_reset_notify
-
-assert order scsi_device::sd_mutex  esp::e_mutex
-
-disallow esp_call_pkt_comp scsi_watch_request_intr
-
-add notify_entry::callback target warlock_dummy
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
diff --git a/usr/src/uts/sparc/st/st_with_fas.wlcmd b/usr/src/uts/sparc/st/st_with_fas.wlcmd
deleted file mode 100644
index 0c02677fbd..0000000000
--- a/usr/src/uts/sparc/st/st_with_fas.wlcmd
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr \
-	fas.c:fas_scsi_destroy_pkt \
-	fas.c:fas_scsi_init_pkt \
-	fas.c:fas_scsi_start \
-	fas.c:fas_scsi_abort \
-	fas.c:fas_scsi_reset \
-	fas.c:fas_scsi_setcap \
-	fas.c:fas_scsi_getcap \
-	fas.c:fas_scsi_dmafree \
-	fas.c:fas_scsi_reset_notify \
-	fas.c:fas_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-        st_get_default_conf  
-
-one scsi_device
-one fas 
-
-root fas_kmem_cache_constructor fas_kmem_cache_destructor
-root fas.c:fas_scsi_dmafree fas.c:fas_scsi_sync_pkt
-
-# choose one of the two for finding problems:
-#
-assert order scsi_device::sd_mutex  fas::f_mutex
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
diff --git a/usr/src/uts/sparc/st/st_with_glm.wlcmd b/usr/src/uts/sparc/st/st_with_glm.wlcmd
deleted file mode 100644
index 8775fb38af..0000000000
--- a/usr/src/uts/sparc/st/st_with_glm.wlcmd
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr \
-	glm.c:glm_scsi_destroy_pkt \
-	glm.c:glm_scsi_init_pkt \
-	glm.c:glm_scsi_start \
-	glm.c:glm_scsi_abort \
-	glm.c:glm_scsi_reset \
-	glm.c:glm_scsi_setcap \
-	glm.c:glm_scsi_getcap \
-	glm.c:glm_scsi_dmafree \
-	glm.c:glm_scsi_reset_notify \
-	glm.c:glm_scsi_tgt_init \
-	glm.c:glm_scsi_tgt_free \
-	glm.c:glm_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-        st_get_default_conf  
-
-one scsi_device
-one glm
-
-root glm_kmem_cache_destructor glm_kmem_cache_constructor
-assert order scsi_device::sd_mutex  glm::g_mutex
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-
diff --git a/usr/src/uts/sparc/st/st_with_isp.wlcmd b/usr/src/uts/sparc/st/st_with_isp.wlcmd
deleted file mode 100644
index 7ff9422052..0000000000
--- a/usr/src/uts/sparc/st/st_with_isp.wlcmd
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-add scsi_watch_request::swr_callback targets \
-	st.c:st_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
-        st.c:st_media_watch_cb \
-	scsi_watch.c:scsi_watch_request_intr \
-	st.c:st_intr
-
-add st.c:st_known_tape_type/config_funct targets \
-        st_get_conf_from_st_dot_conf \
-        st_get_conf_from_st_conf_dot_c \
-        st_get_default_conf  
-
-one scsi_device
-one isp 
-
-add notify_entry::callback target warlock_dummy
-
-root isp_kmem_cache_constructor isp_kmem_cache_destructor
-root isp.c:isp_scsi_dmafree isp.c:isp_scsi_sync_pkt
-root isp.c:isp_scsi_reset_notify
-root isp.c:isp_i_print_response
-
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
-        add $ptr target warlock_dummy
-done
-root    scsi_hba_bus_power
-ignore  delay
-