[MPlayer-cvslog] r31156 - in trunk/libdvdcss: device.c device.h libdvdcss.c libdvdcss.h
diego
subversion at mplayerhq.hu
Tue May 11 12:58:50 CEST 2010
Author: diego
Date: Tue May 11 12:58:50 2010
New Revision: 31156
Log:
libdvdcss: OS/2 support; this merges upstream revisions 220 and 229.
Modified:
trunk/libdvdcss/device.c
trunk/libdvdcss/device.h
trunk/libdvdcss/libdvdcss.c
trunk/libdvdcss/libdvdcss.h
Modified: trunk/libdvdcss/device.c
==============================================================================
--- trunk/libdvdcss/device.c Tue May 11 12:51:46 2010 (r31155)
+++ trunk/libdvdcss/device.c Tue May 11 12:58:50 2010 (r31156)
@@ -65,6 +65,14 @@
# include <IOKit/storage/IODVDMedia.h>
#endif
+#ifdef SYS_OS2
+# define INCL_DOS
+# define INCL_DOSDEVIOCTL
+# include <os2.h>
+# include <io.h> /* setmode() */
+# include <fcntl.h> /* O_BINARY */
+#endif
+
#include "dvdcss/dvdcss.h"
#include "common.h"
@@ -91,6 +99,12 @@ static int aspi_read ( dvdcss_t, void *
static int win_readv ( dvdcss_t, struct iovec *, int );
static int aspi_read_internal ( int, void *, int );
+#elif defined( SYS_OS2 )
+static int os2_open ( dvdcss_t, char const * );
+/* just use macros for libc */
+# define os2_seek libc_seek
+# define os2_read libc_read
+# define os2_readv libc_readv
#endif
int _dvdcss_use_ioctls( dvdcss_t dvdcss )
@@ -110,6 +124,16 @@ int _dvdcss_use_ioctls( dvdcss_t dvdcss
{
return 1;
}
+#elif defined( SYS_OS2 )
+ ULONG ulMode;
+
+ if( DosQueryFHState( dvdcss->i_fd, &ulMode ) != 0 )
+ return 1; /* What to do? Be conservative and try to use the ioctls */
+
+ if( ulMode & OPEN_FLAGS_DASD )
+ return 1;
+
+ return 0;
#else
struct stat fileinfo;
int ret;
@@ -157,6 +181,28 @@ void _dvdcss_check ( dvdcss_t dvdcss )
kern_return_t kern_result;
io_iterator_t media_iterator;
CFMutableDictionaryRef classes_to_match;
+#elif defined( SYS_OS2 )
+#pragma pack( 1 )
+ struct
+ {
+ BYTE bCmdInfo;
+ BYTE bDrive;
+ } param;
+
+ struct
+ {
+ BYTE abEBPB[31];
+ USHORT usCylinders;
+ BYTE bDevType;
+ USHORT usDevAttr;
+ } data;
+#pragma pack()
+
+ ULONG ulParamLen;
+ ULONG ulDataLen;
+ ULONG rc;
+
+ int i;
#else
char *ppsz_devices[] = { "/dev/dvd", "/dev/cdrom", "/dev/hdc", NULL };
int i, i_fd;
@@ -270,6 +316,32 @@ void _dvdcss_check ( dvdcss_t dvdcss )
}
IOObjectRelease( media_iterator );
+#elif defined( SYS_OS2 )
+ for( i = 0; i < 26; i++ )
+ {
+ param.bCmdInfo = 0;
+ param.bDrive = i;
+
+ rc = DosDevIOCtl( ( HFILE )-1, IOCTL_DISK, DSK_GETDEVICEPARAMS,
+ ¶m, sizeof( param ), &ulParamLen,
+ &data, sizeof( data ), &ulDataLen );
+
+ if( rc == 0 )
+ {
+ /* Check for removable and for cylinders */
+ if( ( data.usDevAttr & 1 ) == 0 && data.usCylinders == 0xFFFF )
+ {
+ char psz_dvd[] = "A:";
+
+ psz_dvd[0] += i;
+
+ print_debug( dvdcss, "defaulting to drive `%s'", psz_dvd );
+ free( dvdcss->psz_device );
+ dvdcss->psz_device = strdup( psz_dvd );
+ return;
+ }
+ }
+ }
#else
for( i = 0; ppsz_devices[i]; i++ )
{
@@ -322,6 +394,18 @@ int _dvdcss_open ( dvdcss_t dvdcss )
return aspi_open( dvdcss, psz_device );
}
else
+#elif defined( SYS_OS2 )
+ /* If device is "X:" or "X:\", we are not actually opening a file. */
+ if( psz_device[0] && psz_device[1] == ':' &&
+ ( !psz_device[2] || ( psz_device[2] == '\\' && !psz_device[3] ) ) )
+ {
+ print_debug( dvdcss, "using OS2 API for access" );
+ dvdcss->pf_seek = os2_seek;
+ dvdcss->pf_read = os2_read;
+ dvdcss->pf_readv = os2_readv;
+ return os2_open( dvdcss, psz_device );
+ }
+ else
#endif
{
print_debug( dvdcss, "using libc for access" );
@@ -332,7 +416,7 @@ int _dvdcss_open ( dvdcss_t dvdcss )
}
}
-#ifndef WIN32
+#if !defined(WIN32) && !defined(SYS_OS2)
int _dvdcss_raw_open ( dvdcss_t dvdcss, char const *psz_device )
{
dvdcss->i_raw_fd = open( psz_device, 0 );
@@ -385,11 +469,13 @@ int _dvdcss_close ( dvdcss_t dvdcss )
#else
close( dvdcss->i_fd );
+#ifndef SYS_OS2
if( dvdcss->i_raw_fd >= 0 )
{
close( dvdcss->i_raw_fd );
dvdcss->i_raw_fd = -1;
}
+#endif
return 0;
#endif
@@ -402,7 +488,7 @@ int _dvdcss_close ( dvdcss_t dvdcss )
*****************************************************************************/
static int libc_open ( dvdcss_t dvdcss, char const *psz_device )
{
-#if !defined( WIN32 )
+#if !defined( WIN32 ) && !defined( SYS_OS2 )
dvdcss->i_fd = dvdcss->i_read_fd = open( psz_device, 0 );
#else
dvdcss->i_fd = dvdcss->i_read_fd = open( psz_device, O_BINARY );
@@ -578,6 +664,37 @@ static int aspi_open( dvdcss_t dvdcss, c
}
#endif
+#ifdef SYS_OS2
+static int os2_open ( dvdcss_t dvdcss, char const *psz_device )
+{
+ char psz_dvd[] = "X:";
+ HFILE hfile;
+ ULONG ulAction;
+ ULONG rc;
+
+ psz_dvd[0] = psz_device[0];
+
+ rc = DosOpenL( ( PSZ )psz_dvd, &hfile, &ulAction, 0, FILE_NORMAL,
+ OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
+ OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE | OPEN_FLAGS_DASD,
+ NULL );
+
+ if( rc )
+ {
+ print_error( dvdcss, "failed to open device" );
+ return -1;
+ }
+
+ setmode( hfile, O_BINARY );
+
+ dvdcss->i_fd = dvdcss->i_read_fd = hfile;
+
+ dvdcss->i_pos = 0;
+
+ return 0;
+}
+#endif
+
/*****************************************************************************
* Seek commands.
*****************************************************************************/
Modified: trunk/libdvdcss/device.h
==============================================================================
--- trunk/libdvdcss/device.h Tue May 11 12:51:46 2010 (r31155)
+++ trunk/libdvdcss/device.h Tue May 11 12:58:50 2010 (r31156)
@@ -52,7 +52,7 @@ int _dvdcss_close ( dvdcss_t );
/*****************************************************************************
* Device reading prototypes, raw-device specific
*****************************************************************************/
-#ifndef WIN32
+#if !defined(WIN32) && !defined(SYS_OS2)
int _dvdcss_raw_open ( dvdcss_t, char const * );
#endif
Modified: trunk/libdvdcss/libdvdcss.c
==============================================================================
--- trunk/libdvdcss/libdvdcss.c Tue May 11 12:51:46 2010 (r31155)
+++ trunk/libdvdcss/libdvdcss.c Tue May 11 12:58:50 2010 (r31156)
@@ -166,7 +166,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open (
char *psz_method = getenv( "DVDCSS_METHOD" );
char *psz_verbose = getenv( "DVDCSS_VERBOSE" );
char *psz_cache = getenv( "DVDCSS_CACHE" );
-#ifndef WIN32
+#if !defined(WIN32) && !defined(SYS_OS2)
char *psz_raw_device = getenv( "DVDCSS_RAW_DEVICE" );
#endif
@@ -184,7 +184,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open (
/*
* Initialize structure with default values
*/
-#ifndef WIN32
+#if !defined(WIN32) && !defined(SYS_OS2)
dvdcss->i_raw_fd = -1;
#endif
dvdcss->p_titles = NULL;
@@ -306,7 +306,25 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open (
/* Cache our keys in ${HOME}/.dvdcss/ */
if( psz_home )
{
- snprintf( psz_buffer, PATH_MAX, "%s/.dvdcss", psz_home );
+ int home_pos = 0;
+
+#ifdef SYS_OS2
+ if( *psz_home == '/' || *psz_home == '\\')
+ {
+ char *psz_unixroot = getenv("UNIXROOT");
+
+ if( psz_unixroot &&
+ psz_unixroot[0] &&
+ psz_unixroot[1] == ':' &&
+ psz_unixroot[2] == '\0')
+ {
+ strcpy( psz_buffer, psz_unixroot );
+ home_pos = 2;
+ }
+ }
+#endif
+ snprintf( psz_buffer + home_pos, PATH_MAX - home_pos,
+ "%s/.dvdcss", psz_home );
psz_buffer[PATH_MAX-1] = '\0';
psz_cache = psz_buffer;
}
@@ -536,7 +554,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open (
}
nocache:
-#ifndef WIN32
+#if !defined(WIN32) && !defined(SYS_OS2)
if( psz_raw_device != NULL )
{
_dvdcss_raw_open( dvdcss, psz_raw_device );
Modified: trunk/libdvdcss/libdvdcss.h
==============================================================================
--- trunk/libdvdcss/libdvdcss.h Tue May 11 12:51:46 2010 (r31155)
+++ trunk/libdvdcss/libdvdcss.h Tue May 11 12:58:50 2010 (r31156)
@@ -62,7 +62,7 @@ struct dvdcss_s
int i_readv_buf_size;
#endif
-#ifndef WIN32
+#if !defined(WIN32) && !defined(SYS_OS2)
int i_raw_fd;
#endif
};
More information about the MPlayer-cvslog
mailing list