6491439 warlock support on x86

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

3 files changed, 16 insertions, 210 deletions

diff --git a/usr/src/uts/sparc/usb_mid/Makefile b/usr/src/uts/sparc/usb_mid/Makefile
index 66dccd09d1..3d64d22910 100644
--- a/usr/src/uts/sparc/usb_mid/Makefile
+++ b/usr/src/uts/sparc/usb_mid/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,10 @@
 #
 # CDDL HEADER END
 #
-#
+
 # uts/sparc/usb_mid/Makefile
 
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #	This makefile drives the production of the usb_mid driver kernel module.
@@ -42,9 +41,10 @@ UTSBASE = ../..
 MODULE		= usb_mid
 OBJECTS		= $(USB_MID_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(USB_MID_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 WARLOCK_OUT	= $(USB_MID_OBJS:%.o=%.ll)
 WARLOCK_OK	= $(MODULE).ok
-ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+WLCMD_DIR       = $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -74,10 +74,10 @@ all:		$(ALL_DEPS)
 
 def:		$(DEF_DEPS)
 
-clean:		$(CLEAN_DEPS); \
-                $(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
+clean:		$(CLEAN_DEPS)
+		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
-clobber:	$(CLOBBER_DEPS); \
+clobber:	$(CLOBBER_DEPS)
 		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
@@ -105,19 +105,18 @@ TEST		= test
 #
 #	lock_lint rules
 #
-USB_MID_FILES	= $(MODULE).ll
 USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll)
 UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll)
 OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll)
 EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll)
 
-warlock: $(MODULE).ok warlock_with_usba
+warlock: $(WARLOCK_OK) warlock_with_usba
 
 %.wlcmd:
-	$(TEST) -f $@ || $(SCCS) get $@
+	cd $(WLCMD_DIR); $(TEST) -f $@  || $(SCCS) get $@
 
-usb_mid.ok: usb_mid.ll usb_mid.wlcmd warlock_ddi.files
-	$(WARLOCK) -c usb_mid.wlcmd $(USB_MID_FILES)  \
+$(WARLOCK_OK): $(WARLOCK_OUT)  usb_mid.wlcmd warlock_ddi.files
+	$(WARLOCK) -c $(WLCMD_DIR)/usb_mid.wlcmd $(WARLOCK_OUT)  \
 		-l ../warlock/ddi_dki_impl.ll
 	$(TOUCH) $@
 
@@ -125,11 +124,11 @@ usb_mid.ok: usb_mid.ll usb_mid.wlcmd warlock_ddi.files
 		$(UTSBASE)/common/sys/usb/usb_mid/usb_midvar.h
 	$(WLCC)  $(CPPFLAGS) -DDEBUG -o $@ $<
 
-warlock_with_usba: usb_mid.wlcmd  $(USB_MID_FILES) usba_files \
+warlock_with_usba: usb_mid_with_usba.wlcmd  $(WARLOCK_OUT) usba_files \
 	ohci_files ehci_files uhci_files warlock_ddi.files
-	$(WARLOCK) -c ./usb_mid_with_usba.wlcmd \
+	$(WARLOCK) -c $(WLCMD_DIR)/usb_mid_with_usba.wlcmd \
 		$(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \
-		$(USB_MID_FILES) \
+		$(WARLOCK_OUT) \
 		-l ../warlock/ddi_dki_impl.ll
 
 usba_files:
diff --git a/usr/src/uts/sparc/usb_mid/usb_mid.wlcmd b/usr/src/uts/sparc/usb_mid/usb_mid.wlcmd
deleted file mode 100644
index eb91c0a03a..0000000000
--- a/usr/src/uts/sparc/usb_mid/usb_mid.wlcmd
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2005 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, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#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/sparc/usb_mid/usb_mid_with_usba.wlcmd b/usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd
deleted file mode 100644
index 81b5c8fbd7..0000000000
--- a/usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd
+++ /dev/null
@@ -1,160 +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 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_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_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_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_ugen_power
-
-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 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