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

fix some missing pieces of device/softc split

This commit is contained in:
drochner 2008-06-11 17:27:59 +00:00
parent dc28a7678e
commit ddb238521e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/qbus/dhu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dhu.c,v 1.54 2008/05/27 14:13:41 ad Exp $ */
/* $NetBSD: dhu.c,v 1.55 2008/06/11 17:27:59 drochner Exp $ */
/*
* Copyright (c) 2003, Hugh Graham.
* Copyright (c) 1992, 1993
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.54 2008/05/27 14:13:41 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.55 2008/06/11 17:27:59 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -430,11 +430,10 @@ dhuopen(dev_t dev, int flag, int mode, struct lwp *l)
unit = DHU_M2U(minor(dev));
line = DHU_LINE(minor(dev));
if (unit >= dhu_cd.cd_ndevs || dhu_cd.cd_devs[unit] == NULL)
sc = device_lookup_private(&dhu_cd, unit);
if (!sc)
return (ENXIO);
sc = dhu_cd.cd_devs[unit];
if (line >= sc->sc_lines)
return ENXIO;

10
sys/dev/qbus/rl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rl.c,v 1.38 2008/03/11 05:34:02 matt Exp $ */
/* $NetBSD: rl.c,v 1.39 2008/06/11 17:27:59 drochner Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.38 2008/03/11 05:34:02 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.39 2008/06/11 17:27:59 drochner Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -369,7 +369,7 @@ int
rlclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
int unit = DISKUNIT(dev);
struct rl_softc *rc = rl_cd.cd_devs[unit];
struct rl_softc *rc = device_lookup_private(&rl_cd, unit);
int mask = (1 << DISKPART(dev));
mutex_enter(&rc->rc_disk.dk_openlock);
@ -424,7 +424,7 @@ done: biodone(bp);
int
rlioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
{
struct rl_softc *rc = rl_cd.cd_devs[DISKUNIT(dev)];
struct rl_softc *rc = device_lookup_private(&rl_cd, DISKUNIT(dev));
struct disklabel *lp = rc->rc_disk.dk_label;
int err = 0;
#ifdef __HAVE_OLD_DISKLABEL
@ -634,7 +634,7 @@ rlcstart(struct rlc_softc *sc, struct buf *ob)
bp = ob;
sc->sc_active = bp;
rc = rl_cd.cd_devs[DISKUNIT(bp->b_dev)];
rc = device_lookup_private(&rl_cd, DISKUNIT(bp->b_dev));
bn = sc->sc_diskblk;
lp = rc->rc_disk.dk_label;
if (bn) {