Fix compile errors.

This commit is contained in:
isaki 2008-06-14 13:36:24 +00:00
parent 174aeb1a59
commit 661719fa0e
3 changed files with 14 additions and 13 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: bmd.c,v 1.13 2008/06/13 13:57:58 cegger Exp $ */
/* $NetBSD: bmd.c,v 1.14 2008/06/14 13:36:24 isaki Exp $ */
/*
* Copyright (c) 2002 Tetsuya Isaki. All rights reserved.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.13 2008/06/13 13:57:58 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.14 2008/06/14 13:36:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -227,7 +227,7 @@ bmdopen(dev_t dev, int oflags, int devtype, struct lwp *l)
int
bmdclose(dev_t dev, int fflag, int devtype, struct lwp *l)
{
struct bmd_softc *sc = device_lookup_private(&bmd_cd, BMD_UNIT(dev);
struct bmd_softc *sc = device_lookup_private(&bmd_cd, BMD_UNIT(dev));
DPRINTF(("%s%d\n", __func__, BMD_UNIT(dev)));
@ -257,7 +257,7 @@ bmdstrategy(struct buf *bp)
goto done;
}
sc = device_lookup_private(&bmd_cd, BMD_UNIT(bp->b_dev);
sc = device_lookup_private(&bmd_cd, BMD_UNIT(bp->b_dev));
if (sc == NULL) {
bp->b_error = ENXIO;
goto done;
@ -323,7 +323,7 @@ bmdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
DPRINTF(("%s%d %ld\n", __func__, BMD_UNIT(dev), cmd));
sc = device_lookup_private(&bmd_cd, BMD_UNIT(dev);;
sc = device_lookup_private(&bmd_cd, BMD_UNIT(dev));
if (sc == NULL)
return ENXIO;
@ -363,7 +363,7 @@ bmdsize(dev_t dev)
DPRINTF(("%s%d ", __func__, BMD_UNIT(dev)));
sc = device_lookup_private(&bmd_cd, BMD_UNIT(dev);
sc = device_lookup_private(&bmd_cd, BMD_UNIT(dev));
if (sc == NULL)
return 0;

View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.81 2008/06/13 13:57:58 cegger Exp $ */
/* $NetBSD: fd.c,v 1.82 2008/06/14 13:36:24 isaki Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.81 2008/06/13 13:57:58 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.82 2008/06/14 13:36:24 isaki Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@ -619,7 +619,6 @@ void
fdstrategy(struct buf *bp)
{
struct fd_softc *fd;
int unit = FDUNIT(bp->b_dev);
int sz;
int s;
@ -850,11 +849,13 @@ out_fdc(bus_space_tag_t iot, bus_space_handle_t ioh, u_char x)
int
fdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit;
struct fd_softc *fd;
struct fd_type *type;
struct fdc_softc *fdc;
fd = device_lookup_private(&fd_cd, FDUNIT(dev));;
unit = FDUNIT(dev);
fd = device_lookup_private(&fd_cd, unit);
if (fd == NULL)
return ENXIO;
type = fd_dev_to_type(fd, dev);

View File

@ -1,4 +1,4 @@
/* $NetBSD: grf.c,v 1.35 2008/06/13 13:57:58 cegger Exp $ */
/* $NetBSD: grf.c,v 1.36 2008/06/14 13:36:24 isaki Exp $ */
/*
* Copyright (c) 1990, 1993
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.35 2008/06/13 13:57:58 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.36 2008/06/14 13:36:24 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -153,7 +153,7 @@ grfopen(dev_t dev, int flags, int mode, struct lwp *l)
if (gp == NULL)
return ENXIO;
if (gp->g_flags & GF_ALIVE) == 0)
if ((gp->g_flags & GF_ALIVE) == 0)
return ENXIO;
if ((gp->g_flags & (GF_OPEN|GF_EXCLUDE)) == (GF_OPEN|GF_EXCLUDE))