diff options
| author | marius <marius@FreeBSD.org> | 2010-05-20 12:46:19 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2010-05-20 12:46:19 +0000 |
| commit | 427e94121af638ae0635722babe674c1739b31dd (patch) | |
| tree | c1b605b173e382ecabf76967426d6b4030f956a9 /sys/sparc64 | |
| parent | 985b980574d2ee17e3ef7312420aed400bc136c1 (diff) | |
| download | FreeBSD-src-427e94121af638ae0635722babe674c1739b31dd.zip FreeBSD-src-427e94121af638ae0635722babe674c1739b31dd.tar.gz | |
Change ad_firmware_geom_adjust() to operate on a struct disk * only and
hook it up to ada(4) also. While at it, rename *ad_firmware_geom_adjust()
to *ata_disk_firmware_geom_adjust() etc now that these are no longer
limited to ad(4).
Reviewed by: mav
MFC after: 3 days
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/include/md_var.h | 9 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/ata_machdep.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/sparc64/include/md_var.h b/sys/sparc64/include/md_var.h index a1f3980..8f064e7 100644 --- a/sys/sparc64/include/md_var.h +++ b/sys/sparc64/include/md_var.h @@ -66,13 +66,10 @@ extern cpu_block_zero_t *cpu_block_zero; * Given that the Sun disk label only uses 16-bit fields for cylinders, * heads and sectors we might need to adjust the geometry of large IDE * disks. - * We have to have a knowledge that a device_t is a struct device * here - * to avoid including too many things from this file. */ struct disk; -struct device; -void sparc64_ad_firmware_geom_adjust(struct device *dev, struct disk *disk); -#define ad_firmware_geom_adjust(dev, dsk) \ - sparc64_ad_firmware_geom_adjust(dev, dsk) +void sparc64_ata_disk_firmware_geom_adjust(struct disk *disk); +#define ata_disk_firmware_geom_adjust(disk) \ + sparc64_ata_disk_firmware_geom_adjust(disk) #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/sparc64/sparc64/ata_machdep.c b/sys/sparc64/sparc64/ata_machdep.c index 20729bb..102748d 100644 --- a/sys/sparc64/sparc64/ata_machdep.c +++ b/sys/sparc64/sparc64/ata_machdep.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> void -sparc64_ad_firmware_geom_adjust(device_t dev, struct disk *disk) +sparc64_ata_disk_firmware_geom_adjust(struct disk *disk) { /* |
