Diff for /src/sys/dev/usbmisc/umass/umass.c between versions 1.10 and 1.11

version 1.10, 2004/03/15 02:27:57 version 1.11, 2004/03/15 05:45:19
Line 1070  USB_DETACH(umass) Line 1070  USB_DETACH(umass)
   
         DPRINTF(UDMASS_USB, ("%s: detached\n", USBDEVNAME(sc->sc_dev)));          DPRINTF(UDMASS_USB, ("%s: detached\n", USBDEVNAME(sc->sc_dev)));
   
           /*
            * Set UMASS_FLAGS_GONE to prevent any new transfers from being
            * queued, and abort any transfers in progress to ensure that
            * pending requests (e.g. from CAM's bus scan) are terminated.
            */
         sc->flags |= UMASS_FLAGS_GONE;          sc->flags |= UMASS_FLAGS_GONE;
   
           if (sc->bulkout_pipe)
                   usbd_abort_pipe(sc->bulkout_pipe);
           if (sc->bulkin_pipe)
                   usbd_abort_pipe(sc->bulkin_pipe);
           if (sc->intrin_pipe)
                   usbd_abort_pipe(sc->intrin_pipe);
   
         if ((sc->proto & UMASS_PROTO_SCSI) ||          if ((sc->proto & UMASS_PROTO_SCSI) ||
             (sc->proto & UMASS_PROTO_ATAPI) ||              (sc->proto & UMASS_PROTO_ATAPI) ||
             (sc->proto & UMASS_PROTO_UFI) ||              (sc->proto & UMASS_PROTO_UFI) ||
            (sc->proto & UMASS_PROTO_RBC))            (sc->proto & UMASS_PROTO_RBC)) {
                 /* detach the SCSI host controller (SIM) */                  /* detach the SCSI host controller (SIM) */
                 err = umass_cam_detach_sim(sc);                  err = umass_cam_detach_sim(sc);
           }
   
        for (i = 0; i < XFER_NR; i++)        for (i = 0; i < XFER_NR; i++) {
                 if (sc->transfer_xfer[i])                  if (sc->transfer_xfer[i])
                         usbd_free_xfer(sc->transfer_xfer[i]);                          usbd_free_xfer(sc->transfer_xfer[i]);
           }
   
         /* remove all the pipes */          /* remove all the pipes */
         if (sc->bulkout_pipe)          if (sc->bulkout_pipe)

Removed from v.1.10  
changed lines
  Added in v.1.11