Changeset 4659a85f20c5e36b993ea5f1d55fab29672cedfc

Timestamp:

02/12/02 19:19:43 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

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

git-parent:

[adcd116073483c0a2671a8483e0c259dee9bf307]

git-author:

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

Message:

• ./modules/access/vcd/cdrom.c: NetBSD VCD input fixes, courtesy of
  Olaf 'Rhialto' Seibert.
  

Files:

• configure.ac.in (modified) (1 diff)
• modules/access/vcd/cdrom.c (modified) (11 diffs)

configure.ac.in

@@ -1056 +1056 @@
-  AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
-    PLUGINS="${PLUGINS} vcd"
+  ])
+
+  AC_EGREP_HEADER(scsireq,sys/scsiio.h,[
+    PLUGINS="${PLUGINS} vcd"
+    AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support)
-  ])
-

modules/access/vcd/cdrom.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-5 2002/10/16 23:12:46 massiot
+6 2002/12/02 18:19:43 sam
- *
- * Authors: Johan Bilien <jobi@via.ecp.fr>
@@ -13 +13 @@
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- 
+
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -54 +54 @@
-#   include <IOKit/storage/IOCDMedia.h>
-#   include <IOKit/storage/IOCDMediaBSDClient.h>
+#elif defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
+#   include <sys/inttypes.h>
+#   include <sys/cdio.h>
+#   include <sys/scsiio.h>
-#elif defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H )
-#   include <sys/cdio.h>
@@ -259 +263 @@
-                    continue;
-
- 
+
-                    CDConvertMSFToLBA( pTrackDescriptors[i].p );
-            }
@@ -272 +276 @@
-
-            /* set leadout sector */
- 
+
-                CDConvertMSFToLBA( pTrackDescriptors[i_leadout].p );
-        }
@@ -430 +434 @@
-        }
-
-
+
+
-        struct ioc_toc_header tochdr;
-        struct ioc_read_toc_entry toc_entries;
@@ -457 +462 @@
-             toc_entries.starting_track = 0;
-             toc_entries.data_len = ( i_tracks + 1 ) *
- 
+
-             toc_entries.data = (struct cd_toc_entry *)
-                                    malloc( toc_entries.data_len );
@@ -466 +471 @@
-                 return 0;
-             }
-
+
-             /* Read the TOC */
-             if( ioctl( p_vcddev->i_device_handle, CDIOREADTOCENTRYS,
@@ -476 +481 @@
-                 return 0;
-             }
-
+
-             /* Fill the p_sectors structure with the track/sector matches */
-             for( i = 0 ; i <= i_tracks ; i++ )
-             {
+#if defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
+                 /* FIXME: is this ok? */
+                 (*pp_sectors)[ i ] = toc_entries.data[i].addr.lba;
+#else
-                 (*pp_sectors)[ i ] = ntohl( toc_entries.data[i].addr.lba );
+#endif
-             }
-        }
@@ -676 +686 @@
-                return -1;
-            }
-
+
-            /* We don't want to keep the header of the read sector */
-            memcpy( p_buffer, p_block + VCD_DATA_START, VCD_DATA_SIZE );
-
-            return 0;
+        }
+
+#elif defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
+        struct scsireq  sc;
+
+        int i_blocks = 1;
+        int i_ret;
+
+        int sector_type = 5; /* mode2/form2 */
+        int sync = 0,
+            header_code = 0,
+            user_data = 1,
+            edc_ecc = 0,
+            error_field = 0;
+        int sub_channel = 0;
+
+        memset( &sc, 0, sizeof(sc) );
+        sc.cmd[0] = 0xBE;
+        sc.cmd[1] = (sector_type) << 2;
+        sc.cmd[2] = (i_sector >> 24) & 0xff;
+        sc.cmd[3] = (i_sector >> 16) & 0xff;
+        sc.cmd[4] = (i_sector >>  8) & 0xff;
+        sc.cmd[5] = (i_sector >>  0) & 0xff;
+        sc.cmd[6] = (i_blocks >> 16) & 0xff;
+        sc.cmd[7] = (i_blocks >>  8) & 0xff;
+        sc.cmd[8] = (i_blocks >>  0) & 0xff;
+        sc.cmd[9] = (sync << 7) | (header_code << 5) | (user_data << 4) |
+                    (edc_ecc << 3) | (error_field << 1);
+        sc.cmd[10] = sub_channel;
+        sc.cmdlen = 12;
+        sc.databuf = (caddr_t)p_block;
+        sc.datalen = VCD_SECTOR_SIZE;      // was 2328 == VCD_DATA_SIZE + 4;
+        sc.senselen = sizeof( sc.sense );
+        sc.flags = SCCMD_READ;
+        sc.timeout = 10000;
+
+        i_ret = ioctl( i_fd, SCIOCCOMMAND, &sc );
+        if( i_ret == -1 )
+        {
+            msg_Err( p_this, "SCIOCCOMMAND failed" );
+            return -1;
+        }
+        if( sc.retsts || sc.error )
+        {
+            msg_Err( p_this, "SCSI command failed: status %d error %d\n",
+                             sc.retsts, sc.error );
+           return -1;
-        }
-
@@ -723 +780 @@
-#endif
-
+#if defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
+        /* FIXME: is this ok? */
+        memcpy( p_buffer, p_block, VCD_DATA_SIZE );
+#else
-        /* We don't want to keep the header of the read sector */
-        memcpy( p_buffer, p_block + VCD_DATA_START, VCD_DATA_SIZE );
+#endif
-
-        return( 0 );