Diff for /src/sys/dev/disk/i386/bs/Attic/bsif.h between versions 1.5 and 1.6

version 1.5, 2003/08/27 10:35:16 version 1.6, 2004/02/13 01:04:14
Line 50 Line 50
         bus_dma_tag_t sc_dmat;                    bus_dma_tag_t sc_dmat;          
   
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define OS_DEPEND_DEVICE_HEADER                 \  #define OS_DEPEND_DEVICE_HEADER                 \
         int unit;          int unit;
   
Line 64 Line 64
 #if     defined(__NetBSD__)  #if     defined(__NetBSD__)
 #define BSHW_NBPG       NBPG  #define BSHW_NBPG       NBPG
 #endif  #endif
#if     defined(__FreeBSD__)#if     defined(__DragonFly__) || defined(__FreeBSD__)
 #define BSHW_NBPG       PAGE_SIZE  #define BSHW_NBPG       PAGE_SIZE
 #endif  #endif
   
Line 105 Line 105
 #include <scsi/scsi_disk.h>  #include <scsi/scsi_disk.h>
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
   
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <sys/conf.h>  #include <sys/conf.h>
 #include <vm/vm_extern.h>  #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>  #include <vm/vm_kern.h>
Line 147 Line 147
 #include <i386/Cbus/dev/bs/bsfunc.h>  #include <i386/Cbus/dev/bs/bsfunc.h>
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
   
#ifdef        __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define BUS_IO_DELAY ((void) inb(0x5f))  #define BUS_IO_DELAY ((void) inb(0x5f))
 #define BUS_IO_WEIGHT (outb(0x5f, 0))  #define BUS_IO_WEIGHT (outb(0x5f, 0))
 #define BUS_IOR(offs) (BUS_IO_DELAY, inb(bsc->sc_iobase + (offs)))  #define BUS_IOR(offs) (BUS_IO_DELAY, inb(bsc->sc_iobase + (offs)))
Line 168 Line 168
 #ifdef  __NetBSD__  #ifdef  __NetBSD__
 #define XSBS_INT32T     int  #define XSBS_INT32T     int
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
#ifdef        __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define XSBS_INT32T     int32_t  #define XSBS_INT32T     int32_t
 #endif  /* __FreeBSD__ */  #endif  /* __FreeBSD__ */
   
Line 180 Line 180
 #define XSBS_SCSI_NOSLEEP       SCSI_NOSLEEP  #define XSBS_SCSI_NOSLEEP       SCSI_NOSLEEP
 #define XSBS_SCSI_POLL  SCSI_POLL  #define XSBS_SCSI_POLL  SCSI_POLL
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define XSBS_SCSI_POLL  SCSI_NOMASK  #define XSBS_SCSI_POLL  SCSI_NOMASK
 #endif  /* __FreeBSD__ */  #endif  /* __FreeBSD__ */
   
Line 193  void bs_alloc_buf (struct targ_info *); Line 193  void bs_alloc_buf (struct targ_info *);
 XSBS_INT32T bs_target_open (struct scsi_link *, struct cfdata *);  XSBS_INT32T bs_target_open (struct scsi_link *, struct cfdata *);
 XSBS_INT32T bs_scsi_cmd (struct scsi_xfer *);  XSBS_INT32T bs_scsi_cmd (struct scsi_xfer *);
 #endif  #endif
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 void bs_scsi_cmd(struct cam_sim *sim, union ccb *ccb);  void bs_scsi_cmd(struct cam_sim *sim, union ccb *ccb);
 #endif  #endif
 extern int delaycount;  extern int delaycount;
Line 204  int bsintr (void *); Line 204  int bsintr (void *);
 int bsprint (void *, const char *);  int bsprint (void *, const char *);
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
   
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 static BS_INLINE void memcopy (void *from, void *to, register size_t len);  static BS_INLINE void memcopy (void *from, void *to, register size_t len);
 u_int32_t bs_adapter_info (int);  u_int32_t bs_adapter_info (int);
 #define delay(y) DELAY(y)  #define delay(y) DELAY(y)

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