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

check whether SH4_PCMCIA is defined or not. 

fixes PR. 11441.
This commit is contained in:
msaitoh 2000-11-08 01:03:03 +00:00
parent 5cb13a674a
commit 3ba9161ab2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/sh3/sh3/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.19 2000/09/08 19:52:13 msaitoh Exp $ */
/* $NetBSD: trap.c,v 1.20 2000/11/08 01:03:03 msaitoh Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -663,6 +663,7 @@ tlb_handler(p1, p2, p3, p4, frame)
#define PTEL_VALIDBITS 0x1ffffd7e
#endif
#ifdef SH4
#ifdef SH4_PCMCIA
if (pte & PG_PCMCIA) {
int pcmtype;
unsigned long ptea = 0;
@ -685,7 +686,9 @@ tlb_handler(p1, p2, p3, p4, frame)
& ~PG_N;
SHREG_PTEA = ptea;
} else {
} else
#endif
{
if ( /*1 ||*/ (va >= SH3_P1SEG_BASE)) {
SHREG_PTEL = (pte & PTEL_VALIDBITS)
| PG_WT;
@ -819,6 +822,7 @@ tlb_handler(p1, p2, p3, p4, frame)
#endif
#ifdef SH4
#ifdef SH4_PCMCIA
if (pte & PG_PCMCIA) {
int pcmtype;
unsigned long ptea = 0;
@ -841,7 +845,9 @@ tlb_handler(p1, p2, p3, p4, frame)
& ~PG_N;
SHREG_PTEA = ptea;
} else {
} else
#endif
{
if ( /*1 ||*/ (va >= SH3_P1SEG_BASE)) {
SHREG_PTEL =
(pte & PTEL_VALIDBITS)