[src/netbsd-7]: src/sys/arch/amiga/dev Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/6254c07e744b
branches:  netbsd-7
changeset: 798335:6254c07e744b
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Sep 11 12:14:00 2014 +0000

description:
Pull up following revision(s) (requested by phx in ticket #85):
        sys/arch/amiga/dev/gayle_pcmcia.c: revision 1.30
Add support for newer A1200 models.

diffstat:

 sys/arch/amiga/dev/gayle_pcmcia.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r dc87416d0af6 -r 6254c07e744b sys/arch/amiga/dev/gayle_pcmcia.c
--- a/sys/arch/amiga/dev/gayle_pcmcia.c Wed Sep 10 10:10:43 2014 +0000
+++ b/sys/arch/amiga/dev/gayle_pcmcia.c Thu Sep 11 12:14:00 2014 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: gayle_pcmcia.c,v 1.29 2014/01/22 00:25:16 christos Exp $ */
+/*     $NetBSD: gayle_pcmcia.c,v 1.29.4.1 2014/09/11 12:14:00 martin Exp $ */
 
 /* public domain */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.29 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.29.4.1 2014/09/11 12:14:00 martin Exp $");
 
 /* PCMCIA front-end driver for A1200's and A600's. */
 
@@ -206,6 +206,11 @@
        /* reset the card if it's already there */
        if (gayle_pcmcia_status_read() & GAYLE_CCMEM_DETECT) {
                volatile u_int8_t x;
+
+               gayle_intr_ack(0xff);
+               delay(500);
+               gayle_intr_ack(0xfc);
+
                *reset_card_reg = 0x0;
                delay(1000);
                x = *reset_card_reg;