svn commit: r194900 - head/sys/dev/hptmv
Alexander Motin
mav at FreeBSD.org
Wed Jun 24 20:43:52 UTC 2009
Author: mav
Date: Wed Jun 24 20:43:51 2009
New Revision: 194900
URL: http://svn.freebsd.org/changeset/base/194900
Log:
MFp4:
Remove unused ATAPI definitions, conflicting with ata.h.
Submitted by: scottl
Modified:
head/sys/dev/hptmv/atapi.h
Modified: head/sys/dev/hptmv/atapi.h
==============================================================================
--- head/sys/dev/hptmv/atapi.h Wed Jun 24 20:40:10 2009 (r194899)
+++ head/sys/dev/hptmv/atapi.h Wed Jun 24 20:43:51 2009 (r194900)
@@ -180,200 +180,6 @@ typedef struct _IDE_REGISTERS_2 {
#define MSNS_WRITE_PROTECT 0x40
#define MSNS_READ_PROTECT 0x80
-/***************************************************************************
- * ATAPI IO Register File
- ***************************************************************************/
-
-/*
- * ATAPI register definition
- */
-
-typedef struct _ATAPI_REGISTERS_1 {
- USHORT Data;
- UCHAR InterruptReason; /* Atapi Phase Port */
- UCHAR Unused1;
- UCHAR ByteCountLow; /* Byte Count LSB */
- UCHAR ByteCountHigh; /* Byte Count MSB */
- UCHAR DriveSelect;
- UCHAR Command;
-} ATAPI_REGISTERS_1, *PATAPI_REGISTERS_1;
-
-/*
- * Atapi Error Status
- */
-#define IDE_ERROR_END_OF_MEDIA IDE_ERROR_TRACK0_NOT_FOUND
-#define IDE_ERROR_ILLEGAL_LENGTH IDE_ERROR_ADDRESS_NOT_FOUND
-
-/*
- * ATAPI interrupt reasons
- */
-#define ATAPI_IR_COD 0x01
-#define ATAPI_IR_IO 0x02
-
-/* sense key */
-#define ATAPI_SENSE_NO_SENSE 0x00
-#define ATAPI_SENSE_RECOVERED_ERROR 0x01
-#define ATAPI_SENSE_NOT_READY 0x02
-#define ATAPI_SENSE_MEDIUM_ERROR 0x03
-#define ATAPI_SENSE_HARDWARE_ERROR 0x04
-#define ATAPI_SENSE_ILLEGAL_REQUEST 0x05
-#define ATAPI_SENSE_UNIT_ATTENTION 0x06
-#define ATAPI_SENSE_DATA_PROTECT 0x07
-#define ATAPI_SENSE_BLANK_CHECK 0x08
-#define ATAPI_SENSE_UNIQUE 0x09
-#define ATAPI_SENSE_COPY_ABORTED 0x0A
-#define ATAPI_SENSE_ABORTED_COMMAND 0x0B
-#define ATAPI_SENSE_EQUAL 0x0C
-#define ATAPI_SENSE_VOL_OVERFLOW 0x0D
-#define ATAPI_SENSE_MISCOMPARE 0x0E
-#define ATAPI_SENSE_RESERVED 0x0F
-
-/* Additional Sense codes */
-#define ATAPI_ASC_NO_SENSE 0x00
-#define ATAPI_ASC_LUN_NOT_READY 0x04
-#define ATAPI_ASC_TRACK_ERROR 0x14
-#define ATAPI_ASC_SEEK_ERROR 0x15
-#define ATAPI_ASC_REC_DATA_NOECC 0x17
-#define ATAPI_ASC_REC_DATA_ECC 0x18
-#define ATAPI_ASC_ILLEGAL_COMMAND 0x20
-#define ATAPI_ASC_ILLEGAL_BLOCK 0x21
-#define ATAPI_ASC_INVALID_CDB 0x24
-#define ATAPI_ASC_INVALID_LUN 0x25
-#define ATAPI_ASC_PROTECT 0x27
-#define ATAPI_ASC_MEDIUM_CHANGED 0x28
-#define ATAPI_ASC_BUS_RESET 0x29
-#define ATAPI_ASC_NO_MEDIA_IN_DEVICE 0x3a
-#define ATAPI_ASC_MUSIC_AREA 0xA0
-#define ATAPI_ASC_DATA_AREA 0xA1
-#define ATAPI_ASC_VOLUME_OVERFLOW 0xA7
-
-/*
- * IDE command definitions ( for ATAPI )
- */
-
-#define IDE_COMMAND_ATAPI_RESET 0x08 /* Atapi Software Reset command */
-#define IDE_COMMAND_ATAPI_PACKET 0xA0 /* Atapi Identify command */
-#define IDE_COMMAND_ATAPI_IDENTIFY 0xA1 /* Atapi Packet Command */
-
-
-/*
- * ATAPI command definitions
- */
-
-#define ATAPI_TEST_UNIT_READY 0x00
-#define ATAPI_REZERO_UNIT 0x01
-#define ATAPI_REQUEST_SENSE 0x03
-#define ATAPI_FORMAT_UNIT6 0x04
-#define ATAPI_FORMAT_UNIT 0x24
-#define ATAPI_INQUIRY 0x12
-#define ATAPI_MODE_SELECT 0x15
-#define ATAPI_RELEASE6 0x17
-#define ATAPI_MODE_SENSE 0x1A
-#define ATAPI_START_STOP_UNIT 0x1B
-#define ATAPI_LOAD_UNLOAD 0x1B
-#define ATAPI_RECEIVE_DIAGNOSTIC 0x1C
-#define ATAPI_SEND_DIAGNOSTIC 0x1D
-#define ATAPI_MEDIUM_REMOVAL 0x1E
-#define ATAPI_READ_FORMAT_CAPACITY 0x23
-#define ATAPI_READ_CAPACITY 0x25
-#define ATAPI_READ 0x28
-#define ATAPI_WRITE 0x2A
-#define ATAPI_SEEK 0x2B
-#define ATAPI_ERASE 0x2C
-#define ATAPI_VERIFY 0x2F
-#define ATAPI_WRITE_VERIFY 0x2E
-#define ATAPI_SYNCHRONIZE_CACHE 0x35
-#define ATAPI_LOCK_CACHE 0x36
-#define ATAPI_COMPARE 0x39
-#define ATAPI_WRITE_BUFFER 0x3B
-#define ATAPI_READ_DATA_BUFF 0x3C
-#define ATAPI_READ_SUB_CHANNEL 0x42
-#define ATAPI_READ_TOC 0x43
-#define ATAPI_READ_HEADER 0x44
-#define ATAPI_PLAY_AUDIO10 0x45
-#define ATAPI_GET_CONFIGURATION 0x46
-#define ATAPI_PLAY_AUDIO_MSF 0x47
-#define ATAPI_GET_EVENT_STATUS_NOTIFICATION 0x4A
-#define ATAPI_PAUSE_RESUME 0x4B
-#define ATAPI_LOG_SELECT 0x4C
-#define ATAPI_LOG_SENSE 0x4D
-#define ATAPI_STOP_PLAY_SCAN 0x4E
-#define ATAPI_READ_DISK_INFORMATION 0x51
-#define ATAPI_READ_TRACK_INFORMATION 0x52
-#define ATAPI_RESERVE_TRACK_RZONE 0x53
-#define ATAPI_SEND_OPC_INFORMATION 0x54
-#define ATAPI_MODE_SELECT10 0x55
-#define ATAPI_RELEASE10 0x57
-#define ATAPI_REPAIR_ZONE 0x58
-#define ATAPI_MODE_SENSE10 0x5A
-#define ATAPI_CLOSE_TRACK_SESSION 0x5B
-#define ATAPI_READ_BUFFER_CAPACITY 0x5C
-#define ATAPI_SEND_CUE_SHEET 0x5D
-#define ATAPI_BLANK_COMMAND 0xA1 /*Provide the ability to erase any part of a CD-RW disc.*/
-#define ATAPI_SEND_EVENT 0xA2 /* add for DVD */
-#define ATAPI_SEND_KEY 0xA3 /* add for DVD */
-#define ATAPI_REPORT_KEY 0xA4
-#define ATAPI_PLAY_AUDIO 0xA5
-#define ATAPI_LOAD_UNLOAD_MEDIUM 0xA6
-#define ATAPI_SET_READ_AHEAD 0xA7
-#define ATAPI_READ12 0xA8
-#define ATAPI_READ_DVD_STRUCTURE 0xAD
-#define ATAPI_WRITE12 0xAA
-#define ATAPI_GET_PERFORM_NOTIFICATION 0xAC /* add for DVD-RW */
-#define ATAPI_SET_STREAM 0xB6 /* add for DVD-RW */
-#define ATAPI_READ_CD_MSF 0xB9
-#define ATAPI_SCAN 0xBA
-#define ATAPI_SET_SPEED 0xBB /* no payload */
-#define ATAPI_MECHANISM_STATUS 0xBD
-#define ATAPI_READ_CD 0xBE
-#define ATAPI_SEND_DVD_STRUCTURE 0xBF
-#define ATAPI_SET_CDRW_SPEED 0xDA /*WindowsXP need*/
-
-#define MODE_DSP_WRITE_PROTECT 0x80
-
-
-/***************************************************************************
- * ATAPI IO Register File
- ***************************************************************************/
-
-
-typedef struct _ATAPI_REGISTERS_2 {
- UCHAR AlternateStatus;
-} ATAPI_REGISTERS_2, *PATAPI_REGISTERS_2;
-
-
-/***************************************************************************
- * ATAPI packets
- ***************************************************************************/
-typedef struct _ATAPI_SENSE_DATA {
-#ifdef __BIG_ENDIAN_BITFIELD
- UCHAR Valid:1;
- UCHAR ErrorCode:7;
- UCHAR SegmentNumber;
- UCHAR FileMark:1;
- UCHAR EndOfMedia:1;
- UCHAR IncorrectLength:1;
- UCHAR Reserved:1;
- UCHAR SenseKey:4;
-#else
- UCHAR ErrorCode:7;
- UCHAR Valid:1;
- UCHAR SegmentNumber;
- UCHAR SenseKey:4;
- UCHAR Reserved:1;
- UCHAR IncorrectLength:1;
- UCHAR EndOfMedia:1;
- UCHAR FileMark:1;
-#endif
- UCHAR Information[4];
- UCHAR AdditionalSenseLength;
- UCHAR CommandSpecificInformation[4];
- UCHAR AdditionalSenseCode;
- UCHAR AdditionalSenseCodeQualifier;
- UCHAR FieldReplaceableUnitCode;
- UCHAR SenseKeySpecific[3];
-} ATAPI_SENSE_DATA, *PATAPI_SENSE_DATA;
-
/*
* IDENTIFY data
*/
@@ -580,6 +386,3 @@ typedef enum _DISK_MODE
#pragma pack()
#endif
-
-
-
More information about the svn-src-head
mailing list