Changeset 1236 for trunk/csctapi/ifd_towitoko.c
- Timestamp:
- 01/15/10 16:53:19 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/ifd_towitoko.c
r1235 r1236 185 185 io->bits = 8; 186 186 io->stopbits = 2; 187 io->parity = IO_SERIAL_PARITY_EVEN;187 io->parity = PARITY_EVEN; 188 188 io->dtr = IO_SERIAL_HIGH; 189 189 // io->dtr = IO_SERIAL_LOW; … … 192 192 193 193 194 if (!IO_Serial_SetProperties (io))194 if (!IO_Serial_SetPropertiesOld (io)) 195 195 return IFD_TOWITOKO_IO_ERROR; 196 196 … … 209 209 } 210 210 211 ret = IFD_Towitoko_SetParity (ifd, IFD_TOWITOKO_PARITY_EVEN); 211 if (!IO_Serial_SetParity (PARITY_EVEN)) 212 return IFD_TOWITOKO_IO_ERROR; 212 213 213 214 if (ret != IFD_TOWITOKO_OK) … … 264 265 #endif 265 266 /* Get current settings */ 266 if (!IO_Serial_GetProperties (ifd->io))267 if (!IO_Serial_GetPropertiesOld (ifd->io)) 267 268 return IFD_TOWITOKO_IO_ERROR; 268 269 … … 275 276 ifd->io->input_bitrate = baudrate; 276 277 277 if (!IO_Serial_SetProperties (ifd->io))278 if (!IO_Serial_SetPropertiesOld (ifd->io)) 278 279 return IFD_TOWITOKO_IO_ERROR; 279 280 … … 289 290 290 291 /* Get current settings */ 291 if (!IO_Serial_GetProperties (ifd->io))292 if (!IO_Serial_GetPropertiesOld (ifd->io)) 292 293 return IFD_TOWITOKO_IO_ERROR; 293 294 294 295 (*baudrate) = ifd->io->output_bitrate; 295 296 return IFD_TOWITOKO_OK;297 }298 299 extern int IFD_Towitoko_SetParity (IFD * ifd, BYTE parity)300 {301 if(reader[ridx].typ == R_INTERNAL)302 {303 return IFD_TOWITOKO_OK;304 }305 306 #ifdef DEBUG_IFD307 printf ("IFD: Parity = %s\n",308 parity == IFD_TOWITOKO_PARITY_ODD ? "Odd" :309 parity == IFD_TOWITOKO_PARITY_EVEN ? "Even" : "Invalid");310 #endif311 312 if ((parity != IFD_TOWITOKO_PARITY_EVEN) && (parity != IFD_TOWITOKO_PARITY_ODD) && (parity != IFD_TOWITOKO_PARITY_NONE))313 return IFD_TOWITOKO_PARAM_ERROR;314 315 /* Get current settings */316 if (!IO_Serial_GetProperties (ifd->io))317 return IFD_TOWITOKO_IO_ERROR;318 319 if (ifd->io->parity !=parity)320 {321 ifd->io->parity = parity;322 323 if (!IO_Serial_SetProperties (ifd->io))324 return IFD_TOWITOKO_IO_ERROR;325 }326 296 327 297 return IFD_TOWITOKO_OK; … … 408 378 int parity; 409 379 int i; 410 int par[3] = { IFD_TOWITOKO_PARITY_EVEN, IFD_TOWITOKO_PARITY_ODD, IFD_TOWITOKO_PARITY_NONE};380 int par[3] = {PARITY_EVEN, PARITY_ODD, PARITY_NONE}; 411 381 #ifdef HAVE_NANOSLEEP 412 382 struct timespec req_ts; … … 421 391 IO_Serial_Flush(); 422 392 423 ret = IFD_Towitoko_SetParity (ifd, parity); 424 if (ret != IFD_TOWITOKO_OK) 425 return ret; 393 if (!IO_Serial_SetParity (parity)) 394 return IFD_TOWITOKO_IO_ERROR; 426 395 427 396 ret = IFD_TOWITOKO_IO_ERROR;
Note:
See TracChangeset
for help on using the changeset viewer.