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

use device_lookup_private to get softc

Browse Source
This commit is contained in:
cegger 2008-06-12 23:22:36 +00:00
parent 708f88d69f
commit 0839b594ba
2 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sys/arch/acorn32/mainbus/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.38 2008/04/28 20:23:10 martin Exp $ */
/* $NetBSD: fd.c,v 1.39 2008/06/12 23:22:36 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.38 2008/04/28 20:23:10 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.39 2008/06/12 23:22:36 cegger Exp $");
#include "opt_ddb.h"
@ -560,10 +560,9 @@ fd_dev_to_type(fd, dev)
}
void
fdstrategy(bp)
register struct buf *bp; /* IO operation to perform */
fdstrategy(struct buf *bp)
{
struct fd_softc *fd = fd_cd.cd_devs[FDUNIT(bp->b_dev)];
struct fd_softc *fd = device_lookup_private(&fd_cd,FDUNIT(bp->b_dev));
int sz;
int s;
@ -792,21 +791,13 @@ out_fdc(iot, ioh, x)
}
int
fdopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
struct lwp *l;
fdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit;
struct fd_softc *fd;
struct fd_type *type;
unit = FDUNIT(dev);
if (unit >= fd_cd.cd_ndevs)
return ENXIO;
fd = fd_cd.cd_devs[unit];
if (fd == 0)
fd = device_lookup_private(&fd_cd, FDUNIT(dev));
if (fd == NULL)
return ENXIO;
type = fd_dev_to_type(fd, dev);
if (type == NULL)
@ -825,13 +816,9 @@ fdopen(dev, flags, mode, l)
}
int
fdclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
struct lwp *l;
fdclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct fd_softc *fd = fd_cd.cd_devs[FDUNIT(dev)];
struct fd_softc *fd = device_lookup_private(&fd_cd, FDUNIT(dev));
fd->sc_flags &= ~FD_OPEN;
fd->sc_opts &= ~(FDOPT_NORETRY|FDOPT_SILENT);
@ -1313,14 +1300,9 @@ fdcretry(fdc)
}
int
fdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
void *addr;
int flag;
struct lwp *l;
fdioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
{
struct fd_softc *fd = fd_cd.cd_devs[FDUNIT(dev)];
struct fd_softc *fd = device_lookup_private(&fd_cd, FDUNIT(dev));
struct fdformat_parms *form_parms;
struct fdformat_cmd *form_cmd;
struct ne7_fd_formb *fd_formb;
@ -1495,13 +1477,10 @@ fdioctl(dev, cmd, addr, flag, l)
}
int
fdformat(dev, finfo, l)
dev_t dev;
struct ne7_fd_formb *finfo;
struct lwp *l;
fdformat(dev_t dev, struct ne7_fd_formb *finfo, struct lwp *l)
{
int rv = 0;
struct fd_softc *fd = fd_cd.cd_devs[FDUNIT(dev)];
struct fd_softc *fd = device_lookup_private(&fd_cd,FDUNIT(dev));
struct fd_type *type = fd->sc_type;
struct buf *bp;

13
sys/arch/acorn32/podulebus/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.14 2005/12/11 12:16:05 christos Exp $ */
/* $NetBSD: asc.c,v 1.15 2008/06/12 23:22:36 cegger Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@ -98,7 +98,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.14 2005/12/11 12:16:05 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.15 2008/06/12 23:22:36 cegger Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -337,10 +337,13 @@ void
asc_dump(void)
{
int i;
struct sbi_softc *sc;
for (i = 0; i < asc_cd.cd_ndevs; ++i)
if (asc_cd.cd_devs[i])
sbic_dump(asc_cd.cd_devs[i]);
for (i = 0; i < asc_cd.cd_ndevs; ++i) {
sc = device_lookup_private(&asc_cd, i);
if (sc != NULL)
sbic_dump(sc);
}
}
int