git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
scsi
/
sr_vendor.c
diff --git
a/drivers/scsi/sr_vendor.c
b/drivers/scsi/sr_vendor.c
index
2f7894e
..
78274dc
100644
(file)
--- a/
drivers/scsi/sr_vendor.c
+++ b/
drivers/scsi/sr_vendor.c
@@
-35,16
+35,18
@@
*/
#include <linux/config.h>
*/
#include <linux/config.h>
+#include <linux/cdrom.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/bcd.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/bcd.h>
-
#include <linux/blkdev.h>
#include <linux/blkdev.h>
-#include "scsi.h"
-#include "hosts.h"
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
#include <scsi/scsi_ioctl.h>
#include <scsi/scsi_ioctl.h>
-#include <linux/cdrom.h>
#include "sr.h"
#if 0
#include "sr.h"
#if 0
@@
-135,7
+137,7
@@
int sr_set_blocklength(Scsi_CD *cd, int blocklength)
modesel->block_length_lo = blocklength & 0xff;
cgc.buffer = buffer;
cgc.buflen = sizeof(*modesel);
modesel->block_length_lo = blocklength & 0xff;
cgc.buffer = buffer;
cgc.buflen = sizeof(*modesel);
- cgc.data_direction =
SCSI_DATA_WRIT
E;
+ cgc.data_direction =
DMA_TO_DEVIC
E;
cgc.timeout = VENDOR_TIMEOUT;
if (0 == (rc = sr_do_ioctl(cd, &cgc))) {
cd->device->sector_size = blocklength;
cgc.timeout = VENDOR_TIMEOUT;
if (0 == (rc = sr_do_ioctl(cd, &cgc))) {
cd->device->sector_size = blocklength;
@@
-182,7
+184,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
cgc.buffer = buffer;
cgc.buflen = 12;
cgc.quiet = 1;
cgc.buffer = buffer;
cgc.buflen = 12;
cgc.quiet = 1;
- cgc.data_direction =
SCSI_DATA_READ
;
+ cgc.data_direction =
DMA_FROM_DEVICE
;
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0)
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0)
@@
-210,7
+212,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
cgc.buffer = buffer;
cgc.buflen = 0x16;
cgc.quiet = 1;
cgc.buffer = buffer;
cgc.buflen = 0x16;
cgc.quiet = 1;
- cgc.data_direction =
SCSI_DATA_READ
;
+ cgc.data_direction =
DMA_FROM_DEVICE
;
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0)
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0)
@@
-239,7
+241,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
cgc.buffer = buffer;
cgc.buflen = 4;
cgc.quiet = 1;
cgc.buffer = buffer;
cgc.buflen = 4;
cgc.quiet = 1;
- cgc.data_direction =
SCSI_DATA_READ
;
+ cgc.data_direction =
DMA_FROM_DEVICE
;
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc == -EINVAL) {
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc == -EINVAL) {
@@
-268,7
+270,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
cgc.buffer = buffer;
cgc.buflen = 0x04;
cgc.quiet = 1;
cgc.buffer = buffer;
cgc.buflen = 0x04;
cgc.quiet = 1;
- cgc.data_direction =
SCSI_DATA_READ
;
+ cgc.data_direction =
DMA_FROM_DEVICE
;
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0) {
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0) {
@@
-286,7
+288,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
cgc.buffer = buffer;
cgc.buflen = 12;
cgc.quiet = 1;
cgc.buffer = buffer;
cgc.buflen = 12;
cgc.quiet = 1;
- cgc.data_direction =
SCSI_DATA_READ
;
+ cgc.data_direction =
DMA_FROM_DEVICE
;
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0) {
cgc.timeout = VENDOR_TIMEOUT;
rc = sr_do_ioctl(cd, &cgc);
if (rc != 0) {