Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pcmcia Don't overwrite cfe->flags.



details:   https://anonhg.NetBSD.org/src/rev/bafabf467021
branches:  trunk
changeset: 480797:bafabf467021
user:      enami <enami%NetBSD.org@localhost>
date:      Thu Jan 20 08:47:59 2000 +0000

description:
Don't overwrite cfe->flags.

diffstat:

 sys/dev/pcmcia/pcmcia_cis.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r d9083d5cb485 -r bafabf467021 sys/dev/pcmcia/pcmcia_cis.c
--- a/sys/dev/pcmcia/pcmcia_cis.c       Thu Jan 20 08:34:52 2000 +0000
+++ b/sys/dev/pcmcia/pcmcia_cis.c       Thu Jan 20 08:47:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmcia_cis.c,v 1.14 2000/01/14 23:09:53 cgd Exp $      */
+/*     $NetBSD: pcmcia_cis.c,v 1.15 2000/01/20 08:47:59 enami Exp $    */
 
 #define        PCMCIACISDEBUG
 
@@ -1238,11 +1238,11 @@
                                idx++;
 
                                if (reg & PCMCIA_TPCE_MI_PWRDOWN)
-                                       cfe->flags = PCMCIA_CFE_POWERDOWN;
+                                       cfe->flags |= PCMCIA_CFE_POWERDOWN;
                                if (reg & PCMCIA_TPCE_MI_READONLY)
-                                       cfe->flags = PCMCIA_CFE_READONLY;
+                                       cfe->flags |= PCMCIA_CFE_READONLY;
                                if (reg & PCMCIA_TPCE_MI_AUDIO)
-                                       cfe->flags = PCMCIA_CFE_AUDIO;
+                                       cfe->flags |= PCMCIA_CFE_AUDIO;
                                cfe->maxtwins = reg & PCMCIA_TPCE_MI_MAXTWINS;
 
                                while (reg & PCMCIA_TPCE_MI_EXT) {



Home | Main Index | Thread Index | Old Index