Diff for /src/sys/dev/usbmisc/uscanner/uscanner.c between versions 1.8 and 1.9

version 1.8, 2004/05/13 23:49:22 version 1.9, 2004/05/19 22:52:52
Line 227  struct uscanner_softc { Line 227  struct uscanner_softc {
         USBBASEDEVICE           sc_dev;         /* base device */          USBBASEDEVICE           sc_dev;         /* base device */
         usbd_device_handle      sc_udev;          usbd_device_handle      sc_udev;
         usbd_interface_handle   sc_iface;          usbd_interface_handle   sc_iface;
 #if defined(__FreeBSD__) || defined(__DragonFly__)  
         dev_t                   dev;  
 #endif  
   
         u_int                   sc_dev_flags;          u_int                   sc_dev_flags;
   
Line 371  USB_ATTACH(uscanner) Line 368  USB_ATTACH(uscanner)
   
 #if defined(__FreeBSD__) || defined(__DragonFly__)  #if defined(__FreeBSD__) || defined(__DragonFly__)
         /* the main device, ctrl endpoint */          /* the main device, ctrl endpoint */
        sc->dev = make_dev(&uscanner_cdevsw, USBDEVUNIT(sc->sc_dev),        cdevsw_add(&uscanner_cdevsw, -1, USBDEVUNIT(sc->sc_dev));
         make_dev(&uscanner_cdevsw, USBDEVUNIT(sc->sc_dev),
                 UID_ROOT, GID_OPERATOR, 0644, "%s", USBDEVNAME(sc->sc_dev));                  UID_ROOT, GID_OPERATOR, 0644, "%s", USBDEVNAME(sc->sc_dev));
 #endif  #endif
   
Line 666  USB_DETACH(uscanner) Line 664  USB_DETACH(uscanner)
         vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR);          vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR);
 #elif defined(__FreeBSD__) || defined(__DragonFly__)  #elif defined(__FreeBSD__) || defined(__DragonFly__)
         /* destroy the device for the control endpoint */          /* destroy the device for the control endpoint */
        destroy_dev(sc->dev);        cdevsw_remove(&uscanner_cdevsw, -1, USBDEVUNIT(sc->sc_dev));
 #endif  #endif
   
         usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,          usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,

Removed from v.1.8  
changed lines
  Added in v.1.9