capabilities: clean up file capability reading

[safe/jmp/linux-2.6] / include / linux / cdrom.h

diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index b68fdf1..c6d3e22 100644 (file)
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -2,7 +2,7 @@
  * -- <linux/cdrom.h>
  * General header file for linux CD-ROM drivers 
  * Copyright (C) 1992         David Giller, rafetmad@oxy.edu
- *               1994, 1995   Eberhard Moenkeberg, emoenke@gwdg.de
+ *               1994, 1995   Eberhard Mönkeberg, emoenke@gwdg.de
  *               1996         David van Leeuwen, david@tm.tno.nl
  *               1997, 1998   Erik Andersen, andersee@debian.org
  *               1998-2002    Jens Axboe, axboe@suse.de
@@ -76,7 +76,7 @@
                                            (struct cdrom_multisession) */
 #define CDROM_GET_MCN          0x5311 /* Obtain the "Universal Product Code" 
                                            if available (struct cdrom_mcn) */
-#define CDROM_GET_UPC          CDROM_GET_MCN  /* This one is depricated, 
+#define CDROM_GET_UPC          CDROM_GET_MCN  /* This one is deprecated, 
                                           but here anyway for compatibility */
 #define CDROMRESET             0x5312 /* hard-reset the drive */
 #define CDROMVOLREAD           0x5313 /* Get the drive's volume setting 
@@ -378,7 +378,6 @@ struct cdrom_generic_command
 #define CDC_MEDIA_CHANGED      0x80    /* media changed */
 #define CDC_PLAY_AUDIO         0x100   /* audio functions */
 #define CDC_RESET               0x200   /* hard reset device */
-#define CDC_IOCTLS              0x400   /* driver has non-standard ioctls */
 #define CDC_DRIVE_STATUS        0x800   /* driver implements drive status */
 #define CDC_GENERIC_PACKET     0x1000  /* driver implements generic packets */
 #define CDC_CD_R               0x2000  /* drive is a CD-R */
@@ -415,8 +414,8 @@ struct cdrom_generic_command
 #define CDO_CHECK_TYPE         0x10    /* check type on open for data */
 
 /* Special codes used when specifying changer slots. */
-#define CDSL_NONE              ((int) (~0U>>1)-1)
-#define CDSL_CURRENT           ((int) (~0U>>1))
+#define CDSL_NONE              (INT_MAX-1)
+#define CDSL_CURRENT           INT_MAX
 
 /* For partition based multisession access. IDE can handle 64 partitions
  * per drive - SCSI CD-ROM's use minors to differentiate between the
@@ -507,7 +506,7 @@ struct cdrom_generic_command
 #define GPMODE_TO_PROTECT_PAGE         0x1d
 #define GPMODE_CAPABILITIES_PAGE       0x2a
 #define GPMODE_ALL_PAGES               0x3f
-/* Not in Mt. Fuji, but in ATAPI 2.6 -- depricated now in favor
+/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor
  * of MODE_SENSE_POWER_PAGE */
 #define GPMODE_CDROM_PAGE              0x0d
 
@@ -750,7 +749,7 @@ struct request_sense {
 #define MRW_MODE_PC                    0x03
 
 struct mrw_feature_desc {
-       __u16 feature_code;
+       __be16 feature_code;
 #if defined(__BIG_ENDIAN_BITFIELD)
        __u8 reserved1          : 2;
        __u8 feature_version    : 4;
@@ -777,7 +776,7 @@ struct mrw_feature_desc {
 
 /* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */
 struct rwrt_feature_desc {
-       __u16 feature_code;
+       __be16 feature_code;
 #if defined(__BIG_ENDIAN_BITFIELD)
        __u8 reserved1          : 2;
        __u8 feature_version    : 4;
@@ -804,7 +803,7 @@ struct rwrt_feature_desc {
 };
 
 typedef struct {
-       __u16 disc_information_length;
+       __be16 disc_information_length;
 #if defined(__BIG_ENDIAN_BITFIELD)
        __u8 reserved1                  : 3;
         __u8 erasable                  : 1;
@@ -850,7 +849,7 @@ typedef struct {
 } disc_information;
 
 typedef struct {
-       __u16 track_information_length;
+       __be16 track_information_length;
        __u8 track_lsb;
        __u8 session_lsb;
        __u8 reserved1;
@@ -881,12 +880,12 @@ typedef struct {
        __u8 lra_v                      : 1;
        __u8 reserved3                  : 6;
 #endif
-       __u32 track_start;
-       __u32 next_writable;
-       __u32 free_blocks;
-       __u32 fixed_packet_size;
-       __u32 track_size;
-       __u32 last_rec_address;
+       __be32 track_start;
+       __be32 next_writable;
+       __be32 free_blocks;
+       __be32 fixed_packet_size;
+       __be32 track_size;
+       __be32 last_rec_address;
 } track_information;
 
 struct feature_header {
@@ -897,12 +896,12 @@ struct feature_header {
 };
 
 struct mode_page_header {
-       __u16 mode_data_length;
+       __be16 mode_data_length;
        __u8 medium_type;
        __u8 reserved1;
        __u8 reserved2;
        __u8 reserved3;
-       __u16 desc_length;
+       __be16 desc_length;
 };
 
 #ifdef __KERNEL__
@@ -940,7 +939,7 @@ struct cdrom_device_info {
        int speed;                      /* maximum speed for reading data */
        int capacity;                   /* number of discs in jukebox */
 /* device-related storage */
-       int options             : 30;   /* options flags */
+       unsigned int options    : 30;   /* options flags */
        unsigned mc_flags       : 2;    /* media change buffer flags */
        int use_count;                  /* number of times device opened */
        char name[20];                  /* name of the device type */
@@ -974,9 +973,7 @@ struct cdrom_device_ops {
        int (*reset) (struct cdrom_device_info *);
        /* play stuff */
        int (*audio_ioctl) (struct cdrom_device_info *,unsigned int, void *);
-       /* dev-specific */
-       int (*dev_ioctl) (struct cdrom_device_info *,
-                         unsigned int, unsigned long);
+
 /* driver specifications */
        const int capability;   /* capability flags */
        int n_minors;           /* number of active minor devices */
@@ -1109,7 +1106,7 @@ typedef struct {
 #endif
        __u8 session_format;
        __u8 reserved6;
-       __u32 packet_size;
+       __be32 packet_size;
        __u16 audio_pause;
        __u8 mcn[16];
        __u8 isrc[16];
@@ -1154,7 +1151,7 @@ typedef struct {
 } rpc_state_t;
 
 struct event_header {
-       __u16 data_len;
+       __be16 data_len;
 #if defined(__BIG_ENDIAN_BITFIELD)
        __u8 nea                : 1;
        __u8 reserved1          : 4;