mirror of
https://github.com/reactos/reactos.git
synced 2025-07-31 18:31:56 +00:00
[UDFS] Remove definitions that exist in platform headers and use those instead.
svn path=/trunk/; revision=68157
This commit is contained in:
parent
e8fdb27bd1
commit
67137377fb
3 changed files with 3 additions and 243 deletions
|
@ -3540,36 +3540,6 @@ typedef struct _BD_WRITE_DESCRIPTOR {
|
|||
|
||||
// DVD structure blocks
|
||||
|
||||
typedef struct _DVD_DESCRIPTOR_HEADER {
|
||||
UCHAR Length[2];
|
||||
UCHAR Reserved[2];
|
||||
} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER;
|
||||
|
||||
typedef struct _DVD_LAYER_DESCRIPTOR {
|
||||
DVD_DESCRIPTOR_HEADER Header;
|
||||
// UCHAR Length[2];
|
||||
UCHAR BookVersion : 4; // Part Version
|
||||
UCHAR BookType : 4; // Disk Category
|
||||
|
||||
UCHAR MinimumRate : 4;
|
||||
UCHAR DiskSize : 4;
|
||||
|
||||
UCHAR LayerType : 4;
|
||||
UCHAR TrackPath : 1;
|
||||
UCHAR NumberOfLayers : 2;
|
||||
UCHAR Reserved1 : 1;
|
||||
|
||||
UCHAR TrackDensity : 4;
|
||||
UCHAR LinearDensity : 4;
|
||||
|
||||
UCHAR StartingDataSector[4];
|
||||
UCHAR EndDataSector[4];
|
||||
UCHAR EndLayerZeroSector[4];
|
||||
UCHAR Reserved5 : 7;
|
||||
UCHAR BCAFlag : 1;
|
||||
UCHAR Reserved6;
|
||||
} DVD_LAYER_DESCRIPTOR, *PDVD_LAYER_DESCRIPTOR;
|
||||
|
||||
#define DvdBookType_ROM 0
|
||||
#define DvdBookType_RAM 1
|
||||
#define DvdBookType_R 2
|
||||
|
@ -3649,21 +3619,6 @@ typedef struct _CDVD_TITLE_KEY_HEADER {
|
|||
CDVD_KEY_DATA TitleKey;
|
||||
} CDVD_TITLE_KEY_HEADER, *PCDVD_TITLE_KEY_HEADER;
|
||||
|
||||
typedef struct _DVD_COPYRIGHT_DESCRIPTOR {
|
||||
UCHAR CopyrightProtectionType;
|
||||
UCHAR RegionManagementInformation;
|
||||
UCHAR Reserved[2];
|
||||
} DVD_COPYRIGHT_DESCRIPTOR, *PDVD_COPYRIGHT_DESCRIPTOR;
|
||||
|
||||
typedef struct _DVD_RPC_KEY {
|
||||
UCHAR UserResetsAvailable:3;
|
||||
UCHAR ManufacturerResetsAvailable:3;
|
||||
UCHAR TypeCode:2;
|
||||
UCHAR RegionMask;
|
||||
UCHAR RpcScheme;
|
||||
UCHAR Reserved2[1];
|
||||
} DVD_RPC_KEY, * PDVD_RPC_KEY;
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif //__CDRW_DEVICE_H__
|
||||
|
|
|
@ -29,6 +29,9 @@ Environment:
|
|||
#include "cdrw_hw.h"
|
||||
//#include "ntdddisk.h"
|
||||
|
||||
#include <ntddcdrm.h>
|
||||
#include <ntddcdvd.h>
|
||||
|
||||
#ifndef CTL_CODE
|
||||
#pragma pack(push, 8)
|
||||
#include "winioctl.h"
|
||||
|
@ -53,62 +56,9 @@ Environment:
|
|||
#define FILE_DEVICE_CDRW 0x00000999
|
||||
#endif
|
||||
|
||||
#ifndef FILE_DEVICE_CD_ROM
|
||||
#define FILE_DEVICE_CD_ROM 0x00000002
|
||||
#endif //FILE_DEVICE_CD_ROM
|
||||
|
||||
#ifndef IOCTL_CDROM_BASE
|
||||
#define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM
|
||||
#endif //IOCTL_CDROM_BASE
|
||||
|
||||
#ifndef FILE_DEVICE_DVD
|
||||
#define FILE_DEVICE_DVD 0x00000033
|
||||
#endif //FILE_DEVICE_DVD
|
||||
|
||||
#ifndef IOCTL_DVD_BASE
|
||||
#define IOCTL_DVD_BASE FILE_DEVICE_DVD
|
||||
#endif //IOCTL_DVD_BASE
|
||||
|
||||
#ifndef FILE_DEVICE_DISK
|
||||
#define FILE_DEVICE_DISK 0x00000007
|
||||
#endif //FILE_DEVICE_DISK
|
||||
|
||||
#ifndef IOCTL_DISK_BASE
|
||||
#define IOCTL_DISK_BASE FILE_DEVICE_DISK
|
||||
#endif //IOCTL_DISK_BASE
|
||||
|
||||
#ifndef IOCTL_CDROM_UNLOAD_DRIVER
|
||||
#define IOCTL_CDROM_UNLOAD_DRIVER CTL_CODE(IOCTL_CDROM_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
|
||||
#define IOCTL_CDROM_READ_TOC CTL_CODE(IOCTL_CDROM_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_GET_CONTROL CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_PLAY_AUDIO_MSF CTL_CODE(IOCTL_CDROM_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_SEEK_AUDIO_MSF CTL_CODE(IOCTL_CDROM_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_STOP_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_PAUSE_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_RESUME_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_GET_VOLUME CTL_CODE(IOCTL_CDROM_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_SET_VOLUME CTL_CODE(IOCTL_CDROM_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_READ_Q_CHANNEL CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_GET_LAST_SESSION CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_RAW_READ CTL_CODE(IOCTL_CDROM_BASE, 0x000F, METHOD_OUT_DIRECT, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_DISK_TYPE CTL_CODE(IOCTL_CDROM_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS)
|
||||
|
||||
#define IOCTL_CDROM_CHECK_VERIFY CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_MEDIA_REMOVAL CTL_CODE(IOCTL_CDROM_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_EJECT_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_LOAD_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_RESERVE CTL_CODE(IOCTL_CDROM_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
|
||||
#define IOCTL_CDROM_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_CDROM_BASE, 0x0014, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
|
||||
#define IOCTL_CDROM_READ_TOC_EX CTL_CODE(IOCTL_CDROM_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
#define IOCTL_CDROM_GET_CONFIGURATION CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS)
|
||||
|
||||
#endif //IOCTL_CDROM_UNLOAD_DRIVER
|
||||
|
||||
#ifdef CDRW_RESTRICT_ACCESS
|
||||
|
||||
|
@ -1378,12 +1328,6 @@ typedef struct _GET_LAST_ERROR_USER_OUT {
|
|||
|
||||
//**********************************************************************************************
|
||||
|
||||
typedef enum _TRACK_MODE_TYPE {
|
||||
YellowMode2,
|
||||
XAForm2,
|
||||
CDDA
|
||||
} TRACK_MODE_TYPE, *PTRACK_MODE_TYPE;
|
||||
|
||||
typedef struct _RAW_READ_USER_IN {
|
||||
LARGE_INTEGER DiskOffset;
|
||||
ULONG SectorCount;
|
||||
|
@ -1406,49 +1350,6 @@ typedef struct _PLAY_AUDIO_MSF_USER_IN {
|
|||
#define AudioStatus_PlayError 0x14
|
||||
#define AudioStatus_NoStatus 0x15
|
||||
|
||||
typedef struct _SUB_Q_HEADER {
|
||||
UCHAR Reserved;
|
||||
UCHAR AudioStatus;
|
||||
UCHAR DataLength[2];
|
||||
} SUB_Q_HEADER, *PSUB_Q_HEADER;
|
||||
|
||||
typedef struct _SUB_Q_CURRENT_POSITION {
|
||||
SUB_Q_HEADER Header;
|
||||
UCHAR FormatCode;
|
||||
UCHAR Control : 4;
|
||||
UCHAR ADR : 4;
|
||||
UCHAR TrackNumber;
|
||||
UCHAR IndexNumber;
|
||||
UCHAR AbsoluteAddress[4];
|
||||
UCHAR TrackRelativeAddress[4];
|
||||
} SUB_Q_CURRENT_POSITION, *PSUB_Q_CURRENT_POSITION;
|
||||
|
||||
typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER {
|
||||
SUB_Q_HEADER Header;
|
||||
UCHAR FormatCode;
|
||||
UCHAR Reserved[3];
|
||||
UCHAR Reserved1 : 7;
|
||||
UCHAR Mcval : 1;
|
||||
UCHAR MediaCatalog[15];
|
||||
} SUB_Q_MEDIA_CATALOG_NUMBER, *PSUB_Q_MEDIA_CATALOG_NUMBER;
|
||||
|
||||
typedef struct _SUB_Q_TRACK_ISRC {
|
||||
SUB_Q_HEADER Header;
|
||||
UCHAR FormatCode;
|
||||
UCHAR Reserved0;
|
||||
UCHAR Track;
|
||||
UCHAR Reserved1;
|
||||
UCHAR Reserved2 : 7;
|
||||
UCHAR Tcval : 1;
|
||||
UCHAR TrackIsrc[15];
|
||||
} SUB_Q_TRACK_ISRC, *PSUB_Q_TRACK_ISRC;
|
||||
|
||||
typedef union _SUB_Q_CHANNEL_DATA_USER_OUT {
|
||||
SUB_Q_CURRENT_POSITION CurrentPosition;
|
||||
SUB_Q_MEDIA_CATALOG_NUMBER MediaCatalog;
|
||||
SUB_Q_TRACK_ISRC TrackIsrc;
|
||||
} SUB_Q_CHANNEL_DATA_USER_OUT, *PSUB_Q_CHANNEL_DATA_USER_OUT;
|
||||
|
||||
#define IOCTL_CDROM_SUB_Q_CHANNEL 0x00
|
||||
#define IOCTL_CDROM_CURRENT_POSITION 0x01
|
||||
#define IOCTL_CDROM_MEDIA_CATALOG 0x02
|
||||
|
@ -1494,18 +1395,6 @@ typedef PREAD_TOC_CD_TEXT PREAD_CD_TEXT_USER_OUT;
|
|||
|
||||
//**********************************************************************************************
|
||||
|
||||
typedef struct _VOLUME_CONTROL {
|
||||
UCHAR PortVolume[4];
|
||||
} VOLUME_CONTROL, *PVOLUME_CONTROL;
|
||||
|
||||
typedef VOLUME_CONTROL VOLUME_CONTROL_USER_IN;
|
||||
typedef PVOLUME_CONTROL PVOLUME_CONTROL_USER_IN;
|
||||
|
||||
typedef VOLUME_CONTROL VOLUME_CONTROL_USER_OUT;
|
||||
typedef PVOLUME_CONTROL PVOLUME_CONTROL_USER_OUT;
|
||||
|
||||
//**********************************************************************************************
|
||||
|
||||
typedef struct _INIT_DEINIT_USER_IN {
|
||||
BOOLEAN PassThrough;
|
||||
BOOLEAN Reserved; // For separate device (de)initialization
|
||||
|
@ -1652,18 +1541,6 @@ typedef union _GET_EVENT_USER_OUT {
|
|||
|
||||
//**********************************************************************************************
|
||||
|
||||
|
||||
//**********************************************************************************************
|
||||
|
||||
typedef enum DVD_STRUCTURE_FORMAT {
|
||||
DvdPhysicalDescriptor,
|
||||
DvdCopyrightDescriptor,
|
||||
DvdDiskKeyDescriptor,
|
||||
DvdBCADescriptor,
|
||||
DvdManufacturerDescriptor,
|
||||
DvdMaxDescriptor
|
||||
} DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT;
|
||||
|
||||
typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID;
|
||||
|
||||
typedef struct _DVD_READ_STRUCTURE_USER_IN {
|
||||
|
@ -1687,18 +1564,6 @@ typedef struct _DVD_START_SESSION_USER_OUT {
|
|||
|
||||
//**********************************************************************************************
|
||||
|
||||
typedef enum {
|
||||
DvdChallengeKey = 0x01,
|
||||
DvdBusKey1,
|
||||
DvdBusKey2,
|
||||
DvdTitleKey,
|
||||
DvdAsf,
|
||||
DvdSetRpcKey = 0x6,
|
||||
DvdGetRpcKey = 0x8,
|
||||
DvdDiskKey = 0x80,
|
||||
DvdInvalidateAGID = 0x3f
|
||||
} DVD_KEY_TYPE;
|
||||
|
||||
typedef struct _DVD_READ_KEY_USER_IN {
|
||||
ULONG KeyLength;
|
||||
DVD_SESSION_ID SessionId;
|
||||
|
@ -1711,9 +1576,6 @@ typedef struct _DVD_READ_KEY_USER_IN {
|
|||
// UCHAR KeyData[0];
|
||||
} DVD_READ_KEY_USER_IN, *PDVD_READ_KEY_USER_IN;
|
||||
|
||||
typedef DVD_READ_KEY_USER_IN DVD_COPY_PROTECT_KEY;
|
||||
typedef PDVD_READ_KEY_USER_IN PDVD_COPY_PROTECT_KEY;
|
||||
|
||||
typedef DVD_READ_KEY_USER_IN DVD_READ_KEY_USER_OUT;
|
||||
typedef PDVD_READ_KEY_USER_IN PDVD_READ_KEY_USER_OUT;
|
||||
|
||||
|
@ -1724,16 +1586,6 @@ typedef PDVD_START_SESSION_USER_OUT PDVD_END_SESSION_USER_IN;
|
|||
|
||||
//**********************************************************************************************
|
||||
|
||||
typedef DVD_READ_KEY_USER_IN DVD_SEND_KEY_USER_IN;
|
||||
typedef PDVD_READ_KEY_USER_IN PDVD_SEND_KEY_USER_IN;
|
||||
|
||||
typedef struct _DVD_SET_RPC_KEY {
|
||||
UCHAR PreferredDriveRegionCode;
|
||||
UCHAR Reserved[3];
|
||||
} DVD_SET_RPC_KEY, * PDVD_SET_RPC_KEY;
|
||||
|
||||
//**********************************************************************************************
|
||||
|
||||
// Predefined (Mt. Fuji) key sizes
|
||||
// Add sizeof(DVD_COPY_PROTECT_KEY) to get allocation size for
|
||||
// the full key structure
|
||||
|
@ -1761,9 +1613,6 @@ typedef struct _CDROM_DISK_DATA_USER_OUT {
|
|||
|
||||
} CDROM_DISK_DATA_USER_OUT, *PCDROM_DISK_DATA_USER_OUT;
|
||||
|
||||
#define CDROM_DISK_AUDIO_TRACK (0x00000001)
|
||||
#define CDROM_DISK_DATA_TRACK (0x00000002)
|
||||
|
||||
//**********************************************************************************************
|
||||
|
||||
typedef struct _CDRW_RESET_DRIVER_USER_IN {
|
||||
|
|
|
@ -577,50 +577,6 @@ typedef GENERIC_MAPPING *PGENERIC_MAPPING;
|
|||
|
||||
#define DEVICE_TYPE ULONG
|
||||
|
||||
#define FILE_DEVICE_BEEP 0x00000001
|
||||
#define FILE_DEVICE_CD_ROM 0x00000002
|
||||
#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003
|
||||
#define FILE_DEVICE_CONTROLLER 0x00000004
|
||||
#define FILE_DEVICE_DATALINK 0x00000005
|
||||
#define FILE_DEVICE_DFS 0x00000006
|
||||
#define FILE_DEVICE_DISK 0x00000007
|
||||
#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008
|
||||
#define FILE_DEVICE_FILE_SYSTEM 0x00000009
|
||||
#define FILE_DEVICE_INPORT_PORT 0x0000000a
|
||||
#define FILE_DEVICE_KEYBOARD 0x0000000b
|
||||
#define FILE_DEVICE_MAILSLOT 0x0000000c
|
||||
#define FILE_DEVICE_MIDI_IN 0x0000000d
|
||||
#define FILE_DEVICE_MIDI_OUT 0x0000000e
|
||||
#define FILE_DEVICE_MOUSE 0x0000000f
|
||||
#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010
|
||||
#define FILE_DEVICE_NAMED_PIPE 0x00000011
|
||||
#define FILE_DEVICE_NETWORK 0x00000012
|
||||
#define FILE_DEVICE_NETWORK_BROWSER 0x00000013
|
||||
#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014
|
||||
#define FILE_DEVICE_NULL 0x00000015
|
||||
#define FILE_DEVICE_PARALLEL_PORT 0x00000016
|
||||
#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017
|
||||
#define FILE_DEVICE_PRINTER 0x00000018
|
||||
#define FILE_DEVICE_SCANNER 0x00000019
|
||||
#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a
|
||||
#define FILE_DEVICE_SERIAL_PORT 0x0000001b
|
||||
#define FILE_DEVICE_SCREEN 0x0000001c
|
||||
#define FILE_DEVICE_SOUND 0x0000001d
|
||||
#define FILE_DEVICE_STREAMS 0x0000001e
|
||||
#define FILE_DEVICE_TAPE 0x0000001f
|
||||
#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020
|
||||
#define FILE_DEVICE_TRANSPORT 0x00000021
|
||||
#define FILE_DEVICE_UNKNOWN 0x00000022
|
||||
#define FILE_DEVICE_VIDEO 0x00000023
|
||||
#define FILE_DEVICE_VIRTUAL_DISK 0x00000024
|
||||
#define FILE_DEVICE_WAVE_IN 0x00000025
|
||||
#define FILE_DEVICE_WAVE_OUT 0x00000026
|
||||
#define FILE_DEVICE_8042_PORT 0x00000027
|
||||
#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028
|
||||
#define FILE_DEVICE_BATTERY 0x00000029
|
||||
#define FILE_DEVICE_BUS_EXTENDER 0x0000002a
|
||||
#define FILE_DEVICE_MODEM 0x0000002b
|
||||
#define FILE_DEVICE_VDM 0x0000002c
|
||||
//
|
||||
// Macro definition for defining IOCTL and FSCTL function control codes. Note
|
||||
// that function codes 0-2047 are reserved for Microsoft Corporation, and
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue