Fri Jul 24 06:57:53 2009 UTC ()
G/C DCIAS


(skrll)
diff -r1.14 -r1.15 src/sys/arch/hp700/include/bus.h
cvs diff -r1.14 -r1.15 src/sys/arch/hp700/include/Attic/bus.h (expand / switch to unified diff)

--- src/sys/arch/hp700/include/Attic/bus.h 2009/07/23 13:34:26 1.14
+++ src/sys/arch/hp700/include/Attic/bus.h 2009/07/24 06:57:53 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bus.h,v 1.14 2009/07/23 13:34:26 skrll Exp $ */ 1/* $NetBSD: bus.h,v 1.15 2009/07/24 06:57:53 skrll Exp $ */
2 2
3/* $OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $ */ 3/* $OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $ */
4 4
5/* 5/*
6 * Copyright (c) 1998,1999 Michael Shalayeff 6 * Copyright (c) 1998,1999 Michael Shalayeff
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -171,28 +171,26 @@ typedef const struct hppa_bus_space_tag  @@ -171,28 +171,26 @@ typedef const struct hppa_bus_space_tag
171extern const struct hppa_bus_space_tag hppa_bustag; 171extern const struct hppa_bus_space_tag hppa_bustag;
172 172
173/* flags for bus space map functions */ 173/* flags for bus space map functions */
174#define BUS_SPACE_MAP_CACHEABLE 0x0001 174#define BUS_SPACE_MAP_CACHEABLE 0x0001
175#define BUS_SPACE_MAP_LINEAR 0x0002 175#define BUS_SPACE_MAP_LINEAR 0x0002
176#define BUS_SPACE_MAP_READONLY 0x0004 176#define BUS_SPACE_MAP_READONLY 0x0004
177#define BUS_SPACE_MAP_PREFETCHABLE 0x0008 177#define BUS_SPACE_MAP_PREFETCHABLE 0x0008
178#define BUS_SPACE_MAP_NOEXTENT 0x8000 /* no extent ops */ 178#define BUS_SPACE_MAP_NOEXTENT 0x8000 /* no extent ops */
179#define BUS_SPACE_BARRIER_READ 0x0000 179#define BUS_SPACE_BARRIER_READ 0x0000
180#define BUS_SPACE_BARRIER_WRITE 0x0001 180#define BUS_SPACE_BARRIER_WRITE 0x0001
181 181
182 182
183/* bus access routines */ 183/* bus access routines */
184#define DCIAS(pa) ((void)(pa)) 
185 
186#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) 184#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
187 185
188#define bus_space_map(t,a,c,ca,hp) \ 186#define bus_space_map(t,a,c,ca,hp) \
189 (((t)->hbt_map)((t)->hbt_cookie,(a),(c),(ca),(hp))) 187 (((t)->hbt_map)((t)->hbt_cookie,(a),(c),(ca),(hp)))
190#define bus_space_unmap(t,h,c) \ 188#define bus_space_unmap(t,h,c) \
191 (((t)->hbt_unmap)((t)->hbt_cookie,(h),(c))) 189 (((t)->hbt_unmap)((t)->hbt_cookie,(h),(c)))
192#define bus_space_subregion(t,h,o,c,hp) \ 190#define bus_space_subregion(t,h,o,c,hp) \
193 (((t)->hbt_subregion)((t)->hbt_cookie,(h),(o),(c),(hp))) 191 (((t)->hbt_subregion)((t)->hbt_cookie,(h),(o),(c),(hp)))
194#define bus_space_alloc(t,b,e,c,al,bn,ca,ap,hp) \ 192#define bus_space_alloc(t,b,e,c,al,bn,ca,ap,hp) \
195 (((t)->hbt_alloc)((t)->hbt_cookie,(b),(e),(c),(al),(bn),(ca),(ap),(hp))) 193 (((t)->hbt_alloc)((t)->hbt_cookie,(b),(e),(c),(al),(bn),(ca),(ap),(hp)))
196#define bus_space_free(t,h,c) \ 194#define bus_space_free(t,h,c) \
197 (((t)->hbt_free)((t)->hbt_cookie,(h),(c))) 195 (((t)->hbt_free)((t)->hbt_cookie,(h),(c)))
198#define bus_space_barrier(t,h,o,l,op) \ 196#define bus_space_barrier(t,h,o,l,op) \