diff options
| author |   mbalmer <mbalmer@openbsd.org> | 2006-04-20 10:12:00 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@openbsd.org> | 2006-04-20 10:12:00 +0000 |
| commit | c57467d4cfb2a73e71e2e6411a36d1fcdc9c904c (patch) | |
| tree | 90cc92e2b8f08b059f79cb8c0e30be888d2bfeb1 | |
| parent | simplify; ok djm@ (diff) | |
| download | wireguard-openbsd-c57467d4cfb2a73e71e2e6411a36d1fcdc9c904c.tar.xz wireguard-openbsd-c57467d4cfb2a73e71e2e6411a36d1fcdc9c904c.zip | |
- remove the 'needs-flag' from the udcf entry in files.usb and the #ifdef NUDCF
idom in udcf.c
- declare t1 to t7 as static to prevent the risk of name clashes
- add two missing function prototypes
help and ok miod@
| -rw-r--r-- | sys/dev/usb/files.usb | 4 | ||||
| -rw-r--r-- | sys/dev/usb/udcf.c | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index a13a3e48c66..dea7adc80fc 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.53 2006/04/19 21:12:49 mbalmer Exp $ +# $OpenBSD: files.usb,v 1.54 2006/04/20 10:12:00 mbalmer Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -99,7 +99,7 @@ file dev/usb/umass_scsi.c umass & (scsibus | atapiscsi) # Gude Expert mouseCLOCK DCF77 time signal station receiver device udcf attach udcf at uhub -file dev/usb/udcf.c udcf needs-flag +file dev/usb/udcf.c udcf # Diamond Multimedia Rio 500 device urio diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c index 90616fed1f9..abaa4655320 100644 --- a/sys/dev/usb/udcf.c +++ b/sys/dev/usb/udcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udcf.c,v 1.1 2006/04/19 21:12:49 mbalmer Exp $ */ +/* $OpenBSD: udcf.c,v 1.2 2006/04/20 10:12:00 mbalmer Exp $ */ /* * Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org> @@ -33,9 +33,6 @@ #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> -#include "udcf.h" - -#if NUDCF > 0 #ifdef UDCF_DEBUG #define DPRINTFN(n, x) do { if (udcfdebug > (n)) printf x; } while (0) int udcfdebug = 0; @@ -98,7 +95,7 @@ struct udcf_softc { int sc_utc_next; /* index to sc_utc */ }; -int t1, t2, t3, t4, t5, t6, t7; /* timeouts in hz */ +static int t1, t2, t3, t4, t5, t6, t7; /* timeouts in hz */ void udcf_intr(void *); void udcf_probe(void *); @@ -110,6 +107,9 @@ void udcf_bv_probe(void *); void udcf_mg_probe(void *); void udcf_sl_probe(void *); +int udcfopen(dev_t, int, int, usb_proc_ptr); +int udcfclose(dev_t, int, int, usb_proc_ptr); + USB_DECLARE_DRIVER(udcf); USB_MATCH(udcf) @@ -590,5 +590,3 @@ udcfclose(dev_t dev, int flag, int mode, usb_proc_ptr p) { return (0); } - -#endif /* NUDCF > 0 */ |