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

Diff for /margi2/cardbase.h between versions 1.11 and 1.12

version 1.11, 2001/04/06 09:03:53 version 1.12, 2001/04/25 15:31:08
Line 21 Line 21
 #ifndef CARDBASE_H  #ifndef CARDBASE_H
 #define CARDBASE_H  #define CARDBASE_H
   
   #ifdef PCMCIA_DEBUG
   static int pc_debug = PCMCIA_DEBUG;
   MODULE_PARM(pc_debug, "i");
   #define MARGI_DEBUG (pc_debug)
   #else
   #define MARGI_DEBUG 2 
   #endif
   
 // all the internal structs  // all the internal structs
   
 #include <pcmcia/config.h>  #include <pcmcia/config.h>
Line 74 Line 82
 #define SHORTDEVNAME        "ConvDVD"  #define SHORTDEVNAME        "ConvDVD"
 #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 8  #define NBBUF 8
   
   
   #ifdef MARGI_DEBUG
   #define MDEBUG(n, args...) if (MARGI_DEBUG>(n)) printk(KERN_ERR LOGNAME args)
   #else
   #define MDEBUG(n, args...) 
   #endif  
   
   
 #define VID_PAN_SCAN_PREF       0x01    /* Pan and Scan Display preferred */  #define VID_PAN_SCAN_PREF       0x01    /* Pan and Scan Display preferred */
 #define VID_VERT_COMP_PREF      0x02    /* Vertical compression 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_VC_AND_PS_PREF      0x03    /* PanScan and vertical Compression if allowed */
Line 297  struct cvdv_cards { Line 312  struct cvdv_cards {
         u32 DataDumpSize;                         u32 DataDumpSize;               
         u32 AudioPESSize;                         u32 AudioPESSize;               
         u32 NaviBankSize;                         u32 NaviBankSize;               
         int currentAThread;  
         int currentBThread;  
         int currentType;          int currentType;
         u32 lengthB[NBBUF];          ringbuffy rbufA;
         u32 posB[NBBUF];          ringbuffy rbufB;
         u32 lengthA[NBBUF];          int use_ringA;
         u32 posA[NBBUF];          int use_ringB;
         ringbuffy rbuf;  
         int use_ring;  
   
         int nonblock;          int nonblock;
         //  struct video_device   video;  
         u8 *addr;          u8 *addr;
         unsigned int size;          unsigned int size;
         unsigned int minor;          unsigned int minor;
Line 355  struct cvdv_cards { Line 364  struct cvdv_cards {
         int startingDVDV;       // 1 if card is waiting for the Video ES buffer to fill up, to start the decoder          int startingDVDV;       // 1 if card is waiting for the Video ES buffer to fill up, to start the decoder
         int startingDVDA;       // 1 if card is waiting for the Audio ES buffer to fill up, to start the decoder          int startingDVDA;       // 1 if card is waiting for the Audio ES buffer to fill up, to start the decoder
         int channelrun;         // 1 if channel has been started by the host          int channelrun;         // 1 if channel has been started by the host
         u8 *channelA;           // Buffer for channel A  
         int channelAthread;     // currently filled thread  
         int channelApos;        // write position in buffer  
         u8 *channelB;           // Buffer for channel B  
         int channelBthread;     // currently filled thread  
         int channelBpos;        // write position in buffer  
         int fields;             // counter of video fields, debugging only          int fields;             // counter of video fields, debugging only
         struct CSS css;         // CSS data          struct CSS css;         // CSS data
         u32 NaviPackAddress;    // Read address of the Navi Pack Buffer          u32 NaviPackAddress;    // Read address of the Navi Pack Buffer
         wait_queue_head_t wqA;          wait_queue_head_t wqA;
         wait_queue_head_t wqB;          wait_queue_head_t wqB;
         int threadAthreads;  
         u8 *threadA[NBBUF];  
         u32 threadAsize;  
         int threadBthreads;  
         u8 *threadB[NBBUF];  
         u32 threadBsize;  
         u8 bt864reg[128];       // Bt864/865 register mirror  
         u8 navibuffer[NAVIBUFFERSIZE];          u8 navibuffer[NAVIBUFFERSIZE];
         int navihead;          int navihead;
         int navitail;          int navitail;
Line 427  struct cvdv_cards { Line 423  struct cvdv_cards {
         int                     dvb_registered;          int                     dvb_registered;
         char                    demux_id[16];          char                    demux_id[16];
         dmx_frontend_t          mem_frontend;          dmx_frontend_t          mem_frontend;
         p2p                     tsa;          ipack                   tsa;
         p2p                     tsv;          ipack                   tsv;
 #endif  #endif
 };  };
   
Removed from v.1.11  
changed lines
  Added in v.1.12

LinuxTV legacy CVS <linuxtv.org/cvs>