diff options
author | joerg <joerg@FreeBSD.org> | 2005-03-02 21:33:29 +0000 |
---|---|---|
committer | joerg <joerg@FreeBSD.org> | 2005-03-02 21:33:29 +0000 |
commit | c85a3e95f78bb183ec62ae6ef948265e7ade6b7a (patch) | |
tree | 69c98a86a28838e983d8eca9ba158f46450df8c1 /sys/dev/scd/scdreg.h | |
parent | 2307c11d0fa1ac2133cff99d6c1a90c711b15f61 (diff) | |
download | FreeBSD-src-c85a3e95f78bb183ec62ae6ef948265e7ade6b7a.zip FreeBSD-src-c85a3e95f78bb183ec62ae6ef948265e7ade6b7a.tar.gz |
netchild's mega-patch to isolate compiler dependencies into a central
place.
This moves the dependency on GCC's and other compiler's features into
the central sys/cdefs.h file, while the individual source files can
then refer to #ifdef __COMPILER_FEATURE_FOO where they by now used to
refer to #if __GNUC__ > 3.1415 && __BARC__ <= 42.
By now, GCC and ICC (the Intel compiler) have been actively tested on
IA32 platforms by netchild. Extension to other compilers is supposed
to be possible, of course.
Submitted by: netchild
Reviewed by: various developers on arch@, some time ago
Diffstat (limited to 'sys/dev/scd/scdreg.h')
-rw-r--r-- | sys/dev/scd/scdreg.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h index 38e2293..c98c6ca 100644 --- a/sys/dev/scd/scdreg.h +++ b/sys/dev/scd/scdreg.h @@ -32,12 +32,6 @@ #ifndef SCD_H #define SCD_H -#if defined(__GNUC__) || defined(__INTEL_COMPILER) -#if __GNUC__ >= 2 || defined(__INTEL_COMPILER) -#pragma pack(1) -#endif -#endif - typedef unsigned char bcd_t; #define M_msf(msf) msf[0] #define S_msf(msf) msf[1] @@ -94,7 +88,7 @@ struct sony_drive_configuration { char product[16]; char revision[8]; u_short config; -}; +} __packed; /* Almost same as cd_sub_channel_position_data */ struct sony_subchannel_position_data { @@ -105,14 +99,14 @@ struct sony_subchannel_position_data { u_char rel_msf[3]; u_char dummy; u_char abs_msf[3]; -}; +} __packed; struct sony_tracklist { u_char adr :4; /* xcdplayer needs these two values */ u_char ctl :4; u_char track; u_char start_msf[3]; -}; +} __packed; #define MAX_TRACKS 100 @@ -140,6 +134,6 @@ struct sony_toc { /* The rest is just to take space in case all data is returned */ u_char dummy[6*9]; -}; +} __packed; #endif /* SCD_H */ |