diff options
| author | phk <phk@FreeBSD.org> | 2002-09-20 12:52:03 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-09-20 12:52:03 +0000 |
| commit | 1919170e9039df45d87abbe1d7b256cc0db1ed19 (patch) | |
| tree | 1d367b627ceceea40420446ef7bb5ef0ae17c419 /sys/isa | |
| parent | b003f2381fcadb1c640d68a8885d0a806a0e8d9c (diff) | |
| download | FreeBSD-src-1919170e9039df45d87abbe1d7b256cc0db1ed19.zip FreeBSD-src-1919170e9039df45d87abbe1d7b256cc0db1ed19.tar.gz | |
Make FreeBSD "struct disklabel" agnostic, step 311 of 723:
Rename diskerr() to disk_err() for naming consistency.
Drop the by now entirely useless struct disklabel argument.
Add a flag argument for new-line termination.
Fix a couple of printf-format-casts to %j instead of %l.
Correctly print the name of all bio commands.
Move the function from subr_disklabel.c to subr_disk.c,
and from <sys/disklabel.h> to <sys/disk.h>.
Use the new disk_err() throughout, #include <sys/disk.h> as needed.
Bump __FreeBSD_version for the sake of the aac disk drivers #ifdefs.
Remove unused disklabel members of softc for aac, amr and mlx, which seem
to originally have been intended for diskerr() use, but which only rotted
and got Copy&Pasted at least two times to many.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 8c94574..5e4d381 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -62,6 +62,7 @@ #include <sys/bus.h> #include <sys/conf.h> #include <sys/devicestat.h> +#include <sys/disk.h> #include <sys/disklabel.h> #include <sys/fcntl.h> #include <sys/fdcio.h> @@ -2512,8 +2513,8 @@ retrier(struct fdc_data *fdc) default: fail: if ((fd->options & FDOPT_NOERRLOG) == 0) { - diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE, - (struct disklabel *)NULL); + disk_err(bp, "hard error", + fdc->fd->skip / DEV_BSIZE, 0); if (fdc->flags & FDC_STAT_VALID) { printf( " (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n", |
