--- margi2/margi.h	2001/03/06 23:39:27	1.2
+++ margi2/margi.h	2001/03/29 23:12:01	1.3
@@ -33,39 +33,9 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/system.h>
-//#include <linux/videodev.h>
-
-
-/*
-  PES
-*/
-
-#define PROG_STREAM_MAP  0xBC
-#define PRIVATE_STREAM1  0xBD
-#define PADDING_STREAM   0xBE
-#define PRIVATE_STREAM2  0xBF
-#define AUDIO_STREAM_S   0xC0
-#define AUDIO_STREAM_E   0xDF
-#define VIDEO_STREAM_S   0xE0
-#define VIDEO_STREAM_E   0xEF
-#define ECM_STREAM       0xF0
-#define EMM_STREAM       0xF1
-#define DSM_CC_STREAM    0xF2
-#define ISO13522_STREAM  0xF3
-#define PROG_STREAM_DIR  0xFF
 
 
 #define PBUFFER 100
-enum{AUDIO, VIDEO};
-
-
-typedef struct p2t_s{
-	u8           pes[PBUFFER];
-	int          type;
-	long int     pos;
-	int          frags;
-} p2t_t;
-
 
 u_char read_indexed_register(struct cvdv_cards *card, int addr);
 void write_indexed_register(struct cvdv_cards *card, int addr,
@@ -74,10 +44,10 @@ void WriteByte(struct cvdv_cards *card,
 u_char ReadByte(struct cvdv_cards *card, int addr);
 void MaskByte(struct cvdv_cards *card, int addr, u_char mask, u_char bits);
 int MargiFreeBuffers(struct cvdv_cards *card);
-int MargiSetBuffers(struct cvdv_cards *card, u32 size);
+int MargiSetBuffers(struct cvdv_cards *card, uint32_t size);
 int MargiFlush (struct cvdv_cards *card);
 int MargiPush(struct cvdv_cards *card, int count, const char *data);
-int MargiWriteDirect(struct cvdv_cards *card, u32 count, const char *data);
+int MargiWriteDirect(struct cvdv_cards *card, uint32_t count,const char *data);
 int DecoderStartChannel(struct cvdv_cards *card);
 int DecoderStopChannel(struct cvdv_cards *card);
 void DACSetFrequency(struct cvdv_cards *card, int khz, int multiple);