[src/netbsd-9]: src/sys/arch Pull up following revision(s) (requested by is i...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/24127950fcce
branches:  netbsd-9
changeset: 963681:24127950fcce
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 08 10:28:16 2020 +0000

description:
Pull up following revision(s) (requested by is in ticket #760):

        sys/arch/amiga/dev/gayle_pcmcia.c: revision 1.32
        sys/arch/amigappc/include/bus_defs.h: revision 1.8

The Gayle interface uses swapped (little-endian) word accesses, so we
need to use the amiga_bus_stride_1swap methods for the word accesses.

Analyzed and submitted via port-amiga@ by Martin Åberg.

Tested on formerly working hardware
- by Jukka Andberg      with Dlink DE-660+              (ne)
- by Frank Wille        with D-Link DFE-670TXD          (ne)

Tested on formerly not working hardware:
- by Martin             with 3Com 3c589 Etherling III   (ep)
- by Martin and Frank   with CompactFlash cards         (wdc)

 -

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

diffstat:

 sys/arch/amiga/dev/gayle_pcmcia.c    |  6 +++---
 sys/arch/amigappc/include/bus_defs.h |  5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r a58add8af01c -r 24127950fcce sys/arch/amiga/dev/gayle_pcmcia.c
--- a/sys/arch/amiga/dev/gayle_pcmcia.c Sun Mar 08 10:22:29 2020 +0000
+++ b/sys/arch/amiga/dev/gayle_pcmcia.c Sun Mar 08 10:28:16 2020 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $ */
+/*     $NetBSD: gayle_pcmcia.c,v 1.31.22.1 2020/03/08 10:28:16 martin Exp $ */
 
 /* public domain */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.31.22.1 2020/03/08 10:28:16 martin Exp $");
 
 /* PCMCIA front-end driver for A1200's and A600's. */
 
@@ -131,7 +131,7 @@
        pmap_update(vm_map_pmap(kernel_map));
 
        /* override the one-byte access methods for I/O space */
-       pcmio_bs_methods = amiga_bus_stride_1;
+       pcmio_bs_methods = amiga_bus_stride_1swap;
        pcmio_bs_methods.bsr1 = pcmio_bsr1;
        pcmio_bs_methods.bsw1 = pcmio_bsw1;
        pcmio_bs_methods.bsrm1 = pcmio_bsrm1;
diff -r a58add8af01c -r 24127950fcce sys/arch/amigappc/include/bus_defs.h
--- a/sys/arch/amigappc/include/bus_defs.h      Sun Mar 08 10:22:29 2020 +0000
+++ b/sys/arch/amigappc/include/bus_defs.h      Sun Mar 08 10:28:16 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_defs.h,v 1.6 2014/01/22 00:24:53 christos Exp $    */
+/*     $NetBSD: bus_defs.h,v 1.6.34.1 2020/03/08 10:28:16 martin Exp $ */
 
 /*
  * Copyright (c) 1996 Leo Weppelman.  All rights reserved.
@@ -171,10 +171,13 @@
 #define __BUS_SPACE_HAS_STREAM_METHODS
 
 extern const struct amiga_bus_space_methods amiga_bus_stride_1;
+extern const struct amiga_bus_space_methods amiga_bus_stride_1swap;
+extern const struct amiga_bus_space_methods amiga_bus_stride_1swap_abs;
 extern const struct amiga_bus_space_methods amiga_bus_stride_2;
 extern const struct amiga_bus_space_methods amiga_bus_stride_4;
 extern const struct amiga_bus_space_methods amiga_bus_stride_4swap;
 extern const struct amiga_bus_space_methods amiga_bus_stride_16;
 extern const struct amiga_bus_space_methods amiga_bus_stride_0x1000;
+extern const struct amiga_bus_space_methods amiga_bus_stride_0x4000;
 
 #endif /* _AMIGAPPC_BUS_DEFS_H_ */