d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Declare all the args of wdclose() and wdioctl(). Cosmetic.

Browse Source
This commit is contained in:
Bruce Evans 1995-02-26 01:15:30 +00:00
parent 4640bd1515
commit 77a6e242ae
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=6721
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/i386/isa/wd.c
View File

@ -37,7 +37,7 @@ static int wdtest = 0;
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.64 1995/01/25 21:40:47 bde Exp $
* $Id: wd.c,v 1.65 1995/02/04 19:39:36 phk Exp $
*/
/* TODO:
@ -73,12 +73,14 @@ static int wdtest = 0;
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
#include <sys/diskslice.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/devconf.h>
#include <machine/cpu.h>
#include <machine/bootinfo.h>
#include <machine/clock.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/wdreg.h>
@ -1406,7 +1408,7 @@ wdgetctlr(struct disk *du)
/* ARGSUSED */
int
wdclose(dev_t dev, int flags, int fmt)
wdclose(dev_t dev, int flags, int fmt, struct proc *p)
{
register struct disk *du;
int part = wdpart(dev), mask = 1 << part;
@ -1430,7 +1432,7 @@ wdclose(dev_t dev, int flags, int fmt)
}
int
wdioctl(dev_t dev, int cmd, caddr_t addr, int flag)
wdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
{
int lunit = wdunit(dev);
register struct disk *du;
@ -1445,7 +1447,7 @@ wdioctl(dev_t dev, int cmd, caddr_t addr, int flag)
switch (cmd) {
case DIOCSBAD:
if ((flag & FWRITE) == 0)
if ((flags & FWRITE) == 0)
error = EBADF;
else {
du->dk_bad = *(struct dkbad *)addr;
@ -1466,7 +1468,7 @@ wdioctl(dev_t dev, int cmd, caddr_t addr, int flag)
break;
case DIOCSDINFO:
if ((flag & FWRITE) == 0)
if ((flags & FWRITE) == 0)
error = EBADF;
else
error = setdisklabel(&du->dk_dd,
@ -1491,7 +1493,7 @@ wdioctl(dev_t dev, int cmd, caddr_t addr, int flag)
case DIOCWLABEL:
du->dk_flags &= ~DKFL_WRITEPROT;
if ((flag & FWRITE) == 0)
if ((flags & FWRITE) == 0)
error = EBADF;
else
du->dk_wlabel = *(int *)addr;
@ -1499,7 +1501,7 @@ wdioctl(dev_t dev, int cmd, caddr_t addr, int flag)
case DIOCWDINFO:
du->dk_flags &= ~DKFL_WRITEPROT;
if ((flag & FWRITE) == 0)
if ((flags & FWRITE) == 0)
error = EBADF;
else if ((error = setdisklabel(&du->dk_dd,
(struct disklabel *)addr,
@ -1529,7 +1531,7 @@ wdioctl(dev_t dev, int cmd, caddr_t addr, int flag)
break;
case DIOCWFORMAT:
if ((flag & FWRITE) == 0)
if ((flags & FWRITE) == 0)
error = EBADF;
else {
register struct format_op *fop;

9
sys/i386/isa/wdreg.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91
* $Id: wxreg.h,v 1.1 1993/10/26 22:26:39 nate Exp $
* $Id: wdreg.h,v 1.6 1994/01/04 20:05:26 nate Exp $
*/
/*
@ -96,7 +96,6 @@
#define WDSD_IBM 0xa0 /* forced to 512 byte sector, ecc */
#ifdef KERNEL
/*
* read parameters command returns this:
@ -133,12 +132,12 @@ struct wdparams {
void wdstrategy(struct buf *bp);
void wdintr(int unit);
int wdopen(dev_t dev, int flags, int fmt, struct proc *p);
int wdclose(dev_t dev, int flags, int fmt);
int wdioctl(dev_t dev, int cmd, caddr_t addr, int flag);
int wdclose(dev_t dev, int flags, int fmt, struct proc *p);
int wdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p);
#ifdef B_FORMAT
int wdformat(struct buf *bp);
#endif
int wdsize(dev_t dev);
int wddump(dev_t dev);
#endif KERNEL
#endif /* KERNEL */