Changeset 5373


Ignore:
Timestamp:
Jun 12, 2011, 3:58:39 PM (8 years ago)
Author:
_network
Message:

correct some declarations

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/global-functions.h

    r5361 r5373  
    2323 *       card support
    2424 * =========================== */
    25 void reader_nagra();
    26 void reader_irdeto();
    27 void reader_cryptoworks();
    28 void reader_viaccess();
    29 void reader_conax();
    30 void reader_seca();
    31 void reader_videoguard1();
    32 void reader_videoguard2();
    33 void reader_videoguard12();
    34 void reader_dre();
    35 void reader_tongfang();
     25extern void reader_nagra(struct s_cardsystem *);
     26extern void reader_irdeto(struct s_cardsystem *);
     27extern void reader_cryptoworks(struct s_cardsystem *);
     28extern void reader_viaccess(struct s_cardsystem *);
     29extern void reader_conax(struct s_cardsystem *);
     30extern void reader_seca(struct s_cardsystem *);
     31extern void reader_videoguard1(struct s_cardsystem *);
     32extern void reader_videoguard2(struct s_cardsystem *);
     33extern void reader_videoguard12(struct s_cardsystem *);
     34extern void reader_dre(struct s_cardsystem *);
     35extern void reader_tongfang(struct s_cardsystem *);
    3636
    3737/* ===========================
    3838 *         cardreaders
    3939 * =========================== */
    40 void cardreader_mouse(struct s_cardreader *crdr);
    41 void cardreader_smargo(struct s_cardreader *crdr);
     40extern void cardreader_mouse(struct s_cardreader *crdr);
     41extern void cardreader_smargo(struct s_cardreader *crdr);
    4242#ifdef WITH_STAPI
    43 void cardreader_stapi(struct s_cardreader *crdr);
     43extern void cardreader_stapi(struct s_cardreader *crdr);
    4444#endif
    4545#ifdef HAVE_PCSC
     
    176176#ifdef HAVE_DVBAPI
    177177extern void chk_t_dvbapi(char *token, char *value);
    178 void dvbapi_chk_caidtab(char *caidasc, char type);
    179 void dvbapi_read_priority();
     178extern void dvbapi_chk_caidtab(char *caidasc, char type);
     179extern void dvbapi_read_priority(void);
    180180#endif
    181181
     
    405405extern int32_t reader_ecm(struct s_reader * reader, ECM_REQUEST *);
    406406extern int32_t reader_emm(struct s_reader * reader, EMM_PACKET *);
    407 int32_t reader_get_emm_type(EMM_PACKET *ep, struct s_reader * reader);
    408 struct s_cardsystem *get_cardsystem_by_caid(uint16_t caid);
     407extern int32_t reader_get_emm_type(EMM_PACKET *ep, struct s_reader * reader);
     408extern struct s_cardsystem *get_cardsystem_by_caid(uint16_t caid);
    409409extern void reader_device_close(struct s_reader * reader);
  • trunk/globals.h

    r5365 r5373  
    13191319extern pthread_mutex_t gethostbyname_lock;
    13201320
    1321 pid_t server_pid; // PID of server - set while startup
     1321extern pid_t server_pid; // PID of server - set while startup
    13221322
    13231323#ifdef CS_ANTICASC
  • trunk/module-dvbapi.c

    r5371 r5373  
    2626struct s_client *dvbapi_client=NULL;
    2727
     28#ifdef WITH_STAPI
    2829int32_t stapi_on    = 0;
     30pthread_mutex_t filter_lock;
     31struct STDEVICE dev_list[PTINUM];
     32#endif
    2933
    3034int32_t dvbapi_set_filter(int32_t demux_id, int32_t api, uint16_t pid, uchar *filt, uchar *mask, int32_t timeout, int32_t pidindex, int32_t count, int32_t type) {
     
    103107}
    104108
    105 int32_t dvbapi_check_array(uint16_t *array, int32_t len, uint16_t match) {
    106     int32_t i;
    107     for (i=0; i<len; i++) {
    108         if (array[i]==match) {
    109             return i;
    110         }
    111     }
    112     return -1;
    113 }
    114 
    115 int32_t dvbapi_detect_api() {
     109static int32_t dvbapi_detect_api() {
    116110#ifdef COOL
    117111    selected_api=COOLAPI;
     
    182176}
    183177
    184 int32_t dvbapi_read_device(int32_t dmx_fd, unsigned char *buf, int32_t length)
     178static int32_t dvbapi_read_device(int32_t dmx_fd, unsigned char *buf, int32_t length)
    185179{
    186180    int32_t len, rc;
  • trunk/module-dvbapi.h

    r5284 r5373  
    107107#define PTINUM 10
    108108#define SLOTNUM 20
    109 
    110 pthread_mutex_t filter_lock;
    111 
    112 struct STDEVICE dev_list[PTINUM];
    113109#endif
    114110
  • trunk/oscam.c

    r5372 r5373  
    3737int8_t cs_capture_SEGV=0;
    3838char  cs_tmpdir[200]={0x00};
     39pid_t server_pid=0;
    3940pthread_mutex_t gethostbyname_lock;
    4041pthread_mutex_t get_cw_lock;
Note: See TracChangeset for help on using the changeset viewer.