diff options
| author | Alfred Perlstein <alfred@FreeBSD.org> | 2002-09-23 18:54:32 +0000 |
|---|---|---|
| committer | Alfred Perlstein <alfred@FreeBSD.org> | 2002-09-23 18:54:32 +0000 |
| commit | 4f492bfab53a4732222656e2be91c50a2df9e13c (patch) | |
| tree | 8158103cc2a98a399f6b85e558005d61c5a4bb29 /sys/dev/ata | |
| parent | b8581e0d567d1cdf5ddb03df7e535ffd181347f7 (diff) | |
Notes
Diffstat (limited to 'sys/dev/ata')
| -rw-r--r-- | sys/dev/ata/ata-raid.h | 10 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-all.h | 4 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-cd.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ata/ata-raid.h b/sys/dev/ata/ata-raid.h index 755b147abf9b8..5853ead0365b9 100644 --- a/sys/dev/ata/ata-raid.h +++ b/sys/dev/ata/ata-raid.h @@ -145,7 +145,7 @@ struct highpoint_raid_conf { u_int8_t dummy_2; u_int8_t name_2[15]; int8_t filler3[8]; -} __attribute__((packed)); +} __packed; #define PR_LBA(adp) \ @@ -180,7 +180,7 @@ struct promise_raid_conf { u_int8_t disk_number; u_int8_t channel; u_int8_t device; - u_int64_t magic_0 __attribute__((packed)); + u_int64_t magic_0 __packed; u_int32_t disk_offset; /* 0x210 */ u_int32_t disk_sectors; u_int32_t rebuild_lba; @@ -209,18 +209,18 @@ struct promise_raid_conf { u_int16_t cylinders; u_int8_t heads; u_int8_t sectors; - int64_t magic_1 __attribute__((packed)); + int64_t magic_1 __packed; struct { /* 0x240 */ u_int8_t flags; u_int8_t dummy_0; u_int8_t channel; u_int8_t device; - u_int64_t magic_0 __attribute__((packed)); + u_int64_t magic_0 __packed; } disk[8]; } raid; int32_t filler2[346]; u_int32_t checksum; -} __attribute__((packed)); +} __packed; int ata_raiddisk_probe(struct ad_softc *); int ata_raiddisk_attach(struct ad_softc *); diff --git a/sys/dev/ata/atapi-all.h b/sys/dev/ata/atapi-all.h index af9156457904a..f54562512b6d7 100644 --- a/sys/dev/ata/atapi-all.h +++ b/sys/dev/ata/atapi-all.h @@ -131,10 +131,10 @@ struct atapi_reqsense { u_int8_t eom :1; /* end of medium */ u_int8_t filemark :1; /* filemark */ /* cmd information */ - u_int32_t cmd_info __attribute__((packed)); + u_int32_t cmd_info __packed; u_int8_t sense_length; /* additional sense len (n-7) */ /* additional cmd spec info */ - u_int32_t cmd_specific_info __attribute__((packed)); + u_int32_t cmd_specific_info __packed; u_int8_t asc; /* additional sense code */ u_int8_t ascq; /* additional sense code qual */ u_int8_t replaceable_unit_code; /* replaceable unit code */ diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h index cdd5dc8d5446c..9a5da7b46646a 100644 --- a/sys/dev/ata/atapi-cd.h +++ b/sys/dev/ata/atapi-cd.h @@ -341,7 +341,7 @@ struct write_param { u_int8_t vendor_specific_byte1; u_int8_t vendor_specific_byte2; u_int8_t vendor_specific_byte3; -} __attribute__((packed)); +} __packed; /* CDROM Read Track Information structure */ struct acd_track_info { |