From 89e4e0c09801ef7537f743bd8cb3bd4e4891d581 Mon Sep 17 00:00:00 2001 From: Steve Passe Date: Wed, 25 Jun 1997 20:59:15 +0000 Subject: Modified to declare merged/renamed functions: - get_isa_apic_mask() -> isa_apic_mask() - get_isa_apic_irq() && get_eisa_apic_irq() -> isa_apic_pin() - get_pci_apic_irq() -> pci_apic_pin() --- sys/amd64/include/smp.h | 9 ++++----- sys/i386/include/smp.h | 9 ++++----- sys/sys/smp.h | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index 2943764430c0..38a8cb44f60a 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: smp.h,v 1.10 1997/05/29 05:57:43 fsmp Exp $ + * $Id: smp.h,v 1.3 1997/06/25 20:43:48 smp Exp smp $ * */ @@ -64,11 +64,10 @@ u_int mp_bootaddress __P((u_int)); int mp_probe __P((void)); void mp_start __P((void)); void mp_announce __P((void)); -int get_isa_apic_irq __P((int)); -u_int get_isa_apic_mask __P((u_int)); +u_int isa_apic_mask __P((u_int)); +int isa_apic_pin __P((int)); +int pci_apic_pin __P((int, int, int)); int undirect_isa_irq __P((int)); -int get_eisa_apic_irq __P((int)); -int get_pci_apic_irq __P((int, int, int)); int undirect_pci_irq __P((int)); int apic_bus_type __P((int)); int apic_src_bus_id __P((int, int)); diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h index 2943764430c0..38a8cb44f60a 100644 --- a/sys/i386/include/smp.h +++ b/sys/i386/include/smp.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: smp.h,v 1.10 1997/05/29 05:57:43 fsmp Exp $ + * $Id: smp.h,v 1.3 1997/06/25 20:43:48 smp Exp smp $ * */ @@ -64,11 +64,10 @@ u_int mp_bootaddress __P((u_int)); int mp_probe __P((void)); void mp_start __P((void)); void mp_announce __P((void)); -int get_isa_apic_irq __P((int)); -u_int get_isa_apic_mask __P((u_int)); +u_int isa_apic_mask __P((u_int)); +int isa_apic_pin __P((int)); +int pci_apic_pin __P((int, int, int)); int undirect_isa_irq __P((int)); -int get_eisa_apic_irq __P((int)); -int get_pci_apic_irq __P((int, int, int)); int undirect_pci_irq __P((int)); int apic_bus_type __P((int)); int apic_src_bus_id __P((int, int)); diff --git a/sys/sys/smp.h b/sys/sys/smp.h index 2943764430c0..38a8cb44f60a 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: smp.h,v 1.10 1997/05/29 05:57:43 fsmp Exp $ + * $Id: smp.h,v 1.3 1997/06/25 20:43:48 smp Exp smp $ * */ @@ -64,11 +64,10 @@ u_int mp_bootaddress __P((u_int)); int mp_probe __P((void)); void mp_start __P((void)); void mp_announce __P((void)); -int get_isa_apic_irq __P((int)); -u_int get_isa_apic_mask __P((u_int)); +u_int isa_apic_mask __P((u_int)); +int isa_apic_pin __P((int)); +int pci_apic_pin __P((int, int, int)); int undirect_isa_irq __P((int)); -int get_eisa_apic_irq __P((int)); -int get_pci_apic_irq __P((int, int, int)); int undirect_pci_irq __P((int)); int apic_bus_type __P((int)); int apic_src_bus_id __P((int, int)); -- cgit v1.3