Changeset 1209


Ignore:
Timestamp:
01/13/10 17:19:24 (12 years ago)
Author:
dingo35
Message:

Fix compiler errors

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/csctapi/io_serial.c

    r1208 r1209  
    187187
    188188#if defined(SCI_DEV) || defined(COOL)
    189     if (com==R_INTERNAL)
     189    if (reader_type==R_INTERNAL)
    190190#ifdef SH4
    191191        io->fd = open (filename, O_RDWR|O_NONBLOCK|O_NOCTTY);
     
    509509#endif
    510510   
    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);
    512512   memset (&newtio, 0, sizeof (newtio));
    513513
     
    615615   
    616616#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);
    618618#endif
    619619    return TRUE;
     
    10161016    extern char oscam_device[];
    10171017   snprintf (filename, length, "%s", oscam_device);
    1018 //  if(com==1)
    1019 //      snprintf (filename, length, "/dev/tts/%d", com - 1);
    1020 //  else
    1021 //      snprintf (filename, length, "/dev/sci%d", com - 2);
    10221018}
    10231019
  • trunk/csctapi/pps.c

    r1208 r1209  
    3131#include <string.h>
    3232#include "ifd.h"
     33#include "../globals.h"
    3334
    3435/*
     
    431432#include "sci_global.h"
    432433#include "sci_ioctl.h"
    433     if(pps->icc->ifd->io->com==R_INTERNAL)
     434    if(pps->icc->ifd->io->reader_type == R_INTERNAL)
    434435    {
    435436        int n;
  • trunk/reader-common.c

    r1208 r1209  
    2323  int rc=reader[ridx].typ;
    2424  struct stat sb;
    25   if (reader[ridx].typ == RMOUSE)
     25  if (reader[ridx].typ == R_MOUSE)
    2626  {
    2727      if (!stat(device, &sb))
Note: See TracChangeset for help on using the changeset viewer.