Changeset 2854
- Timestamp:
- 07/26/10 16:31:12 (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/icc_async.c
r2330 r2854 34 34 #include "io_serial.h" 35 35 #include "ifd_cool.h" 36 #include "ifd_mp35.h" 36 37 #include "ifd_phoenix.h" 37 38 #include "ifd_sc8in1.h" … … 87 88 reader->slot=(int)reader->device[pos+1] - 0x30;//FIXME test boundaries 88 89 reader->device[pos]= 0; //slot 1 reader now gets correct physicalname 90 case R_MP35: 89 91 case R_MOUSE: 90 92 reader->handle = open (reader->device, O_RDWR | O_NOCTTY| O_NONBLOCK); … … 142 144 } 143 145 144 if (reader->typ <= R_MOUSE) 146 if (reader->typ == R_MP35) 147 { 148 MP35_Init(reader); 149 } 150 else if (reader->typ <= R_MOUSE) 145 151 if (Phoenix_Init(reader)) { 146 152 cs_log("ERROR: Phoenix_Init returns error"); … … 182 188 call (Sc8in1_GetStatus(reader, &in)); 183 189 break; 190 case R_MP35: 191 // call (MP35_GetStatus(reader, &in)); 192 // break; 184 193 case R_MOUSE: 185 194 call (Phoenix_GetStatus(reader, &in)); … … 224 233 else { 225 234 switch(reader->typ) { 235 case R_MP35: 226 236 case R_DB2COM1: 227 237 case R_DB2COM2: … … 330 340 331 341 switch(reader->typ) { 342 case R_MP35: 332 343 case R_DB2COM1: 333 344 case R_DB2COM2: … … 362 373 { 363 374 switch(reader->typ) { 375 case R_MP35: 364 376 case R_DB2COM1: 365 377 case R_DB2COM2: … … 397 409 398 410 switch(reader->typ) { 411 case R_MP35: 412 call (MP35_Close(reader)); 413 break; 399 414 case R_DB2COM1: 400 415 case R_DB2COM2: … … 645 660 { 646 661 switch(reader->typ) { 662 case R_MP35: 647 663 case R_DB2COM1: 648 664 case R_DB2COM2: -
trunk/csctapi/ifd_phoenix.c
r2561 r2854 4 4 */ 5 5 #include <stdio.h> 6 //#include <time.h>7 //#include <string.h>8 //#include "ioctls.h"9 6 #include "../globals.h" 10 7 #include "atr.h" … … 244 241 int Phoenix_Close (struct s_reader * reader) 245 242 { 243 cs_debug_mask (D_IFD, "IFD: Closing phoenix device %s", reader->device); 246 244 #ifdef USE_GPIO //felix: close dev if card detected 247 245 if(gpio_detect) … … 253 251 #endif 254 252 IO_Serial_Close(reader); 255 cs_debug_mask (D_IFD, "IFD: Closing phoenix device %s", reader->device);256 253 return OK; 257 254 } -
trunk/csctapi/io_serial.c
r2172 r2854 377 377 } 378 378 379 void IO_Serial_Sendbreak(struct s_reader * reader, int duration) 380 { 381 tcsendbreak (reader->handle, duration); 382 } 379 383 380 384 bool IO_Serial_Read (struct s_reader * reader, unsigned timeout, unsigned size, BYTE * data) … … 441 445 } 442 446 443 bool IO_Serial_Write (struct s_reader * reader, unsigned delay, unsigned size, BYTE * data)447 bool IO_Serial_Write (struct s_reader * reader, unsigned delay, unsigned size, const BYTE * data) 444 448 { 445 449 unsigned count, to_send, i_w; … … 492 496 { 493 497 494 cs_debug ("IO: Clos sing serial port %s\n", reader->device);498 cs_debug ("IO: Closing serial port %s\n", reader->device); 495 499 496 500 #if defined(TUXBOX) && defined(PPC) … … 698 702 return OK; 699 703 } 700 -
trunk/csctapi/io_serial.h
r2687 r2854 82 82 /* Input and output */ 83 83 bool IO_Serial_Read (struct s_reader * reader, unsigned timeout, unsigned size, BYTE * data); 84 bool IO_Serial_Write (struct s_reader * reader, unsigned delay, unsigned size, BYTE * data); 84 bool IO_Serial_Write (struct s_reader * reader, unsigned delay, unsigned size, const BYTE * data); 85 void IO_Serial_Sendbreak (struct s_reader * reader, int duration); 85 86 86 87 #endif /* IO_SERIAL */ -
trunk/globals.h
r2851 r2854 135 135 #define D_ALL_DUMP 255 // dumps all 136 136 137 #define R_DB2COM1 138 #define R_DB2COM2 137 #define R_DB2COM1 0x1 // Reader Dbox2 @ com1 138 #define R_DB2COM2 0x2 // Reader Dbox2 @ com1 139 139 #define R_SC8in1 0x3 // Reader smartcard mouse 140 #define R_MOUSE 0x4 // Reader smartcard mouse 140 #define R_MP35 0x4 // AD-Teknik Multiprogrammer 3.5 and 3.6 (only usb tested) 141 #define R_MOUSE 0x5 // Reader smartcard mouse 141 142 /////////////////// phoenix readers which need baudrate setting and timings need to be guarded by OSCam: BEFORE R_MOUSE 142 #define R_INTERNAL 0x 5// Reader smartcard intern143 #define R_INTERNAL 0x10 // Reader smartcard intern 143 144 /////////////////// internal readers (Dreambox, Coolstream, IPBox) are all R_INTERNAL, they are determined compile-time 144 145 /////////////////// readers that do not reed baudrate setting and timings are guarded by reader itself (large buffer built in): AFTER R_SMART 145 #define R_SMART 0x 6// Smartreader+146 #define R_PCSC 0x7// PCSC146 #define R_SMART 0x11 // Smartreader+ 147 #define R_PCSC 0x12 // PCSC 147 148 /////////////////// proxy readers after R_CS378X 148 #define R_CAMD35 0x 10 // Reader cascading camd 3.5x149 #define R_CAMD33 0x 11 // Reader cascading camd 3.3x150 #define R_NEWCAMD 0x 12 // Reader cascading newcamd151 #define R_RADEGAST 0x 13 // Reader cascading radegast152 #define R_CS378X 0x 14 // Reader cascading camd 3.5x TCP153 #define R_CONSTCW 0x 15 // Reader for Constant CW149 #define R_CAMD35 0x20 // Reader cascading camd 3.5x 150 #define R_CAMD33 0x21 // Reader cascading camd 3.3x 151 #define R_NEWCAMD 0x22 // Reader cascading newcamd 152 #define R_RADEGAST 0x23 // Reader cascading radegast 153 #define R_CS378X 0x24 // Reader cascading camd 3.5x TCP 154 #define R_CONSTCW 0x25 // Reader for Constant CW 154 155 /////////////////// peer to peer proxy readers after R_CCCAM 155 156 #ifdef CS_WITH_GBOX 156 #define R_GBOX 0x 20 // Reader cascading gbox157 #endif 158 #define R_CCCAM 0x 25 // Reader cascading cccam157 #define R_GBOX 0x30 // Reader cascading gbox 158 #endif 159 #define R_CCCAM 0x35 // Reader cascading cccam 159 160 #define R_SERIAL 0x80 // Reader serial 160 161 #define R_IS_NETWORK 0x70 161 #define R_IS_CASCADING 0x F0162 #define R_IS_CASCADING 0xE0 162 163 163 164 -
trunk/oscam-config.c
r2826 r2854 2164 2164 char *ctyp =""; 2165 2165 switch(reader[i].typ) { /* TODO like ph*/ 2166 case R_MP35 : 2167 ctyp = "mp35"; 2168 isphysical = 1; 2169 break; 2166 2170 case R_MOUSE : 2167 2171 ctyp = "mouse"; … … 3087 3091 if (!strcmp(token, "protocol")) { 3088 3092 3093 if (!strcmp(value, "mp35")) { 3094 rdr->typ = R_MP35; 3095 return; 3096 } 3097 3089 3098 if (!strcmp(value, "mouse")) { 3090 3099 rdr->typ = R_MOUSE; -
trunk/oscam-http.c
r2847 r2854 678 678 679 679 switch(reader[readeridx].typ) { 680 case R_MP35 : 681 ctyp = "mp35"; 682 isphysical = 1; 683 break; 680 684 case R_MOUSE : 681 685 ctyp = "mouse"; … … 1041 1045 case R_DB2COM1: 1042 1046 case R_DB2COM2: 1047 case R_MP35: 1043 1048 case R_MOUSE : 1044 1049 tpl_addVar(vars, 0, "PROTOCOL", "mouse");
Note:
See TracChangeset
for help on using the changeset viewer.