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

Make "options HP340" actually work without having "option HP360".

Browse Source
This commit is contained in:
carrel 1997-01-31 23:01:21 +00:00
parent d8489a6f7e
commit 05c0e704dc
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/hp300/DOC/Options
View File

@ -1,4 +1,4 @@
$NetBSD: Options,v 1.5 1996/10/13 16:52:40 christos Exp $
$NetBSD: Options,v 1.6 1997/01/31 23:01:21 carrel Exp $
Here is a list of hp300 specific kernel compilation options and what they
mean:
@ -23,8 +23,9 @@ HP330
Support for old hp330 (and 318/319) machines: 16mhz 68020, 68551 PMMU
and 16mhz 68881. Compiles in support for PMMU.
HP340
HP360
Support for old hp360 (and 340) machines: 25mhz 68030+MMU and 25mhz
Support for old 340 and hp360 machines: 25mhz 68030+MMU and 25mhz
68882. Compiles in support for PMMU and 68030. Differs from HP330
in support for 68030 on-chip data cache.

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

@ -1,4 +1,4 @@
/* $NetBSD: dma.c,v 1.11 1997/01/30 09:04:33 thorpej Exp $ */
/* $NetBSD: dma.c,v 1.12 1997/01/31 23:01:25 carrel Exp $ */
/*
* Copyright (c) 1995, 1996, 1997
@ -276,7 +276,7 @@ dmafree(dq)
#endif
DMA_CLEAR(dc);
#if defined(HP360) || defined(HP370) || defined(HP380)
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP380)
/*
* XXX we may not always go thru the flush code in dmastop()
*/
@ -425,7 +425,7 @@ dmago(unit, addr, count, flags)
if (mmutype == MMU_68040 && (flags & DMAGO_READ))
dc->dm_flags |= DMAF_PCFLUSH;
#endif
#if defined(HP360) || defined(HP370)
#if defined(HP340) || defined(HP360) || defined(HP370)
/*
* Remember if we need to flush external physical cache when
* DMA is done. We only do this if we are reading (writing memory).
@ -478,7 +478,7 @@ dmastop(unit)
dmatimo[unit] = 0;
#endif
DMA_CLEAR(dc);
#if defined(HP360) || defined(HP370) || defined(HP380)
#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP380)
if (dc->dm_flags & DMAF_PCFLUSH) {
PCIA();
dc->dm_flags &= ~DMAF_PCFLUSH;

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

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.77 1996/12/11 16:49:23 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.78 1997/01/31 23:01:23 carrel Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -579,7 +579,7 @@ identifycpu()
#ifndef HP330
case HP_330:
#endif
#if !defined(HP360) && !defined(HP370)
#if !defined(HP340) && !defined(HP360) && !defined(HP370)
case HP_340:
case HP_360:
case HP_370: