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

Add #ifdef _LOCORE round delay() prototype and move DELAY macro 

to param.h as well.
This commit is contained in:
mark 1996-02-22 22:21:55 +00:00
parent 2f3ad94f8d
commit 6a3087958a
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/arm32/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.2 1996/02/01 22:29:34 mycroft Exp $ */
/* $NetBSD: cpu.h,v 1.3 1996/02/22 22:22:07 mark Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@ -45,7 +45,7 @@
*
* Based on kate/katelib/arm6.h
*
* $Id: cpu.h,v 1.2 1996/02/01 22:29:34 mycroft Exp $
* $Id: cpu.h,v 1.3 1996/02/22 22:22:07 mark Exp $
*/
#ifndef _ARM_CPU_H
@ -175,13 +175,11 @@
#define CLKF_INTR(frame) ((frame->if_spsr & PSR_MODE) == PSR_IRQ32_MODE)
/* Hack to monitor FPE this requires sys/user.h to be included in kern/kern_clock.h */
/*#define CLKF_INTR(frame) (p && (p->p_addr->u_pcb.pcb_fpstate.fp_flags & 2) != 0)*/
/* Hack to treat FPE time as interrupt time so we can measure it */
/*#define CLKF_INTR(frame) ((frame->if_spsr & PSR_MODE) == PSR_UND32_MODE)*/
#define cpu_set_init_frame(p, frame) (p->p_md.md_regs = frame)
#define DELAY(x) delay(x)
/*
* definitions of cpu-dependent requirements
* referenced in generic code

6
sys/arch/arm32/include/katelib.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: katelib.h,v 1.1 1996/01/31 23:22:11 mark Exp $ */
/* $NetBSD: katelib.h,v 1.2 1996/02/22 22:22:11 mark Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -50,7 +50,7 @@
*
* Based on kate/katelib/prototypes.h
*
* $Id: katelib.h,v 1.1 1996/01/31 23:22:11 mark Exp $
* $Id: katelib.h,v 1.2 1996/02/22 22:22:11 mark Exp $
*/
#include <sys/types.h>
@ -121,8 +121,6 @@ int shell __P((caddr_t /*ident*/));
void kstack_stuff __P((struct proc */*p*/));
void boot0 __P(());
void bootsync __P((void));
void delay __P((int));
void DELAY __P((int));
#endif
/* End of katelib.h */

7
sys/arch/arm32/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.2 1996/02/16 23:29:45 mark Exp $ */
/* $NetBSD: param.h,v 1.3 1996/02/22 22:21:55 mark Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: param.h,v 1.2 1996/02/16 23:29:45 mark Exp $
* $Id: param.h,v 1.3 1996/02/22 22:21:55 mark Exp $
*/
#ifndef _ARM32_PARAM_H_
@ -175,7 +175,10 @@
#define arm_page_to_byte(x) (x << PGSHIFT)
#ifdef _KERNEL
#ifndef _LOCORE
void delay __P((unsigned));
#define DELAY(x) delay(x)
#endif
#endif
#endif /* _ARM_PARAM_H_ */