diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1999-06-04 18:13:25 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1999-06-04 18:13:25 +0000 |
| commit | 216b6d2da03b53b3a935d69cc1c5dfd65786ec01 (patch) | |
| tree | 106b248488a8a4d6dea81b1767448bbec6798967 | |
| parent | 554965376c4a64e65018612406057ccfd06dfe06 (diff) | |
Notes
| -rw-r--r-- | sys/dev/cy/cy.c | 8 | ||||
| -rw-r--r-- | sys/dev/cy/cy_isa.c | 8 | ||||
| -rw-r--r-- | sys/i386/isa/cy.c | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index dd98d7ad5da2..48ecb9ff8c6f 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.89 1999/05/30 16:52:11 phk Exp $ + * $Id: cy.c,v 1.90 1999/05/31 11:25:57 phk Exp $ */ #include "opt_compat.h" @@ -2853,7 +2853,8 @@ cd_getreg(com, reg) if (basecom->car != car) cd_outb(iobase, CD1400_CAR, cy_align, basecom->car = car); val = cd_inb(iobase, reg, cy_align); - write_eflags(ef); + if (ef & PSL_I) + enable_intr(); return (val); } @@ -2879,7 +2880,8 @@ cd_setreg(com, reg, val) if (basecom->car != car) cd_outb(iobase, CD1400_CAR, cy_align, basecom->car = car); cd_outb(iobase, reg, cy_align, val); - write_eflags(ef); + if (ef & PSL_I) + enable_intr(); } #ifdef CyDebug diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index dd98d7ad5da2..48ecb9ff8c6f 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.89 1999/05/30 16:52:11 phk Exp $ + * $Id: cy.c,v 1.90 1999/05/31 11:25:57 phk Exp $ */ #include "opt_compat.h" @@ -2853,7 +2853,8 @@ cd_getreg(com, reg) if (basecom->car != car) cd_outb(iobase, CD1400_CAR, cy_align, basecom->car = car); val = cd_inb(iobase, reg, cy_align); - write_eflags(ef); + if (ef & PSL_I) + enable_intr(); return (val); } @@ -2879,7 +2880,8 @@ cd_setreg(com, reg, val) if (basecom->car != car) cd_outb(iobase, CD1400_CAR, cy_align, basecom->car = car); cd_outb(iobase, reg, cy_align, val); - write_eflags(ef); + if (ef & PSL_I) + enable_intr(); } #ifdef CyDebug diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index dd98d7ad5da2..48ecb9ff8c6f 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.89 1999/05/30 16:52:11 phk Exp $ + * $Id: cy.c,v 1.90 1999/05/31 11:25:57 phk Exp $ */ #include "opt_compat.h" @@ -2853,7 +2853,8 @@ cd_getreg(com, reg) if (basecom->car != car) cd_outb(iobase, CD1400_CAR, cy_align, basecom->car = car); val = cd_inb(iobase, reg, cy_align); - write_eflags(ef); + if (ef & PSL_I) + enable_intr(); return (val); } @@ -2879,7 +2880,8 @@ cd_setreg(com, reg, val) if (basecom->car != car) cd_outb(iobase, CD1400_CAR, cy_align, basecom->car = car); cd_outb(iobase, reg, cy_align, val); - write_eflags(ef); + if (ef & PSL_I) + enable_intr(); } #ifdef CyDebug |