ATAPI pass through v2: update some constants
PATCH 3/5 ATAPI pass through v2: update some constants
This patch updates some constants and fix a wrong one:GPCMD_SEND_DVD_STRUCTURE.
Signature · 1 line
Alexandre Bique
hw/ide.c +60 -17
@@ -216,13 +216,17 @@#define ATAPI_PACKET_SIZE 12 -/* The generic packet command opcodes for CD/DVD Logical Units, -* From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ +/********************************************************************* +* Generic Packet commands, MMC commands, and such +*********************************************************************/ + +/* The generic packet command opcodes for CD/DVD Logical Units, +* From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ #define GPCMD_BLANK 0xa1#define GPCMD_CLOSE_TRACK 0x5b#define GPCMD_FLUSH_CACHE 0x35#define GPCMD_FORMAT_UNIT 0x04 -#define GPCMD_GET_CONFIGURATION 0x46 +#define GPCMD_GET_CONFIGURATION 0x46#define GPCMD_GET_EVENT_STATUS_NOTIFICATION 0x4a#define GPCMD_GET_PERFORMANCE 0xac#define GPCMD_INQUIRY 0x12
@@ -238,6 +242,8 @@#define GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL 0x1e#define GPCMD_READ_10 0x28#define GPCMD_READ_12 0xa8 +#define GPCMD_READ_BUFFER 0x3c +#define GPCMD_READ_BUFFER_CAPACITY 0x5c#define GPCMD_READ_CDVD_CAPACITY 0x25#define GPCMD_READ_CD 0xbe#define GPCMD_READ_CD_MSF 0xb9
@@ -246,15 +252,16 @@#define GPCMD_READ_FORMAT_CAPACITIES 0x23#define GPCMD_READ_HEADER 0x44#define GPCMD_READ_TRACK_RZONE_INFO 0x52 -#define GPCMD_READ_SUBCHANNEL 0x42 -#define GPCMD_READ_TOC_PMA_ATIP 0x43 +#define GPCMD_READ_SUBCHANNEL 0x42 +#define GPCMD_READ_TOC_PMA_ATIP 0x43#define GPCMD_REPAIR_RZONE_TRACK 0x58#define GPCMD_REPORT_KEY 0xa4#define GPCMD_REQUEST_SENSE 0x03#define GPCMD_RESERVE_RZONE_TRACK 0x53 +#define GPCMD_SEND_CUE_SHEET 0x5d#define GPCMD_SCAN 0xba#define GPCMD_SEEK 0x2b -#define GPCMD_SEND_DVD_STRUCTURE 0xad +#define GPCMD_SEND_DVD_STRUCTURE 0xbf#define GPCMD_SEND_EVENT 0xa2#define GPCMD_SEND_KEY 0xa3#define GPCMD_SEND_OPC 0x54
@@ -263,9 +270,11 @@#define GPCMD_START_STOP_UNIT 0x1b#define GPCMD_STOP_PLAY_SCAN 0x4e#define GPCMD_TEST_UNIT_READY 0x00 -#define GPCMD_VERIFY_10 0x2f +#define GPCMD_VERIFY_10 0x2f#define GPCMD_WRITE_10 0x2a +#define GPCMD_WRITE_12 0xaa#define GPCMD_WRITE_AND_VERIFY_10 0x2e +#define GPCMD_WRITE_BUFFER 0x3b/* This is listed as optional in ATAPI 2.6, but is (curiously) * missing from Mt. Fuji, Table 57. It _is_ mentioned in Mt. Fuji * Table 377 as an MMC command for SCSi devices though... Most ATAPI
@@ -279,18 +288,20 @@* older drives only. */ #define GPCMD_GET_MEDIA_STATUS 0xda -#define GPCMD_MODE_SENSE_6 0x1a +#define GPCMD_MODE_SENSE_6 0x1a/* Mode page codes for mode sense/set */ +#define GPMODE_VENDOR_PAGE 0x00#define GPMODE_R_W_ERROR_PAGE 0x01#define GPMODE_WRITE_PARMS_PAGE 0x05 +#define GPMODE_WCACHING_PAGE 0x08#define GPMODE_AUDIO_CTL_PAGE 0x0e#define GPMODE_POWER_PAGE 0x1a#define GPMODE_FAULT_FAIL_PAGE 0x1c#define GPMODE_TO_PROTECT_PAGE 0x1d#define GPMODE_CAPABILITIES_PAGE 0x2a#define GPMODE_ALL_PAGES 0x3f -/* Not in Mt. Fuji, but in ATAPI 2.6 -- depricated now in favor +/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor * of MODE_SENSE_POWER_PAGE */ #define GPMODE_CDROM_PAGE 0x0d
@@ -304,10 +315,26 @@*/ /* Some generally useful CD-ROM information */ -#define CD_MINS 80/* max. minutes per CD */ -#define CD_SECS 60/* seconds per minute */ -#define CD_FRAMES 75/* frames per second */ -#define CD_FRAMESIZE 2048/* bytes per frame, "cooked" mode */ +#define CD_MINS 80/* max. minutes per CD */ +#define CD_SECS 60/* seconds per minute */ +#define CD_FRAMES 75/* frames per second */ +#define CD_SYNC_SIZE 12/* 12 sync bytes per raw data frame */ +#define CD_MSF_OFFSET 150/* MSF numbering offset of first frame */ +#define CD_CHUNK_SIZE 24/* lowest-level "data bytes piece" */ +#define CD_NUM_OF_CHUNKS 98/* chunks per frame */ +#define CD_FRAMESIZE_SUB 96/* subchannel data "frame" size */ +#define CD_HEAD_SIZE 4/* header (address) bytes per raw data frame */ +#define CD_SUBHEAD_SIZE 8/* subheader bytes per raw XA data frame */ +#define CD_EDC_SIZE 4/* bytes EDC per most raw data frame types */ +#define CD_ZERO_SIZE 8/* bytes zero per yellow book mode 1 frame */ +#define CD_ECC_SIZE 276/* bytes ECC per most raw data frame types */ +#define CD_FRAMESIZE 2048/* bytes per frame, "cooked" mode */ +#define CD_FRAMESIZE_RAW 2352/* bytes per frame, "raw" mode */ +#define CD_FRAMESIZE_RAWER 2646/* The maximum possible returned bytes */ +/* most drives don't deliver everything: */ +#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE)/*2340*/ +#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE)/*2336*/ +#define CD_MAX_BYTES (CD_MINS * CD_SECS * CD_FRAMES * CD_FRAMESIZE)#define CD_MAX_SECTORS (CD_MAX_BYTES / 512)
@@ -346,12 +373,15 @@#define MMC_PROFILE_HDDVD_RW_DL 0x005A#define MMC_PROFILE_INVALID 0xFFFF +#define ATAPI_INT_REASON_CD 0x01/* 0 = data transfer */ #define ATAPI_INT_REASON_IO 0x02/* 1 = transfer to the host */ #define ATAPI_INT_REASON_REL 0x04#define ATAPI_INT_REASON_TAG 0xf8/* same constants as bochs */ +#define ASC_NONE 0x00 +#define ASC_READ_ERROR 0x11#define ASC_ILLEGAL_OPCODE 0x20#define ASC_LOGICAL_BLOCK_OOR 0x21#define ASC_INV_FIELD_IN_CMD_PACKET 0x24
@@ -367,10 +397,23 @@#define CFA_INVALID_ADDRESS 0x21#define CFA_ADDRESS_OVERFLOW 0x2f -#define SENSE_NONE 0 -#define SENSE_NOT_READY 2 -#define SENSE_ILLEGAL_REQUEST 5 -#define SENSE_UNIT_ATTENTION 6 +/* Sense keys */ +#define SENSE_NONE 0 +#define SENSE_RECOVERED_ERROR 1 +#define SENSE_NOT_READY 2 +#define SENSE_MEDIUM_ERROR 3 +#define SENSE_HARDWARE_ERROR 4 +#define SENSE_ILLEGAL_REQUEST 5 +#define SENSE_UNIT_ATTENTION 6 +#define SENSE_DATA_PROTECT 7 +#define SENSE_BLANK_CHECK 8 +#define SENSE_VENDOR_SPECIFIC 9 +#define SENSE_COPY_ABORTED 10 +#define SENSE_ABORTED_COMMAND 11 +#define SENSE_VOLUME_OVERFLOW 13 +#define SENSE_MISCOMPARE 14 + +#define IO_BUFFER_MAX_SIZE (IDE_DMA_BUF_SECTORS * 512 + 4)struct IDEState ;
Quoted 2 lines · Bique Alexandre
This patch updates some constants and fix a wrong one:
GPCMD_SEND_DVD_STRUCTURE.
Looks good to me,
Reviewed-by Christoph Hellwig <[email protected]>