Changeset 1209
- Timestamp:
- 01/13/10 17:19:24 (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/io_serial.c
r1208 r1209 187 187 188 188 #if defined(SCI_DEV) || defined(COOL) 189 if ( com==R_INTERNAL)189 if (reader_type==R_INTERNAL) 190 190 #ifdef SH4 191 191 io->fd = open (filename, O_RDWR|O_NONBLOCK|O_NOCTTY); … … 509 509 #endif 510 510 511 // printf("IO: Setting properties: com%d, %ld bps; %d bits/byte; %s parity; %d stopbits; dtr=%d; rts=%d\n", io->reader_type, io->input_bitrate, io->bits, io->parity == IO_SERIAL_PARITY_EVEN ? "Even" : io->parity == IO_SERIAL_PARITY_ODD ? "Odd" : "None", io->stopbits, io->dtr, io->rts);511 // printf("IO: Setting properties: reader_type%d, %ld bps; %d bits/byte; %s parity; %d stopbits; dtr=%d; rts=%d\n", io->reader_type, io->input_bitrate, io->bits, io->parity == IO_SERIAL_PARITY_EVEN ? "Even" : io->parity == IO_SERIAL_PARITY_ODD ? "Odd" : "None", io->stopbits, io->dtr, io->rts); 512 512 memset (&newtio, 0, sizeof (newtio)); 513 513 … … 615 615 616 616 #ifdef DEBUG_IO 617 printf("IO: Setting properties: com%d, %ld bps; %d bits/byte; %s parity; %d stopbits; dtr=%d; rts=%d\n", io->reader_type, io->input_bitrate, io->bits, io->parity == IO_SERIAL_PARITY_EVEN ? "Even" : io->parity == IO_SERIAL_PARITY_ODD ? "Odd" : "None", io->stopbits, io->dtr, io->rts);617 printf("IO: Setting properties: reader_type%d, %ld bps; %d bits/byte; %s parity; %d stopbits; dtr=%d; rts=%d\n", io->reader_type, io->input_bitrate, io->bits, io->parity == IO_SERIAL_PARITY_EVEN ? "Even" : io->parity == IO_SERIAL_PARITY_ODD ? "Odd" : "None", io->stopbits, io->dtr, io->rts); 618 618 #endif 619 619 return TRUE; … … 1016 1016 extern char oscam_device[]; 1017 1017 snprintf (filename, length, "%s", oscam_device); 1018 // if(com==1)1019 // snprintf (filename, length, "/dev/tts/%d", com - 1);1020 // else1021 // snprintf (filename, length, "/dev/sci%d", com - 2);1022 1018 } 1023 1019 -
trunk/csctapi/pps.c
r1208 r1209 31 31 #include <string.h> 32 32 #include "ifd.h" 33 #include "../globals.h" 33 34 34 35 /* … … 431 432 #include "sci_global.h" 432 433 #include "sci_ioctl.h" 433 if(pps->icc->ifd->io-> com==R_INTERNAL)434 if(pps->icc->ifd->io->reader_type == R_INTERNAL) 434 435 { 435 436 int n; -
trunk/reader-common.c
r1208 r1209 23 23 int rc=reader[ridx].typ; 24 24 struct stat sb; 25 if (reader[ridx].typ == R MOUSE)25 if (reader[ridx].typ == R_MOUSE) 26 26 { 27 27 if (!stat(device, &sb))
Note:
See TracChangeset
for help on using the changeset viewer.