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

version 1.4, 2003/08/27 10:35:16 version 1.5, 2004/02/13 01:04:14
Line 38 Line 38
 #ifdef __NetBSD__  #ifdef __NetBSD__
 #include <i386/Cbus/dev/bs/bsif.h>  #include <i386/Cbus/dev/bs/bsif.h>
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "opt_bs.h"  #include "opt_bs.h"
 #include "opt_pc98.h"  #include "opt_pc98.h"
 #include "bs.h"  #include "bs.h"
Line 79  struct scsi_adapter pc98texa55bs = { Line 79  struct scsi_adapter pc98texa55bs = {
 };  };
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
   
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 static int bsprobe (struct isa_device *);  static int bsprobe (struct isa_device *);
 static void bs_poll(struct cam_sim *sim);  static void bs_poll(struct cam_sim *sim);
 static int bsattach(struct isa_device *);  static int bsattach(struct isa_device *);
Line 128  static struct bs_softc *bscdata[NBS]; Line 128  static struct bs_softc *bscdata[NBS];
 /*****************************************************************  /*****************************************************************
  * OS <=> BS INTERFACE   * OS <=> BS INTERFACE
  *****************************************************************/   *****************************************************************/
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 static int  static int
 bsprobe(dev)  bsprobe(dev)
         struct isa_device *dev;          struct isa_device *dev;
Line 221  bsprint(aux, name) Line 221  bsprint(aux, name)
 }  }
 #endif  #endif
   
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 static void  static void
 bs_poll(struct cam_sim *sim)  bs_poll(struct cam_sim *sim)
 {  {
Line 280  bsintr(arg) Line 280  bsintr(arg)
 }  }
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
   
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 static void  static void
 bsintr(unit)  bsintr(unit)
         int unit;          int unit;
Line 292  bsintr(unit) Line 292  bsintr(unit)
 /*****************************************************************  /*****************************************************************
  * JULIAN SCSI <=> BS INTERFACE   * JULIAN SCSI <=> BS INTERFACE
  *****************************************************************/   *****************************************************************/
#ifndef __FreeBSD__#if !defined(__DragonFly__) && !defined(__FreeBSD__)
 static void  static void
 bs_scsi_minphys(bp)  bs_scsi_minphys(bp)
         struct buf *bp;          struct buf *bp;
Line 381  bad: Line 381  bad:
 }  }
 #endif  /* __NetBSD__ */  #endif  /* __NetBSD__ */
   
#ifdef __FreeBSD__#if defined(__DragonFly__) || defined(__FreeBSD__)
 static int bs_dmarangecheck(caddr_t va, unsigned length)  static int bs_dmarangecheck(caddr_t va, unsigned length)
 {  {
         vm_offset_t phys, priorpage = 0, endva;          vm_offset_t phys, priorpage = 0, endva;

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