Sun Mar 8 09:18:34 2020 UTC ()

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

	sys/arch/amiga/dev/gayle_pcmcia.c: revision 1.32

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)


(martin)

diff -r1.29.4.2 -r1.29.4.3 src/sys/arch/amiga/dev/gayle_pcmcia.c

--- src/sys/arch/amiga/dev/gayle_pcmcia.c 2015/02/16 12:48:32	1.29.4.2
+++ src/sys/arch/amiga/dev/gayle_pcmcia.c 2020/03/08 09:18:34	1.29.4.3

 @@ -1,19 +1,19 @@
-/*	$NetBSD: gayle_pcmcia.c,v 1.29.4.2 2015/02/16 12:48:32 martin Exp $ */
+/*	$NetBSD: gayle_pcmcia.c,v 1.29.4.3 2020/03/08 09:18:34 martin Exp $ */
 /* public domain */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.29.4.2 2015/02/16 12:48:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.29.4.3 2020/03/08 09:18:34 martin Exp $");
 /* PCMCIA front-end driver for A1200's and A600's. */
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/systm.h>
 #include <uvm/uvm.h>
 #include <dev/pcmcia/pcmciareg.h>
 #include <dev/pcmcia/pcmciavar.h>
 @@ -121,27 +121,27 @@ pccard_attach(device_t parent, device_t
 , UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
 	if (pcmcia_base == 0) {
 		printf("attach failed (no virtual memory)\n");
 		return;
+	}
 	for (i = GAYLE_PCMCIA_START; i < GAYLE_PCMCIA_END; i += PAGE_SIZE)
 		pmap_enter(vm_map_pmap(kernel_map),
 		    i - GAYLE_PCMCIA_START + pcmcia_base, i,
 		    VM_PROT_READ | VM_PROT_WRITE, true);
 	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;
 	pcmio_bs_methods.bswm1 = pcmio_bswm1;
 	pcmio_bs_methods.bsrr1 = pcmio_bsrr1;
 	pcmio_bs_methods.bswr1 = pcmio_bswr1;
 	pcmio_bs_methods.bssr1 = pcmio_bssr1;
 	pcmio_bs_methods.bscr1 = pcmio_bscr1;
 	reset_card_reg = (u_int8_t *) pcmcia_base +
 	    (GAYLE_PCMCIA_RESET - GAYLE_PCMCIA_START);
 	sc->io_space.base = (bus_addr_t) pcmcia_base +