[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Merge in icu.s 1.62

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d567c30576c7
branches:  sommerfeld_i386mp_1
changeset: 482199:d567c30576c7
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Mon Feb 21 21:53:57 2000 +0000

description:
Merge in icu.s 1.62

diffstat:

 sys/arch/i386/i386/apicvec.s |  37 +++---------------------------
 sys/arch/i386/isa/icu.s      |  53 +++++++++----------------------------------
 2 files changed, 16 insertions(+), 74 deletions(-)

diffs (121 lines):

diff -r 0b85f99e8ce8 -r d567c30576c7 sys/arch/i386/i386/apicvec.s
--- a/sys/arch/i386/i386/apicvec.s      Mon Feb 21 21:11:47 2000 +0000
+++ b/sys/arch/i386/i386/apicvec.s      Mon Feb 21 21:53:57 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: apicvec.s,v 1.1.2.1 2000/02/20 17:01:44 sommerfeld Exp $ */        
+/* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */        
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -103,38 +103,9 @@
        sti
        xorl    %edi,%edi
        xchgl   _C_LABEL(netisr),%edi
-#ifdef INET
-#include "arp.h"
-#if NARP > 0
-       DONET(NETISR_ARP, _C_LABEL(arpintr))
-#endif
-       DONET(NETISR_IP, _C_LABEL(ipintr))
-#endif
-#ifdef INET6
-       DONET(NETISR_IPV6, _C_LABEL(ip6intr))
-#endif
-#ifdef IMP
-       DONET(NETISR_IMP, _C_LABEL(impintr))
-#endif
-#ifdef NS
-       DONET(NETISR_NS, _C_LABEL(nsintr))
-#endif
-#ifdef ISO
-       DONET(NETISR_ISO, _C_LABEL(clnlintr))
-#endif
-#ifdef CCITT
-       DONET(NETISR_CCITT, _C_LABEL(ccittintr))
-#endif
-#ifdef NATM
-       DONET(NETISR_NATM, _C_LABEL(natmintr))
-#endif
-#ifdef NETATALK
-       DONET(NETISR_ATALK, _C_LABEL(atintr))
-#endif
-#include "ppp.h"
-#if NPPP > 0
-       DONET(NETISR_PPP, _C_LABEL(pppintr))
-#endif
+
+#include "net/netisr_dispatch.h"
+       
        jmp     _C_LABEL(Xdoreti)
 
 XINTR(softser):        
diff -r 0b85f99e8ce8 -r d567c30576c7 sys/arch/i386/isa/icu.s
--- a/sys/arch/i386/isa/icu.s   Mon Feb 21 21:11:47 2000 +0000
+++ b/sys/arch/i386/isa/icu.s   Mon Feb 21 21:53:57 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icu.s,v 1.61.10.1 2000/02/20 18:29:43 sommerfeld Exp $ */
+/*     $NetBSD: icu.s,v 1.61.10.2 2000/02/21 21:53:57 sommerfeld Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -157,49 +157,20 @@
        movl    %ebx,CPL
        jmp     %esi
 
-#define DONET(s, c) \
-       .globl  c               ;\
-       testl   $(1 << s),%edi  ;\
-       jz      1f              ;\
-       call    c               ;\
-1:
-
 IDTVEC(softnet)
-       movl    $IPL_SOFTNET,CPL
+       movl    $IPL_SOFTNET,CPL        
        xorl    %edi,%edi
        xchgl   _C_LABEL(netisr),%edi
-#ifdef INET
-#include "arp.h"
-#if NARP > 0
-       DONET(NETISR_ARP, _C_LABEL(arpintr))
-#endif
-       DONET(NETISR_IP, _C_LABEL(ipintr))
-#endif
-#ifdef INET6
-       DONET(NETISR_IPV6, _C_LABEL(ip6intr))
-#endif
-#ifdef IMP
-       DONET(NETISR_IMP, _C_LABEL(impintr))
-#endif
-#ifdef NS
-       DONET(NETISR_NS, _C_LABEL(nsintr))
-#endif
-#ifdef ISO
-       DONET(NETISR_ISO, _C_LABEL(clnlintr))
-#endif
-#ifdef CCITT
-       DONET(NETISR_CCITT, _C_LABEL(ccittintr))
-#endif
-#ifdef NATM
-       DONET(NETISR_NATM, _C_LABEL(natmintr))
-#endif
-#ifdef NETATALK
-       DONET(NETISR_ATALK, _C_LABEL(atintr))
-#endif
-#include "ppp.h"
-#if NPPP > 0
-       DONET(NETISR_PPP, _C_LABEL(pppintr))
-#endif
+
+#define DONETISR(s, c) \
+       .globl  _C_LABEL(c)     ;\
+       testl   $(1 << s),%edi  ;\
+       jz      1f              ;\
+       call    _C_LABEL(c)     ;\
+1:
+
+#include "net/netisr_dispatch.h"
+
        movl    %ebx,CPL
        jmp     %esi