Diff for /src/sys/dev/atm/en/midway.c between versions 1.6 and 1.7

version 1.6, 2003/09/15 23:38:12 version 1.7, 2004/02/13 19:06:15
Line 108 Line 108
 #define INLINE __inline  #define INLINE __inline
 #endif /* EN_DEBUG */  #endif /* EN_DEBUG */
   
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "use_en.h"             /* XXX for midwayvar.h's NEN */  #include "use_en.h"             /* XXX for midwayvar.h's NEN */
 #include "opt_inet.h"  #include "opt_inet.h"
 #include "opt_natm.h"  #include "opt_natm.h"
Line 145 Line 145
 #include <netproto/natm/natm.h>  #include <netproto/natm/natm.h>
 #endif  #endif
   
#if !defined(sparc) && !defined(__FreeBSD__)#if !defined(__DragonFly__) && !defined(sparc) && !defined(__FreeBSD__)
 #include <machine/bus.h>  #include <machine/bus.h>
 #endif  #endif
   
Line 157 Line 157
 #undef vtophys  #undef vtophys
 #define vtophys(va)     alpha_XXX_dmamap((vm_offset_t)(va))  #define vtophys(va)     alpha_XXX_dmamap((vm_offset_t)(va))
 #endif  #endif
#elif defined(__FreeBSD__)#elif defined(__DragonFly__) || defined(__FreeBSD__)
 #include <machine/clock.h>              /* for DELAY */  #include <machine/clock.h>              /* for DELAY */
 #include "midwayreg.h"  #include "midwayreg.h"
 #include "midwayvar.h"  #include "midwayvar.h"
Line 172 Line 172
 #include "use_bpf.h"  #include "use_bpf.h"
 #if NBPF > 0  #if NBPF > 0
 #include <net/bpf.h>  #include <net/bpf.h>
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define BPFATTACH(ifp, dlt, hlen)       bpfattach((ifp), (dlt), (hlen))  #define BPFATTACH(ifp, dlt, hlen)       bpfattach((ifp), (dlt), (hlen))
 #define BPF_MTAP(ifp, m)                bpf_mtap((ifp), (m))  #define BPF_MTAP(ifp, m)                bpf_mtap((ifp), (m))
 #else  #else
Line 1738  struct ifnet *ifp; Line 1738  struct ifnet *ifp;
  * en_mfix: fix a stupid mbuf   * en_mfix: fix a stupid mbuf
  */   */
   
#ifndef __FreeBSD__#if !defined(__DragonFly__) && !defined(__FreeBSD__)
   
 STATIC int en_mfix(sc, mm, prev)  STATIC int en_mfix(sc, mm, prev)
   
Line 2558  void *arg; Line 2558  void *arg;
         sc->sc_dev.dv_xname, reg, MID_INTBITS);          sc->sc_dev.dv_xname, reg, MID_INTBITS);
 #ifdef EN_DEBUG  #ifdef EN_DEBUG
 #ifdef DDB  #ifdef DDB
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
     Debugger("en: unexpected error");      Debugger("en: unexpected error");
 #else  #else
     Debugger();      Debugger();

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