- Timestamp:
- 02/01/12 18:02:46 (12 years ago)
- Location:
- branches/sc8in1/csctapi
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/sc8in1/csctapi/ifd_sc8in1.c
r6320 r6331 903 903 int32_t result; 904 904 int32_t lineData; 905 if (reader->handle == 0) { 906 return 0; 907 } 905 908 ioctl(reader->handle, TIOCMGET, &lineData); 906 909 result = (lineData & TIOCM_CTS) / TIOCM_CTS; … … 965 968 } 966 969 } else { 967 // disable reader threads 968 reader->sc8in1_config->display_running = FALSE; 969 pthread_join(reader->sc8in1_config->display_thread, NULL); 970 if (reader->sc8in1_config->mcr_type) { 971 // disable reader threads 972 reader->sc8in1_config->display_running = FALSE; 973 pthread_join(reader->sc8in1_config->display_thread, NULL); 974 } 970 975 // disable other slots 971 976 struct s_reader *rdr; … … 979 984 } 980 985 // close serial port 981 status = IO_Serial_Close(reader); 982 reader->handle = 0; 986 if (reader->handle != 0) { 987 status = IO_Serial_Close(reader); 988 reader->handle = 0; 989 } 983 990 } 984 991 -
branches/sc8in1/csctapi/io_serial.c
r6265 r6331 191 191 cfsetispeed(tio, IO_Serial_Bitrate(bitrate)); 192 192 cs_debug_mask(D_DEVICE, "standard baudrate: cardmhz=%d mhz=%d -> effective baudrate %u", reader->cardmhz, reader->mhz, bitrate); 193 if (reader->typ == R_SC8in1) { 194 reader->sc8in1_config->current_baudrate = bitrate; 195 } 193 196 } 194 197 #ifdef OS_LINUX … … 217 220 cfsetospeed(tio, IO_Serial_Bitrate(38400)); 218 221 cfsetispeed(tio, IO_Serial_Bitrate(38400)); 222 if (reader->typ == R_SC8in1) { 223 reader->sc8in1_config->current_baudrate = custom_baud_asked; 224 } 219 225 } 220 226 #endif 221 if (reader->typ == R_SC8in1) {222 reader->sc8in1_config->current_baudrate = bitrate;223 }224 227 return OK; 225 228 }
Note:
See TracChangeset
for help on using the changeset viewer.