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

Don't compile SPL/INTR stuff if NEWINTR is defined.

Browse Source
This commit is contained in:
matt 2001-09-05 17:08:41 +00:00
parent 779b9b4649
commit ff5f5ea027
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm/arm32/db_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_machdep.c,v 1.4 2001/09/05 16:17:35 matt Exp $ */ /* $NetBSD: db_machdep.c,v 1.5 2001/09/05 17:08:41 matt Exp $ */
/* /*
* Copyright (c) 1996 Mark Brinicombe * Copyright (c) 1996 Mark Brinicombe
@ -48,8 +48,9 @@ db_show_intrchain_cmd(addr, have_addr, count, modif)
db_expr_t count; db_expr_t count;
char *modif; char *modif;
{ {
#ifndef NEWINTR
int loop; int loop;
irqhandler_t *ptr; struct irqhandler *ptr;
char *name; char *name;
db_expr_t offset; db_expr_t offset;
@ -72,6 +73,7 @@ db_show_intrchain_cmd(addr, have_addr, count, modif)
} }
} }
} }
#endif /* NEWINTR */
} }

10
sys/arch/arm/arm32/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.3 2001/09/05 16:23:10 matt Exp $ # $NetBSD: genassym.cf,v 1.4 2001/09/05 17:08:41 matt Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California. # Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved. # All rights reserved.
@ -103,21 +103,25 @@ define PR_SCALE offsetof(struct uprof, pr_scale)
define IH_FUNC offsetof(struct irqhandler, ih_func) define IH_FUNC offsetof(struct irqhandler, ih_func)
define IH_ARG offsetof(struct irqhandler, ih_arg) define IH_ARG offsetof(struct irqhandler, ih_arg)
define IH_FLAGS offsetof(struct irqhandler, ih_flags)
ifndef NEWINTR
define IH_LEVEL offsetof(struct irqhandler, ih_level) define IH_LEVEL offsetof(struct irqhandler, ih_level)
define IH_NUM offsetof(struct irqhandler, ih_num) define IH_NUM offsetof(struct irqhandler, ih_num)
define IH_FLAGS offsetof(struct irqhandler, ih_flags)
define IH_MASKADDR offsetof(struct irqhandler, ih_maskaddr) define IH_MASKADDR offsetof(struct irqhandler, ih_maskaddr)
define IH_MASKBITS offsetof(struct irqhandler, ih_maskbits) define IH_MASKBITS offsetof(struct irqhandler, ih_maskbits)
define IH_NEXT offsetof(struct irqhandler, ih_next) define IH_NEXT offsetof(struct irqhandler, ih_next)
endif
define FH_FUNC offsetof(struct fiqhandler, fh_func) define FH_FUNC offsetof(struct fiqhandler, fh_func)
define FH_MASK offsetof(struct fiqhandler, fh_mask)
define FH_R8 offsetof(struct fiqhandler, fh_r8) define FH_R8 offsetof(struct fiqhandler, fh_r8)
define FH_R9 offsetof(struct fiqhandler, fh_r9) define FH_R9 offsetof(struct fiqhandler, fh_r9)
define FH_R10 offsetof(struct fiqhandler, fh_r10) define FH_R10 offsetof(struct fiqhandler, fh_r10)
define FH_R11 offsetof(struct fiqhandler, fh_r11) define FH_R11 offsetof(struct fiqhandler, fh_r11)
define FH_R12 offsetof(struct fiqhandler, fh_r12) define FH_R12 offsetof(struct fiqhandler, fh_r12)
define FH_R13 offsetof(struct fiqhandler, fh_r13) define FH_R13 offsetof(struct fiqhandler, fh_r13)
ifndef NEWINTR
define FH_MASK offsetof(struct fiqhandler, fh_mask)
endif
define SIGF_HANDLER offsetof(struct sigframe, sf_handler) define SIGF_HANDLER offsetof(struct sigframe, sf_handler)
define SIGF_SC offsetof(struct sigframe, sf_sc) define SIGF_SC offsetof(struct sigframe, sf_sc)

5
sys/arch/arm/arm32/stubs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: stubs.c,v 1.3 2001/09/05 16:17:35 matt Exp $ */ /* $NetBSD: stubs.c,v 1.4 2001/09/05 17:08:41 matt Exp $ */
/* /*
* Copyright (c) 1994-1998 Mark Brinicombe. * Copyright (c) 1994-1998 Mark Brinicombe.
@ -198,6 +198,7 @@ dumpsys()
delay(1000000); delay(1000000);
} }
#ifndef NEWINTR
/* This is interrupt / SPL related */ /* This is interrupt / SPL related */
int current_spl_level = _SPL_HIGH; int current_spl_level = _SPL_HIGH;
@ -248,4 +249,6 @@ dump_spl_masks()
} }
#endif #endif
#endif /* !NEWINTR */
/* End of stubs.c */ /* End of stubs.c */

6
sys/arch/arm/conf/files.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm,v 1.37 2001/08/05 13:09:47 chris Exp $ # $NetBSD: files.arm,v 1.38 2001/09/05 17:08:41 matt Exp $
# temporary define to allow easy moving to ../arch/arm/arm32 # temporary define to allow easy moving to ../arch/arm/arm32
defopt ARM32 defopt ARM32
@ -67,12 +67,12 @@ file arch/arm/arm32/cpuswitch.S arm32
file arch/arm/arm32/exception.S arm32 file arch/arm/arm32/exception.S arm32
file arch/arm/arm32/fault.c arm32 file arch/arm/arm32/fault.c arm32
file arch/arm/arm32/fusu.S arm32 file arch/arm/arm32/fusu.S arm32
file arch/arm/arm32/intr.c arm32 file arch/arm/arm32/intr.c arm32 & !newintr
file arch/arm/arm32/mem.c arm32 file arch/arm/arm32/mem.c arm32
file arch/arm/arm32/pmap.c arm32 file arch/arm/arm32/pmap.c arm32
file arch/arm/arm32/setcpsr.S arm32 file arch/arm/arm32/setcpsr.S arm32
file arch/arm/arm32/setstack.S arm32 file arch/arm/arm32/setstack.S arm32
file arch/arm/arm32/spl.S arm32 file arch/arm/arm32/spl.S arm32 & !newintr
file arch/arm/arm32/stubs.c arm32 file arch/arm/arm32/stubs.c arm32
file arch/arm/arm32/syscall.c arm32 file arch/arm/arm32/syscall.c arm32
file arch/arm/arm32/sys_machdep.c arm32 file arch/arm/arm32/sys_machdep.c arm32