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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
ide
/
ide-cd.h
diff --git
a/drivers/ide/ide-cd.h
b/drivers/ide/ide-cd.h
index
8305bca
..
ad1f2ed
100644
(file)
--- a/
drivers/ide/ide-cd.h
+++ b/
drivers/ide/ide-cd.h
@@
-460,6
+460,10
@@
struct atapi_changer_info {
/* Extra per-device info for cdrom drives. */
struct cdrom_info {
/* Extra per-device info for cdrom drives. */
struct cdrom_info {
+ ide_drive_t *drive;
+ ide_driver_t *driver;
+ struct gendisk *disk;
+ struct kref kref;
/* Buffer for table of contents. NULL if we haven't allocated
a TOC buffer for this device yet. */
/* Buffer for table of contents. NULL if we haven't allocated
a TOC buffer for this device yet. */
@@
-476,7
+480,6
@@
struct cdrom_info {
struct request request_sense_request;
int dma;
struct request request_sense_request;
int dma;
- int cmd;
unsigned long last_block;
unsigned long start_seek;
/* Buffer to hold mechanism status and changer slot table. */
unsigned long last_block;
unsigned long start_seek;
/* Buffer to hold mechanism status and changer slot table. */
@@
-519,7
+522,7
@@
struct cdrom_info {
/* The generic packet command opcodes for CD/DVD Logical Units,
* From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
/* The generic packet command opcodes for CD/DVD Logical Units,
* From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-const struct {
+
static
const struct {
unsigned short packet_command;
const char * const text;
} packet_command_texts[] = {
unsigned short packet_command;
const char * const text;
} packet_command_texts[] = {
@@
-577,7
+580,7
@@
const struct {
/* From Table 303 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
/* From Table 303 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-const char * const sense_key_texts[16] = {
+
static
const char * const sense_key_texts[16] = {
"No sense data",
"Recovered error",
"Not ready",
"No sense data",
"Recovered error",
"Not ready",
@@
-597,7
+600,7
@@
const char * const sense_key_texts[16] = {
};
/* From Table 304 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
};
/* From Table 304 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-const struct {
+
static
const struct {
unsigned long asc_ascq;
const char * const text;
} sense_data_texts[] = {
unsigned long asc_ascq;
const char * const text;
} sense_data_texts[] = {