diff options
author | sos <sos@FreeBSD.org> | 2000-02-18 20:57:33 +0000 |
---|---|---|
committer | sos <sos@FreeBSD.org> | 2000-02-18 20:57:33 +0000 |
commit | 6feaaed878ea54ff19a32fb1fa9e961f31156bf9 (patch) | |
tree | df6b1c424ce11d10280d0e2830b96a3eb27b5673 /sys/kern/subr_disk.c | |
parent | eeff6080d3810c5a858215f55e4a05d7a095f464 (diff) | |
download | FreeBSD-src-6feaaed878ea54ff19a32fb1fa9e961f31156bf9.zip FreeBSD-src-6feaaed878ea54ff19a32fb1fa9e961f31156bf9.tar.gz |
Update the ata driver to take more advantage of newbus, this
was needed to make attach/detach of devices work, which is
needed for the PCCARD support.
(PCCARD support is still not working though, more to come on that)
Support the CMD646 chip which is used on many alphas, sadly only
in WDMA2 mode, as the silicon is broken beyond belief for UDMA modes.
Lots of cosmetic fixes here and there.
Sorry for the size of this megapatchfromhell but it was not
possible otherwise...
newbus patches based on work from: dfr (Doug Rabson)
Diffstat (limited to 'sys/kern/subr_disk.c')
-rw-r--r-- | sys/kern/subr_disk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index fa5eff9..cf1b3cc 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -88,12 +88,15 @@ disk_dumpcheck(dev_t dev, u_int *count, u_int *blkno, u_int *secsize) void disk_invalidate (struct disk *disk) { - dsgone(&disk->d_slice); + if (disk->d_slice) + dsgone(&disk->d_slice); } void disk_destroy(dev_t dev) { + dev->si_disk = NULL; + destroy_dev(dev); return; } |