Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use an intermediate variable to shorten label initialization code.

Browse Source 
Make wddump() work on more machines.
This commit is contained in:
mycroft 1995-08-05 23:50:23 +00:00
parent 24a5e56396
commit 82b6eec41c
2 changed files with 94 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
sys/dev/ata/wd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wd.c,v 1.141 1995/07/04 07:23:53 mycroft Exp $ */ /* $NetBSD: wd.c,v 1.142 1995/08/05 23:50:23 mycroft Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -983,46 +983,44 @@ void
wdgetdisklabel(wd) wdgetdisklabel(wd)
struct wd_softc *wd; struct wd_softc *wd;
{ {
struct disklabel *lp = &wd->sc_dk.dk_label;
char *errstring; char *errstring;
bzero(&wd->sc_dk.dk_label, sizeof(struct disklabel)); bzero(lp, sizeof(struct disklabel));
bzero(&wd->sc_dk.dk_cpulabel, sizeof(struct cpu_disklabel)); bzero(&wd->sc_dk.dk_cpulabel, sizeof(struct cpu_disklabel));
wd->sc_dk.dk_label.d_secsize = DEV_BSIZE; lp->d_secsize = DEV_BSIZE;
wd->sc_dk.dk_label.d_ntracks = wd->sc_params.wdp_heads; lp->d_ntracks = wd->sc_params.wdp_heads;
wd->sc_dk.dk_label.d_nsectors = wd->sc_params.wdp_sectors; lp->d_nsectors = wd->sc_params.wdp_sectors;
wd->sc_dk.dk_label.d_ncylinders = wd->sc_params.wdp_cylinders; lp->d_ncylinders = wd->sc_params.wdp_cylinders;
wd->sc_dk.dk_label.d_secpercyl = lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
wd->sc_dk.dk_label.d_ntracks * wd->sc_dk.dk_label.d_nsectors;
#if 0 #if 0
strncpy(wd->sc_dk.dk_label.d_typename, "ST506 disk", 16); strncpy(lp->d_typename, "ST506 disk", 16);
wd->sc_dk.dk_label.d_type = DTYPE_ST506; lp->d_type = DTYPE_ST506;
#endif #endif
strncpy(wd->sc_dk.dk_label.d_packname, wd->sc_params.wdp_model, 16); strncpy(lp->d_packname, wd->sc_params.wdp_model, 16);
wd->sc_dk.dk_label.d_secperunit = lp->d_secperunit = lp->d_secpercyl * lp->d_ncylinders;
wd->sc_dk.dk_label.d_secpercyl * wd->sc_dk.dk_label.d_ncylinders; lp->d_rpm = 3600;
wd->sc_dk.dk_label.d_rpm = 3600; lp->d_interleave = 1;
wd->sc_dk.dk_label.d_interleave = 1; lp->d_flags = 0;
wd->sc_dk.dk_label.d_flags = 0;
wd->sc_dk.dk_label.d_partitions[RAW_PART].p_offset = 0; lp->d_partitions[RAW_PART].p_offset = 0;
wd->sc_dk.dk_label.d_partitions[RAW_PART].p_size = lp->d_partitions[RAW_PART].p_size =
wd->sc_dk.dk_label.d_secperunit * lp->d_secperunit * (lp->d_secsize / DEV_BSIZE);
(wd->sc_dk.dk_label.d_secsize / DEV_BSIZE); lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
wd->sc_dk.dk_label.d_partitions[RAW_PART].p_fstype = FS_UNUSED; lp->d_npartitions = RAW_PART + 1;
wd->sc_dk.dk_label.d_npartitions = RAW_PART + 1;
wd->sc_dk.dk_label.d_magic = DISKMAGIC; lp->d_magic = DISKMAGIC;
wd->sc_dk.dk_label.d_magic2 = DISKMAGIC; lp->d_magic2 = DISKMAGIC;
wd->sc_dk.dk_label.d_checksum = dkcksum(&wd->sc_dk.dk_label); lp->d_checksum = dkcksum(lp);
wd->sc_badsect[0] = -1; wd->sc_badsect[0] = -1;
if (wd->sc_state > RECAL) if (wd->sc_state > RECAL)
wd->sc_state = RECAL; wd->sc_state = RECAL;
errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART), errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART),
wdstrategy, &wd->sc_dk.dk_label, &wd->sc_dk.dk_cpulabel); wdstrategy, lp, &wd->sc_dk.dk_cpulabel);
if (errstring) { if (errstring) {
/* /*
* This probably happened because the drive's default * This probably happened because the drive's default
@ -1033,7 +1031,7 @@ wdgetdisklabel(wd)
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
wd->sc_state = GEOMETRY; wd->sc_state = GEOMETRY;
errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART), errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART),
wdstrategy, &wd->sc_dk.dk_label, &wd->sc_dk.dk_cpulabel); wdstrategy, lp, &wd->sc_dk.dk_cpulabel);
} }
if (errstring) { if (errstring) {
printf("%s: %s\n", wd->sc_dev.dv_xname, errstring); printf("%s: %s\n", wd->sc_dev.dv_xname, errstring);
@ -1042,7 +1040,7 @@ wdgetdisklabel(wd)
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
wd->sc_state = GEOMETRY; wd->sc_state = GEOMETRY;
if ((wd->sc_dk.dk_label.d_flags & D_BADSECT) != 0) if ((lp->d_flags & D_BADSECT) != 0)
bad144intern(wd); bad144intern(wd);
} }
@ -1445,52 +1443,41 @@ wddump(dev, blkno, va, size)
struct wdc_softc *wdc; /* disk controller to do the I/O */ struct wdc_softc *wdc; /* disk controller to do the I/O */
struct disklabel *lp; /* disk's disklabel */ struct disklabel *lp; /* disk's disklabel */
int unit, part; int unit, part;
int sectorsize; /* size of a disk sector */ int nblks; /* total number of sectors left to write */
int nsects; /* number of sectors in partition */
int sectoff; /* sector offset of partition */
int totwrt; /* total number of sectors left to write */
int nwrt; /* current number of sectors to write */
int retval;
/* Check if recursive dump; if so, punt. */ /* Check if recursive dump; if so, punt. */
if (wddoingadump) if (wddoingadump)
return EFAULT; return EFAULT;
/* Mark as active early. */
wddoingadump = 1; wddoingadump = 1;
unit = WDUNIT(dev); /* decompose unit & partition */ unit = WDUNIT(dev);
part = WDPART(dev); if (unit >= wdcd.cd_ndevs)
/* Check for acceptable drive number. */
if (unit >= wdcd.cd_ndevs || (wd = wdcd.cd_devs[unit]) == NULL)
return ENXIO; return ENXIO;
wd = wdcd.cd_devs[unit];
if (wd == 0)
return ENXIO;
part = WDPART(dev);
/* Make sure it was initialized. */ /* Make sure it was initialized. */
if (wd->sc_state < OPEN) if (wd->sc_state < OPEN)
return ENXIO; return ENXIO;
/* Remember the controller device, and sanity check */ wdc = (void *)wd->sc_dev.dv_parent;
if ((wdc = (void *)wd->sc_dev.dv_parent) == NULL)
return ENXIO;
/* Convert to disk sectors. Request must be a multiple of size. */ /* Convert to disk sectors. Request must be a multiple of size. */
lp = &wd->sc_dk.dk_label; lp = &wd->sc_dk.dk_label;
sectorsize = lp->d_secsize; if ((size % lp->d_secsize) != 0)
if ((size % sectorsize) != 0)
return EFAULT; return EFAULT;
totwrt = size / sectorsize; nblks = size / lp->d_secsize;
blkno = dbtob(blkno) / sectorsize; /* blkno in DEV_BSIZE units */ blkno = blkno / (lp->d_secsize / DEV_BSIZE);
nsects = lp->d_partitions[part].p_size;
sectoff = lp->d_partitions[part].p_offset;
/* Check transfer bounds against partition size. */ /* Check transfer bounds against partition size. */
if ((blkno < 0) || ((blkno + totwrt) > nsects)) if ((blkno < 0) || ((blkno + nblks) > lp->d_partitions[part].p_size))
return EINVAL; return EINVAL;
/* Offset block number to start of partition. */ /* Offset block number to start of partition. */
blkno += sectoff; blkno += lp->d_partitions[part].p_offset;
/* Recalibrate, if first dump transfer. */ /* Recalibrate, if first dump transfer. */
if (wddumprecalibrated == 0) { if (wddumprecalibrated == 0) {
@ -1503,12 +1490,9 @@ wddump(dev, blkno, va, size)
} }
} }
while (totwrt > 0) { while (nblks > 0) {
daddr_t xlt_blkno = blkno;
long cylin, head, sector; long cylin, head, sector;
daddr_t xlt_blkno;
nwrt = 1; /* ouch XXX */
xlt_blkno = blkno;
if ((lp->d_flags & D_BADSECT) != 0) { if ((lp->d_flags & D_BADSECT) != 0) {
long blkdiff; long blkdiff;
@ -1550,17 +1534,13 @@ wddump(dev, blkno, va, size)
return EIO; return EIO;
} }
outsw(wdc->sc_iobase+wd_data, va, sectorsize / sizeof(short)); outsw(wdc->sc_iobase+wd_data, va, lp->d_secsize >> 1);
/* Check data request (should be done). */ /* Check data request (should be done). */
if (wait_for_ready(wdc) != 0) { if (wait_for_ready(wdc) != 0) {
wderror(wd, NULL, "wddump: timeout waiting for ready"); wderror(wd, NULL, "wddump: timeout waiting for ready");
return EIO; return EIO;
} }
if (wdc->sc_status & WDCS_DRQ) {
wderror(wd, NULL, "wddump: extra drq");
return EIO;
}
#else /* WD_DUMP_NOT_TRUSTED */ #else /* WD_DUMP_NOT_TRUSTED */
/* Let's just talk about this first... */ /* Let's just talk about this first... */
printf("wd%d: dump addr 0x%x, cylin %d, head %d, sector %d\n", printf("wd%d: dump addr 0x%x, cylin %d, head %d, sector %d\n",
@ -1569,10 +1549,11 @@ wddump(dev, blkno, va, size)
#endif #endif
/* update block count */ /* update block count */
totwrt -= nwrt; nblks -= 1;
blkno += nwrt; blkno += 1;
va += sectorsize * nwrt; va += lp->d_secsize;
} }
wddoingadump = 0; wddoingadump = 0;
return 0; return 0;
} }

113
sys/dev/isa/wd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wd.c,v 1.141 1995/07/04 07:23:53 mycroft Exp $ */ /* $NetBSD: wd.c,v 1.142 1995/08/05 23:50:23 mycroft Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -983,46 +983,44 @@ void
wdgetdisklabel(wd) wdgetdisklabel(wd)
struct wd_softc *wd; struct wd_softc *wd;
{ {
struct disklabel *lp = &wd->sc_dk.dk_label;
char *errstring; char *errstring;
bzero(&wd->sc_dk.dk_label, sizeof(struct disklabel)); bzero(lp, sizeof(struct disklabel));
bzero(&wd->sc_dk.dk_cpulabel, sizeof(struct cpu_disklabel)); bzero(&wd->sc_dk.dk_cpulabel, sizeof(struct cpu_disklabel));
wd->sc_dk.dk_label.d_secsize = DEV_BSIZE; lp->d_secsize = DEV_BSIZE;
wd->sc_dk.dk_label.d_ntracks = wd->sc_params.wdp_heads; lp->d_ntracks = wd->sc_params.wdp_heads;
wd->sc_dk.dk_label.d_nsectors = wd->sc_params.wdp_sectors; lp->d_nsectors = wd->sc_params.wdp_sectors;
wd->sc_dk.dk_label.d_ncylinders = wd->sc_params.wdp_cylinders; lp->d_ncylinders = wd->sc_params.wdp_cylinders;
wd->sc_dk.dk_label.d_secpercyl = lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
wd->sc_dk.dk_label.d_ntracks * wd->sc_dk.dk_label.d_nsectors;
#if 0 #if 0
strncpy(wd->sc_dk.dk_label.d_typename, "ST506 disk", 16); strncpy(lp->d_typename, "ST506 disk", 16);
wd->sc_dk.dk_label.d_type = DTYPE_ST506; lp->d_type = DTYPE_ST506;
#endif #endif
strncpy(wd->sc_dk.dk_label.d_packname, wd->sc_params.wdp_model, 16); strncpy(lp->d_packname, wd->sc_params.wdp_model, 16);
wd->sc_dk.dk_label.d_secperunit = lp->d_secperunit = lp->d_secpercyl * lp->d_ncylinders;
wd->sc_dk.dk_label.d_secpercyl * wd->sc_dk.dk_label.d_ncylinders; lp->d_rpm = 3600;
wd->sc_dk.dk_label.d_rpm = 3600; lp->d_interleave = 1;
wd->sc_dk.dk_label.d_interleave = 1; lp->d_flags = 0;
wd->sc_dk.dk_label.d_flags = 0;
wd->sc_dk.dk_label.d_partitions[RAW_PART].p_offset = 0; lp->d_partitions[RAW_PART].p_offset = 0;
wd->sc_dk.dk_label.d_partitions[RAW_PART].p_size = lp->d_partitions[RAW_PART].p_size =
wd->sc_dk.dk_label.d_secperunit * lp->d_secperunit * (lp->d_secsize / DEV_BSIZE);
(wd->sc_dk.dk_label.d_secsize / DEV_BSIZE); lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
wd->sc_dk.dk_label.d_partitions[RAW_PART].p_fstype = FS_UNUSED; lp->d_npartitions = RAW_PART + 1;
wd->sc_dk.dk_label.d_npartitions = RAW_PART + 1;
wd->sc_dk.dk_label.d_magic = DISKMAGIC; lp->d_magic = DISKMAGIC;
wd->sc_dk.dk_label.d_magic2 = DISKMAGIC; lp->d_magic2 = DISKMAGIC;
wd->sc_dk.dk_label.d_checksum = dkcksum(&wd->sc_dk.dk_label); lp->d_checksum = dkcksum(lp);
wd->sc_badsect[0] = -1; wd->sc_badsect[0] = -1;
if (wd->sc_state > RECAL) if (wd->sc_state > RECAL)
wd->sc_state = RECAL; wd->sc_state = RECAL;
errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART), errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART),
wdstrategy, &wd->sc_dk.dk_label, &wd->sc_dk.dk_cpulabel); wdstrategy, lp, &wd->sc_dk.dk_cpulabel);
if (errstring) { if (errstring) {
/* /*
* This probably happened because the drive's default * This probably happened because the drive's default
@ -1033,7 +1031,7 @@ wdgetdisklabel(wd)
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
wd->sc_state = GEOMETRY; wd->sc_state = GEOMETRY;
errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART), errstring = readdisklabel(MAKEWDDEV(0, wd->sc_dev.dv_unit, RAW_PART),
wdstrategy, &wd->sc_dk.dk_label, &wd->sc_dk.dk_cpulabel); wdstrategy, lp, &wd->sc_dk.dk_cpulabel);
} }
if (errstring) { if (errstring) {
printf("%s: %s\n", wd->sc_dev.dv_xname, errstring); printf("%s: %s\n", wd->sc_dev.dv_xname, errstring);
@ -1042,7 +1040,7 @@ wdgetdisklabel(wd)
if (wd->sc_state > GEOMETRY) if (wd->sc_state > GEOMETRY)
wd->sc_state = GEOMETRY; wd->sc_state = GEOMETRY;
if ((wd->sc_dk.dk_label.d_flags & D_BADSECT) != 0) if ((lp->d_flags & D_BADSECT) != 0)
bad144intern(wd); bad144intern(wd);
} }
@ -1445,52 +1443,41 @@ wddump(dev, blkno, va, size)
struct wdc_softc *wdc; /* disk controller to do the I/O */ struct wdc_softc *wdc; /* disk controller to do the I/O */
struct disklabel *lp; /* disk's disklabel */ struct disklabel *lp; /* disk's disklabel */
int unit, part; int unit, part;
int sectorsize; /* size of a disk sector */ int nblks; /* total number of sectors left to write */
int nsects; /* number of sectors in partition */
int sectoff; /* sector offset of partition */
int totwrt; /* total number of sectors left to write */
int nwrt; /* current number of sectors to write */
int retval;
/* Check if recursive dump; if so, punt. */ /* Check if recursive dump; if so, punt. */
if (wddoingadump) if (wddoingadump)
return EFAULT; return EFAULT;
/* Mark as active early. */
wddoingadump = 1; wddoingadump = 1;
unit = WDUNIT(dev); /* decompose unit & partition */ unit = WDUNIT(dev);
part = WDPART(dev); if (unit >= wdcd.cd_ndevs)
/* Check for acceptable drive number. */
if (unit >= wdcd.cd_ndevs || (wd = wdcd.cd_devs[unit]) == NULL)
return ENXIO; return ENXIO;
wd = wdcd.cd_devs[unit];
if (wd == 0)
return ENXIO;
part = WDPART(dev);
/* Make sure it was initialized. */ /* Make sure it was initialized. */
if (wd->sc_state < OPEN) if (wd->sc_state < OPEN)
return ENXIO; return ENXIO;
/* Remember the controller device, and sanity check */ wdc = (void *)wd->sc_dev.dv_parent;
if ((wdc = (void *)wd->sc_dev.dv_parent) == NULL)
return ENXIO;
/* Convert to disk sectors. Request must be a multiple of size. */ /* Convert to disk sectors. Request must be a multiple of size. */
lp = &wd->sc_dk.dk_label; lp = &wd->sc_dk.dk_label;
sectorsize = lp->d_secsize; if ((size % lp->d_secsize) != 0)
if ((size % sectorsize) != 0)
return EFAULT; return EFAULT;
totwrt = size / sectorsize; nblks = size / lp->d_secsize;
blkno = dbtob(blkno) / sectorsize; /* blkno in DEV_BSIZE units */ blkno = blkno / (lp->d_secsize / DEV_BSIZE);
nsects = lp->d_partitions[part].p_size;
sectoff = lp->d_partitions[part].p_offset;
/* Check transfer bounds against partition size. */ /* Check transfer bounds against partition size. */
if ((blkno < 0) || ((blkno + totwrt) > nsects)) if ((blkno < 0) || ((blkno + nblks) > lp->d_partitions[part].p_size))
return EINVAL; return EINVAL;
/* Offset block number to start of partition. */ /* Offset block number to start of partition. */
blkno += sectoff; blkno += lp->d_partitions[part].p_offset;
/* Recalibrate, if first dump transfer. */ /* Recalibrate, if first dump transfer. */
if (wddumprecalibrated == 0) { if (wddumprecalibrated == 0) {
@ -1503,12 +1490,9 @@ wddump(dev, blkno, va, size)
} }
} }
while (totwrt > 0) { while (nblks > 0) {
daddr_t xlt_blkno = blkno;
long cylin, head, sector; long cylin, head, sector;
daddr_t xlt_blkno;
nwrt = 1; /* ouch XXX */
xlt_blkno = blkno;
if ((lp->d_flags & D_BADSECT) != 0) { if ((lp->d_flags & D_BADSECT) != 0) {
long blkdiff; long blkdiff;
@ -1550,17 +1534,13 @@ wddump(dev, blkno, va, size)
return EIO; return EIO;
} }
outsw(wdc->sc_iobase+wd_data, va, sectorsize / sizeof(short)); outsw(wdc->sc_iobase+wd_data, va, lp->d_secsize >> 1);
/* Check data request (should be done). */ /* Check data request (should be done). */
if (wait_for_ready(wdc) != 0) { if (wait_for_ready(wdc) != 0) {
wderror(wd, NULL, "wddump: timeout waiting for ready"); wderror(wd, NULL, "wddump: timeout waiting for ready");
return EIO; return EIO;
} }
if (wdc->sc_status & WDCS_DRQ) {
wderror(wd, NULL, "wddump: extra drq");
return EIO;
}
#else /* WD_DUMP_NOT_TRUSTED */ #else /* WD_DUMP_NOT_TRUSTED */
/* Let's just talk about this first... */ /* Let's just talk about this first... */
printf("wd%d: dump addr 0x%x, cylin %d, head %d, sector %d\n", printf("wd%d: dump addr 0x%x, cylin %d, head %d, sector %d\n",
@ -1569,10 +1549,11 @@ wddump(dev, blkno, va, size)
#endif #endif
/* update block count */ /* update block count */
totwrt -= nwrt; nblks -= 1;
blkno += nwrt; blkno += 1;
va += sectorsize * nwrt; va += lp->d_secsize;
} }
wddoingadump = 0; wddoingadump = 0;
return 0; return 0;
} }