Sun Mar 8 10:01:45 2020 UTC ()
Pull up following revision(s) (requested by is in ticket #1518):

	sys/arch/amigappc/include/bus_defs.h: revision 1.8

gayle wants stride_1swap now, so declare the rest of the bus methods since
we already define them anyway.


(martin)
diff -r1.6 -r1.6.22.1 src/sys/arch/amigappc/include/bus_defs.h
cvs diff -r1.6 -r1.6.22.1 src/sys/arch/amigappc/include/bus_defs.h (expand / switch to unified diff)

--- src/sys/arch/amigappc/include/bus_defs.h 2014/01/22 00:24:53 1.6
+++ src/sys/arch/amigappc/include/bus_defs.h 2020/03/08 10:01:45 1.6.22.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bus_defs.h,v 1.6 2014/01/22 00:24:53 christos Exp $ */ 1/* $NetBSD: bus_defs.h,v 1.6.22.1 2020/03/08 10:01:45 martin Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1996 Leo Weppelman. All rights reserved. 4 * Copyright (c) 1996 Leo Weppelman. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -161,20 +161,23 @@ struct amiga_bus_space_methods { @@ -161,20 +161,23 @@ struct amiga_bus_space_methods {
161 bswm(*bswrs4, uint32_t); 161 bswm(*bswrs4, uint32_t);
162 bssr(*bssr4, uint32_t); 162 bssr(*bssr4, uint32_t);
163 bscr(*bscr4, uint32_t); 163 bscr(*bscr4, uint32_t);
164}; 164};
165 165
166#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ 166#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */
167#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ 167#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */
168 168
169#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) 169#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
170 170
171#define __BUS_SPACE_HAS_STREAM_METHODS 171#define __BUS_SPACE_HAS_STREAM_METHODS
172 172
173extern const struct amiga_bus_space_methods amiga_bus_stride_1; 173extern const struct amiga_bus_space_methods amiga_bus_stride_1;
 174extern const struct amiga_bus_space_methods amiga_bus_stride_1swap;
 175extern const struct amiga_bus_space_methods amiga_bus_stride_1swap_abs;
174extern const struct amiga_bus_space_methods amiga_bus_stride_2; 176extern const struct amiga_bus_space_methods amiga_bus_stride_2;
175extern const struct amiga_bus_space_methods amiga_bus_stride_4; 177extern const struct amiga_bus_space_methods amiga_bus_stride_4;
176extern const struct amiga_bus_space_methods amiga_bus_stride_4swap; 178extern const struct amiga_bus_space_methods amiga_bus_stride_4swap;
177extern const struct amiga_bus_space_methods amiga_bus_stride_16; 179extern const struct amiga_bus_space_methods amiga_bus_stride_16;
178extern const struct amiga_bus_space_methods amiga_bus_stride_0x1000; 180extern const struct amiga_bus_space_methods amiga_bus_stride_0x1000;
 181extern const struct amiga_bus_space_methods amiga_bus_stride_0x4000;
179 182
180#endif /* _AMIGAPPC_BUS_DEFS_H_ */ 183#endif /* _AMIGAPPC_BUS_DEFS_H_ */