summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoraugustss <augustss@NetBSD.org>2001-12-04 19:56:17 +0000
committeraugustss <augustss@NetBSD.org>2001-12-04 19:56:17 +0000
commit1db6a7d9dfc30d8a4dfa73ed2348ccb1ea9a7eb8 (patch)
tree62bf40ae0dc9b4dbb0c9a7a6bd4ab073d542e1ac /sys/dev
parentf7141449f29b99bbee736e0026f29139f38c85f0 (diff)
Simplify interface to irframe.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ir/irframe.c9
-rw-r--r--sys/dev/ir/irframevar.h4
-rw-r--r--sys/dev/pci/oboe.c19
3 files changed, 9 insertions, 23 deletions
diff --git a/sys/dev/ir/irframe.c b/sys/dev/ir/irframe.c
index 23d14914e71..2c09c06011f 100644
--- a/sys/dev/ir/irframe.c
+++ b/sys/dev/ir/irframe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe.c,v 1.4 2001/12/03 23:32:32 augustss Exp $ */
+/* $NetBSD: irframe.c,v 1.5 2001/12/04 19:56:17 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -101,7 +101,6 @@ irframe_attach(struct device *parent, struct device *self, void *aux)
sc->sc_methods->im_write == NULL ||
sc->sc_methods->im_poll == NULL ||
sc->sc_methods->im_set_params == NULL ||
- sc->sc_methods->im_reset_params == NULL ||
sc->sc_methods->im_get_speeds == NULL ||
sc->sc_methods->im_get_turnarounds == NULL)
panic("%s: missing methods\n", sc->sc_dev.dv_xname);
@@ -232,6 +231,7 @@ irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
struct irframe_softc *sc;
void *vaddr = addr;
+ struct irda_params params;
int error;
sc = device_lookup(&irframe_cd, IRFRAMEUNIT(dev));
@@ -251,7 +251,10 @@ irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
break;
case IRDA_RESET_PARAMS:
- error = sc->sc_methods->im_reset_params(sc->sc_handle);
+ params.speed = IRDA_DEFAULT_SPEED;
+ params.ebofs = IRDA_DEFAULT_EBOFS;
+ params.maxsize = IRDA_DEFAULT_SIZE;
+ error = sc->sc_methods->im_set_params(sc->sc_handle, &params);
break;
case IRDA_GET_SPEEDMASK:
diff --git a/sys/dev/ir/irframevar.h b/sys/dev/ir/irframevar.h
index 872c53437b1..98667136983 100644
--- a/sys/dev/ir/irframevar.h
+++ b/sys/dev/ir/irframevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: irframevar.h,v 1.3 2001/12/02 20:06:00 augustss Exp $ */
+/* $NetBSD: irframevar.h,v 1.4 2001/12/04 19:56:17 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,6 @@ struct irframe_methods {
int (*im_write)(void *h, struct uio *uio, int flag);
int (*im_poll)(void *h, int events, struct proc *p);
int (*im_set_params)(void *h, struct irda_params *params);
- int (*im_reset_params)(void *h);
int (*im_get_speeds)(void *h, int *speeds);
int (*im_get_turnarounds)(void *h, int *times);
};
@@ -53,7 +52,6 @@ struct irframe_softc {
struct irframe_methods *sc_methods;
void *sc_handle;
char sc_open;
- struct selinfo sc_rdsel;
};
void irframe_frame_available(struct device *);
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index 6122b5ef713..7b6807fdcfb 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.2 2001/12/02 20:29:55 augustss Exp $ */
+/* $NetBSD: oboe.c,v 1.3 2001/12/04 19:56:18 augustss Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,6 @@ int oboe_close(void *h, int flag, int mode, struct proc *p);
int oboe_read(void *h, struct uio *uio, int flag);
int oboe_write(void *h, struct uio *uio, int flag);
int oboe_set_params(void *h, struct irda_params *params);
-int oboe_reset_params(void *h);
int oboe_get_speeds(void *h, int *speeds);
int oboe_get_turnarounds(void *h, int *times);
int oboe_poll(void *h, int events, struct proc *p);
@@ -157,8 +156,7 @@ struct cfattach oboe_ca = {
struct irframe_methods oboe_methods = {
oboe_open, oboe_close, oboe_read, oboe_write, oboe_poll,
- oboe_set_params, oboe_reset_params, oboe_get_speeds,
- oboe_get_turnarounds
+ oboe_set_params, oboe_get_speeds, oboe_get_turnarounds
};
int
@@ -429,19 +427,6 @@ oboe_set_params(void *h, struct irda_params *p)
}
int
-oboe_reset_params(void *h)
-{
- struct oboe_softc *sc = h;
- int s = splir();
-
- oboe_setbaud(sc, 9600);
-
- splx(s);
-
- return (0);
-}
-
-int
oboe_get_speeds(void *h, int *speeds)
{
struct oboe_softc *sc = h;