Diff for /src/sys/dev/raid/aac/aacvar.h between versions 1.4 and 1.5

version 1.4, 2003/07/06 21:23:47 version 1.5, 2004/02/13 01:33:19
Line 27 Line 27
  * SUCH DAMAGE.   * SUCH DAMAGE.
  *   *
  *      $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.4.2.7 2003/04/08 13:22:08 scottl Exp $   *      $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.4.2.7 2003/04/08 13:22:08 scottl Exp $
 *      $DragonFly: src/sys/dev/aac/aacvar.h,v 1.3 2003/06/23 17:55:28 dillon Exp $ *      $DragonFly$
  */   */
   
 /*  /*
Line 95 Line 95
  * Driver Variable Definitions   * Driver Variable Definitions
  */   */
   
#if __FreeBSD_version >= 500005#if defined(__FreeBSD__) && __FreeBSD_version >= 500005
 # include <sys/taskqueue.h>  # include <sys/taskqueue.h>
 #endif  #endif
   
Line 251  extern struct aac_interface aac_fa_inter Line 251  extern struct aac_interface aac_fa_inter
 TAILQ_HEAD(aac_container_tq, aac_container);  TAILQ_HEAD(aac_container_tq, aac_container);
   
 /* Define the OS version specific locks */  /* Define the OS version specific locks */
#if __FreeBSD_version >= 500005#if defined(__FreeBSD__) && __FreeBSD_version >= 500005
 #include <sys/lock.h>  #include <sys/lock.h>
 #include <sys/mutex.h>  #include <sys/mutex.h>
 typedef struct mtx aac_lock_t;  typedef struct mtx aac_lock_t;
Line 265  typedef struct lwkt_token aac_lock_t; Line 265  typedef struct lwkt_token aac_lock_t;
 #define AAC_LOCK_RELEASE(l)     lwkt_reltoken(l)  #define AAC_LOCK_RELEASE(l)     lwkt_reltoken(l)
 #endif  #endif
   
#if __FreeBSD_version >= 500005#if defined(__FreeBSD__) && __FreeBSD_version >= 500005
 #include <sys/selinfo.h>  #include <sys/selinfo.h>
 #else  #else
 #include <sys/select.h>  #include <sys/select.h>
Line 342  struct aac_softc Line 342  struct aac_softc
         aac_lock_t              aac_sync_lock;          aac_lock_t              aac_sync_lock;
   
         /* delayed activity infrastructure */          /* delayed activity infrastructure */
#if __FreeBSD_version >= 500005#if defined(__FreeBSD__) && __FreeBSD_version >= 500005
         struct task             aac_task_complete;      /* deferred-completion          struct task             aac_task_complete;      /* deferred-completion
                                                          * task */                                                           * task */
 #endif  #endif

Removed from v.1.4  
changed lines
  Added in v.1.5