make 3com kludge conditional

SCCS-vsn: sys/vax/if/if_acc.c 4.15
SCCS-vsn: sys/vax/if/if_dmc.c 4.13
SCCS-vsn: sys/vax/if/if_en.c 4.58
SCCS-vsn: sys/netinet/in_systm.h 4.10

diff --git a/usr/src/sys/netinet/in_systm.h b/usr/src/sys/netinet/in_systm.h
index dea0cbe..9a5508d 100644 (file)
--- a/usr/src/sys/netinet/in_systm.h
+++ b/usr/src/sys/netinet/in_systm.h
@@ -1,4 +1,4 @@
-/* in_systm.h 4.9 82/04/11 */
+/*     in_systm.h      4.10    82/04/20        */

 
 /*
  * Miscellaneous internetwork
 
 /*
  * Miscellaneous internetwork


@@ -31,7 +31,11 @@ typedef      u_long  n_time;                 /* ms since 00:00 GMT, byte rev */
  */
 
 /* splnet is defined in ../sys/asm.sed */
  */
 
 /* splnet is defined in ../sys/asm.sed */

-#define        splimp          spl6    /* temporary hack, usually spl5 */
+#ifdef ECHACK
+#define        splimp          spl6
+#else
+#define        splimp          spl5
+#endif

 #define        setsoftnet()    mtpr(SIRR, 12)
 
 /*
 #define        setsoftnet()    mtpr(SIRR, 12)
 
 /*

diff --git a/usr/src/sys/vax/if/if_acc.c b/usr/src/sys/vax/if/if_acc.c
index 2f6dac5..c22671f 100644 (file)
--- a/usr/src/sys/vax/if/if_acc.c
+++ b/usr/src/sys/vax/if/if_acc.c
@@ -1,4 +1,4 @@
-/*     if_acc.c        4.14    82/04/16        */
+/*     if_acc.c        4.15    82/04/20        */

 
 #include "acc.h"
 #ifdef NACC > 0
 
 #include "acc.h"
 #ifdef NACC > 0


@@ -84,7 +84,9 @@ COUNT(ACCPROBE);
        addr->ocsr = 0;
        if (cvec && cvec != 0x200)      /* transmit -> receive */
                cvec -= 4;
        addr->ocsr = 0;
        if (cvec && cvec != 0x200)      /* transmit -> receive */
                cvec -= 4;

-       br = 0x16;              /* temporary ec hack */
+#ifdef ECHACK
+       br = 0x16;
+#endif

        return (1);
 }
 
        return (1);
 }
 

diff --git a/usr/src/sys/vax/if/if_dmc.c b/usr/src/sys/vax/if/if_dmc.c
index e2e3c69..924f469 100644 (file)
--- a/usr/src/sys/vax/if/if_dmc.c
+++ b/usr/src/sys/vax/if/if_dmc.c
@@ -1,4 +1,4 @@
-/*     if_dmc.c        4.12    82/04/16        */
+/*     if_dmc.c        4.13    82/04/20        */

 
 #include "dmc.h"
 #if NDMC > 0
 
 #include "dmc.h"
 #if NDMC > 0


@@ -101,7 +101,9 @@ COUNT(DMCPROBE);
        addr->bsel1 = DMC_MCLR;
        for (i = 100000; i && (addr->bsel1 & DMC_RUN) == 0; i--)
                ;
        addr->bsel1 = DMC_MCLR;
        for (i = 100000; i && (addr->bsel1 & DMC_RUN) == 0; i--)
                ;

-       br = 0x16;              /* temporary ec hack */
+#ifdef ECHACK
+       br = 0x16;
+#endif

        return (1);
 }
 
        return (1);
 }
 

diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c
index 93c9b78..2f7b589 100644 (file)
--- a/usr/src/sys/vax/if/if_en.c
+++ b/usr/src/sys/vax/if/if_en.c
@@ -1,4 +1,4 @@
-/*     if_en.c 4.57    82/04/16        */
+/*     if_en.c 4.58    82/04/20        */

 
 #include "en.h"
 #include "imp.h"
 
 #include "en.h"
 #include "imp.h"


@@ -85,7 +85,9 @@ COUNT(ENPROBE);
        addr->en_ostat = EN_IEN|EN_GO;
        DELAY(100000);
        addr->en_ostat = 0;
        addr->en_ostat = EN_IEN|EN_GO;
        DELAY(100000);
        addr->en_ostat = 0;

-       br = 0x16;              /* temporary ec hack */
+#ifdef ECHACK
+       br = 0x16;
+#endif

        return (1);
 }
 
        return (1);
 }