From 81ab2caf0a0bead683cf0c0529cfb8e0d3680a21 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 10 Dec 1995 20:54:38 +0000 Subject: [PATCH] Replaced nxreset by noreset (if the reset function gets called, then the device must be configured. It's hard to tell whether a reset function should be noreset or nullreset since reset functions are never called. Most drivers use nullreset but noreset has the advantage of complaining if somehow gets called). --- sys/dev/cy/cy.c | 4 ++-- sys/dev/cy/cy_isa.c | 4 ++-- sys/dev/dgb/dgb.c | 4 ++-- sys/dev/rc/rc.c | 2 +- sys/dev/si/si.c | 4 ++-- sys/dev/sio/sio.c | 4 ++-- sys/gnu/i386/isa/dgb.c | 4 ++-- sys/i386/isa/cy.c | 4 ++-- sys/i386/isa/rc.c | 2 +- sys/i386/isa/si.c | 4 ++-- sys/i386/isa/sio.c | 4 ++-- sys/isa/sio.c | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 6c54a2204e3..92ff71c053b 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.26 1995/12/10 15:54:42 bde Exp $ + * $Id: cy.c,v 1.27 1995/12/10 20:34:27 bde Exp $ */ #include "cy.h" @@ -373,7 +373,7 @@ static d_devtotty_t cydevtotty; #define CDEV_MAJOR 48 static struct cdevsw cy_cdevsw = { cyopen, cyclose, cyread, cywrite, /*48*/ - cyioctl, cystop, nxreset, cydevtotty,/*cyclades*/ + cyioctl, cystop, noreset, cydevtotty,/*cyclades*/ ttselect, nommap, NULL, "cy", NULL, -1 }; diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 6c54a2204e3..92ff71c053b 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.26 1995/12/10 15:54:42 bde Exp $ + * $Id: cy.c,v 1.27 1995/12/10 20:34:27 bde Exp $ */ #include "cy.h" @@ -373,7 +373,7 @@ static d_devtotty_t cydevtotty; #define CDEV_MAJOR 48 static struct cdevsw cy_cdevsw = { cyopen, cyclose, cyread, cywrite, /*48*/ - cyioctl, cystop, nxreset, cydevtotty,/*cyclades*/ + cyioctl, cystop, noreset, cydevtotty,/*cyclades*/ ttselect, nommap, NULL, "cy", NULL, -1 }; diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index 69bf30c5496..6dd2a25f392 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.11 1995/12/08 23:19:28 phk Exp $ + * dgb.c $Id: dgb.c,v 1.12 1995/12/10 15:54:01 bde Exp $ * * Digiboard driver. * @@ -206,7 +206,7 @@ static d_devtotty_t dgbdevtotty; #define CDEV_MAJOR 58 static struct cdevsw dgb_cdevsw = { dgbopen, dgbclose, dgbread, dgbwrite, /*58*/ - dgbioctl, dgbstop, nxreset, dgbdevtotty, /* dgb */ + dgbioctl, dgbstop, noreset, dgbdevtotty, /* dgb */ ttselect, nommap, NULL, "dgb", NULL, -1 }; static speed_t dgbdefaultrate = TTYDEF_SPEED; diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 2c26c31975f..7b99bd7b1ca 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -111,7 +111,7 @@ static d_devtotty_t rcdevtotty; #define CDEV_MAJOR 63 static struct cdevsw rc_cdevsw = { rcopen, rcclose, rcread, rcwrite, /*63*/ - rcioctl, rcstop, nxreset, rcdevtotty,/* rc */ + rcioctl, rcstop, noreset, rcdevtotty,/* rc */ ttselect, nommap, NULL, "rc", NULL, -1 }; /* Per-board structure */ diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 53ca99de538..979352cdecc 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.26 1995/12/10 15:54:47 bde Exp $ + * $Id: si.c,v 1.27 1995/12/10 20:34:30 bde Exp $ */ #ifndef lint @@ -124,7 +124,7 @@ static d_devtotty_t sidevtotty; #define CDEV_MAJOR 68 static struct cdevsw si_cdevsw = { siopen, siclose, siread, siwrite, /*68*/ - siioctl, sistop, nxreset, sidevtotty,/* si */ + siioctl, sistop, noreset, sidevtotty,/* si */ ttselect, nommap, NULL, "si", NULL, -1 }; diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index fa5941c20dc..375521ac79f 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.127 1995/12/10 13:39:13 phk Exp $ + * $Id: sio.c,v 1.128 1995/12/10 15:54:50 bde Exp $ */ #include "sio.h" @@ -310,7 +310,7 @@ static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 static struct cdevsw sio_cdevsw = { sioopen, sioclose, sioread, siowrite, /*28*/ - sioioctl, siostop, nxreset, siodevtotty,/* sio */ + sioioctl, siostop, noreset, siodevtotty,/* sio */ ttselect, nommap, NULL, driver_name, NULL, -1 }; diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index 69bf30c5496..6dd2a25f392 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.11 1995/12/08 23:19:28 phk Exp $ + * dgb.c $Id: dgb.c,v 1.12 1995/12/10 15:54:01 bde Exp $ * * Digiboard driver. * @@ -206,7 +206,7 @@ static d_devtotty_t dgbdevtotty; #define CDEV_MAJOR 58 static struct cdevsw dgb_cdevsw = { dgbopen, dgbclose, dgbread, dgbwrite, /*58*/ - dgbioctl, dgbstop, nxreset, dgbdevtotty, /* dgb */ + dgbioctl, dgbstop, noreset, dgbdevtotty, /* dgb */ ttselect, nommap, NULL, "dgb", NULL, -1 }; static speed_t dgbdefaultrate = TTYDEF_SPEED; diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 6c54a2204e3..92ff71c053b 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.26 1995/12/10 15:54:42 bde Exp $ + * $Id: cy.c,v 1.27 1995/12/10 20:34:27 bde Exp $ */ #include "cy.h" @@ -373,7 +373,7 @@ static d_devtotty_t cydevtotty; #define CDEV_MAJOR 48 static struct cdevsw cy_cdevsw = { cyopen, cyclose, cyread, cywrite, /*48*/ - cyioctl, cystop, nxreset, cydevtotty,/*cyclades*/ + cyioctl, cystop, noreset, cydevtotty,/*cyclades*/ ttselect, nommap, NULL, "cy", NULL, -1 }; diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 2c26c31975f..7b99bd7b1ca 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -111,7 +111,7 @@ static d_devtotty_t rcdevtotty; #define CDEV_MAJOR 63 static struct cdevsw rc_cdevsw = { rcopen, rcclose, rcread, rcwrite, /*63*/ - rcioctl, rcstop, nxreset, rcdevtotty,/* rc */ + rcioctl, rcstop, noreset, rcdevtotty,/* rc */ ttselect, nommap, NULL, "rc", NULL, -1 }; /* Per-board structure */ diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 53ca99de538..979352cdecc 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.26 1995/12/10 15:54:47 bde Exp $ + * $Id: si.c,v 1.27 1995/12/10 20:34:30 bde Exp $ */ #ifndef lint @@ -124,7 +124,7 @@ static d_devtotty_t sidevtotty; #define CDEV_MAJOR 68 static struct cdevsw si_cdevsw = { siopen, siclose, siread, siwrite, /*68*/ - siioctl, sistop, nxreset, sidevtotty,/* si */ + siioctl, sistop, noreset, sidevtotty,/* si */ ttselect, nommap, NULL, "si", NULL, -1 }; diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index fa5941c20dc..375521ac79f 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.127 1995/12/10 13:39:13 phk Exp $ + * $Id: sio.c,v 1.128 1995/12/10 15:54:50 bde Exp $ */ #include "sio.h" @@ -310,7 +310,7 @@ static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 static struct cdevsw sio_cdevsw = { sioopen, sioclose, sioread, siowrite, /*28*/ - sioioctl, siostop, nxreset, siodevtotty,/* sio */ + sioioctl, siostop, noreset, siodevtotty,/* sio */ ttselect, nommap, NULL, driver_name, NULL, -1 }; diff --git a/sys/isa/sio.c b/sys/isa/sio.c index fa5941c20dc..375521ac79f 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.127 1995/12/10 13:39:13 phk Exp $ + * $Id: sio.c,v 1.128 1995/12/10 15:54:50 bde Exp $ */ #include "sio.h" @@ -310,7 +310,7 @@ static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 static struct cdevsw sio_cdevsw = { sioopen, sioclose, sioread, siowrite, /*28*/ - sioioctl, siostop, nxreset, siodevtotty,/* sio */ + sioioctl, siostop, noreset, siodevtotty,/* sio */ ttselect, nommap, NULL, driver_name, NULL, -1 };