Changeset 1651


Ignore:
Timestamp:
02/22/10 14:16:52 (11 years ago)
Author:
merek
Message:

Exclude ump changeset 1736 from OS_CYGWIN - this causes some card detection issues under Cygwin

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/csctapi/ifd_phoenix.c

    r1622 r1651  
    111111        int i;
    112112        int parity[3] = {PARITY_EVEN, PARITY_ODD, PARITY_NONE};
    113     call (Phoenix_SetBaudrate (DEFAULT_BAUDRATE));
     113        call (Phoenix_SetBaudrate (DEFAULT_BAUDRATE));
    114114        for(i=0; i<3; i++) {
    115             cs_sleepms(200); // pause for 200ms as this might help with the PL2303
     115#ifndef OS_CYGWIN
     116            /*
     117            * Pause for 200ms as this might help with the PL2303.
     118            * Some users reporting that this breaks cygwin, so we exclude this.
     119            */
     120            cs_sleepms(200);
     121#endif
    116122            IO_Serial_Flush();
    117123            call (IO_Serial_SetParity (parity[i]));
     
    126132#endif
    127133                IO_Serial_RTS_Set();
    128             cs_sleepms(200); // we went form 50 to 200 as this might help with the PL2303
     134#ifdef OS_CYGWIN
     135            /*
     136            * Pause for 200ms as this might help with the PL2303.
     137            * Some users reporting that this breaks cygwin, so we went back to 50ms.
     138            */
     139            cs_sleepms(50);
     140#else
     141            cs_sleepms(200);
     142#endif
     143
    129144#ifdef USE_GPIO  //felix: set card reset hi (inactive)
    130145            if (gpio_detect) {
     
    134149#endif
    135150                IO_Serial_RTS_Clr();
    136             cs_sleepms(200); // pause for 200ms as this might help with the PL2303
     151#ifndef OS_CYGWIN
     152            /*
     153            * Pause for 200ms as this might help with the PL2303.
     154            * Some users reporting that this breaks cygwin, so we exclude this.
     155            */
     156            cs_sleepms(200);
     157#endif
    137158            IO_Serial_Ioctl_Lock(0);
    138159            if(ATR_InitFromStream (atr, ATR_TIMEOUT) == ATR_OK)
     
    198219        call (tcgetattr (reader[ridx].handle, &tio) != 0);
    199220        call (IO_Serial_SetBitrate (baudrate, &tio));
    200         cs_sleepms(200); // pause for 200ms as this might help with the PL2303
     221#ifndef OS_CYGWIN
     222        /*
     223        * Pause for 200ms as this might help with the PL2303.
     224        * Some users reporting that this breaks cygwin, so we exclude this.
     225        */
     226            cs_sleepms(200);
     227#endif
    201228        call (IO_Serial_SetProperties(tio));
    202         cs_sleepms(200); // pause for 200ms as this might help with the PL2303
     229#ifndef OS_CYGWIN
     230        /*
     231        * Pause for 200ms as this might help with the PL2303.
     232        * Some users reporting that this breaks cygwin, so we exclude this.
     233        */
     234            cs_sleepms(200);
     235#endif
    203236    }
    204237    current_baudrate = baudrate; //so if update fails, current_baudrate is not changed either
Note: See TracChangeset for help on using the changeset viewer.