Skip to content

V
vlc-2-2
Commit 4c17a524 authored by Joris van Rooij's avatar Joris van Rooij Committed by Rémi Denis-Courmont
Browse files
Options

VCD OpenBSD build fix 

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 062cc17a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
modules/access/vcd/cdrom.c
View file @ 4c17a524
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
# include <IOKit/storage/IOCDMedia.h> # include <IOKit/storage/IOCDMedia.h>
# include <IOKit/storage/IOCDMediaBSDClient.h> # include <IOKit/storage/IOCDMediaBSDClient.h>
#elif defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H ) #elif defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
# include <sys/inttypes.h> # include <inttypes.h>
# include <sys/cdio.h> # include <sys/cdio.h>
# include <sys/scsiio.h> # include <sys/scsiio.h>
#elif defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H ) #elif defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H )
...@@ -724,7 +724,7 @@ int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev, ...@@ -724,7 +724,7 @@ int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev,
sc.flags = SCCMD_READ; sc.flags = SCCMD_READ;
sc.timeout = 10000; sc.timeout = 10000;
i_ret = ioctl( i_fd, SCIOCCOMMAND, &sc ); i_ret = ioctl( p_vcddev->i_device_handle, SCIOCCOMMAND, &sc );
if( i_ret == -1 ) if( i_ret == -1 )
{ {
msg_Err( p_this, "SCIOCCOMMAND failed" ); msg_Err( p_this, "SCIOCCOMMAND failed" );
......
modules/access/vcd/cdrom_internals.h
View file @ 4c17a524
...@@ -147,10 +147,6 @@ typedef struct _CDROM_READ_TOC_EX { ...@@ -147,10 +147,6 @@ typedef struct _CDROM_READ_TOC_EX {
#define SRB_EVENT_NOTIFY 0x40 #define SRB_EVENT_NOTIFY 0x40
#define READ_CD 0xbe #define READ_CD 0xbe
#define SECTOR_TYPE_MODE2_FORM2 0x14
#define SECTOR_TYPE_CDDA 0x04
#define READ_CD_RAW_MODE2 0xF0
#define READ_CD_USERDATA 0x10
#define READ_TOC 0x43 #define READ_TOC 0x43
#define READ_TOC_FORMAT_TOC 0x0 #define READ_TOC_FORMAT_TOC 0x0
...@@ -211,6 +207,10 @@ struct SRB_ExecSCSICmd ...@@ -211,6 +207,10 @@ struct SRB_ExecSCSICmd
#pragma pack() #pragma pack()
#endif /* WIN32 */ #endif /* WIN32 */
#define SECTOR_TYPE_MODE2_FORM2 0x14
#define SECTOR_TYPE_CDDA 0x04
#define READ_CD_RAW_MODE2 0xF0
#define READ_CD_USERDATA 0x10
/***************************************************************************** /*****************************************************************************
* Local Prototypes * Local Prototypes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment