[BACK]Return to cardbase.h CVS log [TXT] [DIR] Up to [DVB] / margi2

Diff for /margi2/cardbase.h between versions 1.9 and 1.10

version 1.9, 2001/03/19 23:49:15 version 1.10, 2001/03/29 23:12:01
Line 40 Line 40
 #include <asm/io.h>  #include <asm/io.h>
 #include <asm/byteorder.h>  #include <asm/byteorder.h>
   
   #ifdef DVB
 #include "dvbdev.h"  #include "dvbdev.h"
 #ifdef __DVB_PACK__  #ifdef __DVB_PACK__
 #include <ost/video.h>  #include <ost/video.h>
Line 64 Line 64
   
 #include "dvb_demux.h"  #include "dvb_demux.h"
 #include "dmxdev.h"  #include "dmxdev.h"
   #include "dvb_formats.h"
   #endif
 // List of pci cards in the system  // List of pci cards in the system
   
 #include "cvdvtypes.h"  #include "cvdvtypes.h"
Line 280  typedef struct dvb_devs_s { Line 281  typedef struct dvb_devs_s {
 } dvb_devs_t;  } dvb_devs_t;
   
 struct cvdv_cards {  struct cvdv_cards {
   #ifdef DVB
         struct dvb_device       dvb_dev;          struct dvb_device       dvb_dev;
           dvb_demux_t             demux;
   #endif
         struct cvdv_cards *next;          struct cvdv_cards *next;
         void *margi;          void *margi;
         struct bus_operations *bus;          struct bus_operations *bus;
Line 409  struct cvdv_cards { Line 412  struct cvdv_cards {
         struct timer_list timer;          struct timer_list timer;
         spinlock_t timelock;          spinlock_t timelock;
 #endif  #endif
   
   #ifdef DVB
         dvb_devs_t *dvb_devs;          dvb_devs_t *dvb_devs;
         int users[DVB_DEVS_MAX];          int users[DVB_DEVS_MAX];
         int writers[DVB_DEVS_MAX];          int writers[DVB_DEVS_MAX];
Line 417  struct cvdv_cards { Line 422  struct cvdv_cards {
         boolean                 video_blank;          boolean                 video_blank;
         struct videoStatus      videostate;          struct videoStatus      videostate;
         struct audioStatus      audiostate;          struct audioStatus      audiostate;
         int dvb_registered;          int                     dvb_registered;
           char                    demux_id[16];
           dmx_frontend_t          mem_frontend;
           p2p                     tsa;
           p2p                     tsv;
   #endif
 };  };
   
 extern u8 FlushPacket[32];  extern u8 FlushPacket[32];
Removed from v.1.9  
changed lines
  Added in v.1.10

LinuxTV legacy CVS <linuxtv.org/cvs>