diff options
| author | non <non@FreeBSD.org> | 2000-10-29 06:47:16 +0000 |
|---|---|---|
| committer | non <non@FreeBSD.org> | 2000-10-29 06:47:16 +0000 |
| commit | 89fba057878819a490378efd06434c5caa28b08a (patch) | |
| tree | 6e368ea1defd523ada55acbe469a590fad670b89 /sys | |
| parent | b569d2a37096e9b543e200d78e19d5ea34fc5ff8 (diff) | |
| download | FreeBSD-src-89fba057878819a490378efd06434c5caa28b08a.zip FreeBSD-src-89fba057878819a490378efd06434c5caa28b08a.tar.gz | |
Changed not to use struct isa_device in the argument of scsi_low_activate().
You will not need COMPAT_OLDISA in config file.
This interface may have to change in future.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/cam/scsi/scsi_low_pisa.c | 5 | ||||
| -rw-r--r-- | sys/cam/scsi/scsi_low_pisa.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_low_pisa.c b/sys/cam/scsi/scsi_low_pisa.c index 3c530cb..b095a80 100644 --- a/sys/cam/scsi/scsi_low_pisa.c +++ b/sys/cam/scsi/scsi_low_pisa.c @@ -116,7 +116,7 @@ scsi_low_deactivate(dh) #ifdef __FreeBSD__ int -scsi_low_activate(struct scsi_low_softc *sc, struct isa_device *dev) +scsi_low_activate(struct scsi_low_softc *sc, int flags) { #else #ifdef __NetBSD__ @@ -132,7 +132,8 @@ scsi_low_activate(dh) sc->sl_flags &= ~HW_INACTIVE; #ifdef __FreeBSD__ - sc->sl_cfgflags = ((sc->sl_cfgflags << 16) | ((dev->id_flags) & 0xffff)); + sc->sl_cfgflags = ((sc->sl_cfgflags & 0xffff0000) | + (flags & 0x00ff)); #else /* __NetBSD__ */ sc->sl_cfgflags = DVCFG_MKCFG(DVCFG_MAJOR(sc->sl_cfgflags), \ DVCFG_MINOR(PISA_DR_DVCFG(dr))); diff --git a/sys/cam/scsi/scsi_low_pisa.h b/sys/cam/scsi/scsi_low_pisa.h index 551465a..8a8a542 100644 --- a/sys/cam/scsi/scsi_low_pisa.h +++ b/sys/cam/scsi/scsi_low_pisa.h @@ -40,7 +40,7 @@ int scsi_low_deactivate __P((pisa_device_handle_t)); int scsi_low_notify __P((pisa_device_handle_t, pisa_event_t)); #endif #ifdef __FreeBSD__ -int scsi_low_activate __P((struct scsi_low_softc *, struct isa_device *)); +int scsi_low_activate __P((struct scsi_low_softc *, int)); int scsi_low_deactivate __P((struct scsi_low_softc *)); #endif #endif /* !_SCSI_LOW_PISA_H_ */ |
