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

remove following symbols which became unnecessary in recent cpu_intr() change:

Browse Source 
mips_hardware_intr
	MIPS3_INTERNAL_TIMER_INTERRUPT
	mips3_intr_cycle_count
	mips3_timer_delta
This commit is contained in:
soda 2000-04-15 22:05:51 +00:00
parent 94ee00e39d
commit c56a43535d
7 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/arc/arc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.33 2000/04/03 11:44:19 soda Exp $ */
/* $NetBSD: machdep.c,v 1.34 2000/04/15 22:05:51 soda Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@ -394,12 +394,6 @@ mach_init(argc, argv, envv)
cpu_reboot(RB_HALT | RB_NOSYNC, NULL);
}
physmem = btoc(physmem);
mips_hardware_intr = arc_hardware_intr;
/*
* XXX - currently, timer interrupt from count/compare register
* is not used. so ...
*/
mips3_timer_delta = 0; /* longest interval */
/* look at argv[0] and compute bootdev for autoconfig setup */
makebootdev(argv[0]);

3
sys/arch/arc/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.11 2000/03/30 21:37:51 soren Exp $ */
/* $NetBSD: cpu.h,v 1.12 2000/04/15 22:05:52 soda Exp $ */
/* $OpenBSD: cpu.h,v 1.9 1998/01/28 13:46:10 pefo Exp $ */
#ifndef _ARC_CPU_H_
@ -7,7 +7,6 @@
/*
* Internal timer causes hard interrupt 5.
*/
#define MIPS3_INTERNAL_TIMER_INTERRUPT
#define MIPS_INT_MASK_CLOCK MIPS_INT_MASK_5
#include <mips/cpu.h>

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

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.3 2000/04/03 11:44:20 soda Exp $ */
/* $NetBSD: intr.h,v 1.4 2000/04/15 22:05:52 soda Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@ -126,10 +126,6 @@ extern struct splvec splvec;
#define FPU_INTR 2
extern u_long intrcnt[];
/* handle i/o device interrupts */
extern int (*mips_hardware_intr) __P((unsigned, unsigned, unsigned, unsigned));
int arc_hardware_intr __P((unsigned, unsigned, unsigned, unsigned));
struct clockframe;
void set_intr __P((int, int(*)(u_int, struct clockframe *), int));

4
sys/arch/cobalt/include/cpu.h
View File

@ -1,6 +1,4 @@
/* $NetBSD: cpu.h,v 1.3 2000/03/24 23:06:04 soren Exp $ */
#define MIPS3_INTERNAL_TIMER_INTERRUPT
/* $NetBSD: cpu.h,v 1.4 2000/04/15 22:05:52 soda Exp $ */
#include <mips/cpu.h>
#include <mips/cpuregs.h>

3
sys/arch/hpcmips/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.4 2000/03/24 23:06:04 soren Exp $ */
/* $NetBSD: cpu.h,v 1.5 2000/04/15 22:05:52 soda Exp $ */
#ifndef __HPCMIPS_CPU_H
#define __HPCMIPS_CPU_H
@ -6,7 +6,6 @@
/*
* VR4100: Internal timer causes hard interrupt 5.
*/
#define MIPS3_INTERNAL_TIMER_INTERRUPT
#define MIPS_INT_MASK_CLOCK MIPS_INT_MASK_5
#include <mips/cpu.h>

7
sys/arch/mips/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.38 2000/04/11 02:30:14 nisimura Exp $ */
/* $NetBSD: cpu.h,v 1.39 2000/04/15 22:05:53 soda Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -166,11 +166,6 @@ extern int want_resched; /* resched() was called */
extern u_int mips_L2CacheSize;
extern int mips_L2CacheIsSnooping; /* L2 cache snoops uncached writes ? */
extern int mips_L2CacheMixed;
#ifdef MIPS3_INTERNAL_TIMER_INTERRUPT
extern u_int32_t mips3_intr_cycle_count;
extern u_int32_t mips3_timer_delta;
#endif
#endif /* MIPS3 */
/*

18
sys/arch/mips/mips/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.126 2000/04/15 06:21:01 nisimura Exp $ */
/* $NetBSD: trap.c,v 1.127 2000/04/15 22:05:53 soda Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -44,7 +44,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.126 2000/04/15 06:21:01 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.127 2000/04/15 22:05:53 soda Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_inet.h"
@ -139,14 +139,6 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.126 2000/04/15 06:21:01 nisimura Exp $");
int astpending;
int want_resched;
unsigned ssir;
int (*mips_hardware_intr) __P((unsigned, unsigned, unsigned, unsigned)) = 0;
#if defined(MIPS3) && defined(MIPS3_INTERNAL_TIMER_INTERRUPT)
u_int32_t mips3_intr_cycle_count;
u_int32_t mips3_timer_delta;
#endif
const char *trap_type[] = {
"external interrupt",
@ -186,10 +178,7 @@ const char *trap_type[] = {
void userret __P((struct proc *, unsigned, u_quad_t));
void trap __P((unsigned, unsigned, unsigned, unsigned, struct trapframe *));
void syscall __P((unsigned, unsigned, unsigned));
void interrupt __P((unsigned, unsigned, unsigned));
void ast __P((unsigned));
void netintr __P((void));
extern void softserial __P((void));
vaddr_t MachEmulateBranch __P((struct frame *, vaddr_t, unsigned, int));
extern void MachEmulateFP __P((unsigned));
@ -720,6 +709,9 @@ trap(status, cause, vaddr, opc, frame)
return;
}
/*
* Software (low priority) network interrupt. i.e. softnet().
*/
void
netintr()
{