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

use device_lookup_private to get softc

This commit is contained in:
cegger 2008-06-13 08:27:38 +00:00
parent 5796693f61
commit fa11f9bf6d
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/arch/arc/dev/opms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opms.c,v 1.17 2008/03/01 14:16:49 rmind Exp $ */
/* $NetBSD: opms.c,v 1.18 2008/06/13 08:27:38 cegger Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */
@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.17 2008/03/01 14:16:49 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.18 2008/06/13 08:27:38 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -207,12 +207,9 @@ opms_common_attach(struct opms_softc *sc, bus_space_tag_t opms_iot,
int
opmsopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = PMSUNIT(dev);
struct opms_softc *sc;
if (unit >= opms_cd.cd_ndevs)
return ENXIO;
sc = opms_cd.cd_devs[unit];
sc = device_lookup_private(&opms_cd, PMSUNIT(dev));
if (!sc)
return ENXIO;
@ -245,7 +242,7 @@ opmsopen(dev_t dev, int flag, int mode, struct lwp *l)
int
opmsclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct opms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
struct opms_softc *sc = device_lookup_private(&opms_cd, PMSUNIT(dev));
/* Disable interrupts. */
pms_dev_cmd(PMS_DEV_DISABLE);
@ -262,7 +259,7 @@ opmsclose(dev_t dev, int flag, int mode, struct lwp *l)
int
opmsread(dev_t dev, struct uio *uio, int flag)
{
struct opms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
struct opms_softc *sc = device_lookup_private(&opms_cd, PMSUNIT(dev));
int s;
int error = 0;
size_t length;
@ -308,7 +305,7 @@ opmsread(dev_t dev, struct uio *uio, int flag)
int
opmsioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
{
struct opms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
struct opms_softc *sc = device_lookup_private(&opms_cd, PMSUNIT(dev));
struct mouseinfo info;
int s;
int error;
@ -430,7 +427,7 @@ opmsintr(void *arg)
int
opmspoll(dev_t dev, int events, struct lwp *l)
{
struct opms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
struct opms_softc *sc = device_lookup_private(&opms_cd, PMSUNIT(dev));
int revents = 0;
int s = spltty();
@ -471,7 +468,7 @@ static const struct filterops opmsread_filtops =
int
opmskqfilter(dev_t dev, struct knote *kn)
{
struct opms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
struct opms_softc *sc = device_lookup_private(&opms_cd, PMSUNIT(dev));
struct klist *klist;
int s;

27
sys/arch/arc/dev/pccons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pccons.c,v 1.53 2007/11/19 18:51:37 ad Exp $ */
/* $NetBSD: pccons.c,v 1.54 2008/06/13 08:27:38 cegger Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */
@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.53 2007/11/19 18:51:37 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.54 2008/06/13 08:27:38 cegger Exp $");
#include "opt_ddb.h"
@ -594,13 +594,10 @@ int
pcopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct pc_softc *sc;
int unit = PCUNIT(dev);
struct tty *tp;
if (unit >= pc_cd.cd_ndevs)
return ENXIO;
sc = pc_cd.cd_devs[unit];
if (sc == 0)
sc = device_lookup_private(&pc_cd, PCUNIT(dev));
if (sc == NULL)
return ENXIO;
if (!sc->sc_tty) {
@ -636,7 +633,7 @@ pcopen(dev_t dev, int flag, int mode, struct lwp *l)
int
pcclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct pc_softc *sc = pc_cd.cd_devs[PCUNIT(dev)];
struct pc_softc *sc = device_lookup_private(&pc_cd, PCUNIT(dev));
struct tty *tp = sc->sc_tty;
(*tp->t_linesw->l_close)(tp, flag);
@ -650,7 +647,7 @@ pcclose(dev_t dev, int flag, int mode, struct lwp *l)
int
pcread(dev_t dev, struct uio *uio, int flag)
{
struct pc_softc *sc = pc_cd.cd_devs[PCUNIT(dev)];
struct pc_softc *sc = device_lookup_private(&pc_cd, PCUNIT(dev));
struct tty *tp = sc->sc_tty;
return (*tp->t_linesw->l_read)(tp, uio, flag);
@ -659,7 +656,7 @@ pcread(dev_t dev, struct uio *uio, int flag)
int
pcwrite(dev_t dev, struct uio *uio, int flag)
{
struct pc_softc *sc = pc_cd.cd_devs[PCUNIT(dev)];
struct pc_softc *sc = device_lookup_private(&pc_cd, PCUNIT(dev));
struct tty *tp = sc->sc_tty;
return (*tp->t_linesw->l_write)(tp, uio, flag);
@ -668,7 +665,7 @@ pcwrite(dev_t dev, struct uio *uio, int flag)
int
pcpoll(dev_t dev, int events, struct lwp *l)
{
struct pc_softc *sc = pc_cd.cd_devs[PCUNIT(dev)];
struct pc_softc *sc = device_lookup_private(&pc_cd, PCUNIT(dev));
struct tty *tp = sc->sc_tty;
return (*tp->t_linesw->l_poll)(tp, events, l);
@ -677,7 +674,7 @@ pcpoll(dev_t dev, int events, struct lwp *l)
struct tty *
pctty(dev_t dev)
{
struct pc_softc *sc = pc_cd.cd_devs[PCUNIT(dev)];
struct pc_softc *sc = device_lookup_private(&pc_cd, PCUNIT(dev));
struct tty *tp = sc->sc_tty;
return tp;
@ -714,7 +711,7 @@ pcintr(void *arg)
int
pcioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
struct pc_softc *sc = pc_cd.cd_devs[PCUNIT(dev)];
struct pc_softc *sc = device_lookup_private(&pc_cd, PCUNIT(dev));
struct tty *tp = sc->sc_tty;
int error;
@ -897,8 +894,8 @@ pccnpollc(dev_t dev, int on)
*/
unit = PCUNIT(dev);
if (pc_cd.cd_ndevs > unit) {
sc = pc_cd.cd_devs[unit];
if (sc != 0) {
sc = device_lookup_private(&pc_cd, unit);
if (sc != NULL) {
s = spltty();
pcintr(sc);
splx(s);