Diff for /src/sys/bus/usb/usbdi.c between versions 1.7 and 1.8

version 1.7, 2003/12/30 03:33:28 version 1.8, 2004/02/11 15:17:26
Line 45 Line 45
 #include <sys/systm.h>  #include <sys/systm.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)  #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>  #include <sys/device.h>
#elif defined(__FreeBSD__)#elif defined(__FreeBSD__) || defined(__DragonFly__)
 #include <sys/module.h>  #include <sys/module.h>
 #include <sys/bus.h>  #include <sys/bus.h>
 #include "usb_if.h"  #include "usb_if.h"
Line 64 Line 64
 #include "usbdivar.h"  #include "usbdivar.h"
 #include "usb_mem.h"  #include "usb_mem.h"
   
#if defined(__FreeBSD__)#if defined(__FreeBSD__) || defined(__DragonFly__)
 #include "usb_if.h"  #include "usb_if.h"
 #include <machine/clock.h>  #include <machine/clock.h>
 #define delay(d)        DELAY(d)  #define delay(d)        DELAY(d)
Line 946  usbd_do_request_flags_pipe(usbd_device_h Line 946  usbd_do_request_flags_pipe(usbd_device_h
         usbd_status err;          usbd_status err;
   
 #ifdef DIAGNOSTIC  #ifdef DIAGNOSTIC
#if defined(__i386__) && defined(__FreeBSD__)#if defined(__i386__) && (defined(__FreeBSD__) || defined(__DragonFly__))
         KASSERT(mycpu->gd_intr_nesting_level == 0,          KASSERT(mycpu->gd_intr_nesting_level == 0,
                 ("usbd_do_request: in interrupt context"));                  ("usbd_do_request: in interrupt context"));
 #endif  #endif
Line 1145  usb_match_device(const struct usb_devno Line 1145  usb_match_device(const struct usb_devno
         return (NULL);          return (NULL);
 }  }
   
#if defined(__FreeBSD__)#if defined(__FreeBSD__) || defined(__DragonFly__)
 int  int
 usbd_driver_load(module_t mod, int what, void *arg)  usbd_driver_load(module_t mod, int what, void *arg)
 {  {

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