diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ir/ir.h | 7 | ||||
| -rw-r--r-- | sys/dev/ir/irdaio.h | 3 | ||||
| -rw-r--r-- | sys/dev/ir/irframe.c | 4 | ||||
| -rw-r--r-- | sys/dev/ir/irframevar.h | 13 |
4 files changed, 14 insertions, 13 deletions
diff --git a/sys/dev/ir/ir.h b/sys/dev/ir/ir.h index 3b72ac7b1c1..bbbec2cae94 100644 --- a/sys/dev/ir/ir.h +++ b/sys/dev/ir/ir.h @@ -1,4 +1,4 @@ -/* $NetBSD: ir.h,v 1.1 2001/12/02 10:44:43 augustss Exp $ */ +/* $NetBSD: ir.h,v 1.2 2001/12/05 20:00:15 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ struct ir_attach_args { int ia_type; #define IR_TYPE_IRFRAME 0 #define IR_TYPE_CIR 1 - void *ia_methods; + const void *ia_methods; void *ia_handle; }; @@ -48,8 +48,5 @@ struct irframe_methods; int ir_print(void *aux, const char *pnp); -struct device *irframe_alloc(size_t, struct irframe_methods *, void *); -void irframe_dealloc(struct device *); - #define splir spltty #define IPL_IR IPL_TTY diff --git a/sys/dev/ir/irdaio.h b/sys/dev/ir/irdaio.h index a1d757db5cd..e352ed29f3e 100644 --- a/sys/dev/ir/irdaio.h +++ b/sys/dev/ir/irdaio.h @@ -1,4 +1,4 @@ -/* $NetBSD: irdaio.h,v 1.2 2001/12/04 23:33:33 augustss Exp $ */ +/* $NetBSD: irdaio.h,v 1.3 2001/12/05 20:00:15 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -91,6 +91,7 @@ struct irda_params { #define DONGLE_ACTISYS_PLUS 4 #define DONGLE_LITELINK 5 #define DONGLE_GIRBIL 6 +#define DONGLE_MAX 7 #endif /* _SYS_DEV_IRDA_H_ */ diff --git a/sys/dev/ir/irframe.c b/sys/dev/ir/irframe.c index 98b283b9928..c1e98a719e0 100644 --- a/sys/dev/ir/irframe.c +++ b/sys/dev/ir/irframe.c @@ -1,4 +1,4 @@ -/* $NetBSD: irframe.c,v 1.8 2001/12/05 14:50:14 augustss Exp $ */ +/* $NetBSD: irframe.c,v 1.9 2001/12/05 20:00:15 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -300,7 +300,7 @@ irframepoll(dev_t dev, int events, struct proc *p) struct device * -irframe_alloc(size_t size, struct irframe_methods *m, void *h) +irframe_alloc(size_t size, const struct irframe_methods *m, void *h) { struct cfdriver *cd = &irframe_cd; struct device *dev; diff --git a/sys/dev/ir/irframevar.h b/sys/dev/ir/irframevar.h index 98667136983..31c03feb07f 100644 --- a/sys/dev/ir/irframevar.h +++ b/sys/dev/ir/irframevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: irframevar.h,v 1.4 2001/12/04 19:56:17 augustss Exp $ */ +/* $NetBSD: irframevar.h,v 1.5 2001/12/05 20:00:15 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -48,10 +48,10 @@ struct irframe_methods { }; struct irframe_softc { - struct device sc_dev; - struct irframe_methods *sc_methods; - void *sc_handle; - char sc_open; + struct device sc_dev; + const struct irframe_methods *sc_methods; + void *sc_handle; + char sc_open; }; void irframe_frame_available(struct device *); @@ -60,3 +60,6 @@ void irframe_frame_available(struct device *); #define IRDA_DEFAULT_EBOFS 10 #define IRDA_DEFAULT_SIZE 386 +struct device *irframe_alloc(size_t, const struct irframe_methods *, void *); +void irframe_dealloc(struct device *); + |
