summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorYuri Pankov <yuri.pankov@nexenta.com>2017-06-12 01:35:10 +0300
committerRichard Lowe <richlowe@richlowe.net>2017-06-19 13:10:02 -0400
commit192a5ca9fe8b81784c9921860f876735fc9a1e3e (patch)
tree00acc2e7906b66c17f4f12329e81d60e27489824 /usr/src
parentcabd62a218e426e3dea29d3051d184458cdddbdf (diff)
downloadillumos-joyent-192a5ca9fe8b81784c9921860f876735fc9a1e3e.tar.gz
8371 remove warlock files in usr/src/uts
Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/tools/findunref/exception_list.common8
-rw-r--r--usr/src/tools/findunref/exception_list.open11
-rw-r--r--usr/src/uts/common/io/fibre-channel/impl/fp.wlcmd84
-rw-r--r--usr/src/uts/common/io/fibre-channel/impl/fp_with_fctl.wlcmd76
-rw-r--r--usr/src/uts/common/io/fibre-channel/ulp/fcp.wlcmd67
-rw-r--r--usr/src/uts/common/io/ib/inc.flg6
-rw-r--r--usr/src/uts/common/io/warlock/aac.wlcmd66
-rw-r--r--usr/src/uts/common/io/warlock/ahci.wlcmd112
-rw-r--r--usr/src/uts/common/io/warlock/audiohd.wlcmd69
-rw-r--r--usr/src/uts/common/io/warlock/av1394.wlcmd70
-rw-r--r--usr/src/uts/common/io/warlock/bcm_sata.wlcmd110
-rw-r--r--usr/src/uts/common/io/warlock/dad.wlcmd30
-rw-r--r--usr/src/uts/common/io/warlock/daplt.wlcmd38
-rw-r--r--usr/src/uts/common/io/warlock/ddi_dki_comm.inc227
-rw-r--r--usr/src/uts/common/io/warlock/ddi_dki_impl.c191
-rw-r--r--usr/src/uts/common/io/warlock/ecpp.wlcmd46
-rw-r--r--usr/src/uts/common/io/warlock/ehci.wlcmd98
-rw-r--r--usr/src/uts/common/io/warlock/esp.wlcmd53
-rw-r--r--usr/src/uts/common/io/warlock/fas.wlcmd52
-rw-r--r--usr/src/uts/common/io/warlock/glm.wlcmd33
-rw-r--r--usr/src/uts/common/io/warlock/hci1394.wlcmd103
-rw-r--r--usr/src/uts/common/io/warlock/hermon.wlcmd188
-rw-r--r--usr/src/uts/common/io/warlock/hid.wlcmd54
-rw-r--r--usr/src/uts/common/io/warlock/hid_with_usba.wlcmd211
-rw-r--r--usr/src/uts/common/io/warlock/ib.wlcmd60
-rw-r--r--usr/src/uts/common/io/warlock/ibcm.wlcmd125
-rw-r--r--usr/src/uts/common/io/warlock/ibd.wlcmd70
-rw-r--r--usr/src/uts/common/io/warlock/ibmf.wlcmd74
-rw-r--r--usr/src/uts/common/io/warlock/ibtl.wlcmd319
-rw-r--r--usr/src/uts/common/io/warlock/ifp.wlcmd72
-rw-r--r--usr/src/uts/common/io/warlock/isp.wlcmd56
-rw-r--r--usr/src/uts/common/io/warlock/mpt.wlcmd39
-rw-r--r--usr/src/uts/common/io/warlock/mptsas.wlcmd42
-rw-r--r--usr/src/uts/common/io/warlock/mv.wlcmd107
-rw-r--r--usr/src/uts/common/io/warlock/nv_sata.wlcmd121
-rw-r--r--usr/src/uts/common/io/warlock/ohci.wlcmd97
-rw-r--r--usr/src/uts/common/io/warlock/rdsv3.wlcmd365
-rw-r--r--usr/src/uts/common/io/warlock/sbp2.wlcmd79
-rw-r--r--usr/src/uts/common/io/warlock/scmi2c.wlcmd40
-rw-r--r--usr/src/uts/common/io/warlock/scsa1394.wlcmd159
-rw-r--r--usr/src/uts/common/io/warlock/scsa2usb.wlcmd51
-rw-r--r--usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd248
-rw-r--r--usr/src/uts/common/io/warlock/scsi.c53
-rw-r--r--usr/src/uts/common/io/warlock/sd.wlcmd56
-rw-r--r--usr/src/uts/common/io/warlock/sd_with_esp.wlcmd72
-rw-r--r--usr/src/uts/common/io/warlock/sd_with_fas.wlcmd77
-rw-r--r--usr/src/uts/common/io/warlock/sd_with_glm.wlcmd76
-rw-r--r--usr/src/uts/common/io/warlock/sd_with_isp.wlcmd66
-rw-r--r--usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd82
-rw-r--r--usr/src/uts/common/io/warlock/sd_with_uata.wlcmd127
-rw-r--r--usr/src/uts/common/io/warlock/ses.wlcmd63
-rw-r--r--usr/src/uts/common/io/warlock/ses_with_esp.wlcmd73
-rw-r--r--usr/src/uts/common/io/warlock/ses_with_fas.wlcmd81
-rw-r--r--usr/src/uts/common/io/warlock/ses_with_glm.wlcmd70
-rw-r--r--usr/src/uts/common/io/warlock/ses_with_isp.wlcmd70
-rw-r--r--usr/src/uts/common/io/warlock/si3124.wlcmd120
-rw-r--r--usr/src/uts/common/io/warlock/ssd.wlcmd51
-rw-r--r--usr/src/uts/common/io/warlock/st.wlcmd47
-rw-r--r--usr/src/uts/common/io/warlock/st_with_esp.wlcmd62
-rw-r--r--usr/src/uts/common/io/warlock/st_with_fas.wlcmd70
-rw-r--r--usr/src/uts/common/io/warlock/st_with_glm.wlcmd70
-rw-r--r--usr/src/uts/common/io/warlock/st_with_isp.wlcmd60
-rw-r--r--usr/src/uts/common/io/warlock/tavor.wlcmd144
-rw-r--r--usr/src/uts/common/io/warlock/tem.wlcmd61
-rw-r--r--usr/src/uts/common/io/warlock/uata.wlcmd129
-rw-r--r--usr/src/uts/common/io/warlock/ugen.wlcmd38
-rw-r--r--usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd145
-rw-r--r--usr/src/uts/common/io/warlock/uhci.wlcmd95
-rw-r--r--usr/src/uts/common/io/warlock/usb_ac.wlcmd79
-rw-r--r--usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd221
-rw-r--r--usr/src/uts/common/io/warlock/usb_ah.wlcmd42
-rw-r--r--usr/src/uts/common/io/warlock/usb_as.wlcmd48
-rw-r--r--usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd179
-rw-r--r--usr/src/uts/common/io/warlock/usb_ia.wlcmd32
-rw-r--r--usr/src/uts/common/io/warlock/usb_ia_with_usba.wlcmd179
-rw-r--r--usr/src/uts/common/io/warlock/usb_mid.wlcmd34
-rw-r--r--usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd168
-rw-r--r--usr/src/uts/common/io/warlock/usbecm.wlcmd72
-rw-r--r--usr/src/uts/common/io/warlock/usbecm_with_usba.wlcmd187
-rw-r--r--usr/src/uts/common/io/warlock/usbftdi.wlcmd91
-rw-r--r--usr/src/uts/common/io/warlock/usbftdi_with_usba.wlcmd225
-rw-r--r--usr/src/uts/common/io/warlock/usbprn.wlcmd47
-rw-r--r--usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd165
-rw-r--r--usr/src/uts/common/io/warlock/usbsacm.wlcmd92
-rw-r--r--usr/src/uts/common/io/warlock/usbsacm_with_usba.wlcmd220
-rw-r--r--usr/src/uts/common/io/warlock/usbser.wlcmd99
-rw-r--r--usr/src/uts/common/io/warlock/usbser_edge.wlcmd84
-rw-r--r--usr/src/uts/common/io/warlock/usbser_edge_with_usba.wlcmd222
-rw-r--r--usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd104
-rw-r--r--usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd245
-rw-r--r--usr/src/uts/common/io/warlock/usbskel.wlcmd43
-rw-r--r--usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd168
-rw-r--r--usr/src/uts/common/io/warlock/usbsprl.wlcmd90
-rw-r--r--usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd223
-rw-r--r--usr/src/uts/common/io/warlock/usbvc.wlcmd47
-rw-r--r--usr/src/uts/common/io/warlock/usbvc_with_usba.wlcmd174
-rw-r--r--usr/src/uts/common/io/warlock/wc.wlcmd88
-rw-r--r--usr/src/uts/common/io/warlock/wc_devfs.wlcmd45
-rw-r--r--usr/src/uts/sun/io/scsi/inc.flg4
99 files changed, 3 insertions, 9899 deletions
diff --git a/usr/src/tools/findunref/exception_list.common b/usr/src/tools/findunref/exception_list.common
index ed97eed2ee..dca4a0986b 100644
--- a/usr/src/tools/findunref/exception_list.common
+++ b/usr/src/tools/findunref/exception_list.common
@@ -51,14 +51,6 @@
*/TODO
#
-# Ignore warlock-related goop; not used during a nightly.
-#
-*.wlc
-*.wlcmd
-*/wlcmd
-*/warlock
-
-#
# Ignore internal test directories and test programs.
#
*/tests
diff --git a/usr/src/tools/findunref/exception_list.open b/usr/src/tools/findunref/exception_list.open
index 7a17be4241..8cb26d66f5 100644
--- a/usr/src/tools/findunref/exception_list.open
+++ b/usr/src/tools/findunref/exception_list.open
@@ -194,7 +194,7 @@
./usr/src/cmd/sendmail/src/statusd_shm.h
#
-# Ignore files originally supplied by ISC (Internet Software Consortium)
+# Ignore files originally supplied by ISC (Internet Software Consortium)
# as part of a BIND release.
#
./usr/src/lib/libresolv2/common/irs/getaddrinfo.c
@@ -209,15 +209,6 @@
./usr/src/common/bignum/mont_mulf.c
#
-# Ignore the sparc Makefiles for x86-only drivers;
-# they're used to build warlock only.
-#
-./usr/src/uts/sparc/sata/Makefile
-./usr/src/uts/sparc/si3124/Makefile
-./usr/src/uts/sparc/nv_sata/Makefile
-./usr/src/uts/sparc/ahci/Makefile
-
-#
# Ignore uttrack.c. It is provided as part of the standard
# ACPI CA source code but provides optional resource tracking
# functionality which is not used.
diff --git a/usr/src/uts/common/io/fibre-channel/impl/fp.wlcmd b/usr/src/uts/common/io/fibre-channel/impl/fp.wlcmd
deleted file mode 100644
index f94b76a716..0000000000
--- a/usr/src/uts/common/io/fibre-channel/impl/fp.wlcmd
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#
-
-one fc_port
-
-#
-# List of interrupt handlers in the port driver
-#
-FP_INTERRUPT_HANDLERS="fp_flogi_intr fp_plogi_intr fp_logo_intr fp_adisc_intr\
- fp_ns_intr fp_intr fp_linit_intr fp_rls_intr"
-
-#
-# Lately warlock doesn't seem to recognize job_comp field in 2.8
-# environment - however it does in fp_with_fctl.wlcmd. So root
-# out the following functions
-#
-# PS: ns suggests me to start using locklint, but that will
-# take some time
-#
-root fp_startup_done
-
-#
-# List of callbacks in the port driver
-#
-FP_CALLBACK_HANDLERS="fp_statec_cb fp_unsol_cb"
-
-#
-# Give warlock a dummy target for each of the function
-# pointers in the fca_tran structure.
-#
-
-for ptr in `funcptrs | grep '^fca_tran::'`
-do
- add $ptr target warlock_dummy
-done
-
-#
-# add interrupt targets to fca_transport and fca_els_send
-#
-add fp_cmd::cmd_transport targets $FP_INTERRUPT_HANDLERS
-add fc_packet::pkt_comp targets $FP_INTERRUPT_HANDLERS
-
-#
-# Till such time we actually use the following bus_ops
-# vectors, make them target to warlock_dummys
-#
-add bus_ops::bus_get_eventcookie target warlock_dummy
-add bus_ops::bus_add_eventcall target warlock_dummy
-add bus_ops::bus_remove_eventcall target warlock_dummy
-add bus_ops::bus_post_event target warlock_dummy
-add bus_ops::bus_intr_ctl target warlock_dummy
-
-ignore fp_cache_constructor fp_cache_destructor
-
-#
-# Make all callback handlers as root
-#
-for ptr in $FP_CALLBACK_HANDLERS
-do
- root $ptr
-done
diff --git a/usr/src/uts/common/io/fibre-channel/impl/fp_with_fctl.wlcmd b/usr/src/uts/common/io/fibre-channel/impl/fp_with_fctl.wlcmd
deleted file mode 100644
index 7d52cbc867..0000000000
--- a/usr/src/uts/common/io/fibre-channel/impl/fp_with_fctl.wlcmd
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#
-
-. ./fp.wlcmd
-
-FCTL_ULP_FUNCTIONS="fc_ulp_add fc_ulp_remove fc_ulp_init_packet\
- fc_ulp_uninit_packet fc_ulp_getportmap fc_ulp_login\
- fc_ulp_getmap fc_ulp_get_device_by_nwwn fc_ulp_get_port_device\
- fc_ulp_get_portlist fc_ulp_node_ns fc_ulp_port_ns fc_ulp_transport\
- fc_ulp_issue_els fc_ulp_uballoc fc_ulp_ubfree fc_ulp_ubrelease\
- fc_ulp_abort fc_ulp_linkreset fc_ulp_port_reset fc_ulp_get_did\
- fc_ulp_logout fc_ulp_get_pd_state fc_ulp_is_fc4_bit_set\
- fc_fca_update_errors fc_ulp_get_port_instance fc_ulp_error\
- fc_ulp_pkt_error fc_ulp_is_name_present fc_ulp_is_type_present\
- fc_ulp_get_pwwn_by_did fc_ulp_is_plogi_initiator\
- fc_ulp_get_pwwn_by_did fc_ulp_get_port_handle\
- fc_ulp_pwwn_to_portmap"
-
-FCTL_FCA_FUNCTIONS="fc_fca_attach fc_fca_detach fc_fca_init fc_fca_error\
- fc_fca_pkt_error"
-
-FCTL_IGNORABLE_FUNCTIONS="fctl_get_pd_state fctl_set_pd_state\
- fctl_wwn_match"
-
-#
-# Functions invoked via job_comp pointer for asynchronous request
-#
-add job_request::job_comp target fctl_link_reset_done
-add job_request::job_comp target fp.c:fp_startup_done
-
-add ulp_modinfo::ulp_port_attach target fc_ulp_getportmap
-add ulp_modinfo::ulp_statec_callback target fc_ulp_getportmap
-add ulp_modinfo::ulp_port_detach target warlock_dummy
-add ulp_modinfo::ulp_port_ioctl target warlock_dummy
-add ulp_modinfo::ulp_els_callback target warlock_dummy
-add ulp_modinfo::ulp_data_callback target warlock_dummy
-
-ignore fctl_cache_constructor fctl_cache_destructor
-
-for ptr in $FCTL_IGNORABLE_FUNCTIONS
-do
- ignore $ptr
-done
-
-for ptr in $FCTL_ULP_FUNCTIONS
-do
- root $ptr
-done
-
-for ptr in $FCTL_FCA_FUNCTIONS
-do
- root $ptr
-done
diff --git a/usr/src/uts/common/io/fibre-channel/ulp/fcp.wlcmd b/usr/src/uts/common/io/fibre-channel/ulp/fcp.wlcmd
deleted file mode 100644
index 1234f8c219..0000000000
--- a/usr/src/uts/common/io/fibre-channel/ulp/fcp.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 (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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one fcp_port
-
-#
-# List of callbacks
-#
-
-FCP_CALLBACK_HANDLERS="fcp_statec_callback fcp_cmd_callback \
- fcp_icmd_callback fcp_scsi_callback \
- fcp_els_callback fcp_data_callback \
- fcp_unsol_callback fcp_resource_callback"
-
-root fcp_port_attach fcp_port_detach fcp_port_ioctl
-
-root fcp_scsi_reset_notify
-
-root fcp_kmem_cache_constructor fcp_kmem_cache_destructor
-
-for ptr in $FCP_CALLBACK_HANDLERS
-do
- root $ptr
-done
-
-root fcp_hp_daemon fcp_watch
-
-add scsi_pkt::pkt_comp targets \
- fcp_scsi_start \
- fcp_scsi_abort \
- fcp_scsi_getcap \
- fcp_scsi_setcap \
- fcp_scsi_dmafree \
- fcp_scsi_sync_pkt \
- fcp_scsi_destroy_pkt \
- fcp_scsi_init_pkt \
- fcp_scsi_tgt_init \
- fcp_scsi_tgt_free \
- fcp_scsi_bus_get_eventcookie \
- fcp_scsi_bus_add_eventcall \
- fcp_scsi_bus_remove_eventcall \
- fcp_scsi_bus_post_event
-
diff --git a/usr/src/uts/common/io/ib/inc.flg b/usr/src/uts/common/io/ib/inc.flg
index 6931d133b4..e957c6c30b 100644
--- a/usr/src/uts/common/io/ib/inc.flg
+++ b/usr/src/uts/common/io/ib/inc.flg
@@ -26,7 +26,7 @@
#
# This file brings down all that is needed to build the
-# core Infiniband code.
+# core Infiniband code.
#
# header files
@@ -50,10 +50,6 @@ find_files "s.*.h" \
find_files "s.*" \
usr/src/lib/cfgadm_plugins/ib
-# warlock
-find_files "s.*" \
- usr/src/uts/common/io/warlock
-
# to compile the drivers/modules
find_files "s.*" \
usr/src/uts/sparc/ib \
diff --git a/usr/src/uts/common/io/warlock/aac.wlcmd b/usr/src/uts/common/io/warlock/aac.wlcmd
deleted file mode 100644
index dcab794fd6..0000000000
--- a/usr/src/uts/common/io/warlock/aac.wlcmd
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-one aac_softstate
-
-add aac_softstate::aac_if.aif_get_fwstatus target \
- aac_rx_get_fwstatus \
- aac_rkt_get_fwstatus
-add aac_softstate::aac_if.aif_get_mailbox target \
- aac_rx_get_mailbox \
- aac_rkt_get_mailbox
-add aac_softstate::aac_if.aif_set_mailbox target \
- aac_rx_set_mailbox \
- aac_rkt_set_mailbox
-add aac_cmd::aac_cmd_fib target \
- aac_cmd_fib_rawio \
- aac_cmd_fib_brw64 \
- aac_cmd_fib_brw \
- aac_cmd_fib_copy \
- aac_cmd_fib_scsi32 \
- aac_cmd_fib_scsi64
-add aac_softstate::aac_cmd_fib_scsi target \
- aac_cmd_fib_scsi32 \
- aac_cmd_fib_scsi64
-
-root aac_intr_old aac_intr_new aac_fm_error_cb aac_name_node aac_quiesce
-
-add scsi_pkt::pkt_comp target \
- aac_tran_destroy_pkt \
- aac_tran_init_pkt \
- aac_tran_start \
- aac_tran_abort \
- aac_tran_reset \
- aac_tran_setcap \
- aac_tran_getcap \
- aac_tran_dmafree \
- aac_tran_tgt_init \
- aac_tran_sync_pkt
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-root scsi_hba_bus_power
diff --git a/usr/src/uts/common/io/warlock/ahci.wlcmd b/usr/src/uts/common/io/warlock/ahci.wlcmd
deleted file mode 100644
index e93874fa95..0000000000
--- a/usr/src/uts/common/io/warlock/ahci.wlcmd
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# usr/src/uts/common/io/warlock/ahci.wlcmd
-
-one ahci_ctl
-one ahci_port
-
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-root ahci_intr
-root ahci_watchdog_handler
-root ahci_events_handler
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root sd.c:sdstrategy sdioctl
-root sd.c:sd_target_change_task
-
-root scsi_hba.c:scsi_hba_bus_power
-
-ignore sd.c:sd_scsi_probe_cache_fini
-ignore sd.c:sd_scsi_probe_cache_init
-ignore sd.c:sd_scsi_target_lun_init
-ignore sd.c:sd_scsi_target_lun_fini
-root sd.c:sd_taskq_create
-root sd.c:sd_taskq_delete
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-add scsi_hba_tran::tran_tgt_init targets sata_scsi_tgt_init
-add scsi_hba_tran::tran_tgt_probe targets sata_scsi_tgt_probe
-add scsi_hba_tran::tran_tgt_free targets sata_scsi_tgt_free
-add scsi_hba_tran::tran_start targets sata_scsi_start
-add scsi_hba_tran::tran_abort targets sata_scsi_abort
-add scsi_hba_tran::tran_reset targets sata_scsi_reset
-add scsi_hba_tran::tran_getcap targets sata_scsi_getcap
-add scsi_hba_tran::tran_setcap targets sata_scsi_setcap
-add scsi_hba_tran::tran_init_pkt targets sata_scsi_init_pkt
-add scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-add scsi_hba_tran::tran_sync_pkt targets sata_scsi_sync_pkt
-add scsi_hba_tran::tran_dmafree targets sata_scsi_dmafree
-
-add scsi_hba_tran::tran_add_eventcall targets warlock_dummy
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add scsi_hba_tran::tran_get_eventcookie targets warlock_dummy
-add scsi_hba_tran::tran_get_name targets warlock_dummy
-add scsi_hba_tran::tran_post_event targets warlock_dummy
-add scsi_hba_tran::tran_remove_eventcall targets warlock_dummy
-
-add dk_callback::dkc_callback targets warlock_dummy
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-
-add scsi_watch_request::swr_callback targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-root ahci_fm_error_cb
-
-add scsi_pkt::pkt_comp targets \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- sata_scsi_destroy_pkt \
- sata_scsi_init_pkt \
- sata_scsi_start \
- sata_scsi_abort \
- sata_scsi_reset \
- sata_scsi_start \
- sata_scsi_sync_pkt
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore sd.c:sd_mhd_reset_notify_cb
-ignore delay
-
-assert order ahci_ctl::ahcictl_mutex ahci_port::ahciport_mutex
diff --git a/usr/src/uts/common/io/warlock/audiohd.wlcmd b/usr/src/uts/common/io/warlock/audiohd.wlcmd
deleted file mode 100644
index ccfed972f3..0000000000
--- a/usr/src/uts/common/io/warlock/audiohd.wlcmd
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-
-### specify the root functions
-root audiohd_attach
-root audiohd_detach
-root audiohd_engine_open
-root audiohd_engine_close
-root audiohd_engine_start
-root audiohd_engine_stop
-root audiohd_engine_count
-root audiohd_engine_format
-root audiohd_engine_channels
-root audiohd_engine_rate
-root audiohd_engine_sync
-root audiohd_quiesce
-root audiohd_resume
-root audiohd_suspend
-
-root audiohd_set_beep
-root audiohd_set_cd
-root audiohd_set_center
-root audiohd_set_front
-root audiohd_set_headphone
-root audiohd_set_lfe
-root audiohd_set_linein
-root audiohd_set_mic
-root audiohd_set_rear
-root audiohd_set_recsrc
-root audiohd_set_speaker
-root audiohd_set_surround
-root audiohd_set_mongain
-root audiohd_set_loopback
-root audiohd_beep_on
-root audiohd_beep_off
-root audiohd_beep_freq
-root audiohd_get_control
-
-### thread functions
-add bus_ops::bus_add_eventcall target warlock_dummy
-add bus_ops::bus_config target warlock_dummy
-add bus_ops::bus_get_eventcookie target warlock_dummy
-add bus_ops::bus_intr_ctl target warlock_dummy
-add bus_ops::bus_post_event target warlock_dummy
-add bus_ops::bus_remove_eventcall target warlock_dummy
-add bus_ops::bus_unconfig target warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/av1394.wlcmd b/usr/src/uts/common/io/warlock/av1394.wlcmd
deleted file mode 100644
index db4ca0b85a..0000000000
--- a/usr/src/uts/common/io/warlock/av1394.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one av1394_inst_s
-
-### DDI/DKI entry points
-root av1394_getinfo
-root av1394_attach
-root av1394_detach
-root av1394_open
-root av1394_close
-root av1394_read
-root av1394_write
-root av1394_ioctl
-root av1394_poll
-root av1394_devmap
-
-### callbacks
-root av1394_bus_reset
-root av1394_disconnect
-root av1394_reconnect
-root av1394_isoch_softintr
-root av1394_ic_rsrc_fail
-root av1394_ir_ixl_frame_cb
-root av1394_ir_dma_stopped_cb
-root av1394_it_ixl_begin_cb
-root av1394_it_ixl_buf_cb
-root av1394_it_ixl_eof_cb
-root av1394_it_dma_stopped_cb
-root av1394_pcr_recv_read_request
-root av1394_pcr_recv_lock_request
-root av1394_fcp_cmd_completion_cb
-root av1394_fcp_cmd_write_request_cb
-root av1394_fcp_resp_write_request_cb
-
-add dev_ops::devo_getinfo targets av1394_getinfo
-add dev_ops::devo_attach targets av1394_attach
-add dev_ops::devo_detach targets av1394_detach
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/bcm_sata.wlcmd b/usr/src/uts/common/io/warlock/bcm_sata.wlcmd
deleted file mode 100644
index 05b81e47a3..0000000000
--- a/usr/src/uts/common/io/warlock/bcm_sata.wlcmd
+++ /dev/null
@@ -1,110 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-# usr/src/uts/common/io/warlock/bcm_sata.wlcmd
-
-one bcm_ctl
-one bcm_port
-
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-root bcm_intr
-root bcm_watchdog_handler
-root bcm_events_handler
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root sd.c:sdstrategy sdioctl
-root sd.c:sd_target_change_task
-
-root scsi_hba.c:scsi_hba_bus_power
-
-ignore sd.c:sd_scsi_probe_cache_fini
-ignore sd.c:sd_scsi_probe_cache_init
-ignore sd.c:sd_scsi_target_lun_init
-ignore sd.c:sd_scsi_target_lun_fini
-
-root sd.c:sd_taskq_create
-root sd.c:sd_taskq_delete
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-add scsi_hba_tran::tran_tgt_init targets sata_scsi_tgt_init
-add scsi_hba_tran::tran_tgt_probe targets sata_scsi_tgt_probe
-add scsi_hba_tran::tran_tgt_free targets sata_scsi_tgt_free
-add scsi_hba_tran::tran_start targets sata_scsi_start
-add scsi_hba_tran::tran_abort targets sata_scsi_abort
-add scsi_hba_tran::tran_reset targets sata_scsi_reset
-add scsi_hba_tran::tran_getcap targets sata_scsi_getcap
-add scsi_hba_tran::tran_setcap targets sata_scsi_setcap
-add scsi_hba_tran::tran_init_pkt targets sata_scsi_init_pkt
-add scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-add scsi_hba_tran::tran_sync_pkt targets sata_scsi_sync_pkt
-add scsi_hba_tran::tran_dmafree targets sata_scsi_dmafree
-
-add scsi_hba_tran::tran_add_eventcall targets warlock_dummy
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add scsi_hba_tran::tran_get_eventcookie targets warlock_dummy
-#add scsi_hba_tran::tran_get_name targets warlock_dummy
-add scsi_hba_tran::tran_post_event targets warlock_dummy
-add scsi_hba_tran::tran_remove_eventcall targets warlock_dummy
-
-add dk_callback::dkc_callback targets warlock_dummy
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-
-add scsi_watch_request::swr_callback targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- sata_scsi_destroy_pkt \
- sata_scsi_init_pkt \
- sata_scsi_start \
- sata_scsi_abort \
- sata_scsi_reset \
- sata_scsi_start \
- sata_scsi_sync_pkt
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore sd.c:sd_mhd_reset_notify_cb
-ignore delay
-
-assert order bcm_ctl::bcmc_mutex bcm_port::bcmp_mutex
diff --git a/usr/src/uts/common/io/warlock/dad.wlcmd b/usr/src/uts/common/io/warlock/dad.wlcmd
deleted file mode 100644
index e73b9a3705..0000000000
--- a/usr/src/uts/common/io/warlock/dad.wlcmd
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one dcd_device
-
-ignore dcd_reset_throttle dcd_rname inq_fill clean_print dcd_check_error
-ignore dcduscsimin dcd_sname
-
-### Give warlock a dummy target for each of the function
-### pointers in the dcd_hba_tran structure.
-for ptr in `funcptrs | grep '^dcd_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-
-ignore dcdrunout dcdintr dcd_handle_incomplete dcd_check_error
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-add dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/daplt.wlcmd b/usr/src/uts/common/io/warlock/daplt.wlcmd
deleted file mode 100644
index 9facdd1071..0000000000
--- a/usr/src/uts/common/io/warlock/daplt.wlcmd
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-
-root daplka_cm_rc_handler
-root daplka_cm_service_handler
-root daplka_async_handler
-root daplka_pre_mr_cleanup_callback
-root daplka_timer_thread
-root daplka_cq_handler
-root daplka_shared_mr_cmp
-root daplka_sm_notice_handler
-root daplka_console
-
-add daplka_hash_table::ht_free_func targets \
- daplka_hash_ep_free \
- daplka_hash_mr_free \
- daplka_hash_sp_free \
- daplka_hash_mw_free \
- daplka_hash_cno_free \
- daplka_hash_evd_free \
- daplka_hash_pd_free \
- daplka_hash_sp_unref \
- daplka_hash_timer_free \
- daplka_hash_srq_free
-
-add daplka_hash_table::ht_lookup_func targets \
- daplka_hash_generic_lookup
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ddi_dki_comm.inc b/usr/src/uts/common/io/warlock/ddi_dki_comm.inc
deleted file mode 100644
index 0562d7ca50..0000000000
--- a/usr/src/uts/common/io/warlock/ddi_dki_comm.inc
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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.
- * 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 2007 Sun Microsystems, Inc.
- * All rights reserved. Use is subject to license terms.
- */
-
-/*
- * Copyright 2014 Garrett D'Amore <garrett@damore.org>
- */
-
-/*
- * ddi_dki_comm.inc - Part of a pseudo-kernel to use when analyzing drivers
- * with warlock.
- *
- * The main idea here is to represent all of the ways that the kernel can
- * call into the driver, so that warlock has the correct view of the call
- * graph.
- *
- * This file represents the stuff in common between the DDI/DKI spec and
- * the current implementation. It is included by both ddi_dki_{spec,impl}.c
- *
- * This is a SPARC version; some functions (e.g. ddi_dma_nextwin) should
- * be changed for an x86 version.
- */
-
-#include <sys/note.h>
-#include <sys/devops.h>
-#include <sys/ddi.h>
-#include <sys/sunddi.h>
-#include <sys/proc.h>
-
-_NOTE(DATA_READABLE_WITHOUT_LOCK( dev_ops cb_ops bus_ops ))
-
-/*
- * Now define a dev_ops, a cb_ops, and a bus_ops with 0 for each
- * entry point, so that warlock doesn't complain that these
- * function pointers have no bindings.
- * 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
- */
-struct dev_ops *devops_p, warlock_dev_ops = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-struct cb_ops *cbops_p, warlock_cb_ops = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-struct bus_ops *busops_p, warlock_bus_ops = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-
-/* This rendition of mod_remove() tells warlock that it calls detach. */
-int
-mod_remove(struct modlinkage *a) {
- (*devops_p->devo_detach)(NULL, 0);
-}
-
-/* This rendition of physio() shows that it calls its func ptr args. */
-int
-physio(
- int (*strategy)(struct buf *),
- struct buf *a,
- dev_t b,
- int c,
- void (*mincnt)(struct buf *),
- struct uio *d)
-{
- (*strategy)(0);
- (*mincnt)(0);
-}
-
-/*
- * Tell warlock that args to some funcs get called back as separate threads.
- */
-timeout_id_t
-timeout(void (*fp)(void *), void *a, clock_t b)
-{
- thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_add_intr(dev_info_t *a, uint_t b, ddi_iblock_cookie_t *c,
- ddi_idevice_cookie_t *d, uint_t (*fp)(caddr_t), caddr_t e)
-{
- thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_add_softintr(dev_info_t *a, int b, ddi_softintr_t *c,
- ddi_iblock_cookie_t *d, ddi_idevice_cookie_t *e, uint_t (*fp)(caddr_t),
- caddr_t f)
-{
- thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_intr_add_handler(ddi_intr_handle_t h, ddi_intr_handler_t inthandler,
- void *arg1, void *arg2)
-{
- thread_create(0, 0, (void (*)())inthandler, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_intr_add_softint(dev_info_t *dip, ddi_softint_handle_t *h_p, int soft_pri,
- ddi_intr_handler_t handler, void *arg1)
-{
- thread_create(0, 0, (void (*)())handler, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_addr_setup(
- dev_info_t *a,
- struct as *b,
- caddr_t c,
- size_t d,
- uint_t e,
- int (*fp)(void),
- caddr_t f,
- ddi_dma_lim_t *g,
- ddi_dma_handle_t *h)
-{
- struct bus_ops *ops;
- (*ops->bus_dma_map)(0, 0, 0, 0);
- thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_buf_setup(
- dev_info_t *a,
- struct buf *b,
- uint_t c,
- int (*fp)(void),
- caddr_t d,
- ddi_dma_lim_t *e,
- ddi_dma_handle_t *f)
-{
- struct bus_ops *ops;
- (*ops->bus_dma_map)(0, 0, 0, 0);
- thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-void
-ddi_set_callback(
- int (*fp)(caddr_t),
- caddr_t a,
- uintptr_t *b)
-{
- thread_create(0, 0, (void (*)())fp, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_mctl(dev_info_t *a, dev_info_t *b, ddi_dma_handle_t c,
- enum ddi_dma_ctlops d, off_t *e, size_t *f, caddr_t *g,
- uint_t h)
-{
- struct bus_ops *ops;
- (*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_get_error(ddi_dma_handle_t h, uint_t len, caddr_t errblk)
-{
- struct bus_ops *ops;
- (*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_sync(ddi_dma_handle_t h, off_t o, size_t l, uint_t whom)
-{
- struct bus_ops *ops;
- (*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_prop_op(dev_t dev, dev_info_t *dip, ddi_prop_op_t prop_op, int mod_flags,
- char *name, caddr_t valuep, int *lengthp)
-{
- struct bus_ops *ops;
- (*ops->bus_prop_op)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_add_event_handler(dev_info_t *dip, ddi_eventcookie_t event,
- void (*handler)(dev_info_t *, ddi_eventcookie_t, void *, void *),
- void *arg, ddi_callback_id_t *id)
-{
- struct bus_ops *ops;
- return ((*ops->bus_add_eventcall)(dip, dip, event, handler, arg, id));
-}
-
-int
-ddi_remove_event_handler(ddi_callback_id_t id)
-{
- dev_info_t *dip;
- struct bus_ops *ops;
- return ((*ops->bus_remove_eventcall)(dip, id));
-}
-
-
-int
-ddi_get_eventcookie(dev_info_t *dip, char *name,
- ddi_eventcookie_t *event_cookiep)
-{
- struct bus_ops *ops;
- return ((*ops->bus_get_eventcookie)(dip, dip,
- name, event_cookiep));
-}
diff --git a/usr/src/uts/common/io/warlock/ddi_dki_impl.c b/usr/src/uts/common/io/warlock/ddi_dki_impl.c
deleted file mode 100644
index 3fc438fe98..0000000000
--- a/usr/src/uts/common/io/warlock/ddi_dki_impl.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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.
- * 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 2007 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-/*
- * ddi_dki_impl.c - A pseudo-kernel to use when analyzing drivers with warlock.
- *
- * The main idea here is to represent all of the ways that the kernel can
- * call into the driver, so that warlock has the correct view of the call
- * graph.
- *
- * This version differs from ddi_dki_spec.c in that it represents the
- * current implementation of the DDI/DKI rather than the specification.
- */
-#include "ddi_dki_comm.inc"
-#include <sys/esunddi.h>
-#include <sys/sunndi.h>
-#include <sys/ddi.h>
-#include <sys/epm.h>
-#include <sys/proc.h>
-
-int warlock_dummy(void);
-int _init(void);
-int _fini(void);
-int _info(struct modinfo *a);
-int scsi_init(void);
-
-int main(void) {
-
- /*
- * The following call will cause warlock to know about
- * warlock_dummy as a func that can be used to satisfy
- * unbound function pointers. It shouldn't be needed
- * with the new warlock on suntools.
- */
- warlock_dummy();
-
- /*
- * When the following functions are called, there is never
- * more than one thread running in the driver.
- */
- _init();
- _fini();
- _info(0);
- (*devops_p->devo_identify)(0);
- (*devops_p->devo_probe)(0);
- (*devops_p->devo_attach)(0, 0);
-
- /*
- * When the following functions are called, there may be
- * more than one thread running in the driver.
- */
- _NOTE(COMPETING_THREADS_NOW)
-
-
- scsi_init();
-
- (*devops_p->devo_getinfo)(0, 0, 0, 0);
- (*devops_p->devo_reset)(0, 0);
- (*devops_p->devo_power)(0, 0, 0);
-
- (*cbops_p->cb_open)(0, 0, 0, 0);
- (*cbops_p->cb_close)(0, 0, 0, 0);
- (*cbops_p->cb_strategy)(0);
- (*cbops_p->cb_print)(0, 0);
- (*cbops_p->cb_dump)(0, 0, 0, 0);
- (*cbops_p->cb_read)(0, 0, 0);
- (*cbops_p->cb_write)(0, 0, 0);
- (*cbops_p->cb_ioctl)(0, 0, 0, 0, 0, 0);
- (*cbops_p->cb_devmap)(0, 0, 0, 0, 0, 0);
- (*cbops_p->cb_mmap)(0, 0, 0);
- (*cbops_p->cb_segmap)(0, 0, 0, 0, 0, 0, 0, 0, 0);
- (*cbops_p->cb_chpoll)(0, 0, 0, 0, 0);
- (*cbops_p->cb_prop_op)(0, 0, 0, 0, 0, 0, 0);
- (*cbops_p->cb_aread)(0, 0, 0);
- (*cbops_p->cb_awrite)(0, 0, 0);
-
- (*busops_p->bus_map)(0, 0, 0, 0, 0, 0);
- (*busops_p->bus_get_intrspec)(0, 0, 0);
- (*busops_p->bus_add_intrspec)(0, 0, 0, 0, 0, 0, 0, 0);
- (*busops_p->bus_remove_intrspec)(0, 0, 0, 0);
- (*busops_p->bus_map_fault)(0, 0, 0, 0, 0, 0, 0, 0, 0);
- (*busops_p->bus_dma_map)(0, 0, 0, 0);
- (*busops_p->bus_dma_allochdl)(0, 0, 0, 0, 0, 0);
- (*busops_p->bus_dma_freehdl)(0, 0, 0);
- (*busops_p->bus_dma_bindhdl)(0, 0, 0, 0, 0, 0);
- (*busops_p->bus_dma_unbindhdl)(0, 0, 0);
- (*busops_p->bus_dma_flush)(0, 0, 0, 0, 0, 0);
- (*busops_p->bus_dma_win)(0, 0, 0, 0, 0, 0, 0, 0);
- (*busops_p->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
- (*busops_p->bus_ctl)(0, 0, 0, 0, 0);
- (*busops_p->bus_prop_op)(0, 0, 0, 0, 0, 0, 0, 0);
-
- (*busops_p->bus_get_eventcookie)(0, 0, 0, 0);
- (*busops_p->bus_add_eventcall)(0, 0, 0, 0, 0, 0);
- (*busops_p->bus_remove_eventcall)(0, 0);
- (*busops_p->bus_post_event)(0, 0, 0, 0);
- (*busops_p->bus_intr_ctl)(0, 0, 0, 0, 0);
-
- (*busops_p->bus_config)(0, 0, 0, 0, 0);
- (*busops_p->bus_unconfig)(0, 0, 0, 0);
-
-#ifndef __lock_lint
-/* this causes warnings and it is unclear how to handle this */
- (*busops_p->bus_fm_init)(0, 0, 0, 0);
- (*busops_p->bus_fm_fini)(0, 0);
- (*busops_p->bus_fm_access_enter)(0, 0);
- (*busops_p->bus_fm_access_exit)(0, 0);
- (*busops_p->bus_power)(0, 0, 0, 0, 0);
- (*busops_p->bus_intr_op)(0, 0, 0, 0, 0);
-#endif
-
- ndi_devi_offline(0, 0);
- _NOTE(NO_COMPETING_THREADS_NOW)
-}
-
- /* Power managment framework calls */
-int
-pm_set_power(dev_info_t *dip, int comp, int level, int direction,
- pm_canblock_t canblock, int scan, int *retp)
-{
- (*devops_p->devo_power)(0, 0, 0);
-}
-
-int
-pm_raise_power(dev_info_t *dip, int comp, int level) {
- (*devops_p->devo_power)(0, 0, 0);
-}
-
-int
-pm_lower_power(dev_info_t *dip, int comp, int level) {
- (*devops_p->devo_power)(0, 0, 0);
-}
-
-static kmutex_t mutex;
-static kcondvar_t cv;
-
-void
-delay(clock_t ticks)
-{
- mutex_enter(&mutex);
- cv_wait(&cv, &mutex);
- mutex_exit(&mutex);
-}
-
-void
-putnext(queue_t *q, mblk_t *mp)
-{
- mutex_enter(&mutex);
- cv_wait(&cv, &mutex);
- mutex_exit(&mutex);
-}
-
-int
-ndi_devi_offline(dev_info_t *dip, uint_t flags) {
- (*busops_p->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
- (*busops_p->bus_ctl)(0, 0, 0, 0, 0);
- (*busops_p->bus_get_eventcookie)(0, 0, 0, 0);
- (*busops_p->bus_add_eventcall)(0, 0, 0, 0, 0, 0);
- (*busops_p->bus_remove_eventcall)(0, 0);
- (*busops_p->bus_post_event)(0, 0, 0, 0);
- (*busops_p->bus_unconfig)(0, 0, 0, 0);
-}
-
-int
-ndi_devi_online(dev_info_t *dip, uint_t flags) {
- (*busops_p->bus_config)(0, 0, 0, 0, 0);
-}
diff --git a/usr/src/uts/common/io/warlock/ecpp.wlcmd b/usr/src/uts/common/io/warlock/ecpp.wlcmd
deleted file mode 100644
index 4bba58628e..0000000000
--- a/usr/src/uts/common/io/warlock/ecpp.wlcmd
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one ecppunit
-
-### specify the root functions
-
-root ecpp_open
-root ecpp_close
-root ecpp_wput
-root ecpp_wsrv
-root ecpp_rsrv
-root ecpp_kstat_update
-root ecpp_kstatintr_update
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ehci.wlcmd b/usr/src/uts/common/io/warlock/ehci.wlcmd
deleted file mode 100644
index b53ef2598c..0000000000
--- a/usr/src/uts/common/io/warlock/ehci.wlcmd
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one ehci_state
-one usba_device
-one usba_pipe_handle_data
-one usba_ph_impl
-
-### specify the root functions
-
-### hcdi entry points
-root ehci_hcdi_pipe_open
-root ehci_hcdi_pipe_close
-root ehci_hcdi_pipe_stop_intr_polling
-root ehci_hcdi_pipe_stop_isoc_polling
-root ehci_hcdi_pipe_reset
-root ehci_hcdi_bulk_transfer_size
-root ehci_hcdi_get_current_frame_number
-root ehci_hcdi_get_max_isoc_pkts
-root ehci_intr
-root ehci_hcdi_pipe_ctrl_xfer
-root ehci_hcdi_pipe_bulk_xfer
-root ehci_hcdi_pipe_intr_xfer
-root ehci_hcdi_pipe_isoc_xfer
-root ehci_hcdi_pm_support
-root ehci_hcdi_pipe_reset_data_toggle
-root ehci_quiesce
-
-root hubd_hotplug_thread
-root hubd_exception_cb
-root hubd_read_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_bus_power
-root usba_pipe_sync_close
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-### POLLED entry points
-root ehci_hcdi_polled_input_init
-root ehci_hcdi_polled_input_fini
-root ehci_hcdi_polled_input_enter
-root ehci_hcdi_polled_input_exit
-root ehci_hcdi_polled_read
-root ehci_hcdi_polled_output_init
-root ehci_hcdi_polled_output_fini
-root ehci_hcdi_polled_output_enter
-root ehci_hcdi_polled_output_exit
-root ehci_hcdi_polled_write
-
-### currently unused functions
-
-root ehci_print_qh
-root ehci_print_qtd
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
- ehci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
- ehci_hcdi_polled_input_fini
-
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets hubd_read_cb
-add usb_intr_req::intr_exc_cb targets hubd_exception_cb
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/esp.wlcmd b/usr/src/uts/common/io/warlock/esp.wlcmd
deleted file mode 100644
index fbc8230b82..0000000000
--- a/usr/src/uts/common/io/warlock/esp.wlcmd
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one esp
-
-add esp_cmd::cmd_pkt.pkt_comp targets \
- esp_scsi_destroy_pkt \
- esp_scsi_init_pkt \
- esp_start \
- esp_abort \
- esp_reset \
- esp_setcap \
- esp_getcap \
- esp_scsi_dmafree \
- esp_scsi_reset_notify \
- esp_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-root esp_kmem_cache_constructor esp_kmem_cache_destructor
-
-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/common/io/warlock/fas.wlcmd b/usr/src/uts/common/io/warlock/fas.wlcmd
deleted file mode 100644
index 88f2811ba0..0000000000
--- a/usr/src/uts/common/io/warlock/fas.wlcmd
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one fas
-
-add scsi_pkt::pkt_comp targets \
- fas_scsi_destroy_pkt \
- fas_scsi_init_pkt \
- fas_scsi_start \
- fas_scsi_abort \
- fas_scsi_reset \
- fas_scsi_setcap \
- fas_scsi_getcap \
- fas_scsi_dmafree \
- fas_scsi_reset_notify \
- fas_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-root fas_kmem_cache_constructor fas_kmem_cache_destructor
-
-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/common/io/warlock/glm.wlcmd b/usr/src/uts/common/io/warlock/glm.wlcmd
deleted file mode 100644
index 65a721c409..0000000000
--- a/usr/src/uts/common/io/warlock/glm.wlcmd
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-one glm
-
-add scsi_pkt::pkt_comp targets \
- glm_scsi_destroy_pkt \
- glm_scsi_init_pkt \
- glm_scsi_start \
- glm_scsi_abort \
- glm_scsi_reset \
- glm_scsi_setcap \
- glm_scsi_getcap \
- glm_scsi_dmafree \
- glm_scsi_reset_notify \
- glm_scsi_tgt_init \
- glm_scsi_tgt_free \
- glm_scsi_sync_pkt
-
-add notify_entry::callback target warlock_dummy
-
-root glm_kmem_cache_constructor glm_kmem_cache_destructor
-
-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/common/io/warlock/hci1394.wlcmd b/usr/src/uts/common/io/warlock/hci1394.wlcmd
deleted file mode 100644
index 8fc9c07f6e..0000000000
--- a/usr/src/uts/common/io/warlock/hci1394.wlcmd
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one hci1394_state_s
-
-### HAL interface entry points
-root hci1394_s1394if_shutdown
-root hci1394_s1394if_phy
-root hci1394_s1394if_read
-root hci1394_s1394if_read_response
-root hci1394_s1394if_write
-root hci1394_s1394if_write_response
-root hci1394_s1394if_response_complete
-root hci1394_s1394if_lock
-root hci1394_s1394if_lock_response
-root hci1394_alloc_isoch_dma
-root hci1394_free_isoch_dma
-root hci1394_start_isoch_dma
-root hci1394_stop_isoch_dma
-root hci1394_update_isoch_dma
-root hci1394_s1394if_update_config_rom
-root hci1394_s1394if_reset_bus
-root hci1394_s1394if_short_bus_reset
-root hci1394_s1394if_set_contender_bit
-root hci1394_s1394if_set_root_holdoff_bit
-root hci1394_s1394if_set_gap_count
-root hci1394_s1394if_csr_read
-root hci1394_s1394if_csr_write
-root hci1394_s1394if_csr_cswap32
-root hci1394_s1394if_phy_filter_set
-root hci1394_s1394if_phy_filter_clr
-root hci1394_s1394if_power_state_change
-
-### timeout callbacks
-root hci1394_async_pending_timeout
-
-### currently unused functions
-root hci1394_isoch_resume
-root hci1394_ixl_set_start
-root hci1394_ohci_arreq_stop
-root hci1394_ohci_arresp_stop
-root hci1394_ohci_link_disable
-root hci1394_ohci_phy_clr
-
-add h1394_lock_request/recv_lock_req targets s1394_send_response
-add h1394_read_request/recv_read_req targets s1394_send_response
-add h1394_write_request/recv_write_req targets s1394_send_response
-
-add s1394_hal_s::halinfo.hal_events.response_complete targets \
- hci1394_s1394if_response_complete
-add s1394_hal_s::halinfo.hal_events.set_contender_bit targets \
- hci1394_s1394if_set_contender_bit
-
-### hci1394 callbacks
-add hci1394_ixl_dma_sync/callback targets warlock_dummy
-add hci1394_iso_ctxt_s::isoch_dma_stopped targets warlock_dummy
-
-add hci1394_tlist_s::tl_timer_info.tlt_callback targets \
- hci1394_async_pending_timeout
-add hci1394_q_s::q_info.qi_start targets hci1394_async_arreq_start \
- hci1394_async_arresp_start hci1394_async_atreq_start \
- hci1394_async_atresp_start
-add hci1394_q_s::q_info.qi_wake targets hci1394_async_arreq_wake \
- hci1394_async_arresp_wake hci1394_async_atreq_wake \
- hci1394_async_atresp_wake
-
-# CMP/FCP
-add s1394_cmp_notify_reg_change/cb target warlock_dummy
-add s1394_fcp_recv_write_request/cb target warlock_dummy
-
-add h1394_read_request/recv_read_req target s1394_cmp_ompr_recv_read_request
-add h1394_lock_request/recv_lock_req target s1394_cmp_ompr_recv_lock_request
-add h1394_read_request/recv_read_req target s1394_cmp_impr_recv_read_request
-add h1394_lock_request/recv_lock_req target s1394_cmp_impr_recv_lock_request
-add h1394_write_request/recv_write_req target s1394_fcp_resp_recv_write_request
-add h1394_write_request/recv_write_req target s1394_fcp_cmd_recv_write_request
-
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/hermon.wlcmd b/usr/src/uts/common/io/warlock/hermon.wlcmd
deleted file mode 100644
index 2943b5c4f8..0000000000
--- a/usr/src/uts/common/io/warlock/hermon.wlcmd
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-one hermon_state_s
-
-### IBTF CI interface entry points
-root hermon_ci_query_hca_ports
-root hermon_ci_modify_ports
-root hermon_ci_modify_system_image
-root hermon_ci_alloc_pd
-root hermon_ci_free_pd
-root hermon_ci_alloc_rdd
-root hermon_ci_free_rdd
-root hermon_ci_alloc_ah
-root hermon_ci_free_ah
-root hermon_ci_query_ah
-root hermon_ci_modify_ah
-root hermon_ci_alloc_qp
-root hermon_ci_alloc_special_qp
-root hermon_ci_alloc_qp_range
-root hermon_ci_free_qp
-root hermon_ci_release_qpn
-root hermon_ci_query_qp
-root hermon_ci_modify_qp
-root hermon_ci_alloc_cq
-root hermon_ci_free_cq
-root hermon_ci_query_cq
-root hermon_ci_resize_cq
-root hermon_ci_modify_cq
-root hermon_ci_alloc_cq_sched
-root hermon_ci_free_cq_sched
-root hermon_ci_alloc_eec
-root hermon_ci_free_eec
-root hermon_ci_query_eec
-root hermon_ci_modify_eec
-root hermon_ci_register_mr
-root hermon_ci_register_buf
-root hermon_ci_register_shared_mr
-root hermon_ci_deregister_mr
-root hermon_ci_query_mr
-root hermon_ci_reregister_mr
-root hermon_ci_reregister_buf
-root hermon_ci_sync_mr
-root hermon_ci_register_dma_mr
-root hermon_ci_alloc_mw
-root hermon_ci_free_mw
-root hermon_ci_query_mw
-root hermon_ci_attach_mcg
-root hermon_ci_detach_mcg
-root hermon_ci_post_send
-root hermon_ci_post_recv
-root hermon_ci_poll_cq
-root hermon_ci_notify_cq
-root hermon_ci_ci_data_in
-root hermon_ci_ci_data_out
-root hermon_ci_alloc_srq
-root hermon_ci_free_srq
-root hermon_ci_query_srq
-root hermon_ci_modify_srq
-root hermon_ci_post_srq
-root hermon_ci_map_mem_area
-root hermon_ci_unmap_mem_area
-root hermon_ci_map_mem_iov
-root hermon_ci_unmap_mem_iov
-root hermon_ci_alloc_lkey
-root hermon_ci_register_physical_mr
-root hermon_ci_reregister_physical_mr
-root hermon_ci_create_fmr_pool
-root hermon_ci_destroy_fmr_pool
-root hermon_ci_flush_fmr_pool
-root hermon_ci_register_physical_fmr
-root hermon_ci_deregister_fmr
-root hermon_ci_alloc_io_mem
-root hermon_ci_free_io_mem
-root hermon_ci_query_cq_handler_id
-root hermon_ci_not_supported
-
-### Hermon misc. (currently unused)
-root hermon_config_int_mod
-root hermon_hw_health_check
-root hermon_rsrc_alloc_uarhdl
-root hermon_sense_port_post
-
-### Hermon Firmware commands (currently unused)
-root hermon_sync_tpt_cmd_post
-root hermon_read_mtt_cmd_post
-root hermon_write_mtt_cmd_post
-root hermon_close_hca_cmd_post
-root hermon_modify_mpt_cmd_post
-root hermon_setdebug_post
-root hermon_pci_capability_msix
-
-### Hermon Event Queue function pointers
-add hermon_eq_poll/eqfunction targets hermon_cq_handler \
- hermon_cq_err_handler hermon_comm_estbl_handler \
- hermon_port_state_change_handler hermon_invreq_local_wq_err_handler \
- hermon_local_acc_vio_wq_err_handler \
- hermon_path_mig_handler hermon_path_mig_err_handler \
- hermon_local_wq_cat_err_handler hermon_sendq_drained_handler \
- hermon_cmd_complete_handler hermon_fexch_error_handler \
- hermon_srq_last_wqe_reached_handler hermon_catastrophic_handler \
- hermon_no_eqhandler hermon_eq_demux
-
-### Hermon agent callbacks
-root hermon_agent_handle_req
-root hermon_agent_request_cb
-root hermon_agent_response_cb
-
-### Hermon interrupt allocation callback
-root hermon_intr_cb_handler
-
-### Hermon kmem_cache constructors and destructors
-root hermon_rsrc_cqhdl_constructor
-root hermon_rsrc_cqhdl_destructor
-root hermon_rsrc_qphdl_constructor
-root hermon_rsrc_qphdl_destructor
-root hermon_rsrc_pdhdl_constructor
-root hermon_rsrc_pdhdl_destructor
-root hermon_rsrc_refcnt_constructor
-root hermon_rsrc_refcnt_destructor
-root hermon_rsrc_ahhdl_constructor
-root hermon_rsrc_ahhdl_destructor
-root hermon_rsrc_mrhdl_constructor
-root hermon_rsrc_mrhdl_destructor
-root hermon_rsrc_srqhdl_constructor
-root hermon_rsrc_srqhdl_destructor
-
-### Hermon kstat callback
-root hermon_kstat_cntr_update
-root hermon_kstat_perfcntr64_update
-
-### Hermon userland mapping callbacks and functions
-root hermon_umap_umemlock_cb
-root hermon_devmap_umem_map
-root hermon_devmap_umem_dup
-root hermon_devmap_umem_unmap
-root hermon_devmap_devmem_map
-root hermon_devmap_devmem_dup
-root hermon_devmap_devmem_unmap
-root hermon_devmap_dbrecmem_map
-root hermon_devmap_dbrecmem_dup
-root hermon_devmap_dbrecmem_unmap
-root hermon_umap_db_compare
-add hermon_umap_umemlock_cb/mr_callback targets warlock_dummy
-
-
-### Hermon cleanup on close callback(s)
-add hermon_umap_db_handle_onclose_cb/callback targets \
- hermon_ioctl_flash_cleanup
-
-### Hermon QP number AVL tree compare function
-root hermon_qpn_avl_compare
-
-### Hermon FMR processing
-add hermon_sw_fmr_s::fmr_flush_function targets warlock_dummy
-
-### Hermon FMA processing
-root hermon_inter_err_chk
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/hid.wlcmd b/usr/src/uts/common/io/warlock/hid.wlcmd
deleted file mode 100644
index a1c469a5a9..0000000000
--- a/usr/src/uts/common/io/warlock/hid.wlcmd
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-one hid_state
-
-### specify the root functions
-
-root hid_open
-root hid_close
-root hid_interrupt_pipe_callback
-root hid_wsrv
-root hid_wput
-root hid_default_pipe_callback
-root hid_default_pipe_exception_callback
-root hid_interrupt_pipe_exception_callback
-root hid_restore_state_event_callback
-root hid_disconnect_event_callback
-root hid_power
-root hid_power_change_callback
-
-### polled functions
-root hid_polled_input_enter
-root hid_polled_input_exit
-root hid_polled_read
-
-### thread functions
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/hid_with_usba.wlcmd b/usr/src/uts/common/io/warlock/hid_with_usba.wlcmd
deleted file mode 100644
index e2253682d2..0000000000
--- a/usr/src/uts/common/io/warlock/hid_with_usba.wlcmd
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-one hid_state
-one ohci_state
-one ehci_state
-one uhci_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usb_rval2errno
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_pipe_reset
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_free_bulk_req
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_bulk_xfer
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_get_status
-root usb_ep_num
-root usb_clr_feature
-root usb_get_ep_data
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_pipe_do_async_func_thread
-root usba_move_list
-root usba_ready_interface_node
-root usba_ascii_string_descr
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usba_taskq_destroy
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-root hubd_disconnect_event_cb
-root hubd_reconnect_event_cb
-
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-
-root ohci_intr
-root ehci_intr
-
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root usba_dbuf_tail
-root usb_log
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_bus_power
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usb_log_descr_tree
-root usb_print_descr_tree
-root hubd_root_hub_cleanup_thread
-
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-### specify the hid root functions
-root hid_open
-root hid_close
-root hid_interrupt_pipe_callback
-root hid_wsrv
-root hid_wput
-root hid_default_pipe_callback
-root hid_default_pipe_exception_callback
-root hid_interrupt_pipe_exception_callback
-root hid_restore_state_event_callback
-root hid_disconnect_event_callback
-root hid_power
-root hid_power_change_callback
-
-
-### polled functions
-root hid_polled_input_enter
-root hid_polled_input_exit
-root hid_polled_read
-root usba_dbuf_tail
-
-### thread functions in hid module
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
- ohci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
- ohci_hcdi_polled_input_fini
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
- ehci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
- ehci_hcdi_polled_input_fini
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
- uhci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
- uhci_hcdi_polled_input_fini
diff --git a/usr/src/uts/common/io/warlock/ib.wlcmd b/usr/src/uts/common/io/warlock/ib.wlcmd
deleted file mode 100644
index f78bc241c3..0000000000
--- a/usr/src/uts/common/io/warlock/ib.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 (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 (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# ibnexus Callback handlers for IBDM
-add ibdm.ibdm_ibnex_callback targets ibnex_dm_callback
-
-# ibnnexus to ibtl callback functions
-ignore ibnex_ibtl_callback
-root ibnex_return_apid
-
-# ibnexus bus_ops entry points
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-# IBDM callback handlers from IBTL
-root ibdm_event_hdlr
-
-# ibdm Callback handlers for IBMF / SAA
-root ibdm_ibmf_recv_cb
-root ibdm_ibmf_send_cb
-root ibdm_recv_incoming_mad
-root ibdm_saa_event_cb
-root ibdm_saa_handle_new_gid
-
-# ibnex reprobe function, called from taskq
-root ibnex_handle_reprobe_dev
-root ibnex_handle_hca_attach
-
-# ibnex other functions
-root ibnex_name_child
-
-# ibdm function called from taskq
-root ibdm_saa_event_taskq
-
-# ibnex MPXIO and PM related functions
-root ib_vhci_failover
-root ib_vhci_pi_init
-root ib_vhci_pi_state_change
-root ib_vhci_pi_uninit
-root ibnex_bus_power
diff --git a/usr/src/uts/common/io/warlock/ibcm.wlcmd b/usr/src/uts/common/io/warlock/ibcm.wlcmd
deleted file mode 100644
index ffced96a68..0000000000
--- a/usr/src/uts/common/io/warlock/ibcm.wlcmd
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# ibcm api entry points
-root ibt_open_rc_channel
-root ibt_close_rc_channel
-root ibt_prime_close_rc_channel
-root ibt_request_ud_dest
-root ibt_ud_get_dqpn
-root ibt_cm_delay
-root ibt_register_service
-root ibt_bind_service
-root ibt_unbind_service
-root ibt_unbind_all_services
-root ibt_register_ar
-root ibt_deregister_ar
-root ibt_query_ar
-root ibt_cm_proceed
-root ibt_cm_ud_proceed
-root ibt_deregister_service
-root ibcm_query_classport_info
-root ibt_free_mcg_info
-root ibt_join_mcg
-root ibcm_process_async_join_mcg
-root ibt_leave_mcg
-root ibt_query_mcg
-root ibt_set_alt_path
-root ibt_gid_to_node_info
-root ibt_recycle_rc
-root ibt_get_companion_port_gids
-root ibt_get_paths
-root ibt_get_alt_path
-root ibt_aget_paths
-root ibt_get_ip_paths
-root ibt_aget_ip_paths
-root ibt_get_ip_alt_path
-root ibt_format_ip_private_data
-root ibt_get_ip_data
-root ibt_get_ip_dst_port
-root ibt_get_ip_protocol_num
-root ibt_get_ip_sid
-root ibt_release_ip_sid
-root ibt_get_src_ip
-root ibt_free_srcip_info
-root ibt_lid_to_node_info
-
-root ibt_ofuvcm_get_req_data
-root ibt_ofuvcm_proceed
-
-# callback entry points from ibmf
-root ibcm_recv_cb
-root ibcm_post_req_complete
-root ibcm_post_rep_complete
-root ibcm_post_rep_wait_complete
-root ibcm_post_mra_complete
-root ibcm_post_mra_lap_complete
-root ibcm_post_mra_rep_complete
-root ibcm_post_rej_complete
-root ibcm_post_lap_complete
-root ibcm_post_apr_complete
-root ibcm_post_stored_apr_complete
-root ibcm_post_dreq_complete
-root ibcm_post_drep_complete
-root ibcm_post_rtu_complete
-root ibcm_post_sidr_req_complete
-root ibcm_post_sidr_rep_complete
-root ibcm_resend_post_rep_complete
-
-# Callback handlers from IBTL
-root ibcm_async_handler
-root ibcm_ibtl_node_info
-root ibt_register_subnet_notices
-
-# Callback handlers from ibcm
-root ibcm_local_cm_handler
-
-# driver entry points
-
-root _init
-root _fini
-root _info
-
-# AVL related callbacks
-
-root ibcm_active_node_compare
-root ibcm_passive_node_compare
-root ibcm_passive_comid_node_compare
-
-# CM internal taskq related callbacks
-root ibcm_proceed_via_taskq
-root ibcm_ud_proceed_via_taskq
-root ibcm_recv_task
-root ibcm_init_saa
-root ibcm_process_abort_via_taskq
-root ibcm_process_async_get_paths
-root ibcm_process_get_ip_paths
-root ibcm_service_record_rewrite_task
-
-# kernel callbacks to ibcm
-
-root ibcm_path_cache_timeout_cb
-root ibcm_timeout_cb
-root ibcm_recv_timeout_cb
-root ibcm_sidr_timeout_cb
-root ibcm_sm_notice_handler
diff --git a/usr/src/uts/common/io/warlock/ibd.wlcmd b/usr/src/uts/common/io/warlock/ibd.wlcmd
deleted file mode 100644
index 45146e6811..0000000000
--- a/usr/src/uts/common/io/warlock/ibd.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ibd_state_s
-
-### Async thread
-root ibd_async_work
-
-### GLDv3 callback routines
-root ibd_m_stat
-root ibd_m_start
-root ibd_m_stop
-root ibd_m_promisc
-root ibd_m_multicst
-root ibd_m_unicst
-root ibd_m_tx
-root ibd_m_getcapab
-
-### IBTF callback routines
-root ibd_rcq_handler
-root ibd_scq_handler
-root ibd_async_handler
-root ibd_snet_notices_handler
-root ibd_rc_rcq_handler
-root ibd_rc_scq_handler
-root ibd_rc_dispatch_pass_mad
-root ibd_rc_dispatch_actv_mad
-
-### Streams callback funtions
-root ibd_freemsg_cb
-root ibd_rc_freemsg_cb
-root ibd_rc_srq_freemsg_cb
-
-### Hash callback functions
-root ibd_hash_by_id
-root ibd_hash_key_cmp
-
-### Kstat functions
-root ibd_rc_update_stats
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ibmf.wlcmd b/usr/src/uts/common/io/warlock/ibmf.wlcmd
deleted file mode 100644
index 76fe05f4ee..0000000000
--- a/usr/src/uts/common/io/warlock/ibmf.wlcmd
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-### specify the root functions
-root ibmf_register
-root ibmf_unregister
-root ibmf_setup_async_cb
-root ibmf_tear_down_async_cb
-root ibmf_msg_transport
-root ibmf_alloc_msg
-root ibmf_free_msg
-root ibmf_alloc_qp
-root ibmf_query_qp
-root ibmf_modify_qp
-root ibmf_free_qp
-root ibmf_i_mad_completions
-root ibmf_i_do_send_cb
-root ibmf_i_do_recv_cb
-root ibmf_module_load
-root ibmf_sa_session_open
-root ibmf_sa_session_close
-root ibmf_sa_access
-root ibmf_saa_gid_to_pathrecords
-root ibmf_saa_paths_from_gid
-root ibmf_saa_name_to_service_record
-root ibmf_saa_id_to_service_record
-root ibmf_saa_update_service_record
-root ibmf_recv_wqe_cache_constructor
-root ibmf_send_wqe_cache_constructor
-root ibmf_recv_wqe_cache_destructor
-root ibmf_send_wqe_cache_destructor
-root ibmf_altqp_recv_wqe_cache_constructor
-root ibmf_altqp_recv_wqe_cache_destructor
-root ibmf_altqp_send_wqe_cache_constructor
-root ibmf_altqp_send_wqe_cache_destructor
-root ibmf_saa_notify_event_client_task
-root ibmf_ibt_async_handler
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add ibmf_i_notify_client/async_cb targets warlock_dummy
-add ibmf_i_notify_client/async_cb targets ibmf_saa_report_cb
-add _ibmf_msg_impl::im_trans_cb targets warlock_dummy
-add _ibmf_msg_impl::im_trans_cb targets ibmf_saa_async_cb
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-add ibmf_handlers.c:ibmf_i_callback_clients/cb_array targets \
- ibmf_saa_impl_async_event_cb
-add ibmf_handlers.c:ibmf_i_callback_clients/cb_array targets warlock_dummy
-add ibmf_saa_event_taskq_args_s::et_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ibtl.wlcmd b/usr/src/uts/common/io/warlock/ibtl.wlcmd
deleted file mode 100644
index 032dbcb0e6..0000000000
--- a/usr/src/uts/common/io/warlock/ibtl.wlcmd
+++ /dev/null
@@ -1,319 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# IBTF TI and VTI api entry points
-root ibt_attach
-root ibt_detach
-root ibc_init
-root ibc_fini
-root ibc_attach
-root ibc_post_attach
-root ibc_pre_detach
-root ibc_detach
-root ibt_ci_data_in
-root ibt_ci_data_out
-root ibt_usec2ib
-root ibt_ib2usec
-root ibt_register_mr
-root ibt_register_buf
-root ibt_query_mr
-root ibt_deregister_mr
-root ibt_reregister_mr
-root ibt_reregister_buf
-root ibt_register_shared_mr
-root ibt_sync_mr
-root ibt_alloc_mw
-root ibt_query_mw
-root ibt_free_mw
-root ibt_alloc_lkey
-root ibt_map_mem_area
-root ibt_unmap_mem_area
-root ibt_register_phys_mr
-root ibt_reregister_phys_mr
-root ibt_create_fmr_pool
-root ibt_destroy_fmr_pool
-root ibt_flush_fmr_pool
-root ibt_register_physical_fmr
-root ibt_deregister_fmr
-root ibt_enable_cq_notify
-root ibt_set_cq_handler
-root ibt_query_cq_handler_id
-root ibt_alloc_qp
-root ibt_initialize_qp
-root ibt_alloc_special_qp
-root ibt_flush_qp
-root ibt_free_qp
-root ibt_query_qp
-root ibt_modify_qp
-root ibt_migrate_path
-root ibt_set_qp_private
-root ibt_get_qp_private
-root ibt_qp_to_hca_guid
-root ibt_recover_ud_qp
-root ibt_pause_sendq
-root ibt_unpause_sendq
-root ibt_resize_queues
-root ibt_query_queues
-root ibt_modify_rdma
-root ibt_set_rdma_resource
-root ibt_change_port
-root ibt_alloc_cq_sched
-root ibt_free_cq_sched
-root ibt_alloc_cq
-root ibt_free_cq
-root ibt_query_cq
-root ibt_resize_cq
-root ibt_modify_cq
-root ibt_poll_cq
-root ibt_set_cq_private
-root ibt_get_cq_private
-root ibt_post_send
-root ibt_post_recv
-root ibt_open_hca
-root ibt_close_hca
-root ibt_get_hca_list
-root ibt_free_hca_list
-root ibt_get_port_state
-root ibt_get_port_state_byguid
-root ibt_query_hca_byguid
-root ibt_query_hca
-root ibt_query_hca_ports
-root ibt_query_hca_ports_byguid
-root ibt_modify_system_image
-root ibt_modify_system_image_byguid
-root ibt_modify_port_byguid
-root ibt_modify_port
-root ibt_free_portinfo
-root ibt_pkey2index
-root ibt_pkey2index_byguid
-root ibt_index2pkey
-root ibt_index2pkey_byguid
-root ibt_set_hca_private
-root ibt_get_hca_private
-root ibt_hca_handle_to_guid
-root ibt_hca_guid_to_handle
-root ibt_alloc_rc_channel
-root ibt_query_rc_channel
-root ibt_modify_rc_channel
-root ibt_alloc_ud_channel
-root ibt_alloc_ud_channel_range
-root ibt_query_ud_channel
-root ibt_modify_ud_channel
-root ibt_recover_ud_channel
-root ibt_flush_channel
-root ibt_free_channel
-root ibt_alloc_ud_dest
-root ibt_query_ud_dest
-root ibt_modify_ud_dest
-root ibt_free_ud_dest
-root ibt_modify_reply_ud_dest
-root ibt_is_privileged_ud_dest
-root ibt_update_channel_qkey
-root ibt_set_chan_private
-root ibt_get_chan_private
-root ibt_channel_to_hca_guid
-root ibt_alloc_pd
-root ibt_free_pd
-root ibt_alloc_ah
-root ibt_free_ah
-root ibt_query_ah
-root ibt_modify_ah
-root ibt_attach_mcg
-root ibt_detach_mcg
-root ibt_recycle_ud
-root ibt_reprobe_dev
-root ibt_alloc_srq
-root ibt_free_srq
-root ibt_modify_srq
-root ibt_post_srq
-root ibt_query_srq
-root ibt_get_srq_private
-root ibt_set_srq_private
-root ibt_alloc_io_mem
-root ibt_free_io_mem
-root ibt_map_mem_iov
-root ibt_unmap_mem_iov
-root ibt_register_part_attr_cb
-root ibt_unregister_part_attr_cb
-root ibt_get_part_attr
-root ibt_get_all_part_attr
-root ibt_free_part_attr
-root ibt_register_dma_mr
-
-# IBTF CI api entry points
-root ibc_init
-root ibc_fini
-root ibc_attach
-root ibc_pre_detach
-root ibc_detach
-root ibc_async_handler
-root ibc_cq_handler
-
-# IBTF Debug entry points
-root ibtl_dprintf_intr
-root ibtl_dprintf5
-root ibtl_dprintf4
-root ibtl_dprintf3
-root ibtl_dprintf2
-root ibtl_dprintf1
-root ibtl_dprintf0
-
-# IBTL-CM private interface
-root ibtl_cm_sm_notice_init_failure
-root ibtl_cm_sm_notice_handler
-root ibtl_cm_set_sm_notice_handler
-root ibtl_cm_chan_is_opening
-root ibtl_cm_chan_open_is_aborted
-root ibtl_cm_chan_is_open
-root ibtl_cm_is_chan_closing
-root ibtl_cm_chan_is_closing
-root ibtl_cm_chan_is_closed
-root ibtl_cm_chan_is_reused
-root ibtl_cm_is_chan_closed
-root ibtl_cm_query_hca_ports_byguid
-root ibtl_cm_set_chan_private
-root ibtl_cm_get_chan_private
-root ibtl_cm_release_chan_private
-root ibtl_cm_wait_chan_private
-root ibtl_cm_get_chan_type
-root ibtl_cm_change_service_cnt
-root ibtl_cm_get_hca_port
-root ibtl_cm_get_active_plist
-root ibtl_cm_free_active_plist
-root ibtl_cm_get_1st_full_pkey_ix
-root ibtl_cm_get_local_comp_gids
-root ibtl_cm_is_multi_sm
-root ibtl_cm_set_node_info_cb
-root ibtl_cm_get_clnt_name
-root ibtl_dummy_node_info_cb
-
-# IBTL-IBNEX private interface
-root ibtl_ibnex_get_hca_info
-root ibtl_ibnex_register_callback
-root ibtl_ibnex_unregister_callback
-root ibtl_ibnex_hcadip2guid
-root ibtl_ibnex_hcaguid2dip
-root ibtl_ibnex_get_hca_verbose_data
-root ibtl_ibnex_valid_hca_parent
-root ibtl_ibnex_query_hca_byguid
-
-# IBTL internal taskq related callbacks
-root ibtl_do_mgr_async_task
-root ibtl_hca_client_async_task
-root ibtl_tell_client_about_new_hca
-root ibtl_sm_notice_task
-root ibt_cisco_embedded_sm_rereg_fix
-
-# IBTL internal threads
-root ibtl_async_thread
-root ibtl_cq_thread
-
-# IBTL FMA Hooks
-root ibc_get_ci_failure
-root ibt_get_module_failure
-root ibt_check_failure
-
-# IBTL kstat callback
-root ibtl_kstat_stats_update
-root ibtl_kstat_pkeys_update
-
-
-
-# Internal, but not referenced (n the future, maybe)
-root ibtl_free_eec_async_check
-
-add ibc_operations_s::ibc_alloc_ah targets warlock_dummy
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-add ibc_operations_s::ibc_alloc_cq targets warlock_dummy
-add ibc_operations_s::ibc_alloc_cq_sched targets warlock_dummy
-add ibc_operations_s::ibc_alloc_mw targets warlock_dummy
-add ibc_operations_s::ibc_alloc_pd targets warlock_dummy
-add ibc_operations_s::ibc_alloc_qp targets warlock_dummy
-add ibc_operations_s::ibc_alloc_qp_range targets warlock_dummy
-add ibc_operations_s::ibc_alloc_special_qp targets warlock_dummy
-add ibc_operations_s::ibc_attach_mcg targets warlock_dummy
-add ibc_operations_s::ibc_ci_data_in targets warlock_dummy
-add ibc_operations_s::ibc_ci_data_out targets warlock_dummy
-add ibc_operations_s::ibc_deregister_mr targets warlock_dummy
-add ibc_operations_s::ibc_detach_mcg targets warlock_dummy
-add ibc_operations_s::ibc_free_ah targets warlock_dummy
-add ibc_operations_s::ibc_free_cq targets warlock_dummy
-add ibc_operations_s::ibc_free_cq_sched targets warlock_dummy
-add ibc_operations_s::ibc_free_mw targets warlock_dummy
-add ibc_operations_s::ibc_free_pd targets warlock_dummy
-add ibc_operations_s::ibc_free_qp targets warlock_dummy
-add ibc_operations_s::ibc_modify_ah targets warlock_dummy
-add ibc_operations_s::ibc_modify_cq targets warlock_dummy
-add ibc_operations_s::ibc_modify_ports targets warlock_dummy
-add ibc_operations_s::ibc_modify_qp targets warlock_dummy
-add ibc_operations_s::ibc_modify_system_image targets warlock_dummy
-add ibc_operations_s::ibc_notify_cq targets warlock_dummy
-add ibc_operations_s::ibc_poll_cq targets warlock_dummy
-add ibc_operations_s::ibc_post_recv targets warlock_dummy
-add ibc_operations_s::ibc_post_send targets warlock_dummy
-add ibc_operations_s::ibc_query_ah targets warlock_dummy
-add ibc_operations_s::ibc_query_cq targets warlock_dummy
-add ibc_operations_s::ibc_query_cq_handler_id targets warlock_dummy
-add ibc_operations_s::ibc_query_hca_ports targets warlock_dummy
-add ibc_operations_s::ibc_query_mr targets warlock_dummy
-add ibc_operations_s::ibc_query_mw targets warlock_dummy
-add ibc_operations_s::ibc_query_qp targets warlock_dummy
-add ibc_operations_s::ibc_register_buf targets warlock_dummy
-add ibc_operations_s::ibc_register_mr targets warlock_dummy
-add ibc_operations_s::ibc_register_shared_mr targets warlock_dummy
-add ibc_operations_s::ibc_release_qpn targets warlock_dummy
-add ibc_operations_s::ibc_reregister_buf targets warlock_dummy
-add ibc_operations_s::ibc_reregister_mr targets warlock_dummy
-add ibc_operations_s::ibc_resize_cq targets warlock_dummy
-add ibc_operations_s::ibc_sync_mr targets warlock_dummy
-add ibc_operations_s::ibc_alloc_srq targets warlock_dummy
-add ibc_operations_s::ibc_free_srq targets warlock_dummy
-add ibc_operations_s::ibc_modify_srq targets warlock_dummy
-add ibc_operations_s::ibc_post_srq targets warlock_dummy
-add ibc_operations_s::ibc_query_srq targets warlock_dummy
-add ibc_operations_s::ibc_map_mem_area targets warlock_dummy
-add ibc_operations_s::ibc_unmap_mem_area targets warlock_dummy
-add ibc_operations_s::ibc_alloc_lkey targets warlock_dummy
-add ibc_operations_s::ibc_register_physical_mr targets warlock_dummy
-add ibc_operations_s::ibc_reregister_physical_mr targets warlock_dummy
-add ibc_operations_s::ibc_create_fmr_pool targets warlock_dummy
-add ibc_operations_s::ibc_destroy_fmr_pool targets warlock_dummy
-add ibc_operations_s::ibc_flush_fmr_pool targets warlock_dummy
-add ibc_operations_s::ibc_register_physical_fmr targets warlock_dummy
-add ibc_operations_s::ibc_deregister_fmr targets warlock_dummy
-add ibc_operations_s::ibc_alloc_io_mem targets warlock_dummy
-add ibc_operations_s::ibc_free_io_mem targets warlock_dummy
-add ibc_operations_s::ibc_map_mem_iov targets warlock_dummy
-add ibc_operations_s::ibc_unmap_mem_iov targets warlock_dummy
-add ibc_operations_s::ibc_register_dma_mr targets warlock_dummy
-add ibt_clnt_modinfo_s::mi_async_handler targets warlock_dummy
-add ibtl_handlers.c:ibtl_async_client_call/async_handler targets warlock_dummy
-add ibtl_handlers.c:ibtl_cq_handler_call/cq_handler targets warlock_dummy
-add ibtl_handlers.c:ibtl_sm_notice_task/sm_notice_handler targets warlock_dummy
-add ibtl_mgr_s::mgr_async_handler targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ifp.wlcmd b/usr/src/uts/common/io/warlock/ifp.wlcmd
deleted file mode 100644
index 2bceed5926..0000000000
--- a/usr/src/uts/common/io/warlock/ifp.wlcmd
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-### Warlock commands for analyzing the ifp driver alone.
-
-### Tell warlock there's only one ifp struct, so that it will complain
-### if the lock is acquired when it is already locked.
-
-one ifp
-
-### Tell warlock that ifp_scsi_reset_notify(), which gets called from
-### the scsa stuff through the transport table, is a root function.
-
-root ifp_scsi_reset_notify
-root ifp_ifptm_alive
-root ifp_ifptm_attach
-root ifp_ifptm_detach
-root ifp_ifptm_init
-root ifp_ifptm_mbox_cmd_init
-root ifp_ifptm_mbox_cmd_start
-root ifp_ifptm_reset
-
-ignore ifp.c:ifp_hp_daemon
-
-### Give warlock the lock order we use to prevent deadlocks.
-
-assert order \
- ifp::ifp_response_mutex \
- ifp::ifp_request_mutex \
- ifp::ifp_waitq_mutex
-
-### Tell warlock not to analyze this calling sequence, since it
-### never really occurs.
-
-disallow \
- ifp_i_empty_waitQ \
- ifp_scsi_start \
- ifp_i_polled_cmd_start
-
-ignore ifp_kmem_cache_constructor ifp_kmem_cache_destructor
-ignore ifp_i_print_fcal_position_map
-ignore ifp_bus_get_eventcookie ifp_bus_add_eventcall ifp_bus_remove_eventcall
-ignore ifp_bus_post_event
-ignore ifp_i_print_state
-ignore ifp_scsi_get_name ifp_scsi_get_bus_addr
-ignore ifp_kstat_update
-
-### Tell warlock where calls through pkt_comp go.
-
-add scsi_pkt::pkt_comp targets \
- ifp_scsi_start \
- ifp_scsi_abort \
- ifp_scsi_reset \
- ifp_scsi_getcap \
- ifp_scsi_setcap \
- ifp_scsi_dmafree \
- ifp_scsi_sync_pkt \
- ifp_scsi_destroy_pkt \
- ifp_scsi_init_pkt
-
-add notify_entry::callback target warlock_dummy
-
-### pointers in the scsi_hba_tran structure.
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-root scsi_hba_bus_power
-
diff --git a/usr/src/uts/common/io/warlock/isp.wlcmd b/usr/src/uts/common/io/warlock/isp.wlcmd
deleted file mode 100644
index 1a2c4b11f1..0000000000
--- a/usr/src/uts/common/io/warlock/isp.wlcmd
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-### Warlock commands for analyzing the isp driver alone.
-
-### Tell warlock there's only one isp struct, so that it will complain
-### if the lock is acquired when it is already locked.
-
-one isp
-
-### Tell warlock that isp_scsi_reset_notify(), which gets called from
-### the scsa stuff through the transport table, is a root function.
-
-root isp_scsi_reset_notify isp_i_print_response
-
-### Give warlock the lock order we use to prevent deadlocks.
-
-assert order \
- isp::isp_response_mutex \
- isp::isp_request_mutex \
- isp::isp_waitq_mutex
-
-### Tell warlock not to analyze this calling sequence, since it
-### never really occurs.
-
-disallow \
- isp_i_empty_waitQ \
- isp_scsi_start \
- isp_i_polled_cmd_start
-
-root isp_kmem_cache_constructor isp_kmem_cache_destructor
-
-### Tell warlock where calls through pkt_comp go.
-
-add scsi_pkt::pkt_comp targets \
- isp_scsi_start \
- isp_scsi_abort \
- isp_scsi_reset \
- isp_scsi_getcap \
- isp_scsi_setcap \
- isp_scsi_dmafree \
- isp_scsi_sync_pkt \
- isp_scsi_destroy_pkt \
- isp_scsi_init_pkt
-
-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
diff --git a/usr/src/uts/common/io/warlock/mpt.wlcmd b/usr/src/uts/common/io/warlock/mpt.wlcmd
deleted file mode 100644
index 880db2a1bc..0000000000
--- a/usr/src/uts/common/io/warlock/mpt.wlcmd
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-one mpt
-
-add scsi_pkt::pkt_comp targets \
- mpt_scsi_destroy_pkt \
- mpt_scsi_init_pkt \
- mpt_scsi_start \
- mpt_scsi_abort \
- mpt_scsi_reset \
- mpt_scsi_setcap \
- mpt_scsi_getcap \
- mpt_scsi_dmafree \
- mpt_scsi_reset_notify \
- mpt_scsi_tgt_init \
- mpt_scsi_tgt_free \
- mpt_scsi_sync_pkt \
- mpt_smp_start \
- mpt_sas_getcap
-
-add notify_entry::callback target warlock_dummy
-
-root mpt_kmem_cache_constructor mpt_kmem_cache_destructor
-root mpt_handle_event
-root mpt_handle_dr
-root mpt_name_child
-root mpt_fm_error_cb
-
-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/common/io/warlock/mptsas.wlcmd b/usr/src/uts/common/io/warlock/mptsas.wlcmd
deleted file mode 100644
index a30cfcd74e..0000000000
--- a/usr/src/uts/common/io/warlock/mptsas.wlcmd
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-add bus_ops::bus_add_eventcall target warlock_dummy
-add bus_ops::bus_config target warlock_dummy
-add bus_ops::bus_get_eventcookie target warlock_dummy
-add bus_ops::bus_intr_ctl target warlock_dummy
-add bus_ops::bus_post_event target warlock_dummy
-add bus_ops::bus_remove_eventcall target warlock_dummy
-add bus_ops::bus_unconfig 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/common/io/warlock/mv.wlcmd b/usr/src/uts/common/io/warlock/mv.wlcmd
deleted file mode 100644
index 5664a92e29..0000000000
--- a/usr/src/uts/common/io/warlock/mv.wlcmd
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# usr/src/uts/sparc/marvell88sx/mv.wlcmd
-
-one mv_ctl
-one mv_subctlr
-one mv_port_state
-
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-root sata_hba_ioctl
-root sata_hba_open
-root sata_hba_close
-root sata_scsi_reset
-root sata_scsi_init_pkt
-root sata_scsi_start
-root sata_scsi_destroy_pkt
-root sata_scsi_sync_pkt
-root sata_scsi_tgt_init
-root sata_scsi_tgt_free
-root sata_scsi_tgt_probe
-root sata_scsi_dmafree
-root sata_scsi_abort
-root sata_scsi_getcap
-root sata_scsi_setcap
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root sd.c:sdstrategy sdioctl
-root sd.c:sd_target_change_task
-
-root scsi_hba.c:scsi_hba_bus_power
-
-ignore sd.c:sd_scsi_probe_cache_fini
-ignore sd.c:sd_scsi_probe_cache_init
-ignore sd.c:sd_scsi_target_lun_fini
-ignore sd.c:sd_scsi_target_lun_init
-
-root sd.c:sd_taskq_create
-root sd.c:sd_taskq_delete
-
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-
-add scsi_hba_tran::tran_tgt_init targets sata_scsi_tgt_init
-add scsi_hba_tran::tran_tgt_probe targets sata_scsi_tgt_probe
-add scsi_hba_tran::tran_tgt_free targets sata_scsi_tgt_free
-add scsi_hba_tran::tran_start targets sata_scsi_start
-add scsi_hba_tran::tran_abort targets sata_scsi_abort
-add scsi_hba_tran::tran_reset targets sata_scsi_reset
-add scsi_hba_tran::tran_getcap targets sata_scsi_getcap
-add scsi_hba_tran::tran_setcap targets sata_scsi_setcap
-add scsi_hba_tran::tran_init_pkt targets sata_scsi_init_pkt
-add scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-
-add scsi_hba_tran::tran_add_eventcall targets warlock_dummy
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add scsi_hba_tran::tran_get_eventcookie targets warlock_dummy
-add scsi_hba_tran::tran_get_name targets warlock_dummy
-add scsi_hba_tran::tran_post_event targets warlock_dummy
-add scsi_hba_tran::tran_remove_eventcall targets warlock_dummy
-
-root scsi_hba.c:scsi_hba_bus_power
-
-
-add dk_callback::dkc_callback targets warlock_dummy
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-
-add scsi_watch_request::swr_callback targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- sata_scsi_destroy_pkt \
- sata_scsi_init_pkt \
- sata_scsi_start \
- sata_scsi_abort \
- sata_scsi_reset \
- sata_scsi_start
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore sd.c:sd_mhd_reset_notify_cb
-
-assert order mv_ctl::mv_ctl_mutex mv_subctlr::mv_subctrl_mutex mv_port_state::mv_port_mutex
-
diff --git a/usr/src/uts/common/io/warlock/nv_sata.wlcmd b/usr/src/uts/common/io/warlock/nv_sata.wlcmd
deleted file mode 100644
index c77cca7b70..0000000000
--- a/usr/src/uts/common/io/warlock/nv_sata.wlcmd
+++ /dev/null
@@ -1,121 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# usr/src/uts/common/io/warlock/nv_sata.wlcmd
-
-one nv_ctl
-one nv_port
-
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-root sata_hba_ioctl
-root sata_hba_open
-root sata_hba_close
-root sata_scsi_reset
-root sata_scsi_init_pkt
-root sata_scsi_start
-root sata_scsi_destroy_pkt
-root sata_scsi_sync_pkt
-root sata_scsi_tgt_init
-root sata_scsi_tgt_free
-root sata_scsi_tgt_probe
-root sata_scsi_dmafree
-root sata_scsi_abort
-root sata_scsi_getcap
-root sata_scsi_setcap
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root sd.c:sdstrategy sdioctl
-root sd.c:sd_target_change_task
-
-root scsi_hba.c:scsi_hba_bus_power
-
-ignore sd.c:sd_scsi_probe_cache_fini
-ignore sd.c:sd_scsi_probe_cache_init
-ignore sd.c:sd_scsi_target_lun_fini
-ignore sd.c:sd_scsi_target_lun_init
-root sd.c:sd_taskq_create
-root sd.c:sd_taskq_delete
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-
-add scsi_hba_tran::tran_tgt_init targets sata_scsi_tgt_init
-add scsi_hba_tran::tran_tgt_probe targets sata_scsi_tgt_probe
-add scsi_hba_tran::tran_tgt_free targets sata_scsi_tgt_free
-add scsi_hba_tran::tran_start targets sata_scsi_start
-add scsi_hba_tran::tran_abort targets sata_scsi_abort
-add scsi_hba_tran::tran_reset targets sata_scsi_reset
-add scsi_hba_tran::tran_getcap targets sata_scsi_getcap
-add scsi_hba_tran::tran_setcap targets sata_scsi_setcap
-add scsi_hba_tran::tran_init_pkt targets sata_scsi_init_pkt
-add scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-
-add scsi_hba_tran::tran_add_eventcall targets warlock_dummy
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add scsi_hba_tran::tran_get_eventcookie targets warlock_dummy
-add scsi_hba_tran::tran_get_name targets warlock_dummy
-add scsi_hba_tran::tran_post_event targets warlock_dummy
-add scsi_hba_tran::tran_remove_eventcall targets warlock_dummy
-
-root scsi_hba.c:scsi_hba_bus_power
-
-
-add dk_callback::dkc_callback targets warlock_dummy
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-
-add scsi_watch_request::swr_callback targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- sata_scsi_destroy_pkt \
- sata_scsi_init_pkt \
- sata_scsi_start \
- sata_scsi_abort \
- sata_scsi_reset \
- sata_scsi_start
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore sd.c:sd_mhd_reset_notify_cb
diff --git a/usr/src/uts/common/io/warlock/ohci.wlcmd b/usr/src/uts/common/io/warlock/ohci.wlcmd
deleted file mode 100644
index f5a9cf1261..0000000000
--- a/usr/src/uts/common/io/warlock/ohci.wlcmd
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one ohci_state
-one usba_device
-one usba_pipe_handle_data
-one usba_ph_impl
-
-### specify the root functions
-
-### hcdi entry points
-root ohci_hcdi_pipe_open
-root ohci_hcdi_pipe_close
-root ohci_hcdi_pipe_stop_intr_polling
-root ohci_hcdi_pipe_stop_isoc_polling
-root ohci_hcdi_pipe_reset
-root ohci_hcdi_pipe_reset_data_toggle
-root ohci_hcdi_bulk_transfer_size
-root ohci_hcdi_get_current_frame_number
-root ohci_hcdi_get_max_isoc_pkts
-root ohci_intr
-root ohci_hcdi_pipe_ctrl_xfer
-root ohci_hcdi_pipe_bulk_xfer
-root ohci_hcdi_pipe_intr_xfer
-root ohci_hcdi_pipe_isoc_xfer
-root ohci_hcdi_pm_support
-root ohci_quiesce
-
-root hubd_hotplug_thread
-root hubd_exception_cb
-root hubd_read_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_bus_power
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-### POLLED entry points
-root ohci_hcdi_polled_input_init
-root ohci_hcdi_polled_input_fini
-root ohci_hcdi_polled_input_enter
-root ohci_hcdi_polled_input_exit
-root ohci_hcdi_polled_read
-root ohci_hcdi_polled_output_init
-root ohci_hcdi_polled_output_fini
-root ohci_hcdi_polled_output_enter
-root ohci_hcdi_polled_output_exit
-root ohci_hcdi_polled_write
-
-### currently unused functions
-
-root ohci_print_ed
-root ohci_print_td
-root usba_pipe_sync_close
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
- ohci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
- ohci_hcdi_polled_input_fini
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets hubd_read_cb
-add usb_intr_req::intr_exc_cb targets hubd_exception_cb
diff --git a/usr/src/uts/common/io/warlock/rdsv3.wlcmd b/usr/src/uts/common/io/warlock/rdsv3.wlcmd
deleted file mode 100644
index 8b50fb6de5..0000000000
--- a/usr/src/uts/common/io/warlock/rdsv3.wlcmd
+++ /dev/null
@@ -1,365 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# entry points
-root _init
-root _info
-root _fini
-root __rdsv3_conn_create
-root __rdsv3_conn_error
-root __rdsv3_ib_conn_error
-root __rdsv3_ib_destroy_conns
-root __rdsv3_ib_ring_empty
-root __rdsv3_ib_ring_used
-root __rdsv3_ib_teardown_mr
-root __rdsv3_put_mr_final
-root __rdsv3_rdma_map
-root __rdsv3_rdma_send_complete
-root __rdsv3_wake_sk_sleep
-root _fini
-root _info
-root _init
-root ib_addr_get_dgid
-root ib_addr_get_mgid
-root ib_addr_get_pkey
-root ib_addr_get_sgid
-root ib_addr_set_dgid
-root ib_addr_set_pkey
-root ib_addr_set_sgid
-root ib_width_enum_to_int
-root init_genlist
-root ip_addr_size
-root rdsv3_activate
-root rdsv3_add_bound
-root rdsv3_attach
-root rdsv3_bind
-root rdsv3_bind_node_compare
-root rdsv3_bind_tree_exit
-root rdsv3_bind_tree_init
-root rdsv3_bind_tree_walk
-root rdsv3_cancel_delayed_work
-root rdsv3_capable_interface
-root rdsv3_clear_print_buf
-root rdsv3_clear_recv_queue
-root rds_clif_name
-root rdsv3_clrflowctrl
-root rdsv3_cmsg_rdma_args
-root rdsv3_cmsg_rdma_dest
-root rdsv3_cmsg_rdma_map
-root rdsv3_cmsg_recv
-root rdsv3_cmsg_send
-root rdsv3_cong_add_conn
-root rdsv3_cong_add_socket
-root rdsv3_cong_clear_bit
-root rdsv3_cong_compare
-root rdsv3_cong_exit
-root rdsv3_cong_from_addr
-root rdsv3_cong_get_maps
-root rdsv3_cong_init
-root rdsv3_cong_map_updated
-root rdsv3_cong_monitor
-root rdsv3_cong_queue_updates
-root rdsv3_cong_remove_conn
-root rdsv3_cong_remove_socket
-root rdsv3_cong_set_bit
-root rdsv3_cong_test_bit
-root rdsv3_cong_tree_walk
-root rdsv3_cong_update_alloc
-root rdsv3_cong_updated_since
-root rdsv3_cong_wait
-root rdsv3_conn_compare
-root rdsv3_conn_constructor
-root rdsv3_conn_create
-root rdsv3_conn_create_outgoing
-root rdsv3_conn_destroy
-root rdsv3_conn_destructor
-root rdsv3_conn_drop
-root rdsv3_conn_exit
-root rdsv3_conn_info
-root rdsv3_conn_info_visitor
-root rdsv3_conn_init
-root rdsv3_conn_is_sending
-root rdsv3_conn_lookup
-root rdsv3_conn_message_info
-root rdsv3_conn_message_info_retrans
-root rdsv3_conn_message_info_send
-root rdsv3_conn_transition
-root rdsv3_connect
-root rdsv3_connect_complete
-root rdsv3_connect_worker
-root rdsv3_create_singlethread_workqueue
-root rdsv3_destroy_mr
-root rdsv3_destroy_workqueue
-root rdsv3_detach
-root rdsv3_do_ip_ioctl
-root rdsv3_dprintf_intr
-root rdsv3_dprintf0
-root rdsv3_dprintf1
-root rdsv3_dprintf2
-root rdsv3_dprintf3
-root rdsv3_dprintf4
-root rdsv3_dprintf5
-root rdsv3_exit
-root rdsv3_fast_ip_csum
-root rdsv3_find_bound
-root rdsv3_flush_workqueue
-root rdsv3_for_each_conn_info
-root rdsv3_free_mr
-root rdsv3_get_mr
-root rdsv3_getname
-root rdsv3_getpeername
-root rdsv3_getsockopt
-root rdsv3_ib_ack_send_complete
-root rdsv3_ib_add_conn
-root rdsv3_ib_add_ipaddr
-root rdsv3_ib_add_one
-root rdsv3_ib_advertise_credits
-root rdsv3_ib_alloc_fmr
-root rdsv3_ib_alloc_hdrs
-root rdsv3_ib_attempt_ack
-root rdsv3_ib_cm_connect_complete
-root rdsv3_ib_cm_fill_conn_param
-root rdsv3_ib_cm_handle_connect
-root rdsv3_ib_cm_initiate_connect
-root rdsv3_ib_cong_recv
-root rdsv3_ib_conn_alloc
-root rdsv3_ib_conn_connect
-root rdsv3_ib_conn_free
-root rdsv3_ib_conn_info_visitor
-root rdsv3_ib_conn_shutdown
-root rdsv3_ib_cq_event_handler
-root rdsv3_ib_destroy_conns
-root rdsv3_ib_destroy_nodev_conns
-root rdsv3_ib_dma_map_sg
-root rdsv3_ib_dma_map_sg_rdma
-root rdsv3_ib_dma_unmap_sg
-root rdsv3_ib_dma_unmap_sg_rdma
-root rdsv3_ib_exit
-root rdsv3_ib_flush_mr_pool
-root rdsv3_ib_flush_mrs
-root rdsv3_ib_frag_drop_page
-root rdsv3_ib_frag_free
-root rdsv3_ib_free_hdrs
-root rdsv3_ib_free_mr
-root rdsv3_ib_get_ack
-root rdsv3_ib_get_device
-root rdsv3_ib_get_header
-root rdsv3_ib_get_mr
-root rdsv3_ib_get_mr_info
-root rdsv3_ib_ic_info
-root rdsv3_ib_inc_copy_to_user
-root rdsv3_ib_inc_free
-root rdsv3_ib_inc_purge
-root rdsv3_ib_init
-root rdsv3_ib_laddr_check
-root rdsv3_ib_map_fmr
-root rdsv3_ib_piggyb_ack
-root rdsv3_ib_process_recv
-root rdsv3_ib_protocol_compatible
-root rdsv3_ib_qp_event_handler
-root rdsv3_ib_recv
-root rdsv3_ib_recv_clear_one
-root rdsv3_ib_recv_clear_ring
-root rdsv3_ib_recv_cq_comp_handler
-root rdsv3_ib_recv_exit
-root rdsv3_ib_recv_init
-root rdsv3_ib_recv_init_ack
-root rdsv3_ib_recv_init_ring
-root rdsv3_ib_recv_refill
-root rdsv3_ib_recv_refill_one
-root rdsv3_ib_recv_unmap_page
-root rdsv3_ib_remove_conn
-root rdsv3_ib_remove_ipaddr
-root rdsv3_ib_remove_one
-root rdsv3_ib_ring_alloc
-root rdsv3_ib_ring_completed
-root rdsv3_ib_ring_empty
-root rdsv3_ib_ring_free
-root rdsv3_ib_ring_init
-root rdsv3_ib_ring_low
-root rdsv3_ib_ring_oldest
-root rdsv3_ib_ring_resize
-root rdsv3_ib_ring_unalloc
-root rdsv3_ib_send_ack
-root rdsv3_ib_send_add_credits
-root rdsv3_ib_send_clear_ring
-root rdsv3_ib_send_cq_comp_handler
-root rdsv3_ib_send_grab_credits
-root rdsv3_ib_send_init_ring
-root rdsv3_ib_send_rdma_complete
-root rdsv3_ib_send_unmap_rdma
-root rdsv3_ib_send_unmap_rm
-root rdsv3_ib_set_ack
-root rdsv3_ib_set_flow_control
-root rdsv3_ib_set_protocol
-root rdsv3_ib_setup_qp
-root rdsv3_ib_sg_dma_address
-root rdsv3_ib_stats_info_copy
-root rdsv3_ib_sync_mr
-root rdsv3_ib_sysctl_exit
-root rdsv3_ib_sysctl_init
-root rdsv3_ib_tune_rnr
-root rdsv3_ib_update_ipaddr
-root rdsv3_ib_xmit
-root rdsv3_ib_xmit_complete
-root rdsv3_ib_xmit_populate_wr
-root rdsv3_ib_xmit_rdma
-root rdsv3_if_lookup_by_addr
-root rdsv3_if_lookup_by_name
-root rdsv3_inc_addref
-root rdsv3_inc_info_copy
-root rdsv3_inc_init
-root rdsv3_inc_put
-root rdsv3_info
-root rdsv3_info_deregister_func
-root rdsv3_info_getsockopt
-root rdsv3_info_register_func
-root rdsv3_init
-root rdsv3_ioctl
-root rdsv3_logging_destroy
-root rdsv3_logging_initialization
-root rdsv3_loop_conn_alloc
-root rdsv3_loop_conn_connect
-root rdsv3_loop_conn_free
-root rdsv3_loop_conn_shutdown
-root rdsv3_loop_exit
-root rdsv3_loop_init
-root rdsv3_loop_recv
-root rdsv3_loop_xmit
-root rdsv3_loop_xmit_cong_map
-root rdsv3_message_add_extension
-root rdsv3_message_add_rdma_dest_extension
-root rdsv3_message_add_version_extension
-root rdsv3_message_addref
-root rdsv3_message_alloc
-root rdsv3_message_copy_from_user
-root rdsv3_message_get_version_extension
-root rdsv3_message_inc_copy_to_user
-root rdsv3_message_inc_free
-root rdsv3_message_inc_purge
-root rdsv3_message_map_pages
-root rdsv3_message_next_extension
-root rdsv3_message_populate_header
-root rdsv3_message_purge
-root rdsv3_message_put
-root rdsv3_message_unmapped
-root rdsv3_message_wait
-root rdsv3_mr_compare
-root rdsv3_mr_put
-root rdsv3_mr_tree_walk
-root rdsv3_next_incoming
-root rdsv3_notify_cong
-root rdsv3_notify_queue_get
-root rdsv3_ntop
-root rdsv3_page_remainder_alloc
-root rdsv3_pages_in_vec
-root rds_path_down
-root rds_path_up
-root rdsv3_poll
-root rdsv3_poll_wait
-root rdsv3_put_cmsg
-root rdsv3_queue_delayed_work
-root rdsv3_queue_reconnect
-root rdsv3_queue_work
-root rdsv3_rdma_cm_event_handler
-root rdsv3_rdma_drop_keys
-root rdsv3_rdma_exit
-root rdsv3_rdma_free_op
-root rdsv3_rdma_init
-root rdsv3_rdma_listen_init
-root rdsv3_rdma_listen_stop
-root rdsv3_rdma_prepare
-root rdsv3_rdma_send_complete
-root rdsv3_rdma_unuse
-root rdsv3_recv_incoming
-root rdsv3_recv_incoming_exthdrs
-root rdsv3_recv_rcvbuf_delta
-root rdsv3_recv_uio
-root rdsv3_recv_worker
-root rdsv3_recvmsg
-root rdsv3_release
-root rdsv3_remove_bound
-root rds_sc_path_lookup
-root rdsv3_scaddr_to_ibaddr
-root rdsv3_send_acked_before
-root rdsv3_send_drop_acked
-root rdsv3_send_drop_to
-root rdsv3_send_get_message
-root rdsv3_send_is_acked
-root rdsv3_send_pong
-root rdsv3_send_queue_rm
-root rdsv3_send_remove_from_sock
-root rdsv3_send_reset
-root rdsv3_send_sndbuf_remove
-root rdsv3_send_uio
-root rdsv3_send_worker
-root rdsv3_send_xmit
-root rdsv3_sendmsg
-root rdsv3_set_bool_option
-root rdsv3_setsockopt
-root rdsv3_shutdown
-root rdsv3_shutdown_worker
-root rdsv3_sk_alloc
-root rdsv3_sock_addref
-root rdsv3_sock_exit
-root rdsv3_sock_exit_data
-root rdsv3_sock_inc_info
-root rdsv3_sock_info
-root rdsv3_sock_init
-root rdsv3_sock_init_data
-root rdsv3_sock_put
-root rdsv3_stats_exit
-root rdsv3_stats_info
-root rdsv3_stats_info_copy
-root rdsv3_stats_init
-root rdsv3_still_queued
-root rdsv3_sysctl_exit
-root rdsv3_sysctl_init
-root rdsv3_threads_exit
-root rdsv3_threads_init
-root rdsv3_trace
-root rdsv3_trans_exit
-root rdsv3_trans_get_preferred
-root rdsv3_trans_init
-root rdsv3_trans_register
-root rdsv3_trans_stats_info_copy
-root rdsv3_trans_unregister
-root rdsv3_umem_cb
-root rdsv3_verify_bind_address
-root rdsv3_vlog
-root rdsv3_vprintk
-root rdsv3_wake_sk_sleep
-root rdsv3_work_timeout_handler
-root rdsv3_worker_thread
-root rdsv3_create
-root rdsv3_isloopback
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-
diff --git a/usr/src/uts/common/io/warlock/sbp2.wlcmd b/usr/src/uts/common/io/warlock/sbp2.wlcmd
deleted file mode 100644
index e4b25bdf46..0000000000
--- a/usr/src/uts/common/io/warlock/sbp2.wlcmd
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-root sbp2_tgt_init
-root sbp2_tgt_fini
-root sbp2_tgt_disconnect
-root sbp2_tgt_reconnect
-root sbp2_tgt_reset
-root sbp2_tgt_get_cfgrom
-root sbp2_tgt_get_lun_cnt
-root sbp2_tgt_get_lun
-
-root sbp2_lun_reset
-root sbp2_lun_login
-root sbp2_lun_logout
-
-root sbp2_ses_reconnect
-root sbp2_ses_submit_task
-root sbp2_ses_nudge
-root sbp2_ses_remove_task
-root sbp2_ses_find_task_state
-root sbp2_ses_remove_first_task
-root sbp2_ses_remove_first_task_state
-root sbp2_ses_cancel_first_task
-root sbp2_ses_agent_reset
-root sbp2_ses_abort_task
-root sbp2_ses_abort_task_set
-
-root sbp2_task_orb_alloc
-root sbp2_task_orb_free
-root sbp2_task_orb_kaddr
-root sbp2_task_orb_sync
-
-root sbp2_mgt_status_fifo_wb_cb
-root sbp2_status_fifo_wb_cb
-
-add sbp2_bus::sb_alloc_buf targets warlock_dummy
-add sbp2_bus::sb_alloc_cmd targets warlock_dummy
-add sbp2_bus::sb_buf_wr_done targets warlock_dummy
-add sbp2_bus::sb_free_buf targets warlock_dummy
-add sbp2_bus::sb_free_cmd targets warlock_dummy
-add sbp2_bus::sb_get_iblock_cookie targets warlock_dummy
-add sbp2_bus::sb_rq targets warlock_dummy
-add sbp2_bus::sb_sync_buf targets warlock_dummy
-add sbp2_bus::sb_wb targets warlock_dummy
-add sbp2_bus::sb_wq targets warlock_dummy
-add sbp2_ses::s_status_cb targets warlock_dummy
-
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/scmi2c.wlcmd b/usr/src/uts/common/io/warlock/scmi2c.wlcmd
deleted file mode 100644
index c242aa2e3b..0000000000
--- a/usr/src/uts/common/io/warlock/scmi2c.wlcmd
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-
-### specify the root functions
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-root scmi2c.c:scm_amber_led_on
-root scmi2c.c:stcplus_init_uart
-
diff --git a/usr/src/uts/common/io/warlock/scsa1394.wlcmd b/usr/src/uts/common/io/warlock/scsa1394.wlcmd
deleted file mode 100644
index ef1bd2ea3b..0000000000
--- a/usr/src/uts/common/io/warlock/scsa1394.wlcmd
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one scsa1394_state
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-root scsa1394_scsi_tgt_init
-root scsa1394_scsi_tgt_free
-root scsa1394_scsi_tgt_probe
-root scsa1394_probe_tran
-root scsa1394_scsi_init_pkt
-root scsa1394_scsi_destroy_pkt
-root scsa1394_scsi_start
-root scsa1394_scsi_abort
-root scsa1394_scsi_reset
-root scsa1394_scsi_getcap
-root scsa1394_scsi_setcap
-root scsa1394_scsi_dmafree
-root scsa1394_scsi_sync_pkt
-root scsa1394_scsi_bus_config
-root scsa1394_scsi_bus_unconfig
-root scsa1394_bus_reset
-root scsa1394_disconnect
-root scsa1394_reconnect
-
-root scsa1394_cmd_cache_constructor
-root scsa1394_cmd_cache_destructor
-
-root scsa1394_sbp2_conv_status
-root scsa1394_sbp2_req_bus_reset
-root scsa1394_sbp2_req_reconnect
-root scsa1394_sbp2_req_status
-root scsa1394_sbp2_status_cb
-root scsa1394_sbp2_status_proc
-root scsa1394_sbp2_worker_thread
-
-root scsa1394_bus_get_iblock_cookie
-root scsa1394_bus_get_node_id
-root scsa1394_bus_alloc_cmd
-root scsa1394_bus_free_cmd
-root scsa1394_bus_rq
-root scsa1394_bus_rb
-root scsa1394_bus_wq
-root scsa1394_bus_wb
-root scsa1394_bus_alloc_buf
-root scsa1394_bus_alloc_buf_phys
-root scsa1394_bus_free_buf_phys
-root scsa1394_bus_alloc_buf_normal
-root scsa1394_bus_free_buf_normal
-root scsa1394_bus_free_buf
-root scsa1394_bus_sync_buf
-root scsa1394_bus_buf_rw_done
-root scsa1394_bus_recv_read_request
-root scsa1394_bus_recv_write_request
-
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-
-root sbp2_cfgrom_ent_by_key_walker
-
-add scsi_pkt::pkt_comp targets \
- scsa1394_scsi_destroy_pkt \
- scsa1394_scsi_init_pkt \
- scsa1394_scsi_start \
- scsa1394_scsi_abort \
- scsa1394_scsi_reset \
- scsa1394_scsi_setcap \
- scsa1394_scsi_getcap
-
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-
-add sbp2_bus_buf::bb_rb_cb targets warlock_dummy
-add sbp2_bus_buf::bb_rq_cb targets warlock_dummy
-add sbp2_bus_buf::bb_wb_cb targets warlock_dummy
-add sbp2_bus_buf::bb_wq_cb targets warlock_dummy
-
-add sbp2_bus::sb_alloc_buf targets scsa1394_bus_alloc_buf
-add sbp2_bus::sb_alloc_cmd targets scsa1394_bus_alloc_cmd
-add sbp2_bus::sb_buf_wr_done targets scsa1394_bus_buf_rw_done
-add sbp2_bus::sb_free_buf targets scsa1394_bus_free_buf
-add sbp2_bus::sb_free_cmd targets scsa1394_bus_free_cmd
-add sbp2_bus::sb_get_iblock_cookie targets scsa1394_bus_get_iblock_cookie
-add sbp2_bus::sb_rq targets scsa1394_bus_rq
-add sbp2_bus::sb_sync_buf targets scsa1394_bus_sync_buf
-add sbp2_bus::sb_wb targets scsa1394_bus_wb
-add sbp2_bus::sb_wq targets scsa1394_bus_wq
-add sbp2_ses::s_status_cb targets scsa1394_sbp2_status_cb
-
-ignore sd.c:sd_scsi_probe_cache_fini
-ignore sd.c:sd_scsi_probe_cache_init
-ignore sd.c:sd_scsi_target_lun_fini
-ignore sd.c:sd_scsi_target_lun_init
-root sd.c:sd_taskq_create
-root sd.c:sd_taskq_delete
-
-add scsi_watch_request::swr_callback targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- sd.c:sdintr \
- hba.c:scsa1394_scsi_init_pkt \
- hba.c:scsa1394_scsi_start \
- hba.c:scsa1394_scsi_abort \
- hba.c:scsa1394_scsi_reset \
- hba.c:scsa1394_scsi_setcap \
- hba.c:scsa1394_scsi_getcap \
- hba.c:scsa1394_scsi_tgt_init \
- hba.c:scsa1394_scsi_tgt_free
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-root scsi_hba.c:scsi_hba_bus_power
-root sd.c:sd_mhd_reset_notify_cb
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/scsa2usb.wlcmd b/usr/src/uts/common/io/warlock/scsa2usb.wlcmd
deleted file mode 100644
index 96ff440e22..0000000000
--- a/usr/src/uts/common/io/warlock/scsa2usb.wlcmd
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one scsa2usb_state
-
-root scsa2usb_scsi_tgt_init scsa2usb_scsi_tgt_probe scsa2usb_scsi_tgt_free
-root scsa2usb_scsi_start scsa2usb_scsi_abort scsa2usb_scsi_reset
-root scsa2usb_scsi_getcap scsa2usb_scsi_setcap scsa2usb_scsi_init_pkt
-root scsa2usb_scsi_destroy_pkt
-root scsa2usb_reconnect_event_cb
-root scsa2usb_disconnect_event_cb
-root scsa2usb_panic_callb
-root scsa2usb_work_thread
-
-root scsi_hba_bus_power
-
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-
-add scsi_pkt::pkt_comp targets \
- scsa2usb_scsi_destroy_pkt \
- scsa2usb_scsi_init_pkt \
- scsa2usb_scsi_start \
- scsa2usb_scsi_abort \
- scsa2usb_scsi_reset \
- scsa2usb_scsi_setcap \
- scsa2usb_scsi_getcap
diff --git a/usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd b/usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd
deleted file mode 100644
index afc7645d37..0000000000
--- a/usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one scsa2usb_state
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-### specify the root functions
-
-root usba_ascii_string_descr
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usba_pipe_get_policy
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_rval2errno
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_ep_num
-root usb_get_ep_data
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_free_bulk_req
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_bulk_xfer
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_get_status
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_ugen_power
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_pipe_do_async_func_thread
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-root hubd_cpr_post_user_callb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_root_hub_cleanup_thread
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root usba_dbuf_tail
-root usb_log
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_bus_power
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
-add scsi_pkt::pkt_comp targets \
- scsa2usb_scsi_destroy_pkt \
- scsa2usb_scsi_init_pkt \
- scsa2usb_scsi_start \
- scsa2usb_scsi_abort \
- scsa2usb_scsi_reset \
- scsa2usb_scsi_setcap \
- scsa2usb_scsi_getcap
-
-root scsa2usb_scsi_tgt_init scsa2usb_scsi_tgt_probe scsa2usb_scsi_tgt_free
-
-root scsa2usb_reconnect_event_cb
-root scsa2usb_disconnect_event_cb
-root scsa2usb_work_thread
-root scsa2usb_panic_callb
-
-add scsi_hba_tran::tran_tgt_init targets scsa2usb_scsi_tgt_init
-add scsi_hba_tran::tran_tgt_probe targets scsa2usb_scsi_tgt_probe
-add scsi_hba_tran::tran_tgt_free targets scsa2usb_scsi_tgt_free
-add scsi_hba_tran::tran_start targets scsa2usb_scsi_start
-add scsi_hba_tran::tran_abort targets scsa2usb_scsi_abort
-add scsi_hba_tran::tran_reset targets scsa2usb_scsi_reset
-add scsi_hba_tran::tran_getcap targets scsa2usb_scsi_getcap
-add scsi_hba_tran::tran_setcap targets scsa2usb_scsi_setcap
-add scsi_hba_tran::tran_init_pkt targets scsa2usb_scsi_init_pkt
-add scsi_hba_tran::tran_destroy_pkt targets scsa2usb_scsi_destroy_pkt
-add scsi_hba_tran::tran_bus_config targets scsa2usb_scsi_bus_config
-add scsi_hba_tran::tran_bus_unconfig targets scsa2usb_scsi_bus_unconfig
-
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-
-ignore sd.c:sd_scsi_probe_cache_fini
-ignore sd.c:sd_scsi_probe_cache_init
-ignore sd.c:sd_scsi_target_lun_fini
-ignore sd.c:sd_scsi_target_lun_init
-root sd.c:sd_taskq_create
-root sd.c:sd_taskq_delete
-
-
-add scsi_watch_request::swr_callback targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- scsa2usb.c:scsa2usb_scsi_init_pkt \
- scsa2usb.c:scsa2usb_scsi_start \
- scsa2usb.c:scsa2usb_scsi_abort \
- scsa2usb.c:scsa2usb_scsi_reset \
- scsa2usb.c:scsa2usb_scsi_setcap \
- scsa2usb.c:scsa2usb_scsi_getcap \
- scsa2usb.c:scsa2usb_scsi_tgt_init \
- scsa2usb.c:scsa2usb_scsi_tgt_free
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-root scsi_hba.c:scsi_hba_bus_power
-root sd.c:sd_mhd_reset_notify_cb
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-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_conf_from_tape_drive \
- st_get_default_conf
-
-
-add scsi_watch_request::swr_callback targets \
- st.c:st_media_watch_cb
-
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
-
-root st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/scsi.c b/usr/src/uts/common/io/warlock/scsi.c
deleted file mode 100644
index 845e2f28ea..0000000000
--- a/usr/src/uts/common/io/warlock/scsi.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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.
- * 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 2006 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-/*
- * scsi.c - Warlock versions of DDI/DKI routines associated with scsi
- *
- * These renditions of the scsi-related DDI/DKI routines give warlock
- * info about control flow which warlock needs in order to do a good
- * job of analysis.
- */
-#include <sys/note.h>
-#include <sys/scsi/scsi.h>
-#include <sys/ddi.h>
-#include <sys/sunddi.h>
-#include <sys/scsi/impl/transport.h>
-
-void
-scsi_init()
-{
- struct scsi_hba_tran *p;
-
- p->tran_tgt_init(0, 0, 0, 0);
- p->tran_tgt_probe(0, 0);
- p->tran_tgt_free(0, 0, 0, 0);
- p->tran_add_eventcall(0, 0, 0, 0, 0, 0);
- p->tran_get_eventcookie(0, 0, 0, 0);
- p->tran_post_event(0, 0, 0, 0);
- p->tran_remove_eventcall(0, 0);
-}
diff --git a/usr/src/uts/common/io/warlock/sd.wlcmd b/usr/src/uts/common/io/warlock/sd.wlcmd
deleted file mode 100644
index 24073b8ce7..0000000000
--- a/usr/src/uts/common/io/warlock/sd.wlcmd
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-root sd_mhd_reset_notify_cb
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_start_direct_priority_command
-root sd_target_change_task
-root xbuf_brk_done
-
-### 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
-root scsi_hba_bus_power
-root scsi_hba_fm_init_child
-root sdrunout
-
-add scsi_watch_request::swr_callback targets sd_media_watch_cb sd_mhd_watch_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/sd_with_esp.wlcmd b/usr/src/uts/common/io/warlock/sd_with_esp.wlcmd
deleted file mode 100644
index a7da6e100f..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_esp.wlcmd
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 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 \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add esp_cmd::cmd_pkt.pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-one scsi_device
-one esp
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-
-root esp_kmem_cache_constructor esp_kmem_cache_destructor
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor
-root sd_read_modify_write_task sd_reenable_dsense_task
-root sd_failfast_flushq_callback
-root sd_target_change_task
-
-add notify_entry::callback target sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root esp.c:esp_scsi_dmafree esp.c:esp_scsi_sync_pkt
-
-assert order scsi_device::sd_mutex esp::e_mutex
-
-disallow esp_call_pkt_comp sd_mhd_watch_cb
-disallow esp_call_pkt_comp scsi_watch_request_intr
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-root scsi_hba_bus_power
-ignore delay
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/sd_with_fas.wlcmd b/usr/src/uts/common/io/warlock/sd_with_fas.wlcmd
deleted file mode 100644
index 6086171fc0..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_fas.wlcmd
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 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 \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- 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
-
-one scsi_device
-one fas
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-
-add notify_entry::callback target sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-assert order scsi_device::sd_mutex fas::f_mutex
-root fas_kmem_cache_constructor fas_kmem_cache_destructor
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-root scsi_hba_bus_power
-ignore delay
-
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/sd_with_glm.wlcmd b/usr/src/uts/common/io/warlock/sd_with_glm.wlcmd
deleted file mode 100644
index 35ce38d004..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_glm.wlcmd
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 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 \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- 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
-
-one scsi_device
-one glm
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-add notify_entry::callback target sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root glm_kmem_cache_constructor glm_kmem_cache_destructor
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-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
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/sd_with_isp.wlcmd b/usr/src/uts/common/io/warlock/sd_with_isp.wlcmd
deleted file mode 100644
index df5c7d3b82..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_isp.wlcmd
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 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 \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add scsi_pkt::pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-one scsi_device
-one isp
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-
-add notify_entry::callback target sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-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_i_print_response
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-root scsi_hba_bus_power
-ignore delay
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd b/usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd
deleted file mode 100644
index ff639dace3..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 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 \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- mpt.c:mpt_scsi_destroy_pkt \
- mpt.c:mpt_scsi_init_pkt \
- mpt.c:mpt_scsi_start \
- mpt.c:mpt_scsi_abort \
- mpt.c:mpt_scsi_reset \
- mpt.c:mpt_scsi_setcap \
- mpt.c:mpt_scsi_getcap \
- mpt.c:mpt_scsi_dmafree \
- mpt.c:mpt_scsi_reset_notify \
- mpt.c:mpt_scsi_tgt_init \
- mpt.c:mpt_scsi_tgt_free \
- mpt.c:mpt_scsi_sync_pkt \
- mpt.c:mpt_smp_start \
- mpt.c:mpt_sas_getcap
-
-one scsi_device
-one mpt
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-add notify_entry::callback target sd_mhd_reset_notify_cb
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-root mpt_kmem_cache_constructor mpt_kmem_cache_destructor
-root mpt_handle_event
-root mpt_handle_dr
-root mpt_fm_error_cb
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-assert order scsi_device::sd_mutex mpt::m_mutex
-
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-root scsi_hba_bus_power
-ignore delay
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/sd_with_uata.wlcmd b/usr/src/uts/common/io/warlock/sd_with_uata.wlcmd
deleted file mode 100644
index d49de3a1b9..0000000000
--- a/usr/src/uts/common/io/warlock/sd_with_uata.wlcmd
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 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 \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-add scsi_pkt::pkt_comp targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb \
- sd.c:sd_mhd_watch_cb \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr
-
-one scsi_device
-one ata_controller
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-
-### The following are not used
-for ptr in `funcptrs | grep '^scsi_hba_tran::'`
-do
- add $ptr target warlock_dummy
-done
-
-
-### Declaring the following as root functions
-root scsi_hba_add_eventcall scsi_hba_get_eventcookie scsi_hba_post_event
-root scsi_hba_remove_eventcall ata_bus_ctl ghd_timer_fini ghd_timer_init
-
-root sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd_wm_cache_constructor sd_wm_cache_destructor sd_read_modify_write_task
-root sd_failfast_flushq_callback sd_reenable_dsense_task
-root sd_target_change_task
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-
-### These are the HBA entry points for atapi
-add scsi_hba_tran::tran_tgt_init target atapi_tran_tgt_init
-add scsi_hba_tran::tran_tgt_probe target atapi_tran_tgt_probe
-add scsi_hba_tran::tran_start target atapi_tran_start
-add scsi_hba_tran::tran_abort target atapi_tran_abort
-add scsi_hba_tran::tran_init_pkt target atapi_tran_init_pkt
-add scsi_hba_tran::tran_destroy_pkt target atapi_tran_destroy_pkt
-
-add ata_pkt::ap_start targets \
- atapi_start \
- ata_disk_start
-
-add ata_pkt::ap_intr targets \
- atapi_intr \
- ata_disk_intr
-
-add ata_pkt::ap_complete targets \
- atapi_complete \
- ata_disk_complete
-
-### Entry points for ghd
-
-add cmd_ctl::ccc_hba_start target ata_hba_start
-add cmd_ctl::ccc_hba_complete target ata_hba_complete
-add cmd_ctl::ccc_process_intr target ata_process_intr
-add cmd_ctl::ccc_get_status target ata_get_status
-add cmd_ctl::ccc_timeout_func target ata_timeout_func
-add processfunc target ata_process_intr
-add statfunc target ata_get_status
-
-
-### The following are commented as they would not be called
-
-add dcd_pkt::pkt_comp target warlock_dummy
-add cmd_ctl::ccc_ccballoc target warlock_dummy
-add cmd_ctl::ccc_ccbfree target warlock_dummy
-
-### Ignore the following functions as they are never used
-
-ignore L1_remove ata_disk_init_reset ghd_doneq_put ghd_gcmd_alloc
-ignore ghd_gcmd_free ghd_timer_stop ghd_tran_sync_pkt
-ignore scsi_htos_3byte scsi_htos_long scsi_htos_short scsi_stoh_3byte
-ignore scsi_stoh_long scsi_stoh_short sd_mhd_reset_notify_cb
-
-### The following functions need to be ignored for sd as they are never called
-### for atapi device. The uata hba caters to dad target driver also & the
-### the following are entry points for it
-ignore make_prd ata_disk_tran_abort ata_disk_tran_destroy_pkt
-ignore ata_disk_tran_init_pkt ata_disk_tran_reset ata_disk_tran_start
-ignore ata_disk_tran_tgt_init ata_disk_tran_tgt_probe
-
-### The following are atapi related but never invoked so ignore them too.
-
-ignore atapi_tran_dmafree atapi_tran_sync_pkt
-root atapi_signature
-root scsi_hba_bus_power
-ignore delay
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
-
-root ghd_pktfree ghd_pktalloc
diff --git a/usr/src/uts/common/io/warlock/ses.wlcmd b/usr/src/uts/common/io/warlock/ses.wlcmd
deleted file mode 100644
index fabfebbad4..0000000000
--- a/usr/src/uts/common/io/warlock/ses.wlcmd
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-#
-
-one scsi_device
-
-### 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
-
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init target ses_softc_init
-
-root scsi_hba_bus_power
-
diff --git a/usr/src/uts/common/io/warlock/ses_with_esp.wlcmd b/usr/src/uts/common/io/warlock/ses_with_esp.wlcmd
deleted file mode 100644
index d3329a72a2..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_esp.wlcmd
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one scsi_device
-one esp
-
-add notify_entry::callback target warlock_dummy
-add esp_cmd::cmd_pkt.pkt_comp targets ses.c:ses_callback
-
-#assert order esp::e_mutex scsi_device::sd_mutex
-assert order scsi_device::sd_mutex esp::e_mutex
-
-ignore esp_kmem_cache_constructor esp_kmem_cache_destructor
-ignore esp.c:esp_scsi_dmafree esp.c:esp_scsi_sync_pkt
-ignore esp.c:esp_abort esp.c:esp_scsi_reset_notify
-ignore esp.c:esp_complete_arq_pkt esp.c:esp_call_pkt_comp
-
-root scsi_hba_reset_notify_setup
-
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init target ses_softc_init
-
-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/common/io/warlock/ses_with_fas.wlcmd b/usr/src/uts/common/io/warlock/ses_with_fas.wlcmd
deleted file mode 100644
index 245d8688a4..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_fas.wlcmd
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-
-one scsi_device
-one fas
-
-assert order scsi_device::sd_mutex fas::f_mutex
-
-add scsi_pkt::pkt_comp targets \
- ses.c:ses_callback \
- 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
-
-ignore fas_kmem_cache_constructor fas_kmem_cache_destructor
-
-root scsi_hba_reset_notify_setup
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init target ses_softc_init
-
-
-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/common/io/warlock/ses_with_glm.wlcmd b/usr/src/uts/common/io/warlock/ses_with_glm.wlcmd
deleted file mode 100644
index 86e711e656..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_glm.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-
-one scsi_device
-one glm
-
-add scsi_pkt::pkt_comp targets ses.c:ses_callback
-add notify_entry::callback target warlock_dummy
-
-ignore glm_kmem_cache_constructor glm_kmem_cache_destructor
-ignore glm.c:glm_scsi_dmafree glm.c:glm_scsi_sync_pkt
-ignore glm.c:glm_scsi_reset_notify glm.c:glm_scsi_abort
-
-root glm_kmem_cache_constructor glm_kmem_cache_destructor
-root scsi_hba_reset_notify_setup
-
-
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init target ses_softc_init
-
-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/common/io/warlock/ses_with_isp.wlcmd b/usr/src/uts/common/io/warlock/ses_with_isp.wlcmd
deleted file mode 100644
index b97f2bd06a..0000000000
--- a/usr/src/uts/common/io/warlock/ses_with_isp.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-
-one scsi_device
-one isp
-
-add scsi_pkt::pkt_comp targets ses.c:ses_callback
-add notify_entry::callback target warlock_dummy
-
-ignore isp_kmem_cache_constructor isp_kmem_cache_destructor
-ignore isp.c:isp_scsi_dmafree isp.c:isp_scsi_sync_pkt
-ignore isp.c:isp_scsi_reset_notify
-
-root scsi_hba_reset_notify_setup
-root isp.c:isp_i_print_response
-root ses_runcmd
-
-add ses_softc::ses_vec.get_encstat target safte_get_encstat
-add ses_softc::ses_vec.get_objstat target safte_get_objstat
-add ses_softc::ses_vec.init_enc target safte_init_enc
-add ses_softc::ses_vec.set_encstat target safte_set_encstat
-add ses_softc::ses_vec.set_objstat target safte_set_objstat
-add ses_softc::ses_vec.softc_init target safte_softc_init
-
-add ses_softc::ses_vec.get_encstat target sen_get_encstat
-add ses_softc::ses_vec.get_objstat target sen_get_objstat
-add ses_softc::ses_vec.init_enc target sen_init_enc
-add ses_softc::ses_vec.set_encstat target sen_set_encstat
-add ses_softc::ses_vec.set_objstat target sen_set_objstat
-add ses_softc::ses_vec.softc_init target sen_softc_init
-
-add ses_softc::ses_vec.get_encstat target ses_get_encstat
-add ses_softc::ses_vec.get_objstat target ses_get_objstat
-add ses_softc::ses_vec.init_enc target ses_init_enc
-add ses_softc::ses_vec.set_encstat target ses_set_encstat
-add ses_softc::ses_vec.set_objstat target ses_set_objstat
-add ses_softc::ses_vec.softc_init target ses_softc_init
-
-
-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/common/io/warlock/si3124.wlcmd b/usr/src/uts/common/io/warlock/si3124.wlcmd
deleted file mode 100644
index a368db4802..0000000000
--- a/usr/src/uts/common/io/warlock/si3124.wlcmd
+++ /dev/null
@@ -1,120 +0,0 @@
-
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-one si_ctl_state
-one scsi_device
-one __ddi_xbuf_attr
-one sd_lun
-one sd_resv_reclaim_request
-
-
-root sata_hba_ioctl
-root sata_hba_open
-root sata_hba_close
-root sata_scsi_reset
-root sata_scsi_init_pkt
-root sata_scsi_start
-root sata_scsi_destroy_pkt
-root sata_scsi_sync_pkt
-root sata_scsi_tgt_init
-root sata_scsi_tgt_free
-root sata_scsi_tgt_probe
-root sata_scsi_dmafree
-root sata_scsi_abort
-root sata_scsi_getcap
-root sata_scsi_setcap
-
-add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi
-root sd.c:sd_handle_mchange sd_media_change_task sd_start_stop_unit_task
-root sd.c:sd_wm_cache_constructor sd_wm_cache_destructor
-root sd.c:sd_read_modify_write_task sd_reenable_dsense_task
-root sd.c:sd_failfast_flushq_callback sd_start_direct_priority_command
-root sd.c:sdstrategy sdioctl
-root sd.c:sd_target_change_task
-
-root scsi_hba.c:scsi_hba_bus_power
-
-ignore sd.c:sd_scsi_probe_cache_fini
-ignore sd.c:sd_scsi_probe_cache_init
-ignore sd.c:sd_scsi_target_lun_fini
-ignore sd.c:sd_scsi_target_lun_init
-root sd.c:sd_taskq_create
-root sd.c:sd_taskq_delete
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-add scsi_hba_tran::tran_tgt_init targets sata_scsi_tgt_init
-add scsi_hba_tran::tran_tgt_probe targets sata_scsi_tgt_probe
-add scsi_hba_tran::tran_tgt_free targets sata_scsi_tgt_free
-add scsi_hba_tran::tran_start targets sata_scsi_start
-add scsi_hba_tran::tran_abort targets sata_scsi_abort
-add scsi_hba_tran::tran_reset targets sata_scsi_reset
-add scsi_hba_tran::tran_getcap targets sata_scsi_getcap
-add scsi_hba_tran::tran_setcap targets sata_scsi_setcap
-add scsi_hba_tran::tran_init_pkt targets sata_scsi_init_pkt
-add scsi_hba_tran::tran_destroy_pkt targets sata_scsi_destroy_pkt
-
-add scsi_hba_tran::tran_add_eventcall targets warlock_dummy
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_power targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-add scsi_hba_tran::tran_get_eventcookie targets warlock_dummy
-add scsi_hba_tran::tran_get_name targets warlock_dummy
-add scsi_hba_tran::tran_post_event targets warlock_dummy
-add scsi_hba_tran::tran_remove_eventcall targets warlock_dummy
-root scsi_hba.c:scsi_hba_bus_power
-
-add dk_callback::dkc_callback targets warlock_dummy
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-
-add scsi_watch_request::swr_callback targets \
- sd.c:sd_mhd_watch_cb \
- sd.c:sd_media_watch_cb
-
-root si_fm_error_cb
-root si_quiesce
-
-add scsi_pkt::pkt_comp targets \
- scsi_watch.c:scsi_watch_request_intr \
- sd.c:sdintr \
- sata_scsi_destroy_pkt \
- sata_scsi_init_pkt \
- sata_scsi_start \
- sata_scsi_abort \
- sata_scsi_reset \
- sata_scsi_start
-
-add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy
-
-ignore sd.c:sd_mhd_reset_notify_cb
-ignore si_mop_commands
-
-assert order si_ctl_state::sictl_mutex si_port_state::siport_mutex
diff --git a/usr/src/uts/common/io/warlock/ssd.wlcmd b/usr/src/uts/common/io/warlock/ssd.wlcmd
deleted file mode 100644
index 6952573b9f..0000000000
--- a/usr/src/uts/common/io/warlock/ssd.wlcmd
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-one scsi_device
-root ssd_mhd_reset_notify_cb ssd_event_callback
-root scsi_hba_post_event scsi_hba_remove_eventcall scsi_hba_add_eventcall scsi_hba_get_eventcookie
-
-root ssd_handle_mchange ssd_media_change_task ssd_start_stop_unit_task
-root ssd_wm_cache_constructor ssd_wm_cache_destructor ssd_read_modify_write_task
-root ssd_xbuf_strategy ssd_reenable_dsense_task
-root ssd_failfast_flushq_callback
-root ssd_start_direct_priority_command
-root ssd_target_change_task
-
-### 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 ssd_media_watch_cb ssd_mhd_watch_cb
-add sd.c:ssd_start_cmds/funcp target ssd_initpkt_for_buf ssd_initpkt_for_uscsi
-
-root scsi_hba_bus_power
-
-add sd_uscsi_info::ui_dkc.dkc_callback targets warlock_dummy
-add dk_callback::dkc_callback targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/st.wlcmd b/usr/src/uts/common/io/warlock/st.wlcmd
deleted file mode 100644
index 051c0608ef..0000000000
--- a/usr/src/uts/common/io/warlock/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 (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 2007 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_conf_from_tape_drive \
- st_get_default_conf
-
-root scsi_hba_bus_power
-ignore delay
-root st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_esp.wlcmd b/usr/src/uts/common/io/warlock/st_with_esp.wlcmd
deleted file mode 100644
index 8826920ac6..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_esp.wlcmd
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2007 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_conf_from_tape_drive \
- 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
-
-root st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_fas.wlcmd b/usr/src/uts/common/io/warlock/st_with_fas.wlcmd
deleted file mode 100644
index cd1deb4379..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_fas.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2007 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_conf_from_tape_drive \
- 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
-
-root st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_glm.wlcmd b/usr/src/uts/common/io/warlock/st_with_glm.wlcmd
deleted file mode 100644
index d31bbdc0e2..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_glm.wlcmd
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2007 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_conf_from_tape_drive \
- 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
-
-
-root st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/st_with_isp.wlcmd b/usr/src/uts/common/io/warlock/st_with_isp.wlcmd
deleted file mode 100644
index ca91257e19..0000000000
--- a/usr/src/uts/common/io/warlock/st_with_isp.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 (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 2007 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_conf_from_tape_drive \
- 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
-
-
-root st_bigblk_xfer_done
diff --git a/usr/src/uts/common/io/warlock/tavor.wlcmd b/usr/src/uts/common/io/warlock/tavor.wlcmd
deleted file mode 100644
index 93338f562c..0000000000
--- a/usr/src/uts/common/io/warlock/tavor.wlcmd
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-one tavor_state_s
-
-### IBTF CI interface entry points
-root tavor_ci_query_hca_ports
-root tavor_ci_modify_ports
-root tavor_ci_modify_system_image
-root tavor_ci_alloc_pd
-root tavor_ci_free_pd
-root tavor_ci_alloc_rdd
-root tavor_ci_free_rdd
-root tavor_ci_alloc_ah
-root tavor_ci_free_ah
-root tavor_ci_query_ah
-root tavor_ci_modify_ah
-root tavor_ci_alloc_qp
-root tavor_ci_alloc_special_qp
-root tavor_ci_alloc_qp_range
-root tavor_ci_free_qp
-root tavor_ci_release_qpn
-root tavor_ci_query_qp
-root tavor_ci_modify_qp
-root tavor_ci_alloc_cq
-root tavor_ci_free_cq
-root tavor_ci_query_cq
-root tavor_ci_resize_cq
-root tavor_ci_modify_cq
-root tavor_ci_alloc_cq_sched
-root tavor_ci_free_cq_sched
-root tavor_ci_alloc_eec
-root tavor_ci_free_eec
-root tavor_ci_query_eec
-root tavor_ci_modify_eec
-root tavor_ci_register_mr
-root tavor_ci_register_buf
-root tavor_ci_register_shared_mr
-root tavor_ci_deregister_mr
-root tavor_ci_query_mr
-root tavor_ci_reregister_mr
-root tavor_ci_reregister_buf
-root tavor_ci_sync_mr
-root tavor_ci_alloc_mw
-root tavor_ci_free_mw
-root tavor_ci_query_mw
-root tavor_ci_attach_mcg
-root tavor_ci_detach_mcg
-root tavor_ci_post_send
-root tavor_ci_post_recv
-root tavor_ci_poll_cq
-root tavor_ci_notify_cq
-root tavor_ci_ci_data_in
-root tavor_ci_ci_data_out
-root tavor_ci_alloc_srq
-root tavor_ci_free_srq
-root tavor_ci_query_srq
-root tavor_ci_modify_srq
-root tavor_ci_post_srq
-root tavor_ci_map_mem_area
-root tavor_ci_unmap_mem_area
-root tavor_ci_alloc_lkey
-root tavor_ci_register_physical_mr
-root tavor_ci_reregister_physical_mr
-root tavor_ci_create_fmr_pool
-root tavor_ci_destroy_fmr_pool
-root tavor_ci_flush_fmr_pool
-root tavor_ci_register_physical_fmr
-root tavor_ci_deregister_fmr
-root tavor_ci_map_mem_iov
-root tavor_ci_unmap_mem_iov
-root tavor_ci_alloc_io_mem
-root tavor_ci_free_io_mem
-root tavor_ci_register_dma_mr
-root tavor_ci_not_supported
-
-### Tavor Firmware commands (currently unused)
-root tavor_sync_tpt_cmd_post
-root tavor_write_mtt_cmd_post
-
-### Tavor Event Queue function pointers
-add tavor_eq_poll/eqfunction targets tavor_cq_handler \
- tavor_cq_err_handler tavor_comm_estbl_handler \
- tavor_port_state_change_handler tavor_invreq_local_wq_err_handler \
- tavor_local_acc_vio_wq_err_handler \
- tavor_path_mig_handler tavor_path_mig_err_handler \
- tavor_local_wq_cat_err_handler tavor_sendq_drained_handler \
- tavor_eq_overflow_handler tavor_cmd_complete_handler \
- tavor_srq_catastrophic_handler tavor_srq_last_wqe_reached_handler \
- tavor_ecc_detection_handler tavor_no_eqhandler
-
-### Tavor agent callbacks
-root tavor_agent_handle_req
-root tavor_agent_request_cb
-root tavor_agent_response_cb
-
-### Tavor kmem_cache constructors and destructors
-root tavor_rsrc_cqhdl_constructor
-root tavor_rsrc_cqhdl_destructor
-root tavor_rsrc_qphdl_constructor
-root tavor_rsrc_qphdl_destructor
-root tavor_rsrc_pdhdl_constructor
-root tavor_rsrc_pdhdl_destructor
-root tavor_rsrc_refcnt_constructor
-root tavor_rsrc_refcnt_destructor
-root tavor_rsrc_ahhdl_constructor
-root tavor_rsrc_ahhdl_destructor
-root tavor_rsrc_mrhdl_constructor
-root tavor_rsrc_mrhdl_destructor
-root tavor_rsrc_srqhdl_constructor
-root tavor_rsrc_srqhdl_destructor
-
-### Tavor kstat callback
-root tavor_kstat_cntr_update
-root tavor_kstat_perfcntr64_update
-
-### Tavor userland mapping callbacks and functions
-root tavor_umap_umemlock_cb
-root tavor_devmap_umem_map
-root tavor_devmap_umem_dup
-root tavor_devmap_umem_unmap
-root tavor_devmap_devmem_map
-root tavor_devmap_devmem_dup
-root tavor_devmap_devmem_unmap
-root tavor_umap_db_compare
-add tavor_umap_umemlock_cb/mr_callback targets warlock_dummy
-
-
-### Tavor cleanup on close callback(s)
-add tavor_umap_db_handle_onclose_cb/callback targets \
- tavor_ioctl_flash_cleanup
-
-### Tavor QP number AVL tree compare function
-root tavor_qpn_avl_compare
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
diff --git a/usr/src/uts/common/io/warlock/tem.wlcmd b/usr/src/uts/common/io/warlock/tem.wlcmd
deleted file mode 100644
index 488aef0ed3..0000000000
--- a/usr/src/uts/common/io/warlock/tem.wlcmd
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-add bus_ops::bus_add_eventcall target warlock_dummy
-add bus_ops::bus_config target warlock_dummy
-add bus_ops::bus_get_eventcookie target warlock_dummy
-add bus_ops::bus_intr_ctl target warlock_dummy
-add bus_ops::bus_post_event target warlock_dummy
-add bus_ops::bus_remove_eventcall target warlock_dummy
-add bus_ops::bus_unconfig target warlock_dummy
-add tems_modechange_callback/cb target warlock_dummy
-add vis_polledio::copy target warlock_dummy
-add vis_polledio::cursor target warlock_dummy
-add vis_polledio::display target warlock_dummy
-add tem_safe_callbacks::tsc_display target tem_safe_text_display
-add tem_safe_callbacks::tsc_display target tem_safe_pix_display
-add tem_safe_callbacks::tsc_copy target tem_safe_text_copy
-add tem_safe_callbacks::tsc_copy target tem_safe_pix_copy
-add tem_safe_callbacks::tsc_cursor target tem_safe_text_cursor
-add tem_safe_callbacks::tsc_cursor target tem_safe_pix_cursor
-add tem_safe_callbacks::tsc_bit2pix target tem_safe_pix_bit2pix
-add tem_safe_callbacks::tsc_cls target tem_safe_text_cls
-add tem_safe_callbacks::tsc_cls target tem_safe_pix_cls
-
-root tem_initialized
-root tem_get_size
-root tem_info_init
-root tem_init
-root tem_register_modechg_cb
-root tem_write
-root tems_modechange_callback
-root tem_safe_polled_write
-root tem_activate
-root tem_destroy
-root tem_safe_image_display
-root tem_switch
-root tem_get_fbmode
-root tem_set_fbmode
diff --git a/usr/src/uts/common/io/warlock/uata.wlcmd b/usr/src/uts/common/io/warlock/uata.wlcmd
deleted file mode 100644
index 125ef76873..0000000000
--- a/usr/src/uts/common/io/warlock/uata.wlcmd
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-
-### Warlock commands for analyzing the uata driver alone.
-
-### Tell warlock there's only one ata_controller struct, so that it will
-### complain if the lock is acquired when it is already locked.
-
-one ata_controller
-
-### Tell warlock where calls through pkt_comp go.
-
-add dcd_pkt::pkt_comp targets \
- ata_disk_tran_start \
- ata_disk_tran_reset \
- ata_disk_tran_abort \
- ata_disk_tran_init_pkt \
- ata_disk_tran_destroy_pkt \
- ata_disk_tran_tgt_init
-
-add scsi_pkt::pkt_comp targets \
- atapi_tran_start \
- atapi_tran_abort \
- atapi_tran_init_pkt \
- atapi_tran_destroy_pkt \
- atapi_tran_dmafree \
- atapi_tran_sync_pkt \
- atapi_tran_getcap \
- atapi_tran_setcap \
- atapi_tran_reset \
- atapi_tran_tgt_free \
- atapi_tran_tgt_init \
- ata_disk_tran_tgt_probe
-
-
-add dcd_hba_tran::tran_tgt_init target ata_disk_tran_tgt_init
-add scsi_hba_tran::tran_tgt_init target atapi_tran_tgt_init
-
-add dcd_hba_tran::tran_tgt_probe target ata_disk_tran_tgt_probe
-add scsi_hba_tran::tran_tgt_probe target atapi_tran_tgt_probe
-add scsi_hba_tran::tran_bus_power target warlock_dummy
-
-add dcd_hba_tran::tran_start target ata_disk_tran_start
-add scsi_hba_tran::tran_start target atapi_tran_start
-
-add dcd_hba_tran::tran_reset target ata_disk_tran_reset
-
-add dcd_hba_tran::tran_abort target ata_disk_tran_abort
-add scsi_hba_tran::tran_abort target atapi_tran_abort
-
-add dcd_hba_tran::tran_init_pkt target ata_disk_tran_init_pkt
-add scsi_hba_tran::tran_init_pkt target atapi_tran_init_pkt
-
-add dcd_hba_tran::tran_destroy_pkt target ata_disk_tran_destroy_pkt
-add scsi_hba_tran::tran_destroy_pkt target atapi_tran_destroy_pkt
-
-add scsi_hba_tran::tran_dmafree target atapi_tran_dmafree
-
-add scsi_hba_tran::tran_sync_pkt target atapi_tran_sync_pkt
-
-add scsi_hba_tran::tran_tgt_free target atapi_tran_tgt_free
-
-add scsi_hba_tran::tran_getcap target atapi_tran_getcap
-
-add scsi_hba_tran::tran_setcap target atapi_tran_setcap
-
-add ata_pkt::ap_start targets \
- atapi_start \
- ata_disk_start
-
-add ata_pkt::ap_intr targets \
- atapi_intr \
- ata_disk_intr
-
-add ata_pkt::ap_complete targets \
- atapi_complete \
- ata_disk_complete
-
-add scsi_hba_tran::tran_bus_config targets warlock_dummy
-add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy
-
-add cmd_ctl::ccc_hba_start target ata_hba_start
-add cmd_ctl::ccc_hba_complete target ata_hba_complete
-add cmd_ctl::ccc_process_intr target ata_process_intr
-add cmd_ctl::ccc_get_status target ata_get_status
-add cmd_ctl::ccc_timeout_func target ata_timeout_func
-add processfunc target ata_process_intr
-add statfunc target ata_get_status
-
-### Ignore the following functions as they are never used
-ignore L1_remove ata_disk_init_reset ghd_doneq_put ghd_gcmd_alloc
-ignore ghd_gcmd_free ghd_timer_stop ghd_tran_sync_pkt
-ignore scsi_htos_3byte scsi_htos_long scsi_htos_short scsi_stoh_3byte
-ignore scsi_stoh_long scsi_stoh_short
-
-### The following are not used by our code
-add cmd_ctl::ccc_ccballoc target warlock_dummy
-add cmd_ctl::ccc_ccbfree target warlock_dummy
-
-
-root atapi_signature
-root scsi_hba_bus_power
-root ghd_pktfree
-root ghd_scsa.c:ghd_pktalloc
diff --git a/usr/src/uts/common/io/warlock/ugen.wlcmd b/usr/src/uts/common/io/warlock/ugen.wlcmd
deleted file mode 100644
index 7d652686c5..0000000000
--- a/usr/src/uts/common/io/warlock/ugen.wlcmd
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-
-### specify the root functions
-
-root ugen_skel_disconnect_ev_cb ugen_skel_reconnect_ev_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd b/usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd
deleted file mode 100644
index a09bd9ad38..0000000000
--- a/usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_read
-root usb_get_dev_descr
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_pipe_bulk_transfer_size
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_try_serialize_access
-root usb_get_current_frame_number
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_bulk_xfer
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_ep_num
-root usb_console_input_fini
-root usb_console_input_init
-root usb_print_descr_tree
-root usb_clr_feature
-root usb_get_ep_data
-root usb_register_hotplug_cbs
-root usb_is_pm_enabled
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_free_hcdi_ops
-root usba_ready_interface_node
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_pipe_do_async_func_thread
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_dbuf_tail
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-root ehci_quiesce
-root uhci_quiesce
-root ohci_quiesce
-
-### specify the ugen root functions
-root ugen_skel_disconnect_ev_cb
-root ugen_skel_reconnect_ev_cb
-
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets warlock_dummy
-add usb_intr_req::intr_exc_cb targets warlock_dummy
-add hubd::h_cleanup_child targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
- ohci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
- ohci_hcdi_polled_input_fini
diff --git a/usr/src/uts/common/io/warlock/uhci.wlcmd b/usr/src/uts/common/io/warlock/uhci.wlcmd
deleted file mode 100644
index c8c03f24e9..0000000000
--- a/usr/src/uts/common/io/warlock/uhci.wlcmd
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-one uhci_state
-one usba_device
-one usba_pipe_handle_data
-one usba_ph_impl
-
-### specify the root functions
-
-### hcdi entry points
-root uhci_hcdi_pipe_open
-root uhci_hcdi_pipe_close
-root uhci_hcdi_pipe_stop_intr_polling
-root uhci_hcdi_pipe_stop_isoc_polling
-root uhci_hcdi_pipe_reset
-root uhci_hcdi_pipe_reset_data_toggle
-root uhci_hcdi_bulk_transfer_size
-root uhci_hcdi_get_current_frame_number
-root uhci_hcdi_get_max_isoc_pkts
-root uhci_intr
-root uhci_hcdi_pipe_ctrl_xfer
-root uhci_hcdi_pipe_bulk_xfer
-root uhci_hcdi_pipe_intr_xfer
-root uhci_hcdi_pipe_isoc_xfer
-root uhci_quiesce
-
-root hubd_hotplug_thread
-root hubd_exception_cb
-root hubd_read_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_bus_power
-
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-### POLLED entry points
-root uhci_hcdi_polled_input_init
-root uhci_hcdi_polled_input_fini
-root uhci_hcdi_polled_input_enter
-root uhci_hcdi_polled_input_exit
-root uhci_hcdi_polled_read
-root uhci_hcdi_polled_output_init
-root uhci_hcdi_polled_output_fini
-root uhci_hcdi_polled_output_enter
-root uhci_hcdi_polled_output_exit
-root uhci_hcdi_polled_write
-
-### currently unused functions
-
-root uhci_print_td
-root usba_pipe_sync_close
-
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_bulk_td
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_intr_td
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_ctrl_td
-add uhci_trans_wrapper::tw_handle_td targets uhci_handle_isoc_td
-
-add usba_hcdi_ops::usba_hcdi_console_input_init targets \
- uhci_hcdi_polled_input_init
-add usba_hcdi_ops::usba_hcdi_console_input_fini targets \
- uhci_hcdi_polled_input_fini
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets hubd_read_cb
-add usb_intr_req::intr_exc_cb targets hubd_exception_cb
diff --git a/usr/src/uts/common/io/warlock/usb_ac.wlcmd b/usr/src/uts/common/io/warlock/usb_ac.wlcmd
deleted file mode 100644
index 8436bdcf91..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ac.wlcmd
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one usb_ac_state
-
-### specify the root functions
-root usb_ac_open
-root usb_ac_close
-
-root usb_ac_disconnect_event_cb
-root usb_ac_reconnect_event_cb
-root usb_ac_power
-
-root usb_ac_set_format
-root usb_ac_setup
-root usb_ac_start_play
-root usb_ac_start_record
-root usb_ac_stop_play
-root usb_ac_stop_record
-root usb_ac_teardown
-
-root usb_ac_get_audio
-root usb_ac_send_audio
-root usb_ac_ctrl_restore
-root usb_audio_set_mute
-
-root usb_engine_start
-root usb_engine_stop
-root usb_engine_sync
-root usb_engine_rate
-root usb_engine_format
-root usb_engine_count
-root usb_engine_close
-root usb_engine_channels
-root usb_engine_open
-root usb_engine_qlen
-
-root usb_ac_mux_plumbing_tq
-root usb_ac_mux_unplumbing_tq
-root usb_ac_reader
-
-root usb_audio_write_monitor_gain
-root usb_audio_write_mono_rec
-root usb_audio_write_mono_vol
-root usb_audio_write_ster_vol
-root usb_audio_write_stero_rec
-root usb_audio_write_rec_src
-root usb_audio_write_mic_boost
-root usb_audio_ctrl_read
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd
deleted file mode 100644
index b557303fe5..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd
+++ /dev/null
@@ -1,221 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_ac_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_rval2errno
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_log
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_pipe_bulk_xfer
-root usb_get_ep_data
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_free_bulk_req
-root usb_fini_serialization
-root usb_clr_feature
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_get_policy
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_dbuf_tail
-root hubd_bus_power
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-
-root hubd_restore_state_cb
-root hubd_root_hub_cleanup_thread
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-
-root ohci_intr
-root ehci_intr
-
-### specify the usb_ac root functions
-root usb_ac_open
-root usb_ac_close
-root usb_ac_disconnect_event_cb
-root usb_ac_reconnect_event_cb
-root usb_ac_power
-root usb_ac_set_format
-root usb_ac_setup
-root usb_ac_start_play
-root usb_ac_start_record
-root usb_ac_stop_play
-root usb_ac_stop_record
-root usb_ac_teardown
-
-root usb_ac_get_audio
-root usb_ac_send_audio
-root usb_ac_ctrl_restore
-root usb_audio_set_mute
-
-root usb_engine_start
-root usb_engine_stop
-root usb_engine_sync
-root usb_engine_rate
-root usb_engine_format
-root usb_engine_count
-root usb_engine_close
-root usb_engine_channels
-root usb_engine_open
-root usb_engine_qlen
-
-root usb_ac_mux_plumbing_tq
-root usb_ac_mux_unplumbing_tq
-root usb_ac_reader
-
-root usb_audio_write_monitor_gain
-root usb_audio_write_mono_rec
-root usb_audio_write_mono_vol
-root usb_audio_write_ster_vol
-root usb_audio_write_stero_rec
-root usb_audio_write_rec_src
-root usb_audio_write_mic_boost
-root usb_audio_ctrl_read
-
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-
diff --git a/usr/src/uts/common/io/warlock/usb_ah.wlcmd b/usr/src/uts/common/io/warlock/usb_ah.wlcmd
deleted file mode 100644
index 73fb5a1808..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ah.wlcmd
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-### specify the root functions
-
-root usb_ah_open
-root usb_ah_close
-root usb_ah_wput
-root usb_ah_rput
-root usb_ah_timeout
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usb_as.wlcmd b/usr/src/uts/common/io/warlock/usb_as.wlcmd
deleted file mode 100644
index 4016abb9de..0000000000
--- a/usr/src/uts/common/io/warlock/usb_as.wlcmd
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-
-one usb_as_state
-
-### specify the root functions
-root usb_as_disconnect_event_cb
-root usb_as_reconnect_event_cb
-
-root usb_as_open
-root usb_as_close
-
-root usb_as_power
-
-root usb_as_play_cb
-root usb_as_play_exc_cb
-root usb_as_record_cb
-root usb_as_record_exc_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd
deleted file mode 100644
index e2a932c3c3..0000000000
--- a/usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_as_state
-
-### specify the root functions
-
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_log
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_pipe_bulk_xfer
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_rval2errno
-root usb_free_bulk_req
-root usb_try_serialize_access
-root usb_clr_feature
-root usb_get_ep_data
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-### specify the usb_as root functions
-root usb_as_open
-root usb_as_close
-root usb_as_disconnect_event_cb
-root usb_as_reconnect_event_cb
-root usb_as_power
-
-root usb_as_play_cb
-root usb_as_play_exc_cb
-root usb_as_record_cb
-root usb_as_record_exc_cb
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_pipe_get_policy
-
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_pipe_do_async_func_thread
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_root_hub_cleanup_thread
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_bus_power
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
diff --git a/usr/src/uts/common/io/warlock/usb_ia.wlcmd b/usr/src/uts/common/io/warlock/usb_ia.wlcmd
deleted file mode 100644
index c0c370f9bb..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ia.wlcmd
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-one usb_ia
-one usba_device
-
-### currently unused functions
-root usb_ia_event_cb
-root usb_ia_power
-root usb_ia_bus_ctl
diff --git a/usr/src/uts/common/io/warlock/usb_ia_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_ia_with_usba.wlcmd
deleted file mode 100644
index f3d021f48d..0000000000
--- a/usr/src/uts/common/io/warlock/usb_ia_with_usba.wlcmd
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_ia
-one usba_device
-
-### specify the root functions
-
-root usba_ascii_string_descr
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_reset
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root ohci_intr
-root ehci_intr
-
-root usba_dbuf_tail
-root usb_log
-root usb_ia_event_cb
-root hubd_bus_power
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_hubdi_bus_ctl
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_is_pm_enabled
-root usb_pipe_bulk_transfer_size
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usb_async_req
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_get_current_cfgidx
-
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_free_bulk_req
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_bulk_xfer
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_get_status
-root usb_ep_num
-root usb_register_event_cbs
-root usb_unregister_event_cbs
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_rval2errno
-root usb_clr_feature
-root usb_get_ep_data
-root usb_register_hotplug_cbs
-root usb_register_client
-root usb_reset_device
-root usb_ugen_power
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-root usba_ready_interface_association_node
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root hubd_root_hub_cleanup_thread
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root usba_pipe_do_async_func_thread
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-
-add usba_pipe_async_req::callback targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
diff --git a/usr/src/uts/common/io/warlock/usb_mid.wlcmd b/usr/src/uts/common/io/warlock/usb_mid.wlcmd
deleted file mode 100644
index 2dc9145a4c..0000000000
--- a/usr/src/uts/common/io/warlock/usb_mid.wlcmd
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one usb_mid
-one usba_device
-
-### currently unused functions
-root usb_mid_event_cb
-root usb_mid_power
-root usb_mid_bus_ctl
diff --git a/usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd
deleted file mode 100644
index 0bd5a56a05..0000000000
--- a/usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usb_mid
-one usba_device
-
-### specify the root functions
-
-root usba_ascii_string_descr
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_reset
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root usba_dbuf_tail
-root usb_log
-root usb_mid_event_cb
-root hubd_bus_power
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_hubdi_bus_ctl
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_is_pm_enabled
-root usb_pipe_bulk_transfer_size
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usb_async_req
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_get_current_cfgidx
-
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_free_bulk_req
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_bulk_xfer
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_get_status
-root usb_ep_num
-root usb_register_event_cbs
-root usb_unregister_event_cbs
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_rval2errno
-root usb_clr_feature
-root usb_get_ep_data
-root usb_register_hotplug_cbs
-root usb_register_client
-root usb_reset_device
-root usb_ugen_power
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root hubd_root_hub_cleanup_thread
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-root usba_pipe_do_async_func_thread
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-
-add usba_pipe_async_req::callback targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
diff --git a/usr/src/uts/common/io/warlock/usbecm.wlcmd b/usr/src/uts/common/io/warlock/usbecm.wlcmd
deleted file mode 100644
index 1dfceeca69..0000000000
--- a/usr/src/uts/common/io/warlock/usbecm.wlcmd
+++ /dev/null
@@ -1,72 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one usbecm_state
-
-### specify the root functions
-
-root usbecm_bulkin_cb
-root usbecm_bulkout_cb
-root usbecm_intr_cb
-root usbecm_intr_ex_cb
-
-### specify usbecm function pointers
-
-
-root usbecm_bulkin_cb
-root usbecm_bulkout_cb
-root usbecm_intr_cb
-root usbecm_intr_ex_cb
-
-# temporary
-root usbecm_pm_set_busy
-root usbecm_pm_set_idle
-root usbecm_power
-
-root usbecm_m_stop
-root usbecm_m_start
-root usbecm_m_unicst
-root usbecm_m_multicst
-root usbecm_m_promisc
-root usbecm_m_ioctl
-root usbecm_m_tx
-root usbecm_m_getprop
-root usbecm_m_setprop
-root usbecm_m_stat
-
-root usbecm_disconnect_event_cb
-root usbecm_reconnect_event_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
-
-add usbecm_ds_ops::ecm_ds_init targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_fini targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_start targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_stop targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_intr_cb targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbecm_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbecm_with_usba.wlcmd
deleted file mode 100644
index db55073262..0000000000
--- a/usr/src/uts/common/io/warlock/usbecm_with_usba.wlcmd
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbecm_state
-
-### specify the root functions
-
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_ugen_power
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-### specify the usbecm root functions
-root usbecm_power
-root usbecm_disconnect_event_cb
-root usbecm_reconnect_event_cb
-
-root usbecm_m_stop
-root usbecm_m_start
-root usbecm_m_stat
-root usbecm_m_promisc
-root usbecm_m_multicst
-root usbecm_m_unicst
-root usbecm_m_tx
-root usbecm_m_ioctl
-root usbecm_m_getprop
-root usbecm_m_setprop
-
-# temporary
-root usbecm_pm_set_busy
-root usbecm_pm_set_idle
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
-
-add usbecm_ds_ops::ecm_ds_init targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_fini targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_start targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_stop targets warlock_dummy
-add usbecm_ds_ops::ecm_ds_intr_cb targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbftdi.wlcmd b/usr/src/uts/common/io/warlock/usbftdi.wlcmd
deleted file mode 100644
index 08c948b31e..0000000000
--- a/usr/src/uts/common/io/warlock/usbftdi.wlcmd
+++ /dev/null
@@ -1,91 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one usbser_state
-one uftdi_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_uftdi_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root uftdi_bulkin_cb
-root uftdi_bulkout_cb
-
-### specify uftdi function pointers
-
-add ds_ops::ds_attach targets uftdi_attach
-add ds_ops::ds_detach targets uftdi_detach
-add ds_ops::ds_register_cb targets uftdi_register_cb
-add ds_ops::ds_unregister_cb targets uftdi_unregister_cb
-add ds_ops::ds_open_port targets uftdi_open_port
-add ds_ops::ds_close_port targets uftdi_close_port
-add ds_ops::ds_usb_power targets uftdi_usb_power
-add ds_ops::ds_suspend targets uftdi_suspend
-add ds_ops::ds_resume targets uftdi_resume
-add ds_ops::ds_disconnect targets uftdi_disconnect
-add ds_ops::ds_reconnect targets uftdi_reconnect
-add ds_ops::ds_set_port_params targets uftdi_set_port_params
-add ds_ops::ds_set_modem_ctl targets uftdi_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets uftdi_get_modem_ctl
-add ds_ops::ds_break_ctl targets uftdi_break_ctl
-add ds_ops::ds_tx targets uftdi_tx
-add ds_ops::ds_rx targets uftdi_rx
-add ds_ops::ds_stop targets uftdi_stop
-add ds_ops::ds_start targets uftdi_start
-add ds_ops::ds_fifo_flush targets uftdi_fifo_flush
-add ds_ops::ds_fifo_drain targets uftdi_fifo_drain
-add ds_ops::ds_out_pipe targets uftdi_out_pipe
-add ds_ops::ds_in_pipe targets uftdi_in_pipe
-
-add uftdi_state::uf_cb.cb_tx targets usbser_tx_cb
-add uftdi_state::uf_cb.cb_rx targets usbser_rx_cb
-add uftdi_state::uf_cb.cb_status targets usbser_status_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbftdi_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbftdi_with_usba.wlcmd
deleted file mode 100644
index 2f6d1a7d3c..0000000000
--- a/usr/src/uts/common/io/warlock/usbftdi_with_usba.wlcmd
+++ /dev/null
@@ -1,225 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one uftdi_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-### specify the uftdi root functions
-
-root usbser_soft_state_size
-root usbser_uftdi_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root uftdi_bulkin_cb
-root uftdi_bulkout_cb
-
-### specify uftdi function pointers
-
-add ds_ops::ds_attach targets uftdi_attach
-add ds_ops::ds_detach targets uftdi_detach
-add ds_ops::ds_register_cb targets uftdi_register_cb
-add ds_ops::ds_unregister_cb targets uftdi_unregister_cb
-add ds_ops::ds_open_port targets uftdi_open_port
-add ds_ops::ds_close_port targets uftdi_close_port
-add ds_ops::ds_usb_power targets uftdi_usb_power
-add ds_ops::ds_suspend targets uftdi_suspend
-add ds_ops::ds_resume targets uftdi_resume
-add ds_ops::ds_disconnect targets uftdi_disconnect
-add ds_ops::ds_reconnect targets uftdi_reconnect
-add ds_ops::ds_set_port_params targets uftdi_set_port_params
-add ds_ops::ds_set_modem_ctl targets uftdi_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets uftdi_get_modem_ctl
-add ds_ops::ds_break_ctl targets uftdi_break_ctl
-add ds_ops::ds_tx targets uftdi_tx
-add ds_ops::ds_rx targets uftdi_rx
-add ds_ops::ds_stop targets uftdi_stop
-add ds_ops::ds_start targets uftdi_start
-add ds_ops::ds_fifo_flush targets uftdi_fifo_flush
-add ds_ops::ds_fifo_drain targets uftdi_fifo_drain
-add ds_ops::ds_out_pipe targets uftdi_out_pipe
-add ds_ops::ds_in_pipe targets uftdi_in_pipe
-
-add uftdi_state::uf_cb.cb_tx targets usbser_tx_cb
-add uftdi_state::uf_cb.cb_rx targets usbser_rx_cb
-add uftdi_state::uf_cb.cb_status targets usbser_status_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets uftdi_bulkin_cb
-add usb_bulk_req::bulk_exc_cb targets uftdi_bulkin_cb
-add usb_bulk_req::bulk_cb targets uftdi_bulkout_cb
-add usb_bulk_req::bulk_exc_cb targets uftdi_bulkout_cb
-
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbprn.wlcmd b/usr/src/uts/common/io/warlock/usbprn.wlcmd
deleted file mode 100644
index 436379fdc5..0000000000
--- a/usr/src/uts/common/io/warlock/usbprn.wlcmd
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one usbprn_state
-
-### specify the root functions
-
-root usbprn_open
-root usbprn_close
-root usbprn_ioctl
-root usbprn_bulk_xfer_cb
-root usbprn_bulk_xfer_exc_cb
-root usbprn_reconnect_event_cb
-root usbprn_disconnect_event_cb
-root usbprn_power
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd
deleted file mode 100644
index 2469648729..0000000000
--- a/usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbprn_state
-
-### specify the root functions
-
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_ugen_power
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-
-### specify the usbprn root functions
-root usbprn_open
-root usbprn_close
-root usbprn_ioctl
-root usbprn_bulk_xfer_cb
-root usbprn_bulk_xfer_exc_cb
-
-root usbprn_reconnect_event_cb
-root usbprn_disconnect_event_cb
-root usbprn_power
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets usbprn_bulk_xfer_cb
-add usb_bulk_req::bulk_exc_cb targets usbprn_bulk_xfer_exc_cb
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbsacm.wlcmd b/usr/src/uts/common/io/warlock/usbsacm.wlcmd
deleted file mode 100644
index 8cebc0de43..0000000000
--- a/usr/src/uts/common/io/warlock/usbsacm.wlcmd
+++ /dev/null
@@ -1,92 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-
-one usbser_state
-one usbsacm_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbsacm_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root usbsacm_bulkin_cb
-root usbsacm_bulkout_cb
-root usbsacm_intr_cb
-root usbsacm_intr_ex_cb
-
-### specify usbsacm function pointers
-
-add ds_ops::ds_attach targets usbsacm_ds_attach
-add ds_ops::ds_detach targets usbsacm_ds_detach
-add ds_ops::ds_register_cb targets usbsacm_ds_register_cb
-add ds_ops::ds_unregister_cb targets usbsacm_ds_unregister_cb
-add ds_ops::ds_open_port targets usbsacm_ds_open_port
-add ds_ops::ds_close_port targets usbsacm_ds_close_port
-add ds_ops::ds_usb_power targets usbsacm_ds_usb_power
-add ds_ops::ds_suspend targets usbsacm_ds_suspend
-add ds_ops::ds_resume targets usbsacm_ds_resume
-add ds_ops::ds_disconnect targets usbsacm_ds_disconnect
-add ds_ops::ds_reconnect targets usbsacm_ds_reconnect
-add ds_ops::ds_set_port_params targets usbsacm_ds_set_port_params
-add ds_ops::ds_set_modem_ctl targets usbsacm_ds_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets usbsacm_ds_get_modem_ctl
-add ds_ops::ds_break_ctl targets usbsacm_ds_break_ctl
-add ds_ops::ds_tx targets usbsacm_ds_tx
-add ds_ops::ds_rx targets usbsacm_ds_rx
-add ds_ops::ds_stop targets usbsacm_ds_stop
-add ds_ops::ds_start targets usbsacm_ds_start
-add ds_ops::ds_fifo_flush targets usbsacm_ds_fifo_flush
-add ds_ops::ds_fifo_drain targets usbsacm_ds_fifo_drain
-add ds_ops::ds_in_pipe targets warlock_dummy
-add ds_ops::ds_out_pipe targets warlock_dummy
-
-add usbsacm_port::acm_cb.cb_tx targets usbser_tx_cb
-add usbsacm_port::acm_cb.cb_rx targets usbser_rx_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbsacm_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbsacm_with_usba.wlcmd
deleted file mode 100644
index 98ba44d89d..0000000000
--- a/usr/src/uts/common/io/warlock/usbsacm_with_usba.wlcmd
+++ /dev/null
@@ -1,220 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one usbsacm_state
-one usbsacm_port
-
-### specify the root functions
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-
-### specify the usbsacm root functions
-
-root usbser_soft_state_size
-root usbsacm_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root usbsacm_bulkin_cb
-root usbsacm_bulkout_cb
-
-### specify usbsacm function pointers
-
-add ds_ops::ds_attach targets usbsacm_ds_attach
-add ds_ops::ds_detach targets usbsacm_ds_detach
-add ds_ops::ds_register_cb targets usbsacm_ds_register_cb
-add ds_ops::ds_unregister_cb targets usbsacm_ds_unregister_cb
-add ds_ops::ds_open_port targets usbsacm_ds_open_port
-add ds_ops::ds_close_port targets usbsacm_ds_close_port
-add ds_ops::ds_usb_power targets usbsacm_ds_usb_power
-add ds_ops::ds_suspend targets usbsacm_ds_suspend
-add ds_ops::ds_resume targets usbsacm_ds_resume
-add ds_ops::ds_disconnect targets usbsacm_ds_disconnect
-add ds_ops::ds_reconnect targets usbsacm_ds_reconnect
-add ds_ops::ds_set_port_params targets usbsacm_ds_set_port_params
-add ds_ops::ds_set_modem_ctl targets usbsacm_ds_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets usbsacm_ds_get_modem_ctl
-add ds_ops::ds_break_ctl targets usbsacm_ds_break_ctl
-add ds_ops::ds_tx targets usbsacm_ds_tx
-add ds_ops::ds_rx targets usbsacm_ds_rx
-add ds_ops::ds_stop targets usbsacm_ds_stop
-add ds_ops::ds_start targets usbsacm_ds_start
-add ds_ops::ds_fifo_flush targets usbsacm_ds_fifo_flush
-add ds_ops::ds_fifo_drain targets usbsacm_ds_fifo_drain
-add ds_ops::ds_out_pipe targets warlock_dummy
-add ds_ops::ds_in_pipe targets warlock_dummy
-
-add usbsacm_port::acm_cb.cb_tx targets usbser_tx_cb
-add usbsacm_port::acm_cb.cb_rx targets usbser_rx_cb
-
-add usb_ctrl_req::ctrl_cb targets usbsacm_intr_cb
-add usb_ctrl_req::ctrl_exc_cb targets usbsacm_intr_ex_cb
-add usb_bulk_req::bulk_cb targets usbsacm_bulkin_cb
-add usb_bulk_req::bulk_exc_cb targets usbsacm_bulkin_cb
-add usb_bulk_req::bulk_cb targets usbsacm_bulkout_cb
-add usb_bulk_req::bulk_exc_cb targets usbsacm_bulkout_cb
-
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbser.wlcmd b/usr/src/uts/common/io/warlock/usbser.wlcmd
deleted file mode 100644
index fe2afe0615..0000000000
--- a/usr/src/uts/common/io/warlock/usbser.wlcmd
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one usbser_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-add dev_ops::devo_attach targets usbser_attach
-add dev_ops::devo_detach targets usbser_detach
-add dev_ops::devo_getinfo targets usbser_getinfo
-add dev_ops::devo_power targets usbser_power
-
-add ds_ops::ds_attach targets warlock_dummy
-add ds_ops::ds_detach targets warlock_dummy
-add ds_ops::ds_register_cb targets warlock_dummy
-add ds_ops::ds_unregister_cb targets warlock_dummy
-add ds_ops::ds_open_port targets warlock_dummy
-add ds_ops::ds_close_port targets warlock_dummy
-add ds_ops::ds_usb_power targets warlock_dummy
-add ds_ops::ds_suspend targets warlock_dummy
-add ds_ops::ds_resume targets warlock_dummy
-add ds_ops::ds_disconnect targets warlock_dummy
-add ds_ops::ds_reconnect targets warlock_dummy
-add ds_ops::ds_set_port_params targets warlock_dummy
-add ds_ops::ds_set_modem_ctl targets warlock_dummy
-add ds_ops::ds_get_modem_ctl targets warlock_dummy
-add ds_ops::ds_break_ctl targets warlock_dummy
-add ds_ops::ds_loopback targets warlock_dummy
-add ds_ops::ds_tx targets warlock_dummy
-add ds_ops::ds_rx targets warlock_dummy
-add ds_ops::ds_stop targets warlock_dummy
-add ds_ops::ds_start targets warlock_dummy
-add ds_ops::ds_fifo_flush targets warlock_dummy
-add ds_ops::ds_fifo_drain targets warlock_dummy
-add ds_ops::ds_out_pipe targets warlock_dummy
-add ds_ops::ds_in_pipe targets warlock_dummy
-
-add rseq_step::s_func targets usbser_free_soft_state
-add rseq_step::s_func targets usbser_init_soft_state
-add rseq_step::s_func targets usbser_fini_soft_state
-add rseq_step::s_func targets usbser_attach_dev
-add rseq_step::s_func targets usbser_detach_dev
-add rseq_step::s_func targets usbser_attach_ports
-add rseq_step::s_func targets usbser_detach_ports
-add rseq_step::s_func targets usbser_create_taskq
-add rseq_step::s_func targets usbser_destroy_taskq
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbser_edge.wlcmd b/usr/src/uts/common/io/warlock/usbser_edge.wlcmd
deleted file mode 100644
index fb665af683..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_edge.wlcmd
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one usbser_state
-one edge_pipe
-one edge_state
-one edge_port
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_edge_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root edgesp_bulkin_cb
-root edgesp_bulkout_cb
-root edgesp_intr_cb
-root edgesp_intr_ex_cb
-
-root edgeti_bulkin_cb
-root edgeti_bulkout_cb
-root edgeti_intr_cb
-root edgeti_intr_ex_cb
-
-### specify edgeport function pointers
-
-add ds_ops::ds_attach targets edge_attach
-add ds_ops::ds_detach targets edge_detach
-add ds_ops::ds_register_cb targets edge_register_cb
-add ds_ops::ds_unregister_cb targets edge_unregister_cb
-add ds_ops::ds_open_port targets edge_open_port
-add ds_ops::ds_close_port targets edge_close_port
-add ds_ops::ds_usb_power targets edge_usb_power
-add ds_ops::ds_suspend targets edge_suspend
-add ds_ops::ds_resume targets edge_resume
-add ds_ops::ds_disconnect targets edge_disconnect
-add ds_ops::ds_reconnect targets edge_reconnect
-add ds_ops::ds_set_port_params targets edge_set_port_params
-add ds_ops::ds_set_modem_ctl targets edge_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets edge_get_modem_ctl
-add ds_ops::ds_break_ctl targets edge_break_ctl
-add ds_ops::ds_loopback targets edge_loopback
-add ds_ops::ds_tx targets edge_tx
-add ds_ops::ds_rx targets edge_rx
-add ds_ops::ds_stop targets edge_stop
-add ds_ops::ds_start targets edge_start
-add ds_ops::ds_fifo_flush targets edge_fifo_flush
-add ds_ops::ds_fifo_drain targets edge_fifo_drain
-add ds_ops::ds_out_pipe targets warlock_dummy
-add ds_ops::ds_in_pipe targets warlock_dummy
-
-add edge_port::ep_cb.cb_tx targets usbser_tx_cb
-add edge_port::ep_cb.cb_rx targets usbser_rx_cb
-add edge_port::ep_cb.cb_status targets usbser_status_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbser_edge_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbser_edge_with_usba.wlcmd
deleted file mode 100644
index a52f3e3b7c..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_edge_with_usba.wlcmd
+++ /dev/null
@@ -1,222 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one edge_pipe
-one edge_state
-one edge_port
-
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-### specify the edgeport root functions
-root usbser_soft_state_size
-root usbser_edge_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root edgesp_bulkin_cb
-root edgesp_bulkout_cb
-root edgesp_intr_cb
-root edgesp_intr_ex_cb
-
-root edgeti_bulkin_cb
-root edgeti_bulkout_cb
-root edgeti_intr_cb
-root edgeti_intr_ex_cb
-
-### specify edgeport function pointers
-
-add ds_ops::ds_attach targets edge_attach
-add ds_ops::ds_detach targets edge_detach
-add ds_ops::ds_register_cb targets edge_register_cb
-add ds_ops::ds_unregister_cb targets edge_unregister_cb
-add ds_ops::ds_open_port targets edge_open_port
-add ds_ops::ds_close_port targets edge_close_port
-add ds_ops::ds_usb_power targets edge_usb_power
-add ds_ops::ds_suspend targets edge_suspend
-add ds_ops::ds_resume targets edge_resume
-add ds_ops::ds_disconnect targets edge_disconnect
-add ds_ops::ds_reconnect targets edge_reconnect
-add ds_ops::ds_set_port_params targets edge_set_port_params
-add ds_ops::ds_set_modem_ctl targets edge_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets edge_get_modem_ctl
-add ds_ops::ds_break_ctl targets edge_break_ctl
-add ds_ops::ds_loopback targets edge_loopback
-add ds_ops::ds_tx targets edge_tx
-add ds_ops::ds_rx targets edge_rx
-add ds_ops::ds_stop targets edge_stop
-add ds_ops::ds_start targets edge_start
-add ds_ops::ds_fifo_flush targets edge_fifo_flush
-add ds_ops::ds_fifo_drain targets edge_fifo_drain
-add ds_ops::ds_out_pipe targets warlock_dummy
-add ds_ops::ds_in_pipe targets warlock_dummy
-
-add edge_port::ep_cb.cb_tx targets usbser_tx_cb
-add edge_port::ep_cb.cb_rx targets usbser_rx_cb
-add edge_port::ep_cb.cb_status targets usbser_status_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets edgesp_bulkin_cb
-add usb_bulk_req::bulk_exc_cb targets edgesp_bulkin_cb
-add usb_bulk_req::bulk_cb targets edgesp_bulkout_cb
-add usb_bulk_req::bulk_exc_cb targets edgesp_bulkout_cb
-
-add usb_bulk_req::bulk_cb targets edgeti_bulkin_cb
-add usb_bulk_req::bulk_exc_cb targets edgeti_bulkin_cb
-add usb_bulk_req::bulk_cb targets edgeti_bulkout_cb
-add usb_bulk_req::bulk_exc_cb targets edgeti_bulkout_cb
-
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd b/usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd
deleted file mode 100644
index f74b829b3d..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one usbser_state
-one keyspan_state
-one keyspan_pipe
-one keyspan_port
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_keyspan_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root keyspan_bulkin_cb
-root keyspan_bulkout_cb
-root keyspan_status_cb
-
-root keyspan_bulkin_cb_usa49wg
-root keyspan_introut_cb_usa49wg
-root keyspan_intr_cb_usa49wg
-root keyspan_intr_ex_cb_usa49wg
-
-### specify keyspan function pointers
-
-add ds_ops::ds_attach targets keyspan_attach
-add ds_ops::ds_detach targets keyspan_detach
-add ds_ops::ds_register_cb targets keyspan_register_cb
-add ds_ops::ds_unregister_cb targets keyspan_unregister_cb
-add ds_ops::ds_open_port targets keyspan_open_port
-add ds_ops::ds_close_port targets keyspan_close_port
-add ds_ops::ds_usb_power targets keyspan_usb_power
-add ds_ops::ds_suspend targets keyspan_suspend
-add ds_ops::ds_resume targets keyspan_resume
-add ds_ops::ds_disconnect targets keyspan_disconnect
-add ds_ops::ds_reconnect targets keyspan_reconnect
-add ds_ops::ds_set_port_params targets keyspan_set_port_params
-add ds_ops::ds_set_modem_ctl targets keyspan_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets keyspan_get_modem_ctl
-add ds_ops::ds_break_ctl targets keyspan_break_ctl
-add ds_ops::ds_loopback targets keyspan_loopback
-add ds_ops::ds_tx targets keyspan_tx
-add ds_ops::ds_rx targets keyspan_rx
-add ds_ops::ds_stop targets keyspan_stop
-add ds_ops::ds_start targets keyspan_start
-add ds_ops::ds_fifo_flush targets keyspan_fifo_flush
-add ds_ops::ds_fifo_drain targets keyspan_fifo_drain
-add ds_ops::ds_out_pipe targets warlock_dummy
-add ds_ops::ds_in_pipe targets warlock_dummy
-
-add keyspan_port::kp_cb.cb_tx targets usbser_tx_cb
-add keyspan_port::kp_cb.cb_rx targets usbser_rx_cb
-add keyspan_port::kp_cb.cb_status targets usbser_status_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd
deleted file mode 100644
index 7bd46ef9b0..0000000000
--- a/usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one keyspan_state
-one keyspan_pipe
-one keyspan_port
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-### specify the keyspan root functions
-root usbser_soft_state_size
-root usbser_keyspan_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root keyspan_bulkin_cb
-root keyspan_bulkout_cb
-root keyspan_status_cb
-
-root keyspan_bulkin_cb_usa49wg
-root keyspan_introut_cb_usa49wg
-root keyspan_intr_cb_usa49wg
-root keyspan_intr_ex_cb_usa49wg
-
-### specify keyspan function pointers
-
-add ds_ops::ds_attach targets keyspan_attach
-add ds_ops::ds_detach targets keyspan_detach
-add ds_ops::ds_register_cb targets keyspan_register_cb
-add ds_ops::ds_unregister_cb targets keyspan_unregister_cb
-add ds_ops::ds_open_port targets keyspan_open_port
-add ds_ops::ds_close_port targets keyspan_close_port
-add ds_ops::ds_usb_power targets keyspan_usb_power
-add ds_ops::ds_suspend targets keyspan_suspend
-add ds_ops::ds_resume targets keyspan_resume
-add ds_ops::ds_disconnect targets keyspan_disconnect
-add ds_ops::ds_reconnect targets keyspan_reconnect
-add ds_ops::ds_set_port_params targets keyspan_set_port_params
-add ds_ops::ds_set_modem_ctl targets keyspan_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets keyspan_get_modem_ctl
-add ds_ops::ds_break_ctl targets keyspan_break_ctl
-add ds_ops::ds_loopback targets keyspan_loopback
-add ds_ops::ds_tx targets keyspan_tx
-add ds_ops::ds_rx targets keyspan_rx
-add ds_ops::ds_stop targets keyspan_stop
-add ds_ops::ds_start targets keyspan_start
-add ds_ops::ds_fifo_flush targets keyspan_fifo_flush
-add ds_ops::ds_fifo_drain targets keyspan_fifo_drain
-add ds_ops::ds_out_pipe targets warlock_dummy
-add ds_ops::ds_in_pipe targets warlock_dummy
-
-add keyspan_port::kp_cb.cb_tx targets usbser_tx_cb
-add keyspan_port::kp_cb.cb_rx targets usbser_rx_cb
-add keyspan_port::kp_cb.cb_status targets usbser_status_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets keyspan_bulkin_cb
-add usb_bulk_req::bulk_exc_cb targets keyspan_bulkin_cb
-add usb_bulk_req::bulk_cb targets keyspan_bulkout_cb
-add usb_bulk_req::bulk_exc_cb targets keyspan_bulkout_cb
-add usb_bulk_req::bulk_cb targets keyspan_status_cb
-add usb_bulk_req::bulk_exc_cb targets keyspan_status_cb
-add usb_bulk_req::bulk_cb targets keyspan_bulkin_cb_usa49wg
-add usb_bulk_req::bulk_exc_cb targets keyspan_bulkin_cb_usa49wg
-add usb_intr_req::intr_cb targets keyspan_introut_cb_usa49wg
-add usb_intr_req::intr_exc_cb targets keyspan_introut_cb_usa49wg
-add usb_intr_req::intr_cb targets keyspan_intr_cb_usa49wg
-add usb_intr_req::intr_exc_cb targets keyspan_intr_ex_cb_usa49wg
-
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbskel.wlcmd b/usr/src/uts/common/io/warlock/usbskel.wlcmd
deleted file mode 100644
index 0124361457..0000000000
--- a/usr/src/uts/common/io/warlock/usbskel.wlcmd
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-#ident "%Z%%M% %I% %E% SMI"
-
-one usbskel_state
-
-### specify the root functions
-
-root usbskel_normal_callback
-root usbskel_exception_callback
-root usbskel_disconnect_callback
-root usbskel_reconnect_callback
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd
deleted file mode 100644
index b6b4b07efc..0000000000
--- a/usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbskel_state
-one usba_pipe_handle_data
-one usba_ph_impl
-one hubd
-one usba_device
-
-### specify the root functions
-
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_read
-root usb_get_dev_descr
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_reset
-root usb_pipe_get_private
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_pipe_bulk_transfer_size
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_try_serialize_access
-root usb_get_current_frame_number
-root usb_alloc_bulk_req
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_pipe_bulk_xfer
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_console_input_fini
-root usb_console_input_init
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_free_bulk_req
-root usb_clr_feature
-root usb_get_ep_data
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_is_pm_enabled
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_free_hcdi_ops
-root usba_ready_interface_node
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_pipe_do_async_func_thread
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_dbuf_tail
-root usba_move_list
-root usba_taskq_destroy
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-root hubd_bus_power
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_root_hub_cleanup_thread
-root hubd_cpr_post_user_callb
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-### specify the usbskel root functions
-
-root usbskel_normal_callback
-root usbskel_exception_callback
-root usbskel_disconnect_callback
-root usbskel_reconnect_callback
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_close
-add usba_pipe_async_req::sync_func targets usba_pipe_sync_reset
-
-add usba_pipe_async_req::callback targets warlock_dummy
-add usb_bulk_req::bulk_cb targets warlock_dummy
-add usb_bulk_req::bulk_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_intr_req::intr_cb targets warlock_dummy
-add usb_intr_req::intr_exc_cb targets warlock_dummy
-
-add usba_pm_req::cb targets warlock_dummy
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbsprl.wlcmd b/usr/src/uts/common/io/warlock/usbsprl.wlcmd
deleted file mode 100644
index 720e87c2c6..0000000000
--- a/usr/src/uts/common/io/warlock/usbsprl.wlcmd
+++ /dev/null
@@ -1,90 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-one usbser_state
-one pl2303_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usbser_soft_state_size
-root usbser_pl2303_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root pl2303_bulkin_cb
-root pl2303_bulkout_cb
-
-### specify pl2303 function pointers
-
-add ds_ops::ds_attach targets pl2303_attach
-add ds_ops::ds_detach targets pl2303_detach
-add ds_ops::ds_register_cb targets pl2303_register_cb
-add ds_ops::ds_unregister_cb targets pl2303_unregister_cb
-add ds_ops::ds_open_port targets pl2303_open_port
-add ds_ops::ds_close_port targets pl2303_close_port
-add ds_ops::ds_usb_power targets pl2303_usb_power
-add ds_ops::ds_suspend targets pl2303_suspend
-add ds_ops::ds_resume targets pl2303_resume
-add ds_ops::ds_disconnect targets pl2303_disconnect
-add ds_ops::ds_reconnect targets pl2303_reconnect
-add ds_ops::ds_set_port_params targets pl2303_set_port_params
-add ds_ops::ds_set_modem_ctl targets pl2303_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets pl2303_get_modem_ctl
-add ds_ops::ds_break_ctl targets pl2303_break_ctl
-add ds_ops::ds_tx targets pl2303_tx
-add ds_ops::ds_rx targets pl2303_rx
-add ds_ops::ds_stop targets pl2303_stop
-add ds_ops::ds_start targets pl2303_start
-add ds_ops::ds_fifo_flush targets pl2303_fifo_flush
-add ds_ops::ds_fifo_drain targets pl2303_fifo_drain
-add ds_ops::ds_out_pipe targets pl2303_out_pipe
-add ds_ops::ds_in_pipe targets pl2303_in_pipe
-
-add pl2303_state::pl_cb.cb_tx targets usbser_tx_cb
-add pl2303_state::pl_cb.cb_rx targets usbser_rx_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd
deleted file mode 100644
index c758c93697..0000000000
--- a/usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd
+++ /dev/null
@@ -1,223 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbser_state
-one pl2303_state
-
-### specify the root functions
-
-root usbser_first_device
-root usbser_putchar
-root usbser_getchar
-root usbser_ischar
-root usbser_polledio_enter
-root usbser_polledio_exit
-root usb_console_output_fini
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_fini_serialization
-root usb_init_serialization
-root usb_release_access
-root usb_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_power
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-### specify the pl2303 root functions
-
-root usbser_soft_state_size
-root usbser_pl2303_open
-root usbser_close
-root usbser_wput
-root usbser_wsrv
-root usbser_rsrv
-root usbser_tx_cb
-root usbser_rx_cb
-root usbser_status_cb
-root usbser_wq_thread
-root usbser_rq_thread
-root usbser_disconnect_cb
-root usbser_reconnect_cb
-root usbser_cpr_suspend
-root usbser_cpr_resume
-
-root pl2303_bulkin_cb
-root pl2303_bulkout_cb
-
-### specify pl2303 function pointers
-
-add ds_ops::ds_attach targets pl2303_attach
-add ds_ops::ds_detach targets pl2303_detach
-add ds_ops::ds_register_cb targets pl2303_register_cb
-add ds_ops::ds_unregister_cb targets pl2303_unregister_cb
-add ds_ops::ds_open_port targets pl2303_open_port
-add ds_ops::ds_close_port targets pl2303_close_port
-add ds_ops::ds_usb_power targets pl2303_usb_power
-add ds_ops::ds_suspend targets pl2303_suspend
-add ds_ops::ds_resume targets pl2303_resume
-add ds_ops::ds_disconnect targets pl2303_disconnect
-add ds_ops::ds_reconnect targets pl2303_reconnect
-add ds_ops::ds_set_port_params targets pl2303_set_port_params
-add ds_ops::ds_set_modem_ctl targets pl2303_set_modem_ctl
-add ds_ops::ds_get_modem_ctl targets pl2303_get_modem_ctl
-add ds_ops::ds_break_ctl targets pl2303_break_ctl
-add ds_ops::ds_tx targets pl2303_tx
-add ds_ops::ds_rx targets pl2303_rx
-add ds_ops::ds_stop targets pl2303_stop
-add ds_ops::ds_start targets pl2303_start
-add ds_ops::ds_fifo_flush targets pl2303_fifo_flush
-add ds_ops::ds_fifo_drain targets pl2303_fifo_drain
-add ds_ops::ds_out_pipe targets pl2303_out_pipe
-add ds_ops::ds_in_pipe targets pl2303_in_pipe
-
-add pl2303_state::pl_cb.cb_tx targets usbser_tx_cb
-add pl2303_state::pl_cb.cb_rx targets usbser_rx_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_bulk_req::bulk_cb targets pl2303_bulkin_cb
-add usb_bulk_req::bulk_exc_cb targets pl2303_bulkin_cb
-add usb_bulk_req::bulk_cb targets pl2303_bulkout_cb
-add usb_bulk_req::bulk_exc_cb targets pl2303_bulkout_cb
-
-add usb_isoc_req::isoc_cb targets warlock_dummy
-add usb_isoc_req::isoc_exc_cb targets warlock_dummy
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/usbvc.wlcmd b/usr/src/uts/common/io/warlock/usbvc.wlcmd
deleted file mode 100644
index 906abbb1fe..0000000000
--- a/usr/src/uts/common/io/warlock/usbvc.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 (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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-one usbvc_state
-
-### specify the root functions
-
-root usbvc_open
-root usbvc_close
-root usbvc_read
-root usbvc_ioctl
-root usbvc_power
-
-root usbvc_isoc_cb
-root usbvc_isoc_exc_cb
-root usbvc_disconnect_event_cb
-root usbvc_reconnect_event_cb
-
-add bus_ops::bus_add_eventcall targets warlock_dummy
-add bus_ops::bus_get_eventcookie targets warlock_dummy
-add bus_ops::bus_post_event targets warlock_dummy
-add bus_ops::bus_remove_eventcall targets warlock_dummy
-add bus_ops::bus_intr_ctl targets warlock_dummy
-add bus_ops::bus_config targets warlock_dummy
-add bus_ops::bus_unconfig targets warlock_dummy
diff --git a/usr/src/uts/common/io/warlock/usbvc_with_usba.wlcmd b/usr/src/uts/common/io/warlock/usbvc_with_usba.wlcmd
deleted file mode 100644
index a92af202d8..0000000000
--- a/usr/src/uts/common/io/warlock/usbvc_with_usba.wlcmd
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-one ohci_state
-one ehci_state
-one uhci_state
-one usbvc_state
-
-### specify the root functions
-
-root usb_console_output_init
-root usb_console_output_fini
-root usb_console_output_enter
-root usb_console_output_exit
-root usb_console_write
-root usb_console_input_enter
-root usb_console_input_exit
-root usb_console_input_fini
-root usb_console_input_init
-root usb_console_read
-root usb_get_dev_descr
-root usb_get_if_number
-root usb_parse_CV_cfg_descr
-root usb_parse_CV_ep_descr
-root usb_parse_CV_if_descr
-root usb_parse_comp_ep_descr
-root usb_pipe_get_private
-root usb_get_current_frame_number
-root usb_get_max_isoc_pkts
-root usb_pipe_set_private
-root usba_ready_interface_node
-root usba_free_hcdi_ops
-root usba_async_req_raise_power
-root usba_async_req_lower_power
-root usb_req_raise_power
-root usb_req_lower_power
-root usb_set_device_pwrlvl0
-root usb_set_device_pwrlvl1
-root usb_set_device_pwrlvl2
-root usb_set_device_pwrlvl3
-root usb_is_pm_enabled
-root usb_async_req
-root usb_pipe_bulk_transfer_size
-root usb_get_ep_data
-root usba_pipe_get_policy
-root usb_pipe_ctrl_xfer_wait
-root usb_pipe_drain_reqs
-root usb_try_serialize_access
-root usb_clr_feature
-root usb_clear_feature
-root usb_get_alt_if
-root usb_get_ep_descr
-root usb_get_if_descr
-root usb_log
-root usb_pipe_isoc_xfer
-root usb_pipe_stop_isoc_polling
-root usb_set_alt_if
-root usb_set_cfg
-root usb_get_cfg
-root usb_ep_num
-root usb_get_status
-root usb_pipe_reset
-root usb_log_descr_tree
-root usb_print_descr_tree
-root usb_rval2errno
-root usb_register_hotplug_cbs
-root usb_get_current_cfgidx
-root usb_register_client
-root usb_reset_device
-root usb_ugen_power
-root usb_ugen_attach
-root usb_ugen_close
-root usb_ugen_detach
-root usb_ugen_disconnect_ev_cb
-root usb_ugen_get_hdl
-root usb_ugen_open
-root usb_ugen_poll
-root usb_ugen_read
-root usb_ugen_reconnect_ev_cb
-root usb_ugen_write
-root usb_register_dev_driver
-root usb_unregister_dev_driver
-
-root hcdi_autoclearing
-root hcdi_cb_thread
-root hcdi_shared_cb_thread
-
-
-root hubd_restore_state_cb
-root hubd_disconnect_event_cb
-root hubd_post_resume_event_cb
-root hubd_pre_suspend_event_cb
-root hubd_reconnect_event_cb
-root hubd_hotplug_thread
-root hubd_reset_thread
-root hubd_cpr_post_user_callb
-root hubd_root_hub_cleanup_thread
-root hubd_bus_power
-
-root usba_common_power
-root usba_common_register_events
-root usba_ready_interface_association_node
-root usba_pipe_do_async_func_thread
-root usba_pipe_sync_reset
-root usba_get_hc_dma_attr
-root usba_hcdi_get_req_private
-root usba_hcdi_set_req_private
-root usba_dbuf_tail
-root usba_hubdi_power
-root usba_hubdi_root_hub_power
-root usba_get_hotplug_stats
-root usba_reset_hotplug_stats
-root usba_ascii_string_descr
-root usba_move_list
-root usba_taskq_destroy
-root usba_mk_mctl
-root usb_fail_checkpoint
-
-root ohci_intr
-root ehci_intr
-root ohci_quiesce
-root uhci_quiesce
-root ehci_quiesce
-
-### specify the usbvc root functions
-root usbvc_open
-root usbvc_close
-root usbvc_read
-root usbvc_ioctl
-root usbvc_power
-root usbvc_isoc_cb
-root usbvc_isoc_exc_cb
-root usbvc_disconnect_event_cb
-root usbvc_reconnect_event_cb
-
-add hubd::h_cleanup_child targets warlock_dummy
-add usb_ctrl_req::ctrl_cb targets warlock_dummy
-add usb_ctrl_req::ctrl_exc_cb targets warlock_dummy
-add usb_isoc_req::isoc_cb targets usbvc_isoc_cb
-add usb_isoc_req::isoc_exc_cb targets usbvc_isoc_exc_cb
-add usba_pipe_async_req::callback targets warlock_dummy
-add usba_pipe_async_req::sync_func targets warlock_dummy
-add usba_pm_req::cb targets warlock_dummy
-
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_ctrl_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_bulk_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_intr_td
-add ohci_trans_wrapper::tw_handle_td targets ohci_handle_isoc_td
-
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_bulk_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_intr_qtd
-add ehci_trans_wrapper::tw_handle_qtd targets ehci_handle_ctrl_qtd
diff --git a/usr/src/uts/common/io/warlock/wc.wlcmd b/usr/src/uts/common/io/warlock/wc.wlcmd
deleted file mode 100644
index 838839c745..0000000000
--- a/usr/src/uts/common/io/warlock/wc.wlcmd
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-add bus_ops::bus_add_eventcall target warlock_dummy
-add bus_ops::bus_config target warlock_dummy
-add bus_ops::bus_get_eventcookie target warlock_dummy
-add bus_ops::bus_intr_ctl target warlock_dummy
-add bus_ops::bus_post_event target warlock_dummy
-add bus_ops::bus_remove_eventcall target warlock_dummy
-add bus_ops::bus_unconfig target warlock_dummy
-
-root wcuwput
-root wcopen
-root wclrput
-root wc_polled_enter
-root wc_polled_exit
-root wc_polled_getchar
-root wc_polled_ischar
-root wc_polled_putchar
-root wcclose
-root wcreioctl
-root wcrstrt
-root wc_modechg_cb
-root vc_avl_compare
-
-if test `uname -p` = "sparc"; then
-root wc_cons_wrtvec
-root wconsout
-root wcopoll
-fi
-
-#
-# The devfs part of virtual console only reads these three variables,
-# so we only have to hold the lock when writing to these variables.
-#
-readable wc_dip
-readable vc_active_console
-readable vc_cons_user
-readable vc_state::vc_flags
-
-#
-# Only called from sdev_vtops.c, will be checked in wc_devfs.wlcmd
-#
-ignore vt_getactive
-ignore vt_getconsuser
-ignore vt_wc_attached
-
-#
-# Protected by D_MTPERMODE
-#
-ignore vc_state::vc_acqsig
-ignore vc_state::vc_bufcallid
-ignore vc_state::vc_dispnum
-ignore vc_state::vc_login
-ignore vc_state::vc_minor
-ignore vc_state::vc_pid
-ignore vc_state::vc_relsig
-ignore vc_state::vc_switch_mode
-ignore vc_state::vc_switchto
-ignore vc_state::vc_tem
-ignore vc_state::vc_timeoutid
-ignore vc_state::vc_ttycommon.t_iocpending
-ignore vc_state::vc_ttycommon.t_readq
-ignore vc_state::vc_ttycommon.t_writeq
-ignore vc_state::vc_waitv
-ignore vc_state::vc_wq
diff --git a/usr/src/uts/common/io/warlock/wc_devfs.wlcmd b/usr/src/uts/common/io/warlock/wc_devfs.wlcmd
deleted file mode 100644
index baca059abe..0000000000
--- a/usr/src/uts/common/io/warlock/wc_devfs.wlcmd
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# 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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# This file only checks those virtual console variables
-# which are shared with devfs.
-#
-
-
-add bus_ops::bus_add_eventcall target warlock_dummy
-add bus_ops::bus_config target warlock_dummy
-add bus_ops::bus_get_eventcookie target warlock_dummy
-add bus_ops::bus_intr_ctl target warlock_dummy
-add bus_ops::bus_post_event target warlock_dummy
-add bus_ops::bus_remove_eventcall target warlock_dummy
-add bus_ops::bus_unconfig target warlock_dummy
-
-root devvt_getvnodeops
-root devvt_validate
-root devvt_readdir
-root devvt_lookup
-root devvt_create
diff --git a/usr/src/uts/sun/io/scsi/inc.flg b/usr/src/uts/sun/io/scsi/inc.flg
index 8d33ea8f71..4b1eb82868 100644
--- a/usr/src/uts/sun/io/scsi/inc.flg
+++ b/usr/src/uts/sun/io/scsi/inc.flg
@@ -24,12 +24,11 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# This file brings down all that is needed to build just
+# This file brings down all that is needed to build just
# SCSI Subsystem.
#
find_files "s.*" \
- usr/src/uts/common/io/warlock \
usr/src/uts/common/io/scsi \
usr/src/uts/common/sys \
usr/src/uts/sparc/dada \
@@ -39,7 +38,6 @@ find_files "s.*" \
usr/src/uts/sparc/ses \
usr/src/uts/sparc/ssd \
usr/src/uts/sparc/st \
- usr/src/uts/sparc/warlock \
usr/src/uts/sun/io/dada \
usr/src/uts/sun/sys/dada \
usr/src/uts/sun/sys/scsi