summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-03-15 01:20:05 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-03-15 01:20:05 +0000
commit6fcfd0d23dbe0848151ef07c42448e40fc6e8d9d (patch)
tree2630a112207545f97f9229e94f6bc39db1236155 /sys/dev
parent410da4ddde062db4bb7b750a01b474d3cc2438f7 (diff)
Cosmetic changes only, primarily making comments line up nicely after the
__P removal.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cons.h14
-rw-r--r--sys/dev/ic/midwayvar.h5
-rw-r--r--sys/dev/midi_if.h4
3 files changed, 11 insertions, 12 deletions
diff --git a/sys/dev/cons.h b/sys/dev/cons.h
index 6bf414da617..6d2bdd66786 100644
--- a/sys/dev/cons.h
+++ b/sys/dev/cons.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.h,v 1.10 2002/03/14 04:01:23 millert Exp $ */
+/* $OpenBSD: cons.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */
/* $NetBSD: cons.h,v 1.14 1996/03/14 19:08:35 christos Exp $ */
/*
@@ -44,18 +44,18 @@
*/
struct consdev {
- void (*cn_probe)(struct consdev *);
/* probe hardware and fill in consdev info */
- void (*cn_init)(struct consdev *);
+ void (*cn_probe)(struct consdev *);
/* turn on as console */
- int (*cn_getc)(dev_t);
+ void (*cn_init)(struct consdev *);
/* kernel getchar interface */
- void (*cn_putc)(dev_t, int);
+ int (*cn_getc)(dev_t);
/* kernel putchar interface */
- void (*cn_pollc)(dev_t, int);
+ void (*cn_putc)(dev_t, int);
/* turn on and off polling */
- void (*cn_bell)(dev_t, u_int, u_int, u_int);
+ void (*cn_pollc)(dev_t, int);
/* ring bell */
+ void (*cn_bell)(dev_t, u_int, u_int, u_int);
dev_t cn_dev; /* major/minor of device */
int cn_pri; /* pecking order; the higher the better */
};
diff --git a/sys/dev/ic/midwayvar.h b/sys/dev/ic/midwayvar.h
index 85e07acd510..026ca46d4fb 100644
--- a/sys/dev/ic/midwayvar.h
+++ b/sys/dev/ic/midwayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: midwayvar.h,v 1.10 2002/03/14 01:26:54 millert Exp $ */
+/* $OpenBSD: midwayvar.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */
/*
*
@@ -104,8 +104,7 @@ struct en_softc {
bus_space_tag_t en_memt; /* for EN_READ/EN_WRITE */
bus_space_handle_t en_base; /* base of en card */
bus_size_t en_obmemsz; /* size of en card (bytes) */
- void (*en_busreset)(void *);
- /* bus specific reset function */
+ void (*en_busreset)(void *); /* bus specific reset function */
/* serv list */
u_int32_t hwslistp; /* hw pointer to service list (byte offset) */
diff --git a/sys/dev/midi_if.h b/sys/dev/midi_if.h
index f527ec587bf..7c7b0276fad 100644
--- a/sys/dev/midi_if.h
+++ b/sys/dev/midi_if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: midi_if.h,v 1.4 2002/03/14 03:16:03 millert Exp $ */
+/* $OpenBSD: midi_if.h,v 1.5 2002/03/15 01:20:04 millert Exp $ */
/* $NetBSD: midi_if.h,v 1.3 1998/11/25 22:17:07 augustss Exp $ */
/*
@@ -54,7 +54,7 @@ struct midi_hw_if {
void (*)(void *, int), /* input callback */
void (*)(void *), /* output callback */
void *);
- void (*close)(void *); /* close hardware */
+ void (*close)(void *); /* close hardware */
int (*output)(void *, int); /* output a byte */
void (*getinfo)(void *, struct midi_info *);
int (*ioctl)(void *, u_long, caddr_t, int, struct proc *);