[dvblast-devel] update linsys ASI API interface file

[Christophe Massiot]

dvblast | branch: master | Christophe Massiot <massiot at via.ecp.fr> | Mon Oct 28 15:05:47 2013 +0100| [c23200bbd4779cf1b06114e500117ba13d6c8dbf] | committer: Christophe Massiot

update linsys ASI API interface file

> http://git.videolan.org/gitweb.cgi/dvblast.git/?a=commit;h=c23200bbd4779cf1b06114e500117ba13d6c8dbf
---

 asi.c |    2 +-
 asi.h |   19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/asi.c b/asi.c
index 90405eb..af4486f 100644
--- a/asi.c
+++ b/asi.c
@@ -52,7 +52,7 @@
  * (typically ~100 TS packets) to fill up. And the buffer size cannot be
  * adjusted afer startup. --Meuuh
  */
-#undef USE_HARDWARE_FILTERING
+//#define USE_HARDWARE_FILTERING
 
 /*****************************************************************************
  * Local declarations
diff --git a/asi.h b/asi.h
index 76f16e7..ae10752 100644
--- a/asi.h
+++ b/asi.h
@@ -4,7 +4,7 @@
  * Linear Systems Ltd. DVB Master ASI interface boards.
  *
  * Copyright (C) 1999 Tony Bolger <d7v at indigo.ie>
- * Copyright (C) 2000-2008 Linear Systems Ltd.
+ * Copyright (C) 2000-2010 Linear Systems Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -74,9 +74,13 @@
 /* #define ASI_IOC_TXGETFIFO	_IOR(ASI_IOC_MAGIC, 6, int) */
 #define ASI_IOC_TXGETTXD	_IOR(ASI_IOC_MAGIC, 7, int)
 #define ASI_IOC_TXGET27COUNT	_IOR(ASI_IOC_MAGIC, 8, unsigned int)
-#define ASI_IOC_TXSETPID	_IOR(ASI_IOC_MAGIC, 9, unsigned int)
+/* Provide compatibility with applications compiled for older API */
+#define ASI_IOC_TXSETPID_DEPRECATED	_IOR(ASI_IOC_MAGIC, 9, unsigned int)
+#define ASI_IOC_TXSETPID	_IOW(ASI_IOC_MAGIC, 9, unsigned int)
 #define ASI_IOC_TXGETPCRSTAMP	_IOR(ASI_IOC_MAGIC, 10, struct asi_pcrstamp)
-#define ASI_IOC_TXCHANGENEXTIP	_IOR(ASI_IOC_MAGIC, 11, int)
+/* Provide compatibility with applications compiled for older API */
+#define ASI_IOC_TXCHANGENEXTIP_DEPRECATED	_IOR(ASI_IOC_MAGIC, 11, int)
+#define ASI_IOC_TXCHANGENEXTIP	_IOW(ASI_IOC_MAGIC, 11, int)
 
 #define ASI_IOC_RXGETCAP	_IOR(ASI_IOC_MAGIC, 65, unsigned int)
 #define ASI_IOC_RXGETEVENTS	_IOR(ASI_IOC_MAGIC, 66, unsigned int)
@@ -102,7 +106,9 @@
 /* #define ASI_IOC_RXGETSTAMP	_IOR(ASI_IOC_MAGIC, 86, unsigned int) */
 #define ASI_IOC_RXGET27COUNT	_IOR(ASI_IOC_MAGIC, 87, unsigned int)
 #define ASI_IOC_RXGETSTATUS2	_IOR(ASI_IOC_MAGIC, 88, int)
-#define ASI_IOC_RXSETINPUT	_IOR(ASI_IOC_MAGIC, 89, int)
+/* Provide compatibility with applications compiled for older API */
+#define ASI_IOC_RXSETINPUT_DEPRECATED	_IOR(ASI_IOC_MAGIC, 89, int)
+#define ASI_IOC_RXSETINPUT	_IOW(ASI_IOC_MAGIC, 89, int)
 #define ASI_IOC_RXGETRXD2	_IOR(ASI_IOC_MAGIC, 90, int)
 
 #define ASI_IOC_GETID		_IOR(ASI_IOC_MAGIC, 129, unsigned int)
@@ -196,6 +202,7 @@ struct asi_pcrstamp {
 #define ASI_CAP_TX_TIMESTAMPS	0x00010000
 #define ASI_CAP_TX_PTIMESTAMPS	0x00020000
 #define ASI_CAP_TX_NULLPACKETS	0x00040000
+#define ASI_CAP_TX_EXTCLKSRC2	0x00080000
 
 #define ASI_CAP_RX_SYNC		0x00000004
 #define ASI_CAP_RX_MAKE188	0x00000008
@@ -215,13 +222,13 @@ struct asi_pcrstamp {
 #define ASI_CAP_RX_PTIMESTAMPS	0x00020000
 #define ASI_CAP_RX_NULLPACKETS	0x00040000
 #define ASI_CAP_RX_REDUNDANT	0x00080000
-#define ASI_CAP_RX_DATA2 		0x00100000
+#define ASI_CAP_RX_DATA2	0x00100000
 
 /* Transmitter clock source settings */
 #define ASI_CTL_TX_CLKSRC_ONBOARD	0
 #define ASI_CTL_TX_CLKSRC_EXT		1
 #define ASI_CTL_TX_CLKSRC_RX		2
-/* #define ASI_CTL_TX_CLKSRC_EXT_PAL	3 */
+#define ASI_CTL_TX_CLKSRC_EXT2		3
 
 /* Transmitter mode settings */
 #define ASI_CTL_TX_MODE_188	0