diff options
| author | sos <sos@FreeBSD.org> | 2002-04-05 18:04:05 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2002-04-05 18:04:05 +0000 |
| commit | dfb0853c774d541589442a9cbaf238e97dc129f5 (patch) | |
| tree | 1669f0f7be3dd1606818330da4e49495d581035e /sys/dev/ata | |
| parent | 7fbdb2bc1c1e9e626ad6e3d5d20e7d897db71269 (diff) | |
| download | FreeBSD-src-dfb0853c774d541589442a9cbaf238e97dc129f5.zip FreeBSD-src-dfb0853c774d541589442a9cbaf238e97dc129f5.tar.gz | |
Cleanups.
Diffstat (limited to 'sys/dev/ata')
| -rw-r--r-- | sys/dev/ata/ata-disk.c | 12 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index b4dbf87..5a72220 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -125,8 +125,8 @@ ad_attach(struct ata_device *atadev) adp->total_secs = atadev->param->cylinders * adp->heads * adp->sectors; bioq_init(&adp->queue); - lbasize = (u_int32_t)atadev->param->lba_size_lo | - ((u_int32_t)atadev->param->lba_size_hi << 16); + lbasize = (u_int32_t)atadev->param->lba_size_1 | + ((u_int32_t)atadev->param->lba_size_2 << 16); /* does this device need oldstyle CHS addressing */ if (!ad_version(atadev->param->version_major) || @@ -137,10 +137,10 @@ ad_attach(struct ata_device *atadev) if (atadev->param->cylinders == 16383 && adp->total_secs < lbasize) adp->total_secs = lbasize; - lbasize48 = (u_int64_t)atadev->param->lba_size48_1 | - ((u_int64_t)atadev->param->lba_size48_2 << 16) | - ((u_int64_t)atadev->param->lba_size48_3 << 32) | - ((u_int64_t)atadev->param->lba_size48_4 << 48); + lbasize48 = ((u_int64_t)atadev->param->lba_size48_1) | + ((u_int64_t)atadev->param->lba_size48_2 << 16) | + ((u_int64_t)atadev->param->lba_size48_3 << 32) | + ((u_int64_t)atadev->param->lba_size48_4 << 48); /* use the 48bit LBA size if valid */ if (atadev->param->support.address48 && lbasize48 > 268435455) diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 4018401..da46d77 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -255,22 +255,17 @@ acd_init_lun(struct ata_device *atadev) return cdp; } -/* - * Handle dev_clone events, so that acd can be used as root device. - */ static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { - struct acd_softc *cdp; + struct acd_softc *cdp = arg; char *p; int unit; - cdp = arg; if (*dev != NODEV) return; if (!dev_stdclone(name, &p, "acd", &unit)) return; - /* Handle compatability slices. */ if (*p != '\0' && strcmp(p, "a") != 0 && strcmp(p, "c") != 0) return; if (unit == cdp->lun) |
