Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some prototypes that are not implemented. Make some functions

Browse Source 
static that are only used in intr.c.
This commit is contained in:
joerg 2008-05-07 07:00:16 +00:00
parent fd15456f57
commit 1e127b8726
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/x86/include/i82093var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82093var.h,v 1.7 2008/04/28 20:23:40 martin Exp $ */
/* $NetBSD: i82093var.h,v 1.8 2008/05/07 07:00:16 joerg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -78,9 +78,6 @@ struct ioapic_softc {
#define APIC_IRQ_ISLEGACY(x) (!((x) & APIC_INT_VIA_APIC))
#define APIC_IRQ_LEGACY_IRQ(x) ((x) & 0xff)
void *apic_intr_establish(int, int, int, int (*)(void *), void *);
void apic_intr_disestablish(void *);
void ioapic_print_redir(struct ioapic_softc *, const char *, int);
void ioapic_format_redir(char *, const char *, int, uint32_t, uint32_t);
struct ioapic_softc *ioapic_find(int);
@ -88,7 +85,6 @@ struct ioapic_softc *ioapic_find_bybase(int);
void ioapic_enable(void);
void ioapic_reenable(void);
void lapic_vectorset(void); /* XXX */
extern int nioapics;
extern struct ioapic_softc *ioapics;

6
sys/arch/x86/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.33 2008/04/28 22:47:37 ad Exp $ */
/* $NetBSD: intr.h,v 1.34 2008/05/07 07:00:16 joerg Exp $ */
/*-
* Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -165,10 +165,6 @@ void *nmi_establish(int (*)(void *), void *);
bool nmi_disestablish(void *);
int nmi_dispatch(void);
int x86_nmi(void);
void intr_calculatemasks(struct cpu_info *);
int intr_allocate_slot_cpu(struct cpu_info *, struct pic *, int, int *);
int intr_allocate_slot(struct pic *, int, int, int, struct cpu_info **, int *,
int *);
void *intr_establish(int, struct pic *, int, int, int, int (*)(void *), void *);
void intr_disestablish(struct intrhand *);
void intr_add_pcibus(struct pcibus_attach_args *);

10
sys/arch/x86/x86/intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.48 2008/04/30 12:00:52 joerg Exp $ */
/* $NetBSD: intr.c,v 1.49 2008/05/07 07:00:16 joerg Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.48 2008/04/30 12:00:52 joerg Exp $");
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.49 2008/05/07 07:00:16 joerg Exp $");
#include "opt_multiprocessor.h"
#include "opt_acpi.h"
@ -288,7 +288,7 @@ x86_nmi(void)
/*
* Recalculate the interrupt masks from scratch.
*/
void
static void
intr_calculatemasks(struct cpu_info *ci)
{
int irq, level, unusedirqs, intrlevel[MAX_INTR_SOURCES];
@ -464,7 +464,7 @@ intr_scan_bus(int bus, int pin, int *handle)
}
#endif
int
static int
intr_allocate_slot_cpu(struct cpu_info *ci, struct pic *pic, int pin,
int *index)
{
@ -514,7 +514,7 @@ intr_allocate_slot_cpu(struct cpu_info *ci, struct pic *pic, int pin,
/*
* A simple round-robin allocator to assign interrupts to CPUs.
*/
int
static int
intr_allocate_slot(struct pic *pic, int legacy_irq, int pin, int level,
struct cpu_info **cip, int *index, int *idt_slot)
{