This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / sr_ioctl.c

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 7d24b57..e94c3a2 100644 (file)
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -10,13 +10,9 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
-#include <scsi/scsi.h>
-#include <scsi/scsi_dbg.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_eh.h>
+#include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_request.h>
 
 #include "sr.h"
 
@@ -69,7 +65,7 @@ static int sr_fake_playtrkind(struct cdrom_device_info *cdi, struct cdrom_ti *ti
        cgc.cmd[6] = trk1_te.cdte_addr.msf.minute;
        cgc.cmd[7] = trk1_te.cdte_addr.msf.second;
        cgc.cmd[8] = trk1_te.cdte_addr.msf.frame;
-       cgc.data_direction = DMA_NONE;
+       cgc.data_direction = SCSI_DATA_NONE;
        cgc.timeout = IOCTL_TIMEOUT;
        return sr_do_ioctl(cdi->handle, &cgc);
 }
@@ -142,7 +138,7 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                        if (!cgc->quiet)
                                printk(KERN_INFO "%s: CDROM not ready.  Make sure there is a disc in the drive.\n", cd->cdi.name);
 #ifdef DEBUG
-                       scsi_print_req_sense("sr", SRpnt);
+                       print_req_sense("sr", SRpnt);
 #endif
                        err = -ENOMEDIUM;
                        break;
@@ -153,14 +149,14 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                                /* sense: Invalid command operation code */
                                err = -EDRIVE_CANT_DO_THIS;
 #ifdef DEBUG
-                       __scsi_print_command(cgc->cmd);
-                       scsi_print_req_sense("sr", SRpnt);
+                       print_command(cgc->cmd);
+                       print_req_sense("sr", SRpnt);
 #endif
                        break;
                default:
                        printk(KERN_ERR "%s: CDROM (ioctl) error, command: ", cd->cdi.name);
-                       __scsi_print_command(cgc->cmd);
-                       scsi_print_req_sense("sr", SRpnt);
+                       print_command(cgc->cmd);
+                       print_req_sense("sr", SRpnt);
                        err = -EIO;
                }
        }
@@ -187,7 +183,7 @@ static int test_unit_ready(Scsi_CD *cd)
        memset(&cgc, 0, sizeof(struct packet_command));
        cgc.cmd[0] = GPCMD_TEST_UNIT_READY;
        cgc.quiet = 1;
-       cgc.data_direction = DMA_NONE;
+       cgc.data_direction = SCSI_DATA_NONE;
        cgc.timeout = IOCTL_TIMEOUT;
        return sr_do_ioctl(cd, &cgc);
 }
@@ -200,7 +196,7 @@ int sr_tray_move(struct cdrom_device_info *cdi, int pos)
        memset(&cgc, 0, sizeof(struct packet_command));
        cgc.cmd[0] = GPCMD_START_STOP_UNIT;
        cgc.cmd[4] = (pos == 0) ? 0x03 /* close */ : 0x02 /* eject */ ;
-       cgc.data_direction = DMA_NONE;
+       cgc.data_direction = SCSI_DATA_NONE;
        cgc.timeout = IOCTL_TIMEOUT;
        return sr_do_ioctl(cd, &cgc);
 }
@@ -284,7 +280,7 @@ int sr_get_mcn(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn)
        cgc.cmd[8] = 24;
        cgc.buffer = buffer;
        cgc.buflen = 24;
-       cgc.data_direction = DMA_FROM_DEVICE;
+       cgc.data_direction = SCSI_DATA_READ;
        cgc.timeout = IOCTL_TIMEOUT;
        result = sr_do_ioctl(cd, &cgc);
 
@@ -314,7 +310,7 @@ int sr_select_speed(struct cdrom_device_info *cdi, int speed)
        cgc.cmd[0] = GPCMD_SET_SPEED;   /* SET CD SPEED */
        cgc.cmd[2] = (speed >> 8) & 0xff;       /* MSB for speed (in kbytes/sec) */
        cgc.cmd[3] = speed & 0xff;      /* LSB */
-       cgc.data_direction = DMA_NONE;
+       cgc.data_direction = SCSI_DATA_NONE;
        cgc.timeout = IOCTL_TIMEOUT;
 
        if (sr_do_ioctl(cd, &cgc))
@@ -351,7 +347,7 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void *arg)
                        cgc.buffer = buffer;
                        cgc.buflen = 12;
                        cgc.quiet = 1;
-                       cgc.data_direction = DMA_FROM_DEVICE;
+                       cgc.data_direction = SCSI_DATA_READ;
 
                        result = sr_do_ioctl(cd, &cgc);
 
@@ -371,7 +367,7 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void *arg)
                        cgc.cmd[8] = 12;                /* LSB of length */
                        cgc.buffer = buffer;
                        cgc.buflen = 12;
-                       cgc.data_direction = DMA_FROM_DEVICE;
+                       cgc.data_direction = SCSI_DATA_READ;
 
                        result = sr_do_ioctl(cd, &cgc);
 
@@ -397,7 +393,7 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void *arg)
                cgc.cmd[5] = ti->cdti_ind0;
                cgc.cmd[7] = ti->cdti_trk1;
                cgc.cmd[8] = ti->cdti_ind1;
-               cgc.data_direction = DMA_NONE;
+               cgc.data_direction = SCSI_DATA_NONE;
 
                result = sr_do_ioctl(cd, &cgc);
                if (result == -EDRIVE_CANT_DO_THIS)
@@ -466,7 +462,7 @@ static int sr_read_cd(Scsi_CD *cd, unsigned char *dest, int lba, int format, int
        }
        cgc.buffer = dest;
        cgc.buflen = blksize;
-       cgc.data_direction = DMA_FROM_DEVICE;
+       cgc.data_direction = SCSI_DATA_READ;
        cgc.timeout = IOCTL_TIMEOUT;
        return sr_do_ioctl(cd, &cgc);
 }
@@ -507,7 +503,7 @@ static int sr_read_sector(Scsi_CD *cd, int lba, int blksize, unsigned char *dest
        cgc.cmd[8] = 1;
        cgc.buffer = dest;
        cgc.buflen = blksize;
-       cgc.data_direction = DMA_FROM_DEVICE;
+       cgc.data_direction = SCSI_DATA_READ;
        cgc.timeout = IOCTL_TIMEOUT;
        rc = sr_do_ioctl(cd, &cgc);