diff options
Diffstat (limited to 'drivers/ide/ide-cd.h')
| -rw-r--r-- | drivers/ide/ide-cd.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index bf676b262181..d5ae036af00c 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
| @@ -33,33 +33,33 @@ | |||
| 33 | 33 | ||
| 34 | /* Structure of a MSF cdrom address. */ | 34 | /* Structure of a MSF cdrom address. */ |
| 35 | struct atapi_msf { | 35 | struct atapi_msf { |
| 36 | byte reserved; | 36 | u8 reserved; |
| 37 | byte minute; | 37 | u8 minute; |
| 38 | byte second; | 38 | u8 second; |
| 39 | byte frame; | 39 | u8 frame; |
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | /* Space to hold the disk TOC. */ | 42 | /* Space to hold the disk TOC. */ |
| 43 | #define MAX_TRACKS 99 | 43 | #define MAX_TRACKS 99 |
| 44 | struct atapi_toc_header { | 44 | struct atapi_toc_header { |
| 45 | unsigned short toc_length; | 45 | unsigned short toc_length; |
| 46 | byte first_track; | 46 | u8 first_track; |
| 47 | byte last_track; | 47 | u8 last_track; |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | struct atapi_toc_entry { | 50 | struct atapi_toc_entry { |
| 51 | byte reserved1; | 51 | u8 reserved1; |
| 52 | #if defined(__BIG_ENDIAN_BITFIELD) | 52 | #if defined(__BIG_ENDIAN_BITFIELD) |
| 53 | __u8 adr : 4; | 53 | u8 adr : 4; |
| 54 | __u8 control : 4; | 54 | u8 control : 4; |
| 55 | #elif defined(__LITTLE_ENDIAN_BITFIELD) | 55 | #elif defined(__LITTLE_ENDIAN_BITFIELD) |
| 56 | __u8 control : 4; | 56 | u8 control : 4; |
| 57 | __u8 adr : 4; | 57 | u8 adr : 4; |
| 58 | #else | 58 | #else |
| 59 | #error "Please fix <asm/byteorder.h>" | 59 | #error "Please fix <asm/byteorder.h>" |
| 60 | #endif | 60 | #endif |
| 61 | byte track; | 61 | u8 track; |
| 62 | byte reserved2; | 62 | u8 reserved2; |
| 63 | union { | 63 | union { |
| 64 | unsigned lba; | 64 | unsigned lba; |
| 65 | struct atapi_msf msf; | 65 | struct atapi_msf msf; |