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

Fix some #ifdef lossage if HP340, HP360, or HP375 is defined, but HP370 is not.

This commit is contained in:
mycroft 1997-04-06 21:40:35 +00:00
parent b28097e684
commit 1929ddf09c
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/hp300/dev/dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dma.c,v 1.15 1997/04/02 22:37:27 scottr Exp $ */
/* $NetBSD: dma.c,v 1.16 1997/04/06 21:40:35 mycroft Exp $ */
/*
* Copyright (c) 1995, 1996, 1997
@ -274,7 +274,7 @@ dmafree(dq)
#endif
DMA_CLEAR(dc);
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP380)
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP375) || defined(HP380)
/*
* XXX we may not always go thru the flush code in dmastop()
*/
@ -423,7 +423,7 @@ dmago(unit, addr, count, flags)
if (mmutype == MMU_68040 && (flags & DMAGO_READ))
dc->dm_flags |= DMAF_PCFLUSH;
#endif
#if defined(HP340) || defined(HP360) || defined(HP370)
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP375)
/*
* Remember if we need to flush external physical cache when
* DMA is done. We only do this if we are reading (writing memory).
@ -475,7 +475,7 @@ dmastop(unit)
dmatimo[unit] = 0;
#endif
DMA_CLEAR(dc);
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP380)
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP375) || defined(HP380)
if (dc->dm_flags & DMAF_PCFLUSH) {
PCIA();
dc->dm_flags &= ~DMAF_PCFLUSH;

5
sys/arch/hp300/hp300/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.87 1997/04/02 22:41:36 scottr Exp $ */
/* $NetBSD: machdep.c,v 1.88 1997/04/06 21:40:37 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -538,10 +538,11 @@ identifycpu()
#ifndef HP330
case HP_330:
#endif
#if !defined(HP340) && !defined(HP360) && !defined(HP370)
#if !defined(HP340) && !defined(HP360) && !defined(HP370) && !defined(HP375)
case HP_340:
case HP_360:
case HP_370:
case HP_375:
#endif
#if !defined(HP380)
case HP_380:

6
sys/arch/hp300/hp300/sys_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_machdep.c,v 1.14 1997/04/01 03:12:30 scottr Exp $ */
/* $NetBSD: sys_machdep.c,v 1.15 1997/04/06 21:40:38 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -228,7 +228,7 @@ cachectl(req, addr, len)
switch (req) {
case CC_EXTPURGE|CC_PURGE:
case CC_EXTPURGE|CC_FLUSH:
#if defined(HP370)
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP375)
if (ectype == EC_PHYS)
PCIA();
/* fall into... */
@ -238,7 +238,7 @@ cachectl(req, addr, len)
DCIU();
break;
case CC_EXTPURGE|CC_IPURGE:
#if defined(HP370)
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP375)
if (ectype == EC_PHYS)
PCIA();
else