Re: port-arm/52057

[smesgr <smesgr%gmail.com@localhost>]

The following reply was made to PR port-arm/52057; it has been noted by GNATS.

From: smesgr <smesgr%gmail.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: port-arm/52057
Date: Tue, 14 Mar 2017 19:33:24 +0100

 sorry by mistake submit only one half of the patch. Here is the complete 
 patch:
 
 Index: dev/pcmcia/wdc_pcmcia.c
 ===================================================================
 RCS file: /cvsroot/src/sys/dev/pcmcia/wdc_pcmcia.c,v
 retrieving revision 1.124
 diff -u -r1.124 wdc_pcmcia.c
 --- dev/pcmcia/wdc_pcmcia.c    12 Oct 2013 16:49:01 -0000    1.124
 +++ dev/pcmcia/wdc_pcmcia.c    9 Mar 2017 20:36:04 -0000
 @@ -207,6 +207,7 @@
   wdc_pcmcia_attach(device_t parent, device_t self, void *aux)
   {
       struct wdc_pcmcia_softc *sc = device_private(self);
 +    prop_dictionary_t dict = device_properties(parent);
       struct pcmcia_attach_args *pa = aux;
       struct pcmcia_config_entry *cfe;
       struct wdc_regs *wdr;
 @@ -214,6 +215,7 @@
       bus_size_t offset;
       int i;
       int error;
 +    bool cap32 = FALSE;
 
       aprint_naive("\n");
 
 @@ -287,7 +289,10 @@
           aprint_normal_dev(self, "i/o mapped mode\n");
           wdr->data32iot = wdr->cmd_iot;
           wdr->data32ioh = wdr->cmd_iohs[wd_data];
 -        sc->sc_wdcdev.sc_atac.atac_cap |= ATAC_CAP_DATA32;
 +        if(!prop_dictionary_get_bool(dict, "is_cap_data32", &cap32) || 
 cap32) {
 +            sc->sc_wdcdev.sc_atac.atac_cap |= ATAC_CAP_DATA32;
 +        }
       }
 
       sc->sc_wdcdev.sc_atac.atac_pio_cap = 0;
 Index: arch/arm/xscale/pxa2x0_pcic.c
 ===================================================================
 RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_pcic.c,v
 retrieving revision 1.12
 diff -u -r1.12 pxa2x0_pcic.c
 --- arch/arm/xscale/pxa2x0_pcic.c    13 Oct 2013 06:55:34 -0000 1.12
 +++ arch/arm/xscale/pxa2x0_pcic.c    9 Mar 2017 20:37:12 -0000
 @@ -400,6 +400,7 @@
   {
       struct pxapcic_softc *sc = device_private(self);
       struct pxapcic_socket *sock;
 +    prop_dictionary_t dict;
       int s[PXAPCIC_NSLOT];
       int i;
       u_int cs;
 @@ -419,6 +420,9 @@
 
           config_pending_incr(self);
 
 +        dict = device_properties(sock->pcmcia);
 +        prop_dictionary_set_bool(dict, "is_cap_data32", false);
 +
           /* If there's a card there, attach it. */
           cs = (*sock->pcictag->read)(sock, PXAPCIC_CARD_STATUS);
           if (cs == PXAPCIC_CARD_VALID)