Diff for /src/sys/bus/firewire/firewirereg.h between versions 1.6 and 1.7

version 1.6, 2004/02/05 13:32:07 version 1.7, 2004/02/05 17:51:43
Line 70  struct fw_device{ Line 70  struct fw_device{
 };  };
   
 struct firewire_softc {  struct firewire_softc {
#if __FreeBSD_version >= 500000#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
         dev_t dev;          dev_t dev;
 #endif  #endif
         struct firewire_comm *fc;          struct firewire_comm *fc;
Line 313  extern devclass_t firewire_devclass; Line 313  extern devclass_t firewire_devclass;
 #define         FWPRI           ((PZERO+8)|PCATCH)  #define         FWPRI           ((PZERO+8)|PCATCH)
 #endif  #endif
   
#if __FreeBSD_version >= 500000#if defined(__DragonFly__) || __FreeBSD_version < 500000
#define CALLOUT_INIT(x) callout_init(x, 0 /* mpsafe */) 
#else 
 #define CALLOUT_INIT(x) callout_init(x)  #define CALLOUT_INIT(x) callout_init(x)
   #else
   #define CALLOUT_INIT(x) callout_init(x, 0 /* mpsafe */)
 #endif  #endif
   
#if __FreeBSD_version < 500000#if defined(__DragonFly__) || __FreeBSD_version < 500000
 /* compatibility shim for 4.X */  /* compatibility shim for 4.X */
 #define bio buf  #define bio buf
 #define bio_bcount b_bcount  #define bio_bcount b_bcount

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