BSD 4_4 release

[unix-history] / usr / src / sys / net / netisr.h

diff --git a/usr/src/sys/net/netisr.h b/usr/src/sys/net/netisr.h
index c9da1e3..e2e4653 100644 (file)
--- a/usr/src/sys/net/netisr.h
+++ b/usr/src/sys/net/netisr.h
@@ -1,23 +1,36 @@
 /*
 /*

- * Copyright (c) 1980, 1986, 1989 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1986, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  Neither the name of the University nor the names of
- * its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)netisr.h    7.6 (Berkeley) 6/28/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)netisr.h    8.1 (Berkeley) 6/10/93

  */
 
 /*
  */
 
 /*


@@ -43,9 +56,30 @@
 #define        NETISR_IMP      3               /* same as AF_IMPLINK */
 #define        NETISR_NS       6               /* same as AF_NS */
 #define        NETISR_ISO      7               /* same as AF_ISO */
 #define        NETISR_IMP      3               /* same as AF_IMPLINK */
 #define        NETISR_NS       6               /* same as AF_NS */
 #define        NETISR_ISO      7               /* same as AF_ISO */

+#define        NETISR_CCITT    10              /* same as AF_CCITT */
+#define        NETISR_ARP      18              /* same as AF_LINK */

 
 #define        schednetisr(anisr)      { netisr |= 1<<(anisr); setsoftnet(); }
 
 
 #define        schednetisr(anisr)      { netisr |= 1<<(anisr); setsoftnet(); }
 

+#ifdef i386
+/* XXX Temporary -- soon to vanish - wfj */
+#define        NETISR_SCLK     11              /* softclock */
+#define        NETISR_AST      12              /* ast -- resched */
+
+#undef schednetisr
+#define        schednetisr(anisr)      {\
+       if(netisr == 0) { \
+               softem++; \
+       } \
+       netisr |= 1<<(anisr); \
+}
+#ifndef LOCORE
+#ifdef KERNEL
+int    softem; 
+#endif
+#endif
+#endif /* i386 */
+

 #ifndef LOCORE
 #ifdef KERNEL
 int    netisr;                         /* scheduling bits for network */
 #ifndef LOCORE
 #ifdef KERNEL
 int    netisr;                         /* scheduling bits for network */