Mercurial > illumos > illumos-gate
changeset 978:276670f0fee7
6352154 warlock all is not clean
6352865 reduce messages from USB drivers in /var/adm/messages
line wrap: on
line diff
--- a/usr/src/uts/common/io/scsi/targets/sd.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/scsi/targets/sd.c Tue Nov 22 18:35:14 2005 -0800 @@ -11233,6 +11233,8 @@ #define SD_TASKQ_MAXALLOC 256 static taskq_t *sd_tq = NULL; +_NOTE(SCHEME_PROTECTS_DATA("stable data", sd_tq)) + static int sd_taskq_minalloc = SD_TASKQ_MINALLOC; static int sd_taskq_maxalloc = SD_TASKQ_MAXALLOC; @@ -11246,6 +11248,7 @@ */ #define SD_WMR_TASKQ_NUMTHREADS 1 static taskq_t *sd_wmr_tq = NULL; +_NOTE(SCHEME_PROTECTS_DATA("stable data", sd_wmr_tq)) /* * Function: sd_taskq_create
--- a/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac.c Tue Nov 22 18:35:14 2005 -0800 @@ -650,7 +650,7 @@ kmem_free(key, key_len); if (uacp->usb_ac_audiohdl == NULL) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, "audio_sup_register failed"); goto fail; @@ -683,7 +683,7 @@ if ((ddi_create_minor_node(dip, "mux", S_IFCHR, minor, NULL, 0)) != DDI_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, "usb_ac_attach: couldn't create minor node mux"); goto fail; @@ -709,7 +709,7 @@ /* Register for events */ if (usb_register_event_cbs(dip, &usb_ac_events, 0) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, "usb_ac_attach: couldn't register for events"); goto fail; @@ -724,7 +724,7 @@ return (DDI_SUCCESS); fail: if (uacp) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, "attach failed"); (void) usb_ac_cleanup(dip, uacp); }
--- a/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac_dacf.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/audio/usb_ac/usb_ac_dacf.c Tue Nov 22 18:35:14 2005 -0800 @@ -217,7 +217,7 @@ /* usb_as and hid should be attached but double check */ if (usb_ac_online_siblings(uacp) != USB_SUCCESS) { mutex_exit(&uacp->usb_ac_mutex); - USB_DPRINTF_L1(PRINT_MASK_ALL, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "no audio streams driver plumbed"); return (DACF_FAILURE); @@ -251,7 +251,7 @@ ldi_ident_release(li); } if (error) { - USB_DPRINTF_L1(PRINT_MASK_ALL, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "open failed, error=%d", error); usb_ac_rele_siblings(uacp); @@ -279,7 +279,7 @@ (void) usb_ac_mux_unplumbing(info_hdl, arg_hdl, flags); - USB_DPRINTF_L1(PRINT_MASK_ALL, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "no audio streams driver plumbed"); usb_ac_rele_siblings(uacp); @@ -545,7 +545,7 @@ mutex_enter(&uacp->usb_ac_mutex); if (error) { - USB_DPRINTF_L1(PRINT_MASK_ALL, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "ldi_open_by_dev failed on major = %d minor = %d, " "name = %s error=%d", drv_major, drv_instance, ddi_driver_name(child_dip), error); @@ -564,7 +564,7 @@ if (usb_ac_get_reg_data(uacp, drv_lh, count) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ALL, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "get_reg_data failed on major = %d " "minor = %d, name = %s", drv_major, @@ -590,7 +590,7 @@ mutex_enter(&uacp->usb_ac_mutex); if (error) { - USB_DPRINTF_L1(PRINT_MASK_ALL, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "ldi_ioctl failed for usb_ah, " "major:%d minor:%d name:%s", @@ -608,7 +608,7 @@ } } else { /* should not be here */ - USB_DPRINTF_L1(PRINT_MASK_ALL, uacp->usb_ac_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "usb_ac_mux_plumbing: unknown module"); count --; @@ -640,7 +640,7 @@ mutex_enter(&uacp->usb_ac_mutex); if (error) { - USB_DPRINTF_L1(PRINT_MASK_ALL, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "plink failed for major:%d minor:%d" "name:%s", drv_major, drv_instance, @@ -726,7 +726,7 @@ /* Haven't found a streaming interface; fail mixer registration */ if (n > USB_AC_MAX_AS_PLUMBED) { USB_DPRINTF_L1(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, - "usb_ac_mixer_registration: no streaming interface"); + "no streaming interface"); return (USB_FAILURE); } @@ -888,8 +888,8 @@ if (am_attach(uacp->usb_ac_audiohdl, DDI_ATTACH, info) == AUDIO_FAILURE) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, - "am_attach failed"); + USB_DPRINTF_L2(PRINT_MASK_ATTA, uacp->usb_ac_log_handle, + "am_attach: failed"); mutex_enter(&uacp->usb_ac_mutex); @@ -954,7 +954,7 @@ if ((error = ldi_ioctl(drv_lh, USB_AUDIO_MIXER_REGISTRATION, (intptr_t)streams_reg, FKIOCTL, kcred, &rval)) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ALL, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "ldi_ioctl fails for mixer registration, error=%d", error); mutex_enter(&uacp->usb_ac_mutex); @@ -1021,7 +1021,7 @@ } } if (i == USB_AC_MAX_AS_PLUMBED) { - USB_DPRINTF_L1(PRINT_MASK_ALL, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "no corresponding registration structure"); @@ -1118,7 +1118,7 @@ mutex_exit(&uacp->usb_ac_mutex); if (ndi_devi_online(child_dip, NDI_ONLINE_ATTACH) != NDI_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ALL, + USB_DPRINTF_L2(PRINT_MASK_ALL, uacp->usb_ac_log_handle, "failure to online driver %s%d", ddi_driver_name(child_dip),
--- a/usr/src/uts/common/io/usb/clients/audio/usb_as/usb_as.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/audio/usb_as/usb_as.c Tue Nov 22 18:35:14 2005 -0800 @@ -454,7 +454,7 @@ if ((ddi_create_minor_node(dip, "usb_as", S_IFCHR, USB_AS_CONSTRUCT_MINOR(instance), NULL, 0)) != DDI_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uasp->usb_as_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uasp->usb_as_log_handle, "usb_as_attach: couldn't create minor node"); goto fail; @@ -468,7 +468,7 @@ /* Register for events */ if (usb_register_event_cbs(dip, &usb_as_events, 0) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uasp->usb_as_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uasp->usb_as_log_handle, "usb_as_attach: couldn't register for events"); goto fail; @@ -484,7 +484,7 @@ fail: if (uasp) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uasp->usb_as_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uasp->usb_as_log_handle, "attach failed"); usb_as_cleanup(dip, uasp); }
--- a/usr/src/uts/common/io/usb/clients/hid/hid.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/hid/hid.c Tue Nov 22 18:35:14 2005 -0800 @@ -640,7 +640,7 @@ if ((ddi_create_minor_node(dip, minor_name, S_IFCHR, HID_CONSTRUCT_EXTERNAL_MINOR(instance), DDI_PSEUDO, 0)) != DDI_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, hidp->hid_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, hidp->hid_log_handle, "hid_attach: Could not create minor node"); goto fail; @@ -675,7 +675,7 @@ /* register for all events */ if (usb_register_event_cbs(dip, &hid_events, 0) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, hidp->hid_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, hidp->hid_log_handle, "usb_register_event_cbs failed"); goto fail; @@ -1758,7 +1758,7 @@ &data, /* data */ &completion_reason, &cb_flags, 0) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, hidp->hid_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, hidp->hid_log_handle, "Failed to receive the Report Descriptor"); freemsg(data);
--- a/usr/src/uts/common/io/usb/clients/printer/usbprn.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/printer/usbprn.c Tue Nov 22 18:35:14 2005 -0800 @@ -392,7 +392,7 @@ if ((ddi_create_minor_node(dip, "printer", S_IFCHR, instance << USBPRN_MINOR_INSTANCE_SHIFT, DDI_NT_PRINTER, 0)) != DDI_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, usbprnp->usbprn_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, usbprnp->usbprn_log_handle, "usbprn_attach: cannot create minor node"); goto fail; @@ -417,7 +417,7 @@ /* Register for events */ if (usb_register_event_cbs(dip, &usbprn_events, 0) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, usbprnp->usbprn_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, usbprnp->usbprn_log_handle, "usbprn_attach: usb_register_event_cbs failed"); goto fail; @@ -1010,7 +1010,7 @@ if (usbprn_open_usb_pipes(usbprnp) != USB_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, usbprnp->usbprn_log_handle, + USB_DPRINTF_L2(PRINT_MASK_ATTA, usbprnp->usbprn_log_handle, "usbprn_open: pipe open failed"); usb_release_access(usbprnp->usbprn_ser_acc); @@ -2545,7 +2545,7 @@ /* Check if we are talking to the same device */ if (usb_check_same_device(dip, usbprnp->usbprn_log_handle, - USB_LOG_L2, PRINT_MASK_ALL, + USB_LOG_L0, PRINT_MASK_ALL, USB_CHK_ALL, NULL) != USB_SUCCESS) { /* change the device state from suspended to disconnected */
--- a/usr/src/uts/common/io/usb/clients/usbms/usbms.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/usbms/usbms.c Tue Nov 22 18:35:14 2005 -0800 @@ -370,7 +370,7 @@ } } else { USB_DPRINTF_L1(PRINT_MASK_ALL, - usbms_log_handle, "usbms: Invalid HID " + usbms_log_handle, "Invalid HID " "Descriptor Tree. Set to default value(3 buttons)."); usbmsp->usbms_num_buttons = USB_MS_DEFAULT_BUTTON_NO; }
--- a/usr/src/uts/common/io/usb/clients/usbser/usbser.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/usbser/usbser.c Tue Nov 22 18:35:14 2005 -0800 @@ -2174,7 +2174,7 @@ usbser_st_put_stopi++; USB_DPRINTF_L1(DPRINT_RX_CB, pp->port_lh, - "usbser_rx_cb: input overrun"); + "input overrun"); } }
--- a/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/keyspan_dsd.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/usbser/usbser_keyspan/keyspan_dsd.c Tue Nov 22 18:35:14 2005 -0800 @@ -321,7 +321,7 @@ /* get device specific parameters */ if (keyspan_attach_dev(ksp) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_ATTACH, ksp->ks_lh, "fail attach dev "); + USB_DPRINTF_L2(DPRINT_ATTACH, ksp->ks_lh, "fail attach dev "); goto fail_attach_dev; } @@ -329,7 +329,7 @@ keyspan_attach_ports(ksp); if (keyspan_init_pipes(ksp) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_ATTACH, ksp->ks_lh, + USB_DPRINTF_L2(DPRINT_ATTACH, ksp->ks_lh, "keyspan_init_pipes: failed."); goto fail_init_pipes; @@ -340,7 +340,7 @@ keyspan_set_dev_state_online(ksp); if (keyspan_create_pm_components(ksp) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_ATTACH, ksp->ks_lh, + USB_DPRINTF_L2(DPRINT_ATTACH, ksp->ks_lh, "keyspan_create_pm_components: failed."); goto fail_pm; @@ -353,7 +353,7 @@ /* open the global pipes */ if (keyspan_attach_pipes(ksp) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_ATTACH, ksp->ks_lh, + USB_DPRINTF_L2(DPRINT_ATTACH, ksp->ks_lh, "keyspan_attach_pipes: failed."); goto fail_attach_pipes; @@ -489,7 +489,7 @@ keyspan_close_port_pipes(kp); } - USB_DPRINTF_L1(DPRINT_OPEN, kp->kp_lh, + USB_DPRINTF_L2(DPRINT_OPEN, kp->kp_lh, "keyspan_open_hw_port: failed. This port can't be used."); return (rval); @@ -865,7 +865,7 @@ mutex_exit(&kp->kp_mutex); if (keyspan_send_cmd(kp) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_CTLOP, kp->kp_lh, + USB_DPRINTF_L2(DPRINT_CTLOP, kp->kp_lh, "keyspan_send_cmd() FAILED"); return (USB_FAILURE); @@ -1523,7 +1523,7 @@ #endif /* If KEYSPAN_USA49WLC defined */ default: mutex_exit(&ksp->ks_mutex); - USB_DPRINTF_L1(DPRINT_ATTACH, ksp->ks_lh, + USB_DPRINTF_L2(DPRINT_ATTACH, ksp->ks_lh, "keyspan_attach_dev:" "the device's product id can't be recognized"); @@ -1731,7 +1731,7 @@ return (state); } - if (usb_check_same_device(ksp->ks_dip, ksp->ks_lh, USB_LOG_L2, + if (usb_check_same_device(ksp->ks_dip, ksp->ks_lh, USB_LOG_L0, DPRINT_MASK_ALL, USB_CHK_ALL, NULL) != USB_SUCCESS) { mutex_enter(&ksp->ks_mutex); state = ksp->ks_dev_state = USB_DEV_DISCONNECTED;
--- a/usr/src/uts/common/io/usb/clients/usbser/usbsprl/pl2303_dsd.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/clients/usbser/usbsprl/pl2303_dsd.c Tue Nov 22 18:35:14 2005 -0800 @@ -1091,7 +1091,7 @@ return (state); } - if (usb_check_same_device(plp->pl_dip, plp->pl_lh, USB_LOG_L2, + if (usb_check_same_device(plp->pl_dip, plp->pl_lh, USB_LOG_L0, DPRINT_MASK_ALL, USB_CHK_ALL, NULL) != USB_SUCCESS) { mutex_enter(&plp->pl_mutex); state = plp->pl_dev_state = USB_DEV_DISCONNECTED; @@ -1204,7 +1204,7 @@ if (pm->pm_wakeup_enabled) { rval = pm_raise_power(dip, 0, USB_DEV_OS_FULL_PWR); if (rval != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_PM, plp->pl_lh, + USB_DPRINTF_L2(DPRINT_PM, plp->pl_lh, "pl2303_destroy_pm_components:" "raising power failed, rval=%d", rval); } @@ -1265,7 +1265,7 @@ rval = pm_raise_power(dip, 0, USB_DEV_OS_FULL_PWR); if (rval != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_PM, plp->pl_lh, "raising power failed"); + USB_DPRINTF_L2(DPRINT_PM, plp->pl_lh, "raising power failed"); } mutex_enter(&plp->pl_mutex);
--- a/usr/src/uts/common/io/usb/hcd/openhci/ohci.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci.c Tue Nov 22 18:35:14 2005 -0800 @@ -2294,7 +2294,7 @@ /* Restart the controller */ if (ohci_init_ctlr(ohcip) != DDI_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, ohcip->ohci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ATTA, ohcip->ohci_log_hdl, "ohci_cpr_resume: ohci host controller resume failed "); mutex_exit(&ohcip->ohci_int_mutex); @@ -3414,7 +3414,7 @@ if ((interval < MIN_POLL_INTERVAL) || (interval > MAX_POLL_INTERVAL)) { - USB_DPRINTF_L1(PRINT_MASK_LISTS, ohcip->ohci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_LISTS, ohcip->ohci_log_hdl, "ohci_adjust_polling_interval: " "Endpoint's poll interval must be between %d and %d ms", MIN_POLL_INTERVAL, MAX_POLL_INTERVAL); @@ -3435,7 +3435,7 @@ if ((port_status == USBA_LOW_SPEED_DEV) && (interval < MIN_LOW_SPEED_POLL_INTERVAL)) { - USB_DPRINTF_L1(PRINT_MASK_BW, ohcip->ohci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_BW, ohcip->ohci_log_hdl, "ohci_adjust_polling_interval: " "Low speed endpoint's poll interval of %d ms " "is below threshold. Rounding up to %d ms", @@ -8247,7 +8247,7 @@ if (!(hced_head & HC_EPT_Halt)) { uint_t hced_ctrl = Get_ED(pp->pp_ept->hced_ctrl); - USB_DPRINTF_L1(PRINT_MASK_INTR, ohcip->ohci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_INTR, ohcip->ohci_log_hdl, "ohci_cleanup_data_underrun: Unable to clean up a short " "xfer error. Client might send/receive irrelevant data." " Device address %d Endpoint number %d",
--- a/usr/src/uts/common/io/usb/hcd/uhci/uhci.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/hcd/uhci/uhci.c Tue Nov 22 18:35:14 2005 -0800 @@ -415,7 +415,7 @@ return (DDI_SUCCESS); fail: - USB_DPRINTF_L1(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, "failed to attach"); (void) uhci_cleanup(uhcip); @@ -594,7 +594,7 @@ return (uhci_cleanup(uhcip) == USB_SUCCESS ? DDI_SUCCESS : DDI_FAILURE); case DDI_SUSPEND: - USB_DPRINTF_L1(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, "uhci_detach: Suspend not supported"); return (DDI_FAILURE); @@ -821,7 +821,7 @@ * We configured the hw incorrectly, disable future interrupts. */ if ((intr_status & USBSTS_REG_HOST_SYS_ERR)) { - USB_DPRINTF_L1(PRINT_MASK_INTR, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_INTR, uhcip->uhci_log_hdl, "uhci_intr: Sys Err Disabling Interrupt"); Set_OpReg16(USBINTR, DISABLE_ALL_INTRS); mutex_exit(&uhcip->uhci_int_mutex);
--- a/usr/src/uts/common/io/usb/hcd/uhci/uhcihub.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/hcd/uhci/uhcihub.c Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -301,7 +301,7 @@ break; default: - USB_DPRINTF_L1(PRINT_MASK_ROOT_HUB, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ROOT_HUB, uhcip->uhci_log_hdl, "uhci_handle_set_clear_port_feature: " "Unsupported request 0x%x 0x%x", bRequest, wValue); error = USB_FAILURE; @@ -340,7 +340,7 @@ break; default: - USB_DPRINTF_L1(PRINT_MASK_ROOT_HUB, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ROOT_HUB, uhcip->uhci_log_hdl, "uhci_handle_set_clear_port_feature: " "Unsupported request 0x%x 0x%x", bRequest, wValue); error = USB_FAILURE;
--- a/usr/src/uts/common/io/usb/hcd/uhci/uhciutil.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/hcd/uhci/uhciutil.c Tue Nov 22 18:35:14 2005 -0800 @@ -518,7 +518,7 @@ if (!(cmd_reg & (USBCMD_REG_HC_RUN | USBCMD_REG_MAXPKT_64 | USBCMD_REG_CONFIG_FLAG))) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, "uhci_init_ctlr: Controller initialization failed"); return (USB_FAILURE); @@ -612,7 +612,7 @@ if (ddi_regs_map_setup(dip, index, (caddr_t *)&uhcip->uhci_regsp, 0, sizeof (hc_regs_t), &attr, &uhcip->uhci_regs_handle) != DDI_SUCCESS) { - USB_DPRINTF_L1(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ATTA, uhcip->uhci_log_hdl, "ddi_regs_map_setup: failed"); return (USB_FAILURE); @@ -919,7 +919,7 @@ "uhci_alloc_queue_head: Allocated %d", index); if (index == uhci_qh_pool_size) { - USB_DPRINTF_L1(PRINT_MASK_ALLOC, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_ALLOC, uhcip->uhci_log_hdl, "uhci_alloc_queue_head: All QH exhausted"); /* Free the dummy td allocated for this qh. */ @@ -1305,7 +1305,7 @@ */ if ((port_status == USBA_LOW_SPEED_DEV) && (interval < MIN_LOW_SPEED_POLL_INTERVAL)) { - USB_DPRINTF_L1(PRINT_MASK_LISTS, uhcip->uhci_log_hdl, + USB_DPRINTF_L2(PRINT_MASK_LISTS, uhcip->uhci_log_hdl, "uhci_bandwidth_adjust: Low speed endpoint's poll interval " "must be >= %d ms, adjusted", MIN_LOW_SPEED_POLL_INTERVAL);
--- a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c Tue Nov 22 18:35:14 2005 -0800 @@ -677,7 +677,7 @@ altif_data = &dev_data->dev_curr_cfg->cfg_if[interface].if_alt[0]; if (altif_data->altif_n_ep == 0) { - USB_DPRINTF_L1(DPRINT_MASK_SCSA, log_handle, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, log_handle, "invalid alt 0 for interface %d", interface); mutex_exit(&scsa2usbp->scsa2usb_mutex); @@ -687,7 +687,7 @@ /* All CB/CBI, BO devices should have this value set */ if (altif_data->altif_descr.bInterfaceClass != USB_CLASS_MASS_STORAGE) { - USB_DPRINTF_L1(DPRINT_MASK_SCSA, log_handle, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, log_handle, "invalid interface class (0x%x)", altif_data->altif_descr.bInterfaceClass); } @@ -737,7 +737,7 @@ if (scsa2usbp->scsa2usb_protocol_override) { scsa2usbp->scsa2usb_cmd_protocol |= scsa2usbp->scsa2usb_protocol_override; - USB_DPRINTF_L1(DPRINT_MASK_SCSA, log_handle, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, log_handle, "overriding protocol %x", scsa2usbp->scsa2usb_intfc_descr.bInterfaceProtocol); break; @@ -766,7 +766,7 @@ if (scsa2usbp->scsa2usb_subclass_override) { scsa2usbp->scsa2usb_cmd_protocol |= scsa2usbp->scsa2usb_subclass_override; - USB_DPRINTF_L1(DPRINT_MASK_SCSA, log_handle, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, log_handle, "overriding subclass %x", scsa2usbp->scsa2usb_intfc_descr.bInterfaceSubClass); break; @@ -795,7 +795,7 @@ } if (ept_check == B_FALSE) { - USB_DPRINTF_L1(DPRINT_MASK_SCSA, log_handle, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, log_handle, "scsa2usb%d doesn't support minimum required endpoints", instance); mutex_exit(&scsa2usbp->scsa2usb_mutex); @@ -918,7 +918,7 @@ /* log the conf file override string if there is one */ if (scsa2usbp->scsa2usb_override_str) { - USB_DPRINTF_L1(DPRINT_MASK_SCSA, scsa2usbp->scsa2usb_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, scsa2usbp->scsa2usb_log_handle, "scsa2usb.conf override: %s", scsa2usbp->scsa2usb_override_str); } @@ -1253,7 +1253,7 @@ if ((rval = usb_handle_remote_wakeup(dip, USB_REMOTE_WAKEUP_DISABLE)) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_SCSA, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, scsa2usbp->scsa2usb_log_handle, "disable remote wakeup failed " "(%d)", rval); @@ -3977,7 +3977,7 @@ (void) scsi_transport(pkt); if (pkt->pkt_reason) { - USB_DPRINTF_L0(DPRINT_MASK_SCSA, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, scsa2usbp->scsa2usb_log_handle, "INQUIRY failed, cannot determine device type, " "pkt_reason=0x%x", pkt->pkt_reason);
--- a/usr/src/uts/common/io/usb/scsa2usb/usb_ms_bulkonly.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/scsa2usb/usb_ms_bulkonly.c Tue Nov 22 18:35:14 2005 -0800 @@ -839,7 +839,7 @@ * Otherwise we assume that device supports only one LUN. */ if ((data->b_wptr - data->b_rptr) != 1) { - USB_DPRINTF_L1(DPRINT_MASK_SCSA, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, scsa2usbp->scsa2usb_log_handle, "device reported incorrect luns (adjusting to 1)"); } else { @@ -855,7 +855,7 @@ * we assume 1. */ if ((luns >= SCSA2USB_MAX_LUNS) || (luns <= 0)) { - USB_DPRINTF_L1(DPRINT_MASK_SCSA, + USB_DPRINTF_L2(DPRINT_MASK_SCSA, scsa2usbp->scsa2usb_log_handle, "device reported %d luns " "(adjusting to 1)", luns);
--- a/usr/src/uts/common/io/usb/usb_mid/usb_mid.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usb_mid/usb_mid.c Tue Nov 22 18:35:14 2005 -0800 @@ -746,7 +746,7 @@ if (ddi_create_minor_node(dip, "usb_mid", S_IFCHR, instance << USB_MID_MINOR_INSTANCE_SHIFT, DDI_NT_NEXUS, 0) != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, usb_mid->mi_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, usb_mid->mi_log_handle, "cannot create devctl minor node"); goto fail; } @@ -796,7 +796,7 @@ return (DDI_SUCCESS); fail: - USB_DPRINTF_L1(DPRINT_MASK_ATTA, NULL, "usb_mid%d cannot attach", + USB_DPRINTF_L2(DPRINT_MASK_ATTA, NULL, "usb_mid%d cannot attach", instance); if (usb_mid) { @@ -872,7 +872,7 @@ if (usb_mid->mi_ndi_event_hdl && (ndi_event_free_hdl(usb_mid->mi_ndi_event_hdl) != NDI_SUCCESS)) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, usb_mid->mi_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, usb_mid->mi_log_handle, "usb_mid_cleanup: ndi_event_free_hdl failed"); return (DDI_FAILURE);
--- a/usr/src/uts/common/io/usb/usba/hcdi.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/hcdi.c Tue Nov 22 18:35:14 2005 -0800 @@ -196,7 +196,7 @@ hcdi->hcdi_ugen_default_binding = USBA_UGEN_INTERFACE_BINDING; } else { - USB_DPRINTF_L1(DPRINT_MASK_HCDI, + USB_DPRINTF_L2(DPRINT_MASK_HCDI, hcdi->hcdi_log_handle, "illegal value (%s) for " "ugen_default_binding property",
--- a/usr/src/uts/common/io/usb/usba/hubdi.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/hubdi.c Tue Nov 22 18:35:14 2005 -0800 @@ -411,7 +411,7 @@ if (usba_hubdi_detach(dip, DDI_DETACH) != DDI_SUCCESS) { if (DEVI_IS_ATTACHING(dip)) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, hubdi_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubdi_log_handle, "failure to unbind root hub after attach failure"); } @@ -1828,7 +1828,7 @@ */ rval = usba_hubdi_register(dip, 0); if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubd->h_log_handle, "usba_hubdi_register failed"); goto fail; } @@ -1860,7 +1860,7 @@ /* event registration */ if (hubd_register_events(hubd) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubd->h_log_handle, "hubd_register_events failed"); goto fail; @@ -1871,7 +1871,7 @@ /* initialize and create children */ if (hubd_check_ports(hubd) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubd->h_log_handle, "hubd_check_ports failed"); mutex_exit(HUBD_MUTEX(hubd)); @@ -1897,7 +1897,7 @@ if (ddi_create_minor_node(dip, ap_name, S_IFCHR, instance, DDI_NT_USB_ATTACHMENT_POINT, 0) != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubd->h_log_handle, "cannot create attachment point node (%d)", instance); mutex_exit(HUBD_MUTEX(hubd)); @@ -1911,7 +1911,7 @@ if (ddi_create_minor_node(dip, "hubd", S_IFCHR, instance | minor, DDI_NT_NEXUS, 0) != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubd->h_log_handle, "cannot create devctl minor node (%d)", instance); goto fail; @@ -1954,7 +1954,7 @@ if (hubd) { rval = hubd_cleanup(dip, hubd); if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ATTA, hubdi_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ATTA, hubdi_log_handle, "failure to complete cleanup after attach failure"); } } @@ -2612,7 +2612,7 @@ } else if (rval != NDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_ALL, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_ALL, hubd->h_log_handle, "hubd_cleanup: ndi_event_free_hdl failed"); ndi_devi_exit(dip, circ); @@ -2933,7 +2933,7 @@ if ((rval = usb_pipe_open(hubd->h_dip, &hubd->h_ep1_descr, &hubd->h_pipe_policy, 0, &hubd->h_ep1_ph)) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HUB, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HUB, hubd->h_log_handle, "open intr pipe failed (%d)", rval); mutex_enter(HUBD_MUTEX(hubd)); @@ -3716,7 +3716,7 @@ if ((rval = hubd_determine_port_status(hubd, port, &status, &change, 0)) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "getting status failed (%d)", rval); (void) hubd_disable_port(hubd, port); @@ -3725,7 +3725,7 @@ } if (status & PORT_STATUS_POCI) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L0(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "port %d overcurrent", port); (void) hubd_disable_port(hubd, port); @@ -3831,7 +3831,7 @@ hubd->h_total_hotplug_success++; if (retry > 0) { - USB_DPRINTF_L1( + USB_DPRINTF_L2( DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "device on port %d " @@ -4042,7 +4042,7 @@ * the port power is automatically disabled, so we * won't see disconnects. */ - USB_DPRINTF_L1(DPRINT_MASK_PORT, hubd->h_log_handle, + USB_DPRINTF_L0(DPRINT_MASK_PORT, hubd->h_log_handle, "global over current condition, " "please disconnect hub"); } @@ -4107,7 +4107,7 @@ 0, NULL, 0, &completion_reason, &cb_flags, 0)) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_PORT, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_PORT, hubd->h_log_handle, "reset port%d failed (%d 0x%x %d)", port, completion_reason, cb_flags, rval); @@ -4174,7 +4174,7 @@ GET_STATUS_LENGTH, &data, 0, &completion_reason, &cb_flags, 0)) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_PORT, + USB_DPRINTF_L2(DPRINT_MASK_PORT, hubd->h_log_handle, "get status port%d failed (%d 0x%x %d)", port, completion_reason, cb_flags, rval); @@ -4470,8 +4470,8 @@ } if (*status & PORT_STATUS_POCI) { - USB_DPRINTF_L1(DPRINT_MASK_PORT, hubd->h_log_handle, - "port%d over current!", port); + USB_DPRINTF_L2(DPRINT_MASK_PORT, hubd->h_log_handle, + "port%d overcurrent!", port); hubd->h_port_state[port] |= (PORT_STATUS_POCI & ack_flag); } else { @@ -4769,7 +4769,7 @@ /* Print warning message if port has no power */ if (!(status & PORT_STATUS_PPS)) { - USB_DPRINTF_L1(DPRINT_MASK_PORT, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_PORT, hubd->h_log_handle, "hubd_enable_all_port_power: port %d power-on " "failed, port status 0x%x", port, status); } @@ -5021,7 +5021,7 @@ if (size == USB_PARSE_ERROR) { if (pdata->b_rptr[1] != USB_DESCR_TYPE_CFG) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "device returned incorrect " "configuration descriptor type."); @@ -5031,7 +5031,7 @@ } if (confdescr->wTotalLength < USB_CFG_DESCR_SIZE) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "device returned incorrect " "configuration descriptor size."); @@ -5059,7 +5059,7 @@ if ((pdata->b_wptr - pdata->b_rptr) != confdescr->wTotalLength) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "device returned incorrect " "configuration descriptor."); @@ -5334,7 +5334,7 @@ if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "usb_create_child_devi failed (%d)", rval); goto fail_cleanup; @@ -5381,8 +5381,8 @@ /* Open the default pipe */ if ((rval = usb_pipe_open(child_dip, NULL, NULL, USB_FLAGS_SLEEP | USBA_FLAGS_PRIVILEGED, &ph)) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, - "usb_pipe_open failed (%d)", rval); + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + "usb_pipe_open failed (%d)", rval); goto fail_cleanup; } @@ -5427,7 +5427,7 @@ &completion_reason, &cb_flags, 0); if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "getting device descriptor failed (%s 0x%x %d)", usb_str_cr(completion_reason), cb_flags, rval); goto fail_cleanup; @@ -5451,14 +5451,14 @@ freemsg(pdata); pdata = NULL; if (size < 8) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "get device descriptor returned %lu bytes", size); goto fail_cleanup; } if (length < 8) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "fail enumeration: bLength=%d", length); goto fail_cleanup; @@ -5474,7 +5474,7 @@ NULL, 0, &completion_reason, &cb_flags, 0)) != USB_SUCCESS) { char buffer[64]; - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "setting address failed (cr=%s cb_flags=%s rval=%d)", usb_str_cr(completion_reason), usb_str_cb_flags(cb_flags, buffer, sizeof (buffer)), @@ -5512,7 +5512,7 @@ /* re-open the pipe for the device with the new address */ if ((rval = usb_pipe_open(child_dip, NULL, NULL, USB_FLAGS_SLEEP | USBA_FLAGS_PRIVILEGED, &ph)) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "usb_pipe_open failed (%d)", rval); goto fail_cleanup; @@ -5563,7 +5563,7 @@ goto fail_cleanup; } } else if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "getting device descriptor failed " "(%d 0x%x %d)", @@ -5590,7 +5590,7 @@ pdata = NULL; if (size != USB_DEV_DESCR_SIZE) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "fail enumeration: descriptor size=%lu " "expected size=%u", size, USB_DEV_DESCR_SIZE); @@ -5609,7 +5609,7 @@ } if (usb_dev_descr.bNumConfigurations == 0) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "device descriptor:\n\t" "l=0x%x type=0x%x USB=0x%x class=0x%x subclass=0x%x\n\t" "protocol=0x%x maxpktsize=0x%x " @@ -5635,7 +5635,7 @@ /* retrieve config cloud for all configurations */ rval = hubd_get_all_device_config_cloud(hubd, child_dip, child_ud); if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "failed to get configuration descriptor(s)"); goto fail_cleanup; @@ -5647,7 +5647,7 @@ /* Check if the user selected configuration index is in range */ if (user_conf_index >= usb_dev_descr.bNumConfigurations) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "Configuration index for device idVendor=%d " "idProduct=%d is=%d, and is out of range[0..%d]", usb_dev_descr.idVendor, usb_dev_descr.idProduct, @@ -5820,7 +5820,7 @@ int rval = usba_destroy_child_devi(child_dip, NDI_DEVI_REMOVE); if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "failure to remove child node"); } } @@ -6182,7 +6182,7 @@ rval = usba_persistent_pipe_open(usba_device); if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HOTPLUG, + USB_DPRINTF_L2(DPRINT_MASK_HOTPLUG, hubd->h_log_handle, "failed to reopen all pipes on reconnect"); } @@ -7641,7 +7641,7 @@ /* Print warning message if port has no power */ if (!(status & PORT_STATUS_PPS)) { - USB_DPRINTF_L1(DPRINT_MASK_PORT, hubd->h_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_PORT, hubd->h_log_handle, "hubd_toggle_port: port %d power-on failed, " "port status 0x%x", port, status);
--- a/usr/src/uts/common/io/usb/usba/usba.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/usba.c Tue Nov 22 18:35:14 2005 -0800 @@ -291,14 +291,14 @@ DDI_PROP_DONTPASS | DDI_PROP_CANSLEEP, "assigned-address", (caddr_t)&usb_addr, &len) != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, hubdi_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, hubdi_log_handle, "usba_bus_ctl:\n\t" "%s%d %s%d op=%d rdip = 0x%p dip = 0x%p", ddi_node_name(rdip), ddi_get_instance(rdip), ddi_node_name(dip), ddi_get_instance(dip), op, rdip, dip); - USB_DPRINTF_L1(DPRINT_MASK_USBA, hubdi_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, hubdi_log_handle, "usba_bus_ctl: DDI_NOT_WELL_FORMED (%s (0x%p))", ddi_node_name(child_dip), (void *)child_dip); @@ -309,7 +309,7 @@ DDI_PROP_DONTPASS, "reg", &data, &n)) != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, hubdi_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, hubdi_log_handle, "usba_bus_ctl: %d, DDI_NOT_WELL_FORMED", rval); return (DDI_NOT_WELL_FORMED); @@ -473,7 +473,7 @@ usba_device->usb_addr = 0; - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "no usb address available"); mutex_exit(&hcdi->hcdi_mutex); @@ -903,7 +903,7 @@ usba_unset_usb_address(usba_device); } - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_create_child_devi failed: rval=%d", rval); return (rval); @@ -1537,7 +1537,7 @@ if (ddi_prop_lookup_int_array(DDI_DEV_T_ANY, odip, DDI_PROP_DONTPASS, "reg", &odata, &n_odata) != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HCDI, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HCDI, usba_log_handle, "usba_find_existing_node: " "%s: DDI_NOT_WELL_FORMED", ddi_driver_name(odip)); @@ -1563,7 +1563,7 @@ child, DDI_PROP_DONTPASS, "reg", &ndata, &n_ndata) != DDI_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_HCDI, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_HCDI, usba_log_handle, "usba_find_existing_node: " "%s DDI_NOT_WELL_FORMED", ddi_driver_name(child)); @@ -1677,7 +1677,7 @@ USB_IF_DESCR_SIZE); if (size != USB_IF_DESCR_SIZE) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "parsing interface: " "size (%lu) != USB_IF_DESCR_SIZE (%d)", size, USB_IF_DESCR_SIZE); @@ -1703,7 +1703,7 @@ DDI_DEV_T_NONE, child_dip, "reg", reg, 1); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: property update failed"); return (child_dip); @@ -1970,7 +1970,7 @@ if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: property update failed"); return (child_dip); @@ -1981,7 +1981,7 @@ rval = ndi_prop_update_int(DDI_DEV_T_NONE, child_dip, "assigned-address", usba_device->usb_addr); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: address update failed"); } @@ -1990,7 +1990,7 @@ "assigned-address", usba_device->usb_addr); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: address update failed"); } @@ -1998,35 +1998,35 @@ rval = ndi_prop_update_int(DDI_DEV_T_NONE, child_dip, "usb-vendor-id", usb_dev_descr->idVendor); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: usb-vendor-id update failed"); } rval = ndi_prop_update_int(DDI_DEV_T_NONE, child_dip, "usb-product-id", usb_dev_descr->idProduct); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: usb-product-id update failed"); } rval = ndi_prop_update_int(DDI_DEV_T_NONE, child_dip, "usb-revision-id", usb_dev_descr->bcdDevice); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: usb-revision-id update failed"); } rval = ndi_prop_update_int(DDI_DEV_T_NONE, child_dip, "usb-num-configs", usb_dev_descr->bNumConfigurations); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: usb-num-configs update failed"); } rval = ndi_prop_update_int(DDI_DEV_T_NONE, child_dip, "usb-release", usb_dev_descr->bcdUSB); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: usb-release update failed"); } @@ -2037,7 +2037,7 @@ rval = ndi_prop_update_string(DDI_DEV_T_NONE, child_dip, "usb-serialno", devprop_str); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: " "usb-serialno update failed"); } @@ -2048,7 +2048,7 @@ rval = ndi_prop_update_string(DDI_DEV_T_NONE, child_dip, "usb-vendor-name", devprop_str); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: " "usb-vendor-name update failed"); } @@ -2059,7 +2059,7 @@ rval = ndi_prop_update_string(DDI_DEV_T_NONE, child_dip, "usb-product-name", devprop_str); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: " "usb-product-name update failed"); } @@ -2083,7 +2083,7 @@ rval = ndi_prop_create_boolean(DDI_DEV_T_NONE, child_dip, "low-speed"); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_device_node: " "low speed prop update failed"); } @@ -2147,7 +2147,7 @@ USB_IF_DESCR_SIZE); if (size != USB_IF_DESCR_SIZE) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "parsing interface: size (%lu) != USB_IF_DESCR_SIZE (%d)", size, USB_IF_DESCR_SIZE); mutex_exit(&child_ud->usb_mutex); @@ -2299,7 +2299,7 @@ rval = ndi_prop_update_int(DDI_DEV_T_NONE, child_dip, "assigned-address", child_ud->usb_addr); if (rval != DDI_PROP_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "usba_ready_interface_node: address update failed"); } @@ -2679,7 +2679,7 @@ usba_ph_impl_t *ph_impl = &usba_device->usb_ph_list[i]; if (ph_impl->usba_ph_data) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "%s%d: leaking pipehandle=0x%p (0x%p) ep_addr=0x%x", ddi_driver_name(ph_impl->usba_ph_data->p_dip), @@ -2714,7 +2714,7 @@ mutex_exit(&entry->list_mutex); leaks++; - USB_DPRINTF_L1(DPRINT_MASK_USBA, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "%s%d: leaking request 0x%p", ddi_driver_name(wrp->wr_dip), @@ -2752,7 +2752,7 @@ if (i_ddi_node_state(dip) < DS_ATTACHED) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "%s%d: leaking dev_data 0x%p", ddi_driver_name(dip), @@ -2774,7 +2774,7 @@ dev_info_t *dip = usba_device-> usb_client_attach_list[iface].dip; - USB_DPRINTF_L1(DPRINT_MASK_USBA, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "%s%d: did no usb_client_detach", ddi_driver_name(dip), ddi_get_instance(dip)); @@ -2800,7 +2800,7 @@ usba_device->usb_client_ev_cb_list[iface]. ev_data; - USB_DPRINTF_L1(DPRINT_MASK_USBA, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "%s%d: did no usb_unregister_event_cbs", ddi_driver_name(dip), ddi_get_instance(dip)); @@ -2821,7 +2821,7 @@ mutex_exit(&usba_device->usb_mutex); if (leaks) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usba_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usba_log_handle, "all %d leaks fixed", leaks); } }
--- a/usr/src/uts/common/io/usb/usba/usbai.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/usbai.c Tue Nov 22 18:35:14 2005 -0800 @@ -713,7 +713,7 @@ rval = hcdi->hcdi_ops-> usba_hcdi_pm_support(root_hub_dip); if (rval != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usbai_log_handle, "%s%d: no PM enabled for this device", ddi_driver_name(dip),
--- a/usr/src/uts/common/io/usb/usba/usbai_pipe_mgmt.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/usbai_pipe_mgmt.c Tue Nov 22 18:35:14 2005 -0800 @@ -326,7 +326,7 @@ if (((usb_flags & USB_FLAGS_SLEEP) == 0) && (callback == NULL)) { usba_release_ph_data(ph_impl); - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_setup_func_call: async request with " "no callback"); @@ -966,7 +966,7 @@ callback(pipe_handle, callback_arg, USB_INVALID_ARGS, callback_flags); } else { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_close: invalid arguments"); } @@ -989,7 +989,7 @@ callback(pipe_handle, callback_arg, USB_INVALID_CONTEXT, callback_flags); } else { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_close: invalid context"); } @@ -1014,7 +1014,7 @@ if (USBA_IS_DEFAULT_PIPE(ph_data) && ((usb_flags & USBA_FLAGS_PRIVILEGED) == 0)) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_close: not allowed to close def pipe"); mutex_exit(&ph_data->p_mutex); @@ -1024,7 +1024,7 @@ callback(pipe_handle, callback_arg, USB_INVALID_PIPE, callback_flags); } else { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_close: invalid pipe"); } @@ -1149,7 +1149,7 @@ if (usba_device->usb_hcdi_ops->usba_hcdi_pipe_close(ph_data, usb_flags) != USB_SUCCESS) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_sync_close: hcd close failed"); /* carry on regardless! */ } @@ -1256,7 +1256,7 @@ callback(pipe_handle, callback_arg, USB_INVALID_ARGS, callback_flags); } else { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_reset: invalid arguments"); } @@ -1270,7 +1270,7 @@ callback(pipe_handle, callback_arg, USB_INVALID_CONTEXT, callback_flags); } else { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_reset: invalid context"); } @@ -1285,7 +1285,7 @@ /* is this the default pipe? */ if (USBA_IS_DEFAULT_PIPE(ph_data)) { if ((usb_flags & USBA_FLAGS_PRIVILEGED) == 0) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_reset: not allowed to reset def pipe"); mutex_exit(&ph_data->p_mutex); @@ -1293,7 +1293,7 @@ callback(pipe_handle, callback_arg, USB_INVALID_PIPE, callback_flags); } else { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usb_pipe_reset: invalid pipe"); }
--- a/usr/src/uts/common/io/usb/usba/usbai_register.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/usbai_register.c Tue Nov 22 18:35:14 2005 -0800 @@ -218,7 +218,7 @@ } if (version == USBA_MAKE_VER(USBA_LEG_MAJOR_VER, USBA_LEG_MINOR_VER)) { - USB_DPRINTF_L1(DPRINT_MASK_REGISTER, usbai_reg_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_REGISTER, usbai_reg_log_handle, "Accepting legacy USB driver version %d.%d for %s%d", USBA_LEG_MAJOR_VER, USBA_LEG_MINOR_VER, ddi_driver_name(dip), ddi_get_instance(dip));
--- a/usr/src/uts/common/io/usb/usba/usbai_req.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/usbai_req.c Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2063,7 +2063,7 @@ if ((ph_data->p_ep.bmAttributes & USB_EP_ATTR_MASK) != USB_EP_ATTR_INTR) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_stop_intr_polling: wrong pipe type"); usba_release_ph_data(ph_data->p_ph_impl); @@ -2072,7 +2072,7 @@ } if ((ph_data->p_ep.bEndpointAddress & USB_EP_DIR_IN) == 0) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_stop_intr_polling: wrong pipe direction"); usba_release_ph_data(ph_data->p_ph_impl); @@ -2081,7 +2081,7 @@ } if (servicing_interrupt() && (flags & USB_FLAGS_SLEEP)) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_stop_intr_polling: invalid context"); usba_release_ph_data(ph_data->p_ph_impl); @@ -2553,7 +2553,7 @@ if ((ph_data->p_ep.bmAttributes & USB_EP_ATTR_MASK) != USB_EP_ATTR_ISOCH) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_stop_isoc_polling: wrong pipe type"); usba_release_ph_data(ph_data->p_ph_impl); @@ -2561,7 +2561,7 @@ return; } if ((ph_data->p_ep.bEndpointAddress & USB_EP_DIR_IN) == 0) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_stop_isoc_polling: wrong pipe direction"); usba_release_ph_data(ph_data->p_ph_impl); @@ -2570,7 +2570,7 @@ } if (servicing_interrupt() && (flags & USB_FLAGS_SLEEP)) { - USB_DPRINTF_L1(DPRINT_MASK_USBAI, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBAI, usbai_log_handle, "usba_pipe_stop_intr_polling: invalid context"); usba_release_ph_data(ph_data->p_ph_impl);
--- a/usr/src/uts/common/io/usb/usba/usbai_util.c Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/io/usb/usba/usbai_util.c Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2054,7 +2054,7 @@ if (impl_tokenp->s_flag & USB_INIT_SER_CHECK_SAME_THREAD) { if (impl_tokenp->s_thread != curthread) { - USB_DPRINTF_L1(DPRINT_MASK_USBA, usbai_log_handle, + USB_DPRINTF_L2(DPRINT_MASK_USBA, usbai_log_handle, "usb_release_access: release from wrong thread"); } ASSERT(impl_tokenp->s_thread == curthread);
--- a/usr/src/uts/common/sys/1394/targets/scsa1394/impl.h Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/sys/1394/targets/scsa1394/impl.h Tue Nov 22 18:35:14 2005 -0800 @@ -214,6 +214,7 @@ } scsa1394_bus_buf_t; _NOTE(SCHEME_PROTECTS_DATA("unique per task", scsa1394_bus_buf)) +_NOTE(SCHEME_PROTECTS_DATA("dev_info::devi_lock", dev_info::devi_state)) /* various translation macros */ #define ADDR2TRAN(ap) ((ap)->a_hba_tran)
--- a/usr/src/uts/common/sys/usb/clients/hid/hidvar.h Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/common/sys/usb/clients/hid/hidvar.h Tue Nov 22 18:35:14 2005 -0800 @@ -236,6 +236,7 @@ _NOTE(DATA_READABLE_WITHOUT_LOCK(hid_state_t::hid_log_handle)) _NOTE(DATA_READABLE_WITHOUT_LOCK(hid_state_t::hid_if_descr)) _NOTE(DATA_READABLE_WITHOUT_LOCK(hid_state_t::hid_dev_data)) +_NOTE(DATA_READABLE_WITHOUT_LOCK(hid_state_t::hid_dev_descr)) _NOTE(SCHEME_PROTECTS_DATA("stable data", hid_state_t::hid_rq_ptr)) _NOTE(SCHEME_PROTECTS_DATA("stable data", hid_state_t::hid_wq_ptr))
--- a/usr/src/uts/intel/amsrc2/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/intel/amsrc2/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,14 +22,14 @@ # # uts/intel/amsrc2/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # This makefile drives the production of the audio mixer # sample rate conversion routine #1 (amsrc2). # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -73,7 +73,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) - $(RM) $(MODULE).ok main.ll am_src1.ll lint: $(LINT_DEPS) @@ -87,33 +86,3 @@ # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -SCCS = sccs -TEST = test - -# -# Warlock rules -# -AMSRC2_FILES = $(AMSRC2_OBJS:%.o=%.ll) - -warlock: main.ll $(MODULE).ok - $(WARLOCK) $(AMSRC2_FILES) -l main.ll - -%.ll: $(UTSBASE)/common/io/audio/sada/amsrc2/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< - -main.ll: main.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ main.c - -$(MODULE).ok: $(AMSRC2_FILES) - $(TOUCH) $@ - -%.wlcmd main.c: - $(TEST) -f $@ || $(SCCS) get $@ -
--- a/usr/src/uts/intel/hci1394/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/intel/hci1394/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/intel/hci1394/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -94,38 +94,3 @@ # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -SCCS = sccs -TEST = test - -# -# Warlock targets -# -WARLOCK_OBJECTS = $(HCI1394_OBJS:%.o=%.ll) -S1394_FILES = $(S1394_OBJS:%.o= -l ../s1394/%.ll) - -warlock: $(MODULE).ok - -%.wlcmd: - $(TEST) -f $@ || $(SCCS) get $@ - -$(MODULE).ok: $(WARLOCK_OBJECTS) s1394.files warlock_ddi.files hci1394.wlcmd - $(WARLOCK) -c hci1394.wlcmd $(WARLOCK_OBJECTS) $(S1394_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/adapters/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -s1394.files: - @cd ../s1394; pwd; $(MAKE) warlock -
--- a/usr/src/uts/intel/kbtrans/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/intel/kbtrans/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -21,10 +21,10 @@ # # # uts/intel/kbtrans/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" # # This makefile drives the production of the kbtrans kernel module. # @@ -79,24 +79,3 @@ # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# -WARLOCK_OBJECTS = $(KBTRANS_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok $(WARLOCK_OBJECTS) - -%.ok: $(WARLOCK_OBJECTS) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbkbm/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< -
--- a/usr/src/uts/intel/s1394/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/intel/s1394/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/intel/1394/s1394/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -92,26 +92,3 @@ # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch - -# -# Warlock targets -# -WARLOCK_OBJECTS = $(S1394_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -$(MODULE).ok: $(WARLOCK_OBJECTS) warlock_ddi.files - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock -
--- a/usr/src/uts/intel/sbp2/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/intel/sbp2/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # uts/intel/sbp2/Makefile @@ -61,11 +61,9 @@ all: $(ALL_DEPS) -clean: $(CLEAN_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) +clean: $(CLEAN_DEPS) -clobber: $(CLOBBER_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) +clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) @@ -79,27 +77,3 @@ # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock -# - -SBP2_FILES = $(SBP2_OBJS:%.o=%.ll) -WARLOCK_CMD = $(MODULE).wlcmd - -warlock: $(MODULE).ok - -%.ok: $(SBP2_FILES) - $(WARLOCK) -c $(WARLOCK_CMD) $(SBP2_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sbp2/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
--- a/usr/src/uts/intel/scsa1394/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/intel/scsa1394/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -80,33 +80,3 @@ # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -SCCS = sccs -TEST = test - -# -# Warlock targets -# -WARLOCK_OBJECTS = $(SCSA1394_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.wlcmd: - $(TEST) -f $@ || $(SCCS) get $@ - -$(MODULE).ok: $(WARLOCK_OBJECTS) warlock_ddi.files scsa1394.wlcmd - $(WARLOCK) -c scsa1394.wlcmd $(WARLOCK_OBJECTS) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/targets/scsa1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock
--- a/usr/src/uts/intel/usbser/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/intel/usbser/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # uts/intel/usbser/Makefile @@ -41,8 +41,6 @@ MODULE = usbser OBJECTS = $(USBSER_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSER_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(USBSER_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) # @@ -68,11 +66,9 @@ def: $(DEF_DEPS) -clean: $(CLEAN_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) +clean: $(CLEAN_DEPS) -clobber: $(CLOBBER_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) +clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS)
--- a/usr/src/uts/sparc/amsrc2/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/amsrc2/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,13 +22,13 @@ # # uts/sparc/amsrc2/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # This makefile drives the production of the audio mixer # sample rate conversion routine #1 (amsrc2). # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" # # Path to the base of the uts directory tree (usually /usr/src/uts).
--- a/usr/src/uts/sparc/dada/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/dada/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/sparc/dada/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -40,6 +40,8 @@ OBJECTS = $(DADA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(DADA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) +WARLOCK_OUT = $(DADA_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -70,9 +72,11 @@ clean: $(CLEAN_DEPS) -clobber: $(CLOBBER_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -lint: $(LINT_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint64
--- a/usr/src/uts/sparc/ecpp/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ecpp/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -21,7 +21,7 @@ # # # uts/sparc/ecpp/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -77,9 +77,11 @@ clean: $(CLEAN_DEPS) -clobber: $(CLOBBER_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -lint: $(LINT_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint64
--- a/usr/src/uts/sparc/esp/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/esp/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/sparc/esp/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -44,6 +44,8 @@ OBJECTS = $(ESP_OBJS:%=$(OBJS_DIR)/%) LINTS = $(ESP_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) +WARLOCK_OUT = $(ESP_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -71,9 +73,11 @@ def: $(DEF_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS)
--- a/usr/src/uts/sparc/esp/esp.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/esp/esp.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -42,6 +42,11 @@ root esp_kmem_cache_constructor esp_kmem_cache_destructor -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay +
--- a/usr/src/uts/sparc/fas/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/fas/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/sparc/fas/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # This makefile drives the production of the fas driver kernel module. @@ -43,6 +43,8 @@ OBJECTS = $(FAS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(FAS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) +WARLOCK_OUT = $(FAS_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -70,9 +72,11 @@ def: $(DEF_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS)
--- a/usr/src/uts/sparc/fas/fas.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/fas/fas.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,10 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. + +#ident "%Z%%M% %I% %E% SMI" one fas @@ -41,6 +42,10 @@ root fas_kmem_cache_constructor fas_kmem_cache_destructor -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay
--- a/usr/src/uts/sparc/hci1394/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/hci1394/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/sparc/hci1394/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -46,6 +46,8 @@ ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/1394/adapters LDFLAGS += -dy -Nmisc/s1394 +WARLOCK_OUT = $(HCI1394_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -83,9 +85,11 @@ all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS)
--- a/usr/src/uts/sparc/ibmf/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ibmf/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -43,6 +43,9 @@ LINTS = $(IBMF_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/ibtl +WARLOCK_OUT = $(IBMF_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok + # # Include common rules. # @@ -77,9 +80,11 @@ all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS)
--- a/usr/src/uts/sparc/ibtl/ibtl.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ibtl/ibtl.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,9 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# # ident "%Z%%M% %I% %E% SMI" # IBTF TI and VTI api entry points @@ -158,7 +158,6 @@ root ibc_detach root ibc_async_handler root ibc_cq_handler -root ibc_fmr_flush_handler # IBTF Debug entry points root ibtl_dprintf_intr @@ -286,6 +285,5 @@ 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_fmr_flush_handler_call/fmr_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
--- a/usr/src/uts/sparc/s1394/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/s1394/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/sparc/1394/s1394/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -44,6 +44,8 @@ OBJECTS = $(S1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(S1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) +WARLOCK_OUT = $(S1394_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -81,9 +83,11 @@ all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS)
--- a/usr/src/uts/sparc/scsa1394/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/scsa1394/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -38,6 +38,8 @@ OBJECTS = $(SCSA1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SCSA1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) +WARLOCK_OUT = $(SCSA1394_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -76,11 +78,11 @@ all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint32 @@ -107,14 +109,19 @@ # WARLOCK_OBJECTS = $(SCSA1394_OBJS:%.o=%.ll) SBP2_FILES = $(SBP2_OBJS:%.o= -l ../sbp2/%.ll) +SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) +SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll) warlock: $(MODULE).ok %.wlcmd: $(TEST) -f $@ || $(SCCS) get $@ -$(MODULE).ok: $(WARLOCK_OBJECTS) sbp2.files warlock_ddi.files scsa1394.wlcmd - $(WARLOCK) -c scsa1394.wlcmd $(WARLOCK_OBJECTS) $(SBP2_FILES) \ +$(MODULE).ok: $(WARLOCK_OBJECTS) sbp2.files warlock_ddi.files scsa1394.wlcmd \ + sd.files scsi.files + $(WARLOCK) -c scsa1394.wlcmd $(WARLOCK_OBJECTS) $(SD_FILES) \ + $(SCSI_FILES) \ + $(SBP2_FILES) \ -l ../warlock/ddi_dki_impl.ll $(TOUCH) $@ @@ -126,3 +133,11 @@ warlock_ddi.files: @cd ../warlock; pwd; $(MAKE) warlock + +sd.files: + @cd ../sd; pwd; $(MAKE) warlock_alone + +scsi.files: + @cd ../scsi; pwd; $(MAKE) warlock + +
--- a/usr/src/uts/sparc/scsa1394/scsa1394.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/scsa1394/scsa1394.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,10 +19,16 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" -one scsa1394_state +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 @@ -78,6 +81,7 @@ 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 @@ -114,3 +118,40 @@ 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 +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 + +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
--- a/usr/src/uts/sparc/scsa2usb/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/scsa2usb/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # uts/sparc/scsa2usb/Makefile @@ -29,7 +29,7 @@ # kernel module. sparc architecture dependent # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -110,6 +110,8 @@ UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) +SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) +ST_FILES = $(ST_OBJS:%.o=../st/%.ll) SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll) warlock: $(MODULE).ok $(WARLOCK_OBJECTS) warlock_with_usba @@ -132,9 +134,12 @@ $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< warlock_with_usba: scsa2usb.wlcmd $(WARLOCK_OBJECTS) usba_files \ - ohci_files ehci_files uhci_files warlock_ddi.files + ohci_files ehci_files uhci_files warlock_ddi.files sd.files st.files $(WARLOCK) -c ./scsa2usb_with_usba.wlcmd \ $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ + $(SD_FILES) \ + $(ST_FILES) \ + $(SCSI_FILES) \ $(WARLOCK_OBJECTS) \ -l ../warlock/ddi_dki_impl.ll @@ -155,3 +160,9 @@ scsi.files: @cd ../scsi; pwd; $(MAKE) warlock + +sd.files: + @cd ../sd; pwd; $(MAKE) warlock_alone + +st.files: + @cd ../sd; pwd; $(MAKE) warlock_alone
--- a/usr/src/uts/sparc/scsa2usb/scsa2usb.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/scsa2usb/scsa2usb.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -26,6 +26,22 @@ 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_null_free +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 \ @@ -34,22 +50,3 @@ scsa2usb_scsi_reset \ scsa2usb_scsi_setcap \ scsa2usb_scsi_getcap - - -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_null_free -root scsa2usb_panic_callb - -root scsa2usb_work_thread - -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 scsi_hba_bus_power
--- a/usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,12 +19,20 @@ # # CDDL HEADER END # +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# #ident "%Z%%M% %I% %E% SMI" -one ohci_state -one ehci_state -one uhci_state -one scsa2usb_state +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 @@ -128,16 +133,10 @@ 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 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_pipe_async_req::callback targets warlock_dummy -add usba_pm_req::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 @@ -158,9 +157,6 @@ scsa2usb_scsi_getcap 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 @@ -168,7 +164,65 @@ 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 -root scsa2usb_scsi_bus_config 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 +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 + +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_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
--- a/usr/src/uts/sparc/sd/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -22,7 +22,7 @@ # # uts/sparc/sd/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -45,6 +45,8 @@ LINTS = $(SD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets +WARLOCK_OUT = $(SD_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -72,9 +74,11 @@ def: $(DEF_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -107,13 +111,13 @@ # and warlock can only handle one extern function by a given name; # any loaded after the first are ignored. -SD_FILES = $(MODULE).ll +SD_FILES = $(SD_OBJS:%.o=%.ll) SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) warlock: warlock_alone warlock_with_esp warlock_with_isp warlock_with_fas \ warlock_with_glm warlock_with_uata warlock_with_mpt -warlock_alone: $(MODULE).ok +warlock_alone: $(MODULE).ok $(SD_FILES) %.wlcmd: $(TEST) -f $@ || $(SCCS) get $@ @@ -153,8 +157,8 @@ warlock_with_mpt: sd_with_mpt.wlcmd $(SD_FILES) scsi_files mpt_files \ warlock_ddi.files $(WARLOCK) -c ./sd_with_mpt.wlcmd \ - $(SD_FILES) ../mpt/mpt $(SCSI_FILES) \ - -l ../warlock/ddi_dki_impl.ll + $(SD_FILES) ../mpt/*.ll $(SCSI_FILES) \ + -l ../warlock/ddi_dki_impl.ll scsi_files: @cd ../scsi; pwd; $(MAKE) warlock
--- a/usr/src/uts/sparc/sd/sd.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/sd.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,17 +19,21 @@ # # CDDL HEADER END # -#pragma ident "%Z%%M% %I% %E% SMI" +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" -one scsi_device +one scsi_device +one __ddi_xbuf_attr +one sd_lun +one sd_resv_reclaim_request + root sd_mhd_reset_notify_cb -root scsi_hba_post_event scsi_hba_remove_eventcall scsi_hba_add_eventcall -root scsi_hba_get_eventcookie - 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_xbuf_strategy root sd_failfast_flushq_callback root sd_start_direct_priority_command @@ -42,6 +43,12 @@ do add $ptr target warlock_dummy done +root scsi_hba_bus_power 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
--- a/usr/src/uts/sparc/sd/sd_with_esp.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/sd_with_esp.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ - -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,8 +19,11 @@ # # CDDL HEADER END # + +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ sd.c:sd_mhd_watch_cb \ @@ -36,26 +36,36 @@ scsi_watch.c:scsi_watch_request_intr \ sd.c:sdintr -one scsi_device -one esp - -root esp_kmem_cache_constructor esp_kmem_cache_destructor +add __ddi_xbuf_attr::xa_strategy targets sd_xbuf_strategy -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_xbuf_strategy -root sd_failfast_flushq_callback +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 sd_read_modify_write_task +root sd_failfast_flushq_callback 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 +root esp.c:esp_scsi_dmafree esp.c:esp_scsi_sync_pkt -assert order scsi_device::sd_mutex esp::e_mutex +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 -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy - +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
--- a/usr/src/uts/sparc/sd/sd_with_fas.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/sd_with_fas.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,12 +19,18 @@ # # CDDL HEADER END # -#pragma ident "%Z%%M% %I% %E% SMI" +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ 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 \ @@ -45,8 +48,12 @@ fas.c:fas_scsi_reset_notify \ fas.c:fas_scsi_sync_pkt -one scsi_device -one fas +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 @@ -56,6 +63,15 @@ 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_xbuf_strategy root sd_failfast_flushq_callback +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 +
--- a/usr/src/uts/sparc/sd/sd_with_glm.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/sd_with_glm.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#pragma ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,11 +19,17 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ 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 \ @@ -46,21 +49,28 @@ glm.c:glm_scsi_tgt_free \ glm.c:glm_scsi_sync_pkt -one scsi_device -one glm -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 +one scsi_device +one glm +one __ddi_xbuf_attr +one sd_lun +one sd_resv_reclaim_request -root glm_kmem_cache_constructor glm_kmem_cache_destructor +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 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_xbuf_strategy -root sd_failfast_flushq_callback +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 assert order scsi_device::sd_mutex glm::g_mutex - -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy - +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
--- a/usr/src/uts/sparc/sd/sd_with_isp.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/sd_with_isp.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,7 +1,28 @@ -# Copyright 1998-2002 Sun Microsystems, Inc. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ sd.c:sd_mhd_watch_cb \ @@ -13,9 +34,15 @@ 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 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 @@ -26,10 +53,14 @@ 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_xbuf_strategy root sd_failfast_flushq_callback +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 -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy -
--- a/usr/src/uts/sparc/sd/sd_with_mpt.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/sd_with_mpt.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#pragma ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,11 +19,17 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ 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 \ @@ -46,22 +49,30 @@ mpt.c:mpt_scsi_tgt_free \ mpt.c:mpt_scsi_sync_pkt -one scsi_device -one mpt -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 +one scsi_device +one mpt +one __ddi_xbuf_attr +one sd_lun +one sd_resv_reclaim_request -root mpt_kmem_cache_constructor mpt_kmem_cache_destructor -root mpt_do_dma +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 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_xbuf_strategy -root sd_failfast_flushq_callback +root mpt_kmem_cache_constructor mpt_kmem_cache_destructor +root mpt_do_dma + +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 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 -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy -
--- a/usr/src/uts/sparc/sd/sd_with_uata.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/sd/sd_with_uata.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ - -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,11 +19,16 @@ # # CDDL HEADER END # -#pragma ident "%Z%%M% %I% %E% SMI" +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ 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 \ @@ -35,20 +37,18 @@ scsi_watch.c:scsi_watch_request_intr \ sd.c:sdintr -one scsi_device -one ata_controller +one scsi_device +one ata_controller +one __ddi_xbuf_attr +one sd_lun +one sd_resv_reclaim_request + ### The following are not used - -add scsi_hba_tran::tran_add_eventcall target warlock_dummy -add scsi_hba_tran::tran_get_eventcookie target warlock_dummy -add scsi_hba_tran::tran_post_event target warlock_dummy -add scsi_hba_tran::tran_remove_eventcall target warlock_dummy -add scsi_hba_tran::tran_get_bus_addr target warlock_dummy -add scsi_hba_tran::tran_get_name target warlock_dummy -add scsi_hba_tran::tran_reset_notify target warlock_dummy -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done ### Declaring the following as root functions @@ -57,7 +57,6 @@ 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_xbuf_strategy root sd_failfast_flushq_callback add sd.c:sd_start_cmds/funcp target sd_initpkt_for_buf sd_initpkt_for_uscsi @@ -116,4 +115,9 @@ ### The following are atapi related but never invoked so ignore them too. ignore atapi_tran_dmafree atapi_tran_sync_pkt -root atapi_signature +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 +
--- a/usr/src/uts/sparc/ses/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ses/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -45,8 +45,9 @@ LINTS = $(SES_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets -WARLOCK_TARGETS = warlock.ok warlock_with_esp.ok warlock_with_fas.ok \ - warlock_with_isp.ok warlock_with_glm.ok + +WARLOCK_OUT = $(SES_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -72,9 +73,11 @@ clean: $(CLEAN_DEPS) -clobber: $(CLOBBER_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -lint: $(LINT_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint64 @@ -103,6 +106,8 @@ SES_FILES = $(MODULE).ll SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) +WARLOCK_TARGETS = warlock.ok warlock_with_esp.ok warlock_with_fas.ok \ + warlock_with_isp.ok warlock_with_glm.ok warlock: $(WARLOCK_TARGETS)
--- a/usr/src/uts/sparc/ses/ses.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ses/ses.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,10 @@ # # CDDL HEADER END # +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# #ident "%Z%%M% %I% %E% SMI" # @@ -58,3 +59,5 @@ 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 +
--- a/usr/src/uts/sparc/ses/ses_with_esp.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ses/ses_with_esp.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,7 +19,10 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # +#ident "%Z%%M% %I% %E% SMI" one scsi_device one esp @@ -64,6 +64,9 @@ add ses_softc::ses_vec.set_objstat target ses_set_objstat add ses_softc::ses_vec.softc_init target ses_softc_init -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy - +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay
--- a/usr/src/uts/sparc/ses/ses_with_fas.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ses/ses_with_fas.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,10 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" # one scsi_device @@ -48,7 +49,6 @@ root scsi_hba_reset_notify_setup - root ses_runcmd add ses_softc::ses_vec.get_encstat target safte_get_encstat @@ -72,6 +72,10 @@ add ses_softc::ses_vec.set_objstat target ses_set_objstat add ses_softc::ses_vec.softc_init target ses_softc_init -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay
--- a/usr/src/uts/sparc/ses/ses_with_glm.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ses/ses_with_glm.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,10 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" # one scsi_device @@ -61,6 +62,9 @@ add ses_softc::ses_vec.set_objstat target ses_set_objstat add ses_softc::ses_vec.softc_init target ses_softc_init -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy - +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay
--- a/usr/src/uts/sparc/ses/ses_with_isp.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ses/ses_with_isp.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,4 +1,25 @@ -# Copyright 1998-2002 Sun Microsystems, Inc. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # @@ -41,7 +62,9 @@ add ses_softc::ses_vec.softc_init target ses_softc_init -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy - - +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay
--- a/usr/src/uts/sparc/ssd/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ssd/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -21,11 +21,10 @@ # # # uts/sparc/ssd/Makefile - -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # - #ident "%Z%%M% %I% %E% SMI" # @@ -48,6 +47,9 @@ ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets +WARLOCK_OUT = $(SSD_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok + # # Include common rules. # @@ -76,9 +78,11 @@ def: $(DEF_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -129,7 +133,7 @@ $(TOUCH) $@ ssd.ll: $(UTSBASE)/common/io/scsi/targets/sd.c - $(WLCC) $(CPPFLAGS) $(WLCCFLAGS) -o $@ $(UTSBASE)/common/io/scsi/targets/sd.c + $(WLCC) $(CPPFLAGS) $(WLCCFLAGS) -DDEBUG -o $@ $(UTSBASE)/common/io/scsi/targets/sd.c warlock_ddi.files: @cd ../warlock; pwd; $(MAKE) warlock
--- a/usr/src/uts/sparc/ssd/ssd.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/ssd/ssd.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#pragma ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,10 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" one scsi_device root ssd_mhd_reset_notify_cb ssd_event_callback @@ -42,3 +43,9 @@ 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 +
--- a/usr/src/uts/sparc/st/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/st/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -19,10 +19,9 @@ # # CDDL HEADER END # -# # uts/sparc/st/Makefile # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -45,6 +44,8 @@ LINTS = $(ST_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets +WARLOCK_OUT = $(ST_OBJS:%.o=%.ll) +WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -72,9 +73,11 @@ def: $(DEF_DEPS) -clean: $(CLEAN_DEPS) +clean: $(CLEAN_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS); \ + $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -105,8 +108,8 @@ # and warlock can only handle one extern function by a given name; # any loaded after the first are ignored. -ST_FILES = $(MODULE).ll SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) +ST_FILES = $(ST_OBJS:%.o=%.ll) warlock: warlock_alone warlock_with_esp warlock_with_isp warlock_with_fas \ warlock_with_glm @@ -157,7 +160,7 @@ glm_files: @cd ../glm; pwd; $(MAKE) warlock -st.ok: st.wlcmd $(ST_FILES) scsi_files warlock_ddi.files +st.ok: st.wlcmd st.ll st_conf.ll scsi_files warlock_ddi.files $(WARLOCK) -c ./st.wlcmd $(ST_FILES) $(SCSI_FILES) \ -l ../warlock/ddi_dki_impl.ll $(TOUCH) $@
--- a/usr/src/uts/sparc/st/st.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/st/st.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,8 +19,11 @@ # # CDDL HEADER END # - -#pragma ident "%Z%%M% %I% %E% SMI" +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" one scsi_device root scsi_hba_post_event scsi_hba_remove_eventcall scsi_hba_add_eventcall scsi_hba_get_eventcookie @@ -36,3 +36,12 @@ done add scsi_watch_request::swr_callback targets st_media_watch_cb + +add st.c:st_known_tape_type/config_funct targets \ + st_get_conf_from_st_dot_conf \ + st_get_conf_from_st_conf_dot_c \ + st_get_default_conf + +root scsi_hba_bus_power +ignore delay +
--- a/usr/src/uts/sparc/st/st_with_esp.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/st/st_with_esp.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#pragma ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,10 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ st.c:st_media_watch_cb @@ -31,6 +32,10 @@ scsi_watch.c:scsi_watch_request_intr \ st.c:st_intr +add st.c:st_known_tape_type/config_funct targets \ + st_get_conf_from_st_dot_conf \ + st_get_conf_from_st_conf_dot_c \ + st_get_default_conf one scsi_device one esp @@ -45,6 +50,11 @@ add notify_entry::callback target warlock_dummy -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay +
--- a/usr/src/uts/sparc/st/st_with_fas.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/st/st_with_fas.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ - -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,7 +19,10 @@ # # CDDL HEADER END # -#pragma ident "%Z%%M% %I% %E% SMI" +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ st.c:st_media_watch_cb @@ -44,6 +44,11 @@ add notify_entry::callback target warlock_dummy +add st.c:st_known_tape_type/config_funct targets \ + st_get_conf_from_st_dot_conf \ + st_get_conf_from_st_conf_dot_c \ + st_get_default_conf + one scsi_device one fas @@ -54,6 +59,10 @@ # assert order scsi_device::sd_mutex fas::f_mutex -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay
--- a/usr/src/uts/sparc/st/st_with_glm.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/st/st_with_glm.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,6 +1,3 @@ -#pragma ident "%Z%%M% %I% %E% SMI" -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. # # CDDL HEADER START # @@ -22,6 +19,10 @@ # # CDDL HEADER END # +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ st.c:st_media_watch_cb @@ -45,12 +46,22 @@ add notify_entry::callback target warlock_dummy +add st.c:st_known_tape_type/config_funct targets \ + st_get_conf_from_st_dot_conf \ + st_get_conf_from_st_conf_dot_c \ + st_get_default_conf + one scsi_device one glm root glm_kmem_cache_destructor glm_kmem_cache_constructor assert order scsi_device::sd_mutex glm::g_mutex -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay +
--- a/usr/src/uts/sparc/st/st_with_isp.wlcmd Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/st/st_with_isp.wlcmd Tue Nov 22 18:35:14 2005 -0800 @@ -1,7 +1,28 @@ -# Copyright 1998-2002 Sun Microsystems, Inc. All rights reserved. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" add scsi_watch_request::swr_callback targets \ st.c:st_media_watch_cb @@ -11,6 +32,11 @@ scsi_watch.c:scsi_watch_request_intr \ st.c:st_intr +add st.c:st_known_tape_type/config_funct targets \ + st_get_conf_from_st_dot_conf \ + st_get_conf_from_st_conf_dot_c \ + st_get_default_conf + one scsi_device one isp @@ -21,6 +47,11 @@ root isp.c:isp_scsi_reset_notify root isp.c:isp_i_print_response -add scsi_hba_tran::tran_bus_config targets warlock_dummy -add scsi_hba_tran::tran_bus_unconfig targets warlock_dummy +for ptr in `funcptrs | grep '^scsi_hba_tran::'` +do + add $ptr target warlock_dummy +done +root scsi_hba_bus_power +ignore delay +
--- a/usr/src/uts/sparc/warlock/Makefile Tue Nov 22 18:33:39 2005 -0800 +++ b/usr/src/uts/sparc/warlock/Makefile Tue Nov 22 18:35:14 2005 -0800 @@ -19,12 +19,11 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# ident "%Z%%M% %I% %E% SMI" + # This makefile drives the production of the fas driver kernel module. # # sparc architecture dependent @@ -105,6 +104,7 @@ warlock.1394: @cd ../s1394; rm -f *.ll *.ok; $(MAKE) warlock @cd ../hci1394; rm -f *.ll *.ok; $(MAKE) warlock + @cd ../scsa1394; rm -f *.ll *.ok; $(MAKE) warlock warlock.ecpp: @cd ../ecpp; rm -f *.ll *.ok; $(MAKE) warlock