Changeset d7b4b27b2c049e4f9197ff7206a8a06b6db36d40

Timestamp:

09/01/02 11:22:37 (7 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1010571757 +0000

git-parent:

[c7b1c474c6a8687a0645553beb0e5c6f868d8c5c]

git-author:

Sam Hocevar <sam@videolan.org> 1010571757 +0000

Message:

• ./src/interface/intf_eject.c: BSD/OS port by Steven M. Schultz.
  

Files:

• src/interface/intf_eject.c (modified) (4 diffs)
• src/interface/main.c (modified) (2 diffs)

src/interface/intf_eject.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-1 2002/01/09 02:01:14
+2 2002/01/09 10:22:37
- *
- * Author: Julien Blache <jb@technologeek.org> for the Linux part
@@ -30 +30 @@
-#include <videolan/vlc.h>
-
+#ifdef HAVE_DVD_H
+#   include <dvd.h>
+#endif
+
-#ifdef SYS_LINUX
-
-/* This code could be extended to support CD/DVD-ROM chargers */
-#   include <linux/version.h>
-    /* handy macro found in 2.1 kernels, but not in older ones */
@@ -54 +56 @@
-#   include <scsi/sg.h>
-#   include <scsi/scsi_ioctl.h>
+#endif
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+#ifdef SYS_LINUX
+static int EjectSCSI ( int i_fd );
+#endif
+
+/*****************************************************************************
+ * intf_Eject: eject the CDRom
+ *****************************************************************************
+ * returns 0 on success
+ * returns 1 on failure
+ * returns -1 if not implemented
+ *****************************************************************************/
+int intf_Eject( const char *psz_device )
+{
+    int i_ret;
+
+    /* This code could be extended to support CD/DVD-ROM chargers */
+    int i_fd = 0;
+
+    i_fd = open( psz_device, O_RDONLY | O_NONBLOCK );
+   
+    if( i_fd == -1 )
+    {
+        intf_ErrMsg( "intf error: couldn't open device %s", psz_device );
+        return 1;
+    }
+
+#ifdef SYS_LINUX
+    /* Try a simple ATAPI eject */
+    i_ret = ioctl( i_fd, CDROMEJECT, 0 );
+
+    if( i_ret != 0 )
+    {
+        i_ret = EjectSCSI( i_fd );
+    }
+
+    if( i_ret != 0 )
+    {
+        intf_ErrMsg( "intf error: couldn't eject %s", psz_device );
+    }
+
+#elif defined (HAVE_DVD_H)
+    i_ret = ioctl( i_fd, CDROMEJECT, 0 );
+
+#else
+    intf_ErrMsg( "intf error: CD-Rom ejection unsupported on this platform" );
+    i_ret = -1;
-
-#endif
+    close( i_fd );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
+/* The following functions are local */
-
-
+
+
- * Eject using SCSI commands. Return 0 if successful
-
-csi
+****************************************************************************
+CSI
-{
-    int i_status;
@@ -134 +178 @@
-    return i_status;
-}
+#endif
-
-/*
- * returns 0 on success
- * returns 1 on failure
- * returns -1 if not implemented
- *
- * Modify eject_disc() prototype as needed for portability
- */
-
-int intf_Eject( const char *psz_device )
-{
-  int i_ret;
-
-#ifdef SYS_LINUX
-  int i_fd = 0;
-
-   i_fd = open( psz_device, O_RDONLY | O_NONBLOCK );
-   
-   if( i_fd == -1 )
-   {
-       intf_ErrMsg( "intf error: couldn't open device %s", psz_device );
-       return 1;
-   }
-
-   if( EjectCdrom(i_fd) == 0 )
-   {
-       i_ret = 0;
-   }
-   else if( EjectScsi(i_fd) == 0 )
-   {
-       i_ret = 0;
-   }
-   else
-   {
-       intf_ErrMsg( "intf error: couldn't eject %s", psz_device );
-       i_ret = 1;
-   }
-
-   close( i_fd );
-
-#else
-   i_ret = -1;
-
-#endif
-   return i_ret;
-}
-

src/interface/main.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-3 2002/01/07 02:12:30
+4 2002/01/09 10:22:37
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -1309 +1309 @@
-            i_capabilities |= CPU_CAPABILITY_SSE;
-        }
-        else
-        {
-            fprintf( stderr, "warning: your OS doesn't have support for "
-                             "SSE instructions, some optimizations\n"
-                             "will be disabled"
-#      ifdef SYS_LINUX
-                             " (you will need Linux kernel 2.4.x or later)"
-#      endif
-                             "\n" );
-        }
-#   endif
-    }