Changeset 3653

Timestamp:

10/21/10 12:22:36 (13 years ago)

Author:

dingo35

Message:

get rid of extern reader declararions

Location:

trunk

Files:

• module-constcw.c (modified) (2 diffs)
• module-newcamd.c (modified) (5 diffs)
• module-radegast.c (modified) (1 diff)
• module-serial.c (modified) (1 diff)
• oscam-chk.c (modified) (1 diff)
• oscam-reader.c (modified) (1 diff)

trunk/module-constcw.c

@@ -2 +2 @@
 #include "globals.h"
 
-extern struct  s_reader  reader[CS_MAXREADER];
 int pserver = 0;
 
@@ -122 +121 @@
 
     //cs_sleepms(50);
-    write_ecm_answer(reader, er);
+    write_ecm_answer(rdr, er);
     
     client->last = t;

trunk/module-newcamd.c

@@ -1 +1 @@
 #include "globals.h"
-extern struct  s_reader  reader[CS_MAXREADER];
 
 #define CWS_NETMSGSIZE 272
@@ -460 +459 @@
 }
 
-static FILTER mk_user_au_ftab(int au)
+static FILTER mk_user_au_ftab(struct s_reader *aureader)
 {
   int i,j,found;
@@ -467 +466 @@
   FILTER *pufilt;
 
-  filt.caid = reader[au].caid[0];
+  filt.caid = aureader->caid[0];
   if (filt.caid == 0) filt.caid = cl->ftab.filts[0].caid;
   filt.nprids = 0;
@@ -473 +472 @@
   pufilt = &cl->ftab.filts[0];
 
-  for( i=0; i<reader[au].nprov; i++ )
-    filt.prids[filt.nprids++] = b2i(3, &reader[au].prid[i][1]);
+  for( i=0; i<aureader->nprov; i++ )
+    filt.prids[filt.nprids++] = b2i(3, &aureader->prid[i][1]);
 
   for( i=0; i<pufilt->nprids; i++ )
@@ -761 +760 @@
     // set userfilter for au enabled clients    
         if (aureader)
-          cl->ftab.filts[0] = mk_user_au_ftab(get_ridx(aureader));
+          cl->ftab.filts[0] = mk_user_au_ftab(aureader);
 
         pufilt = &cl->ftab.filts[0];

trunk/module-radegast.c

@@ -1 +1 @@
 #include "globals.h"
-extern struct  s_reader  reader[CS_MAXREADER];
 
 static int radegast_send(struct s_client * client, uchar *buf)

trunk/module-serial.c

@@ -2 +2 @@
 #include "globals.h"
 #include <termios.h>
-extern struct  s_reader  reader[CS_MAXREADER];
 
 #define HSIC_CRC 0xA5

trunk/oscam-chk.c

@@ -331 +331 @@
 }
 
-extern struct  s_reader  reader[CS_MAXREADER];
-
 int chk_ctab(ushort caid, CAIDTAB *ctab) {
   if (!caid || !ctab->caid[0])

trunk/oscam-reader.c

@@ -3 +3 @@
 
 int logfd=0;
-extern struct  s_reader  reader[CS_MAXREADER];
 
 void reader_do_idle(struct s_reader * reader);