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

Diff for /margi2/cardbase.h between versions 1.5 and 1.6

version 1.5, 2001/01/31 14:19:02 version 1.6, 2001/03/06 23:39:26
Line 40 Line 40
 #include <asm/io.h>  #include <asm/io.h>
 #include <asm/byteorder.h>  #include <asm/byteorder.h>
   
   #include <linux/videodev.h>
   
   
   #include "dvbdev.h"
   #ifdef __DVB_PACK__
   #include <ost/video.h>
   #include <ost/audio.h>
   #include <ost/demux.h>
   #include <ost/dmx.h>
   #include <ost/sec.h>
   #include <ost/frontend.h>
   #include <ost/ca.h>
   #else
   #include <linux/ost/video.h>
   #include <linux/ost/audio.h>
   #include <linux/ost/demux.h>
   #include <linux/ost/dmx.h>
   #include <linux/ost/sec.h>
   #include <linux/ost/frontend.h>
   #include <linux/ost/ca.h>
   #endif
   
   #include "dvb_demux.h"
   #include "dmxdev.h"
   
 // List of pci cards in the system  // List of pci cards in the system
   
Line 50 Line 74
 #define MEDDEVNAME          "convergence DVD"  #define MEDDEVNAME          "convergence DVD"
 #define LONGDEVNAME         "convergence DVD Video Decoder"  #define LONGDEVNAME         "convergence DVD Video Decoder"
 #define LOGNAME             "convdvd"  #define LOGNAME             "convdvd"
 #define NBBUF 16  #define NBBUF 8
   
   
   #define VID_PAN_SCAN_PREF       0x01    /* Pan and Scan Display preferred */
   #define VID_VERT_COMP_PREF      0x02    /* Vertical compression display preferred */
   #define VID_VC_AND_PS_PREF      0x03    /* PanScan and vertical Compression if allowed */
   #define VID_CENTRE_CUT_PREF     0x05    /* PanScan with zero vector */
   
   
 // Character device definitions  // Character device definitions
 // char dev name  // char dev name
Line 239  typedef struct PTSRecord { Line 270  typedef struct PTSRecord {
         u32 PTS[MAX_PTS];          u32 PTS[MAX_PTS];
 } PTSStorage;  } PTSStorage;
   
   #define DVB_DEVS_MAX 8
   
   typedef struct dvb_devs_s {
           int num;  
           int tab[DVB_DEVS_MAX];
           int max_users[DVB_DEVS_MAX];
           int max_writers[DVB_DEVS_MAX];
   } dvb_devs_t;
   
 struct cvdv_cards {  struct cvdv_cards {
           struct video_device   video;
           struct dvb_device       dvb_dev;
   
         struct cvdv_cards *next;          struct cvdv_cards *next;
         //  struct video_device       video;  
         void *margi;          void *margi;
         struct bus_operations *bus;          struct bus_operations *bus;
         u_char scl;          u_char scl;
Line 303  struct cvdv_cards { Line 345  struct cvdv_cards {
         int AuxFifoLayer;       //  "   "   "   "     "          int AuxFifoLayer;       //  "   "   "   "     "
         int AudioInitialized;   // Is the Audio set up?          int AudioInitialized;   // Is the Audio set up?
         int AudioOldMode;       // remainder of the previous mode while trickmodes, or -1          int AudioOldMode;       // remainder of the previous mode while trickmodes, or -1
         int open[MINORNUM];     // is the 64017 initialized and the video out active?          int open;       // is the 64017 initialized and the video out active?
         int closing;            // 1 if char device closed, but DMA still running          int closing;            // 1 if char device closed, but DMA still running
         int startingV;          // 1 if card is waiting for the Video ES buffer to fill up, to start the decoder          int startingV;          // 1 if card is waiting for the Video ES buffer to fill up, to start the decoder
         int startingA;          // 1 if card is waiting for the Audio ES buffer to fill up, to start the decoder          int startingA;          // 1 if card is waiting for the Audio ES buffer to fill up, to start the decoder
Line 361  struct cvdv_cards { Line 403  struct cvdv_cards {
         u8 highlight[10];       // content of registers 1C0 thru 1C0, to be written after next BAV int.          u8 highlight[10];       // content of registers 1C0 thru 1C0, to be written after next BAV int.
         int highlight_valid;    // if 1          int highlight_valid;    // if 1
         int do_flush;           // if 1, send flush packet after last transfer done          int do_flush;           // if 1, send flush packet after last transfer done
           int hasZV;
   #ifdef NOINT
           struct timer_list timer;
           spinlock_t timelock;
   #endif
           dvb_devs_t *dvb_devs;
           int users[DVB_DEVS_MAX];
           int writers[DVB_DEVS_MAX];
   
           dmxdev_t                dmxdev;
           boolean                 video_blank;
           struct videoStatus      videostate;
           struct audioStatus      audiostate;
           int dvb_registered;
   
 };  };
   
 extern u8 FlushPacket[32];  extern u8 FlushPacket[32];
Removed from v.1.5  
changed lines
  Added in v.1.6

LinuxTV legacy CVS <linuxtv.org/cvs>