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.
This commit is contained in:
parent
79a3221d60
commit
36d7accaa9
@ -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)));
|
||||
|
@ -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_ */
|
||||
|
Loading…
Reference in New Issue
Block a user