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

Make these build with recent tweaks to powerpc's bus_space(9) by moving

Browse Source 
the inclusion of <powerpc/bus.h> to *after* the definitions of
PHYS_TO_BUS_MEM() and BUS_MEM_TO_PHYS().
This commit is contained in:
scw 2003-07-28 07:58:49 +00:00
parent a2bec8caf7
commit b91f2fb51d
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/bebox/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.27 2003/03/18 16:40:19 matt Exp $ */
/* $NetBSD: bus.h,v 1.28 2003/07/28 07:58:49 scw Exp $ */
/* $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $ */
/*-
@ -104,8 +104,6 @@
#ifndef _BEBOX_BUS_H_
#define _BEBOX_BUS_H_
#include <powerpc/bus.h>
/*
* Values for the Be bus space tag, not to be used directly by MI code.
*/
@ -127,4 +125,6 @@ extern struct powerpc_bus_space bebox_isa_io_bs_tag;
extern struct powerpc_bus_space bebox_isa_mem_bs_tag;
#endif
#include <powerpc/bus.h>
#endif /* _BEBOX_BUS_H_ */

9
sys/arch/mvmeppc/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.2 2003/03/18 16:40:20 matt Exp $ */
/* $NetBSD: bus.h,v 1.3 2003/07/28 07:58:50 scw Exp $ */
/*-
* Copyright (c) 200e The NetBSD Foundation, Inc.
@ -39,8 +39,10 @@
#ifndef _MVMEPPC_BUS_H_
#define _MVMEPPC_BUS_H_
#include <powerpc/bus.h>
#define PHYS_TO_BUS_MEM(t,x) ((x) | 0x80000000)
#define BUS_MEM_TO_PHYS(t,x) ((x) & ~0x80000000)
#include <powerpc/bus.h>
#define MVMEPPC_PHYS_BASE_IO 0x80000000
#define MVMEPPC_PHYS_SIZE_IO 0x3f800000
@ -58,9 +60,6 @@
#define MVMEPPC_BUS_SPACE_MEM 1
#define MVMEPPC_BUS_SPACE_NUM_REGIONS 2
#define PHYS_TO_BUS_MEM(t,x) ((x) | 0x80000000)
#define BUS_MEM_TO_PHYS(t,x) ((x) & ~0x80000000)
#ifdef _KERNEL
extern struct powerpc_bus_space mvmeppc_isa_io_bs_tag;
extern struct powerpc_bus_space mvmeppc_isa_mem_bs_tag;

6
sys/arch/pmppc/include/bus.h
View File

@ -1,10 +1,8 @@
/* $NetBSD: bus.h,v 1.2 2003/03/06 00:20:42 matt Exp $ */
/* $NetBSD: bus.h,v 1.3 2003/07/28 07:58:51 scw Exp $ */
#ifndef _PMPPC_BUS_H_
#define _PMPPC_BUS_H_
#include <powerpc/bus.h>
/*
* Address conversion as seen from a PCI master.
*/
@ -17,4 +15,6 @@ extern struct powerpc_bus_space pmppc_pci_io_tag;
void pmppc_bus_space_init(void);
void pmppc_bus_space_mallocok(void);
#include <powerpc/bus.h>
#endif /* _PMPPC_BUS_H_ */

6
sys/arch/prep/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.9 2003/03/18 16:40:22 matt Exp $ */
/* $NetBSD: bus.h,v 1.10 2003/07/28 07:58:51 scw Exp $ */
/* $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $ */
/*-
@ -104,8 +104,6 @@
#ifndef _PREP_BUS_H_
#define _PREP_BUS_H_
#include <powerpc/bus.h>
/*
* Values for the Be bus space tag, not to be used directly by MI code.
*/
@ -126,4 +124,6 @@ extern struct powerpc_bus_space prep_mem_space_tag;
extern struct powerpc_bus_space prep_isa_mem_space_tag;
#endif
#include <powerpc/bus.h>
#endif /* _PREP_BUS_H_ */

6
sys/arch/sandpoint/include/bus.h
View File

@ -1,11 +1,9 @@
/* $NetBSD: bus.h,v 1.5 2003/03/18 16:40:24 matt Exp $ */
/* $NetBSD: bus.h,v 1.6 2003/07/28 07:58:52 scw Exp $ */
/* $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $ */
#ifndef _SANDPOINT_BUS_H_
#define _SANDPOINT_BUS_H_
#include <powerpc/bus.h>
/*
* Values for the SandPoint bus space tag, not to be used directly by MI code.
*/
@ -25,4 +23,6 @@ extern struct powerpc_bus_space sandpoint_io_bs_tag;
extern struct powerpc_bus_space sandpoint_isa_io_bs_tag;
extern struct powerpc_bus_space sandpoint_mem_bs_tag;
#include <powerpc/bus.h>
#endif /* _SANDPOINT_BUS_H_ */