diff options
author | bde <bde@FreeBSD.org> | 1998-12-17 18:18:06 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-12-17 18:18:06 +0000 |
commit | 4d682cb5b40c5c61249e4a7e55fc11ff4349e088 (patch) | |
tree | 8805ec06b7dd6302d0f4edf904f71d5ea78486f4 | |
parent | 54f96be976a3971faa99b61949eabd13b4b341c4 (diff) | |
download | FreeBSD-src-4d682cb5b40c5c61249e4a7e55fc11ff4349e088.zip FreeBSD-src-4d682cb5b40c5c61249e4a7e55fc11ff4349e088.tar.gz |
Oops, this should have been in the previous commit (ensure atomic update
of com->cor[1]).
-rw-r--r-- | sys/dev/cy/cy.c | 4 | ||||
-rw-r--r-- | sys/dev/cy/cy_isa.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/cy.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 08cf534..ccec809 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.76 1998/11/28 15:48:09 bde Exp $ + * $Id: cy.c,v 1.77 1998/12/17 17:40:13 bde Exp $ */ #include "opt_compat.h" @@ -2018,10 +2018,12 @@ comparam(tp, t) if (cflag & CCTS_OFLOW) opt |= CD1400_COR2_CCTS_OFLOW; #endif + disable_intr(); if (opt != com->cor[1]) { cor_change |= CD1400_CCR_COR2; cd_setreg(com, CD1400_COR2, com->cor[1] = opt); } + enable_intr(); /* * set channel option register 3 - diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 08cf534..ccec809 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.76 1998/11/28 15:48:09 bde Exp $ + * $Id: cy.c,v 1.77 1998/12/17 17:40:13 bde Exp $ */ #include "opt_compat.h" @@ -2018,10 +2018,12 @@ comparam(tp, t) if (cflag & CCTS_OFLOW) opt |= CD1400_COR2_CCTS_OFLOW; #endif + disable_intr(); if (opt != com->cor[1]) { cor_change |= CD1400_CCR_COR2; cd_setreg(com, CD1400_COR2, com->cor[1] = opt); } + enable_intr(); /* * set channel option register 3 - diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 08cf534..ccec809 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.76 1998/11/28 15:48:09 bde Exp $ + * $Id: cy.c,v 1.77 1998/12/17 17:40:13 bde Exp $ */ #include "opt_compat.h" @@ -2018,10 +2018,12 @@ comparam(tp, t) if (cflag & CCTS_OFLOW) opt |= CD1400_COR2_CCTS_OFLOW; #endif + disable_intr(); if (opt != com->cor[1]) { cor_change |= CD1400_CCR_COR2; cd_setreg(com, CD1400_COR2, com->cor[1] = opt); } + enable_intr(); /* * set channel option register 3 - |