Diff for /src/sys/sys/device_port.h between versions 1.2 and 1.3

version 1.2, 2003/06/17 04:28:58 version 1.3, 2004/02/06 03:20:47
Line 25 Line 25
  * SUCH DAMAGE.   * SUCH DAMAGE.
  *   *
  * $FreeBSD: src/sys/sys/device_port.h,v 1.1.2.1 2000/10/29 11:05:45 non Exp $   * $FreeBSD: src/sys/sys/device_port.h,v 1.1.2.1 2000/10/29 11:05:45 non Exp $
 * $DragonFly: src/sys/sys/device_port.h,v 1.1 2003/06/16 06:47:18 dillon Exp $ * $DragonFly$
  */   */
   
 #if defined(__NetBSD__)  #if defined(__NetBSD__)
 # include <sys/device.h>  # include <sys/device.h>
#elif defined(__FreeBSD__)#elif defined(__DragonFly__)
# if __FreeBSD_version >= 400001# if __DragonFly_version >= 100000
 #  include <sys/module.h>  #  include <sys/module.h>
 #  include <sys/bus.h>  #  include <sys/bus.h>
 # else  # else
Line 48 Line 48
 # define DEVPORT_DEVNAME(dev)           (dev).dv_xname  # define DEVPORT_DEVNAME(dev)           (dev).dv_xname
 # define DEVPORT_DEVUNIT(dev)           (dev).dv_unit  # define DEVPORT_DEVUNIT(dev)           (dev).dv_unit
   
#elif defined(__FreeBSD__)#elif defined(__DragonFly__)
 /*  /*
  * FreeBSD (compatibility for struct device)   * FreeBSD (compatibility for struct device)
  */   */
#if __FreeBSD_version >= 400001#if __DragonFly_version >= 100000
 # define DEVPORT_DEVICE                 device_t  # define DEVPORT_DEVICE                 device_t
 # define DEVPORT_DEVNAME(dev)           device_get_name(dev)  # define DEVPORT_DEVNAME(dev)           device_get_name(dev)
 # define DEVPORT_DEVUNIT(dev)           device_get_unit(dev)  # define DEVPORT_DEVUNIT(dev)           device_get_unit(dev)
Line 82 Line 82
 /*  /*
  * PC-Card device driver (compatibility for struct pccard_devinfo *)   * PC-Card device driver (compatibility for struct pccard_devinfo *)
  */   */
#if __FreeBSD_version >= 400001#if __DragonFly_version >= 100000
 # define DEVPORT_PDEVICE                device_t  # define DEVPORT_PDEVICE                device_t
 # define DEVPORT_PDEVUNIT(pdev)         device_get_unit(pdev)  # define DEVPORT_PDEVUNIT(pdev)         device_get_unit(pdev)
 # define DEVPORT_PDEVFLAGS(pdev)        device_get_flags(pdev)  # define DEVPORT_PDEVFLAGS(pdev)        device_get_flags(pdev)
Line 112 Line 112
 # endif  # endif
 #endif  #endif
   
#endif /* __FreeBSD__ */#endif /* __DragonFly */
   

Removed from v.1.2  
changed lines
  Added in v.1.3