Discussion:
[libdvdcss-devel] [PATCH] ioctl.h Drop some pointless ifdefs around a set of harmless #defines
Diego Biurrun
2013-01-31 20:51:01 UTC
Permalink
Signed-off-by: Diego Biurrun <***@biurrun.de>
---
src/ioctl.h | 46 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/ioctl.h b/src/ioctl.h
index ebc972e..c0bc7d5 100644
--- a/src/ioctl.h
+++ b/src/ioctl.h
@@ -168,30 +168,28 @@ typedef union dvd_authinfo dvd_authinfo;
/*****************************************************************************
* Various DVD I/O tables
*****************************************************************************/
-#if defined( SYS_BEOS ) || defined( WIN32 ) || defined ( SOLARIS_USCSI ) || defined ( HPUX_SCTL_IO ) || defined ( __QNXNTO__ ) || defined ( SYS_OS2 )
- /* The generic packet command opcodes for CD/DVD Logical Units,
- * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-# define GPCMD_READ_DVD_STRUCTURE 0xad
-# define GPCMD_REPORT_KEY 0xa4
-# define GPCMD_SEND_KEY 0xa3
- /* DVD struct types */
-# define DVD_STRUCT_PHYSICAL 0x00
-# define DVD_STRUCT_COPYRIGHT 0x01
-# define DVD_STRUCT_DISCKEY 0x02
-# define DVD_STRUCT_BCA 0x03
-# define DVD_STRUCT_MANUFACT 0x04
- /* Key formats */
-# define DVD_REPORT_AGID 0x00
-# define DVD_REPORT_CHALLENGE 0x01
-# define DVD_SEND_CHALLENGE 0x01
-# define DVD_REPORT_KEY1 0x02
-# define DVD_SEND_KEY2 0x03
-# define DVD_REPORT_TITLE_KEY 0x04
-# define DVD_REPORT_ASF 0x05
-# define DVD_SEND_RPC 0x06
-# define DVD_REPORT_RPC 0x08
-# define DVD_INVALIDATE_AGID 0x3f
-#endif
+/* The generic packet command opcodes for CD/DVD Logical Units,
+ * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
+#define GPCMD_READ_DVD_STRUCTURE 0xad
+#define GPCMD_REPORT_KEY 0xa4
+#define GPCMD_SEND_KEY 0xa3
+ /* DVD struct types */
+#define DVD_STRUCT_PHYSICAL 0x00
+#define DVD_STRUCT_COPYRIGHT 0x01
+#define DVD_STRUCT_DISCKEY 0x02
+#define DVD_STRUCT_BCA 0x03
+#define DVD_STRUCT_MANUFACT 0x04
+ /* Key formats */
+#define DVD_REPORT_AGID 0x00
+#define DVD_REPORT_CHALLENGE 0x01
+#define DVD_SEND_CHALLENGE 0x01
+#define DVD_REPORT_KEY1 0x02
+#define DVD_SEND_KEY2 0x03
+#define DVD_REPORT_TITLE_KEY 0x04
+#define DVD_REPORT_ASF 0x05
+#define DVD_SEND_RPC 0x06
+#define DVD_REPORT_RPC 0x08
+#define DVD_INVALIDATE_AGID 0x3f

/*****************************************************************************
* win32 ioctl specific
--
1.7.9.5
Jean-Baptiste Kempf
2013-02-01 12:37:51 UTC
Permalink
seems ok.
--
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device
Jean-Baptiste Kempf
2013-02-11 00:27:55 UTC
Permalink
Post by Jean-Baptiste Kempf
seems ok.
Applied

Best regards,
--
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device
Diego Biurrun
2013-02-11 12:59:41 UTC
Permalink
libdvdcss | branch: master | Diego Biurrun <***@biurrun.de> | Thu Jan 31 21:51:01 2013 +0100| [e7df02a90f2aff82d24603da162602ee381205d2] | committer: Jean-Baptiste Kempf

ioctl.h Drop some pointless ifdefs around a set of harmless #defines
http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=e7df02a90f2aff82d24603da162602ee381205d2
---

src/ioctl.h | 46 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/ioctl.h b/src/ioctl.h
index ebc972e..c0bc7d5 100644
--- a/src/ioctl.h
+++ b/src/ioctl.h
@@ -168,30 +168,28 @@ typedef union dvd_authinfo dvd_authinfo;
/*****************************************************************************
* Various DVD I/O tables
*****************************************************************************/
-#if defined( SYS_BEOS ) || defined( WIN32 ) || defined ( SOLARIS_USCSI ) || defined ( HPUX_SCTL_IO ) || defined ( __QNXNTO__ ) || defined ( SYS_OS2 )
- /* The generic packet command opcodes for CD/DVD Logical Units,
- * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-# define GPCMD_READ_DVD_STRUCTURE 0xad
-# define GPCMD_REPORT_KEY 0xa4
-# define GPCMD_SEND_KEY 0xa3
- /* DVD struct types */
-# define DVD_STRUCT_PHYSICAL 0x00
-# define DVD_STRUCT_COPYRIGHT 0x01
-# define DVD_STRUCT_DISCKEY 0x02
-# define DVD_STRUCT_BCA 0x03
-# define DVD_STRUCT_MANUFACT 0x04
- /* Key formats */
-# define DVD_REPORT_AGID 0x00
-# define DVD_REPORT_CHALLENGE 0x01
-# define DVD_SEND_CHALLENGE 0x01
-# define DVD_REPORT_KEY1 0x02
-# define DVD_SEND_KEY2 0x03
-# define DVD_REPORT_TITLE_KEY 0x04
-# define DVD_REPORT_ASF 0x05
-# define DVD_SEND_RPC 0x06
-# define DVD_REPORT_RPC 0x08
-# define DVD_INVALIDATE_AGID 0x3f
-#endif
+/* The generic packet command opcodes for CD/DVD Logical Units,
+ * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
+#define GPCMD_READ_DVD_STRUCTURE 0xad
+#define GPCMD_REPORT_KEY 0xa4
+#define GPCMD_SEND_KEY 0xa3
+ /* DVD struct types */
+#define DVD_STRUCT_PHYSICAL 0x00
+#define DVD_STRUCT_COPYRIGHT 0x01
+#define DVD_STRUCT_DISCKEY 0x02
+#define DVD_STRUCT_BCA 0x03
+#define DVD_STRUCT_MANUFACT 0x04
+ /* Key formats */
+#define DVD_REPORT_AGID 0x00
+#define DVD_REPORT_CHALLENGE 0x01
+#define DVD_SEND_CHALLENGE 0x01
+#define DVD_REPORT_KEY1 0x02
+#define DVD_SEND_KEY2 0x03
+#define DVD_REPORT_TITLE_KEY 0x04
+#define DVD_REPORT_ASF 0x05
+#define DVD_SEND_RPC 0x06
+#define DVD_REPORT_RPC 0x08
+#define DVD_INVALIDATE_AGID 0x3f

/*****************************************************************************
* win32 ioctl specific

Loading...