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.3
[linux-2.6.git]
/
include
/
linux
/
cdrom.h
diff --git
a/include/linux/cdrom.h
b/include/linux/cdrom.h
index
8fcf9bc
..
bcc9410
100644
(file)
--- a/
include/linux/cdrom.h
+++ b/
include/linux/cdrom.h
@@
-237,9
+237,9
@@
struct cdrom_read
struct cdrom_read_audio
{
union cdrom_addr addr; /* frame address */
struct cdrom_read_audio
{
union cdrom_addr addr; /* frame address */
- __u8 addr_format; /* CDROM_LBA or CDROM_MSF */
+ __u8 addr_format;
/* CDROM_LBA or CDROM_MSF */
int nframes; /* number of 2352-byte-frames to read at once */
int nframes; /* number of 2352-byte-frames to read at once */
- __u8
*buf;
/* frame buffer (size: nframes*2352 bytes) */
+ __u8
__user *buf;
/* frame buffer (size: nframes*2352 bytes) */
};
/* This struct is used with the CDROMMULTISESSION ioctl */
};
/* This struct is used with the CDROMMULTISESSION ioctl */
@@
-280,17
+280,16
@@
struct cdrom_blk
struct cdrom_generic_command
{
unsigned char cmd[CDROM_PACKET_SIZE];
struct cdrom_generic_command
{
unsigned char cmd[CDROM_PACKET_SIZE];
- unsigned char *buffer;
+ unsigned char
__user
*buffer;
unsigned int buflen;
int stat;
unsigned int buflen;
int stat;
- struct request_sense *sense;
+ struct request_sense
__user
*sense;
unsigned char data_direction;
int quiet;
int timeout;
unsigned char data_direction;
int quiet;
int timeout;
- void
*reserved[1];
+ void
__user *reserved[1]; /* unused, actually */
};
};
-
/*
* A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336,
* 2340, or 2352 bytes long.
/*
* A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336,
* 2340, or 2352 bytes long.
@@
-467,9
+466,10
@@
struct cdrom_generic_command
#define GPCMD_REPORT_KEY 0xa4
#define GPCMD_REQUEST_SENSE 0x03
#define GPCMD_RESERVE_RZONE_TRACK 0x53
#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_SCAN 0xba
#define GPCMD_SEEK 0x2b
-#define GPCMD_SEND_DVD_STRUCTURE 0x
ad
+#define GPCMD_SEND_DVD_STRUCTURE 0x
bf
#define GPCMD_SEND_EVENT 0xa2
#define GPCMD_SEND_KEY 0xa3
#define GPCMD_SEND_OPC 0x54
#define GPCMD_SEND_EVENT 0xa2
#define GPCMD_SEND_KEY 0xa3
#define GPCMD_SEND_OPC 0x54
@@
-907,6
+907,19
@@
struct mode_page_header {
#include <linux/fs.h> /* not really needed, later.. */
#include <linux/device.h>
#include <linux/fs.h> /* not really needed, later.. */
#include <linux/device.h>
+struct packet_command
+{
+ unsigned char cmd[CDROM_PACKET_SIZE];
+ unsigned char *buffer;
+ unsigned int buflen;
+ int stat;
+ struct request_sense *sense;
+ unsigned char data_direction;
+ int quiet;
+ int timeout;
+ void *reserved[1];
+};
+
/*
* _OLD will use PIO transfer on atapi devices, _BPC_* will use DMA
*/
/*
* _OLD will use PIO transfer on atapi devices, _BPC_* will use DMA
*/
@@
-965,15
+978,15
@@
struct cdrom_device_ops {
int n_minors; /* number of active minor devices */
/* handle uniform packets for scsi type devices (scsi,atapi) */
int (*generic_packet) (struct cdrom_device_info *,
int n_minors; /* number of active minor devices */
/* handle uniform packets for scsi type devices (scsi,atapi) */
int (*generic_packet) (struct cdrom_device_info *,
- struct
cdrom_generic
_command *);
+ struct
packet
_command *);
};
/* the general block_device operations structure: */
extern int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip,
struct file *fp);
extern int cdrom_release(struct cdrom_device_info *cdi, struct file *fp);
};
/* the general block_device operations structure: */
extern int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip,
struct file *fp);
extern int cdrom_release(struct cdrom_device_info *cdi, struct file *fp);
-extern int cdrom_ioctl(struct
cdrom_device_info *cdi, struct inode *ip
,
- unsigned int cmd, unsigned long arg);
+extern int cdrom_ioctl(struct
file *file, struct cdrom_device_info *cdi
,
+
struct inode *ip,
unsigned int cmd, unsigned long arg);
extern int cdrom_media_changed(struct cdrom_device_info *);
extern int register_cdrom(struct cdrom_device_info *cdi);
extern int cdrom_media_changed(struct cdrom_device_info *);
extern int register_cdrom(struct cdrom_device_info *cdi);
@@
-990,11
+1003,11
@@
typedef struct {
extern int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written);
extern int cdrom_number_of_slots(struct cdrom_device_info *cdi);
extern int cdrom_mode_select(struct cdrom_device_info *cdi,
extern int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written);
extern int cdrom_number_of_slots(struct cdrom_device_info *cdi);
extern int cdrom_mode_select(struct cdrom_device_info *cdi,
- struct
cdrom_generic
_command *cgc);
+ struct
packet
_command *cgc);
extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
- struct
cdrom_generic
_command *cgc,
+ struct
packet
_command *cgc,
int page_code, int page_control);
int page_code, int page_control);
-extern void init_cdrom_command(struct
cdrom_generic
_command *cgc,
+extern void init_cdrom_command(struct
packet
_command *cgc,
void *buffer, int len, int type);
/* The SCSI spec says there could be 256 slots. */
void *buffer, int len, int type);
/* The SCSI spec says there could be 256 slots. */