Print this page
8368 remove warlock leftovers from usr/src/uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/1394/targets/scsa1394/hba.c
          +++ new/usr/src/uts/common/io/1394/targets/scsa1394/hba.c
↓ open down ↓ 270 lines elided ↑ open up ↑
 271  271                  return (DDI_SUCCESS);
 272  272          default:
 273  273                  return (DDI_FAILURE);
 274  274          }
 275  275  
 276  276          if (ddi_soft_state_zalloc(scsa1394_statep, instance) != 0) {
 277  277                  return (DDI_FAILURE);
 278  278          }
 279  279          sp = SCSA1394_INST2STATE(instance);
 280  280  
 281      -#ifndef __lock_lint
 282  281          sp->s_dip = dip;
 283  282          sp->s_instance = instance;
 284      -#endif
 285  283          mutex_init(&sp->s_mutex, NULL, MUTEX_DRIVER,
 286  284              sp->s_attachinfo.iblock_cookie);
 287  285          cv_init(&sp->s_event_cv, NULL, CV_DRIVER, NULL);
 288  286  
 289  287          if (scsa1394_attach_1394(sp) != DDI_SUCCESS) {
 290  288                  scsa1394_cleanup(sp, 1);
 291  289                  return (DDI_FAILURE);
 292  290          }
 293  291  
 294  292          if (scsa1394_sbp2_attach(sp) != DDI_SUCCESS) {
↓ open down ↓ 23 lines elided ↑ open up ↑
 318  316  
 319  317          /* prevent async PM changes until we are done */
 320  318          (void) pm_busy_component(dip, 0);
 321  319  
 322  320          /* Set power to full on */
 323  321          (void) pm_raise_power(dip, 0, PM_LEVEL_D0);
 324  322  
 325  323          /* we are done */
 326  324          (void) pm_idle_component(dip, 0);
 327  325  
 328      -#ifndef __lock_lint
 329  326          sp->s_dev_state = SCSA1394_DEV_ONLINE;
 330      -#endif
 331  327  
 332  328          ddi_report_dev(dip);
 333  329  
 334  330          return (DDI_SUCCESS);
 335  331  }
 336  332  
 337  333  static int
 338  334  scsa1394_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 339  335  {
 340  336          int             instance = ddi_get_instance(dip);
↓ open down ↓ 714 lines elided ↑ open up ↑
1055 1051          if (scsa1394_probe_g0_nodata(sd, waitfunc,
1056 1052              SCMD_START_STOP, 0, 1) != SCSIPROBE_EXISTS) {
1057 1053                  lp->l_nosup_start_stop = B_TRUE;
1058 1054          }
1059 1055  
1060 1056          /* standard probe issues INQUIRY, which some devices may not support */
1061 1057          if (scsi_hba_probe(sd, waitfunc) != SCSIPROBE_EXISTS) {
1062 1058                  lp->l_nosup_inquiry = B_TRUE;
1063 1059                  scsa1394_sbp2_fake_inquiry(sp, &lp->l_fake_inq);
1064 1060                  bcopy(&lp->l_fake_inq, sd->sd_inq, SUN_INQSIZE);
1065      -#ifndef __lock_lint
1066 1061                  lp->l_rmb_orig = 1;
1067      -#endif
1068 1062          }
1069 1063  
1070 1064          if (scsa1394_wrka_fake_rmb) {
1071 1065                  sd->sd_inq->inq_rmb = 1;
1072 1066          }
1073 1067  
1074 1068          return (SCSIPROBE_EXISTS);
1075 1069  }
1076 1070  
1077 1071  static int
↓ open down ↓ 1591 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX