[src/trunk]: src/sys/arch Rename i8259_stubs -> legacy_stubs. We will want th...

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

details:   https://anonhg.NetBSD.org/src/rev/70f2f568291c
branches:  trunk
changeset: 829918:70f2f568291c
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Feb 17 18:51:53 2018 +0000

description:
Rename i8259_stubs -> legacy_stubs. We will want the entries to have the
same name, eg:

        legacy_stubs
                -> Xintr_legacy0, Xrecurse_legacy0, Xresume_legacy0
                -> Xintr_legacy1, Xrecurse_legacy1, Xresume_legacy1
                ...

diffstat:

 sys/arch/amd64/amd64/vector.S |   8 ++++----
 sys/arch/i386/i386/vector.S   |  10 +++++-----
 sys/arch/x86/include/intr.h   |   4 ++--
 sys/arch/x86/x86/i8259.c      |   8 ++++----
 sys/arch/x86/x86/intr.c       |   6 +++---
 sys/arch/xen/x86/pintr.c      |   4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diffs (162 lines):

diff -r 4e82281af4fa -r 70f2f568291c sys/arch/amd64/amd64/vector.S
--- a/sys/arch/amd64/amd64/vector.S     Sat Feb 17 17:44:09 2018 +0000
+++ b/sys/arch/amd64/amd64/vector.S     Sat Feb 17 18:51:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vector.S,v 1.58 2018/02/09 08:42:26 maxv Exp $ */
+/*     $NetBSD: vector.S,v 1.59 2018/02/17 18:51:53 maxv Exp $ */
 
 /*
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -560,8 +560,8 @@
 
 #endif
 
-       .type _C_LABEL(i8259_stubs), @object
-LABEL(i8259_stubs)
+       .type _C_LABEL(legacy_stubs), @object
+LABEL(legacy_stubs)
        .quad _C_LABEL(Xintr_legacy0), _C_LABEL(Xrecurse_legacy0)
        .quad _C_LABEL(Xresume_legacy0)
        .quad _C_LABEL(Xintr_legacy1), _C_LABEL(Xrecurse_legacy1)
@@ -594,7 +594,7 @@
        .quad _C_LABEL(Xresume_legacy14)
        .quad _C_LABEL(Xintr_legacy15), _C_LABEL(Xrecurse_legacy15)
        .quad _C_LABEL(Xresume_legacy15)
-END(i8259_stubs)
+END(legacy_stubs)
 
 #if NIOAPIC > 0
 
diff -r 4e82281af4fa -r 70f2f568291c sys/arch/i386/i386/vector.S
--- a/sys/arch/i386/i386/vector.S       Sat Feb 17 17:44:09 2018 +0000
+++ b/sys/arch/i386/i386/vector.S       Sat Feb 17 18:51:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vector.S,v 1.74 2018/01/27 18:48:59 maxv Exp $ */
+/*     $NetBSD: vector.S,v 1.75 2018/02/17 18:51:53 maxv Exp $ */
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.74 2018/01/27 18:48:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.75 2018/02/17 18:51:53 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -576,8 +576,8 @@
 
 #endif
 
-       .type   _C_LABEL(i8259_stubs), @object
-LABEL(i8259_stubs)
+       .type   _C_LABEL(legacy_stubs), @object
+LABEL(legacy_stubs)
        .long _C_LABEL(Xintr_legacy0), _C_LABEL(Xrecurse_legacy0)
        .long _C_LABEL(Xresume_legacy0)
        .long _C_LABEL(Xintr_legacy1), _C_LABEL(Xrecurse_legacy1)
@@ -610,7 +610,7 @@
        .long _C_LABEL(Xresume_legacy14)
        .long _C_LABEL(Xintr_legacy15), _C_LABEL(Xrecurse_legacy15)
        .long _C_LABEL(Xresume_legacy15)
-END(i8259_stubs)
+END(legacy_stubs)
 
 #if NIOAPIC > 0
        .type   _C_LABEL(ioapic_edge_stubs), @object
diff -r 4e82281af4fa -r 70f2f568291c sys/arch/x86/include/intr.h
--- a/sys/arch/x86/include/intr.h       Sat Feb 17 17:44:09 2018 +0000
+++ b/sys/arch/x86/include/intr.h       Sat Feb 17 18:51:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.53 2018/01/04 01:01:59 knakahara Exp $      */
+/*     $NetBSD: intr.h,v 1.54 2018/02/17 18:51:53 maxv Exp $   */
 
 /*-
  * Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -197,7 +197,7 @@
 void Xpreemptrecurse(void);
 void Xpreemptresume(void);
 
-extern struct intrstub i8259_stubs[];
+extern struct intrstub legacy_stubs[];
 extern struct intrstub ioapic_edge_stubs[];
 extern struct intrstub ioapic_level_stubs[];
 extern struct intrstub x2apic_edge_stubs[];
diff -r 4e82281af4fa -r 70f2f568291c sys/arch/x86/x86/i8259.c
--- a/sys/arch/x86/x86/i8259.c  Sat Feb 17 17:44:09 2018 +0000
+++ b/sys/arch/x86/x86/i8259.c  Sat Feb 17 18:51:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i8259.c,v 1.16 2013/11/06 20:19:03 mrg Exp $   */
+/*     $NetBSD: i8259.c,v 1.17 2018/02/17 18:51:53 maxv Exp $  */
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i8259.c,v 1.16 2013/11/06 20:19:03 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i8259.c,v 1.17 2018/02/17 18:51:53 maxv Exp $");
 
 #include <sys/param.h> 
 #include <sys/systm.h>
@@ -116,8 +116,8 @@
        .pic_hwunmask = i8259_hwunmask,
        .pic_addroute = i8259_setup,
        .pic_delroute = i8259_setup,
-       .pic_level_stubs = i8259_stubs,
-       .pic_edge_stubs = i8259_stubs,
+       .pic_level_stubs = legacy_stubs,
+       .pic_edge_stubs = legacy_stubs,
 };
 
 void
diff -r 4e82281af4fa -r 70f2f568291c sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Sat Feb 17 17:44:09 2018 +0000
+++ b/sys/arch/x86/x86/intr.c   Sat Feb 17 18:51:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.122 2018/01/23 13:57:57 roy Exp $   */
+/*     $NetBSD: intr.c,v 1.123 2018/02/17 18:51:53 maxv Exp $  */
 
 /*
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.122 2018/01/23 13:57:57 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.123 2018/02/17 18:51:53 maxv Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -280,7 +280,7 @@
        /* icu vectors */
        for (i = 0; i < NUM_LEGACY_IRQS; i++) {
                idt_vec_reserve(ICU_OFFSET + i);
-               idt_vec_set(ICU_OFFSET + i, i8259_stubs[i].ist_entry);
+               idt_vec_set(ICU_OFFSET + i, legacy_stubs[i].ist_entry);
        }
 
        /*
diff -r 4e82281af4fa -r 70f2f568291c sys/arch/xen/x86/pintr.c
--- a/sys/arch/xen/x86/pintr.c  Sat Feb 17 17:44:09 2018 +0000
+++ b/sys/arch/xen/x86/pintr.c  Sat Feb 17 18:51:53 2018 +0000
@@ -103,7 +103,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.2 2017/12/13 16:30:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.3 2018/02/17 18:51:53 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -135,7 +135,7 @@
 /* XXX: todo - compat with lapic.c and XEN for x2apic */
 bool x2apic_mode __read_mostly = false;
 /* for x86/i8259.c */
-struct intrstub i8259_stubs[NUM_LEGACY_IRQS] = {{0,0}};
+struct intrstub legacy_stubs[NUM_LEGACY_IRQS] = {{0,0}};
 /* for x86/ioapic.c */
 struct intrstub ioapic_edge_stubs[MAX_INTR_SOURCES] = {{0,0}};
 struct intrstub ioapic_level_stubs[MAX_INTR_SOURCES] = {{0,0}};