mplayer.hg: libmpdvdkit2/ioctl.c comparison

comparison libmpdvdkit2/ioctl.c @ 8637:0211de3039eb

update libdvdcss in libmpdvdkit to latest version (1.2.4) patch by Andreas Hess <jaska@gmx.net>

author	arpi
date	Sun, 29 Dec 2002 15:32:56 +0000
parents	1d15ca298dda
children	c932c17042bf

comparison

equal deleted inserted replaced

-:db4a1b1254cb
+:0211de3039eb
 *          Jon Lech Johansen <jon-vl@nanocrew.net>
 *          Håkan Hjort <d95hjort@dtek.chalmers.se>
 *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
 *          David Siebörger <drs-videolan@rucus.ru.ac.za>
 *          Alex Strelnikov <lelik@os2.ru>
+*          Gildas Bazin <gbazin@netcourrier.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 i_ret = ioctl( i_fd, DKIOCDVDREADSTRUCTURE, &dvd );
 *pi_copyright = dvdbs.copyrightProtectionSystemType;
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 p_buffer[ 8 ];
 SCSI_PASS_THROUGH_DIRECT sptd;
+/*  When using IOCTL_DVD_READ_STRUCTURE and
+DVD_COPYRIGHT_DESCRIPTOR, CopyrightProtectionType
+seems to be always 6 ???
+To work around this M$ bug we try to send a raw scsi command
+instead (if we've got enough privileges to do so). */
 memset( &sptd, 0, sizeof( sptd ) );
 memset( &p_buffer, 0, sizeof( p_buffer ) );
-/*  When using IOCTL_DVD_READ_STRUCTURE and
-DVD_COPYRIGHT_DESCRIPTOR, CopyrightProtectionType
-is always 6. So we send a raw scsi command instead. */
 sptd.Length             = sizeof( SCSI_PASS_THROUGH_DIRECT );
 sptd.CdbLength          = 12;
 sptd.DataIn             = SCSI_IOCTL_DATA_IN;
 sptd.DataTransferLength = 8;
 IOCTL_SCSI_PASS_THROUGH_DIRECT,
 &sptd, sizeof( SCSI_PASS_THROUGH_DIRECT ),
 &sptd, sizeof( SCSI_PASS_THROUGH_DIRECT ),
 &tmp, NULL ) ? 0 : -1;
+if( i_ret == 0 )
+{
 *pi_copyright = p_buffer[ 4 ];
+}
 }
 else
 {
 INIT_SSC( GPCMD_READ_DVD_STRUCTURE, 8 );
 i_ret = ioctl( i_fd, DKIOCDVDREADSTRUCTURE, &dvd );
 memcpy( p_key, dvdbs.discKeyStructures, DVD_DISCKEY_SIZE );
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[DVD_DISK_KEY_LENGTH];
 PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
 i_ret = ioctl( i_fd, DKIOCDVDREPORTKEY, &dvd );
 memcpy( p_key, dvdbs.titleKeyValue, DVD_KEY_SIZE );
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[DVD_BUS_KEY_LENGTH];
 PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
 key->KeyLength  = DVD_TITLE_KEY_LENGTH;
 key->SessionId  = *pi_agid;
 key->KeyType    = DvdTitleKey;
 key->KeyFlags   = 0;
-key->Parameters.TitleOffset.QuadPart = (LONGLONG) i_pos;
+key->Parameters.TitleOffset.QuadPart = (LONGLONG) i_pos *
+2048 /*DVDCSS_BLOCK_SIZE*/;
 i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_DVD_READ_KEY, key,
 key->KeyLength, key, key->KeyLength, &tmp, NULL ) ? 0 : -1;
 memcpy( p_key, key->KeyData, DVD_KEY_SIZE );
 i_ret = ioctl( i_fd, DKIOCDVDREPORTKEY, &dvd );
 *pi_agid = dvdbs.grantID;
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 ULONG id;
 DWORD tmp;
 i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_DVD_START_SESSION,
 i_ret = ioctl( i_fd, DKIOCDVDREPORTKEY, &dvd );
 memcpy( p_challenge, dvdbs.challengeKeyValue, DVD_CHALLENGE_SIZE );
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[DVD_CHALLENGE_KEY_LENGTH];
 PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
 i_ret = ioctl( i_fd, DKIOCDVDREPORTKEY, &dvd );
 *pi_asf = dvdbs.successFlag;
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[DVD_ASF_LENGTH];
 PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
 i_ret = ioctl( i_fd, DKIOCDVDREPORTKEY, &dvd );
 memcpy( p_key, dvdbs.key1Value, DVD_KEY_SIZE );
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[DVD_BUS_KEY_LENGTH];
 PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
 dvd.grantID = *pi_agid;
 i_ret = ioctl( i_fd, DKIOCDVDSENDKEY, &dvd );
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_DVD_END_SESSION,
 pi_agid, sizeof( *pi_agid ), NULL, 0, &tmp, NULL ) ? 0 : -1;
 memcpy( dvdbs.challengeKeyValue, p_challenge, DVD_CHALLENGE_SIZE );
 i_ret = ioctl( i_fd, DKIOCDVDSENDKEY, &dvd );
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[DVD_CHALLENGE_KEY_LENGTH];
 PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
 memcpy( dvdbs.key2Value, p_key, DVD_KEY_SIZE );
 i_ret = ioctl( i_fd, DKIOCDVDSENDKEY, &dvd );
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[DVD_BUS_KEY_LENGTH];
 PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
 *p_type = dvdbs.typeCode;
 *p_mask = dvdbs.driveRegion;
 *p_scheme = dvdbs.rpcScheme;
 #elif defined( WIN32 )
-if( WIN2K ) /* NT/Win2000/Whistler */
+if( WIN2K ) /* NT/2k/XP */
 {
 DWORD tmp;
 u8 buffer[ DVD_REGION_LENGTH ];
 PDVD_REGION region = (PDVD_REGION) &buffer;
 i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_DVD_GET_REGION, NULL, 0,
 region, DVD_REGION_LENGTH, &tmp, NULL ) ? 0 : -1;
 /* Someone who has the headers should correct all this. */
-	/* Use the IOCTL_SCSI_PASS_THROUGH_DIRECT so we get the real
+/* Use the IOCTL_SCSI_PASS_THROUGH_DIRECT so we get the real
-	 * values of theses entities?  */
+* values of theses entities?  */
 if(region->SystemRegion != 0) {
-	    *p_type = region->ResetCount > 1 ? 1 : 3 - region->ResetCount;
+*p_type = region->ResetCount > 1 ? 1 : 3 - region->ResetCount;
-	    *p_mask =  0xff ^ (1 << (region->SystemRegion - 1));
+*p_mask =  0xff ^ (1 << (region->SystemRegion - 1));
-	    *p_scheme = 1;
+*p_scheme = 1;
-	}
+}
-	else
+else
-	{
+{
-	    *p_type = 0;  /* ?? */
+*p_type = 0;  /* ?? */
-	    *p_mask = 0xff;
+*p_mask = 0xff;
-	    *p_scheme = 1; /* ?? */
+*p_scheme = 1; /* ?? */
-	}
+}
 }
 else
 {
 INIT_SSC( GPCMD_REPORT_KEY, 8 );
 }
 #endif
 #if defined( __QNXNTO__ )
 /*****************************************************************************
-* QNXInitCPT: initialize a ssc structure for the win32 aspi layer
+* QNXInitCPT: initialize a CPT structure for QNX Neutrino
 *****************************************************************************
-* This function initializes a ssc raw device command structure for future
+* This function initializes a cpt command structure for future use,
-* use, either a read command or a write command.
+* either a read command or a write command.
 *****************************************************************************/
 static void QNXInitCPT( CAM_PASS_THRU * p_cpt, int i_type )
 {
 switch( i_type )
 {
 p_cpt->cam_cdb[ 8 ] = (p_cpt->cam_dxfer_len >> 8) & 0xff;
 p_cpt->cam_cdb[ 9 ] =  p_cpt->cam_dxfer_len       & 0xff;
 p_cpt->cam_cdb_len = 12;
-	p_cpt->cam_timeout = CAM_TIME_DEFAULT;
+p_cpt->cam_timeout = CAM_TIME_DEFAULT;
 }
 #endif
 #if defined( SYS_OS2 )
 /*****************************************************************************

Mercurial > mplayer.hg

comparison libmpdvdkit2/ioctl.c @ 8637:0211de3039eb