|
@@ -2580,11 +2580,13 @@ void ide_cdrom_release_real (struct cdrom_device_info *cdi)
|
|
|
CDROM_STATE_FLAGS(drive)->toc_valid = 0;
|
|
|
}
|
|
|
|
|
|
+#define IDE_CD_CAPABILITIES \
|
|
|
+ (CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | \
|
|
|
+ CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | \
|
|
|
+ CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R | \
|
|
|
+ CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_GENERIC_PACKET | \
|
|
|
+ CDC_MO_DRIVE | CDC_MRW | CDC_MRW_W | CDC_RAM)
|
|
|
|
|
|
-
|
|
|
-/****************************************************************************
|
|
|
- * Device initialization.
|
|
|
- */
|
|
|
static struct cdrom_device_ops ide_cdrom_dops = {
|
|
|
.open = ide_cdrom_open_real,
|
|
|
.release = ide_cdrom_release_real,
|
|
@@ -2597,14 +2599,7 @@ static struct cdrom_device_ops ide_cdrom_dops = {
|
|
|
.get_mcn = ide_cdrom_get_mcn,
|
|
|
.reset = ide_cdrom_reset,
|
|
|
.audio_ioctl = ide_cdrom_audio_ioctl,
|
|
|
- .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK |
|
|
|
- CDC_SELECT_SPEED | CDC_SELECT_DISC |
|
|
|
- CDC_MULTI_SESSION | CDC_MCN |
|
|
|
- CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET |
|
|
|
- CDC_DRIVE_STATUS | CDC_CD_R |
|
|
|
- CDC_CD_RW | CDC_DVD | CDC_DVD_R| CDC_DVD_RAM |
|
|
|
- CDC_GENERIC_PACKET | CDC_MO_DRIVE | CDC_MRW |
|
|
|
- CDC_MRW_W | CDC_RAM,
|
|
|
+ .capability = IDE_CD_CAPABILITIES,
|
|
|
.generic_packet = ide_cdrom_packet,
|
|
|
};
|
|
|
|