diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-01-06 16:00:24 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-01-06 16:00:24 +0000 |
| commit | 44470ae7eb74b0fe824c0aa8a463ac98672c2798 (patch) | |
| tree | df82daf0a5bc06079d4bcce87b966a96fdfd4582 | |
| parent | the modern world defaults to 8n1 (diff) | |
| download | wireguard-openbsd-44470ae7eb74b0fe824c0aa8a463ac98672c2798.tar.xz wireguard-openbsd-44470ae7eb74b0fe824c0aa8a463ac98672c2798.zip | |
from freebsd: rename some fields.
note: the use of unions and structures in here is bad; the use of
bitfields is even worse. the interface defined here desperately
needs a cleanup.
| -rw-r--r-- | sys/sys/cdio.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h index 66cbfcd6011..e2c104f9e23 100644 --- a/sys/sys/cdio.h +++ b/sys/sys/cdio.h @@ -5,13 +5,24 @@ /* Shared between kernel & process */ +union msf_lba { + struct { + u_char unused; + u_char minute; + u_char second; + u_char frame; + } msf; + int lba; + u_char addr[4]; +}; + struct cd_toc_entry { u_char nothing1; u_char control:4; u_char addr_type:4; u_char track; u_char nothing2; - u_char addr[4]; + union msf_lba addr; }; struct cd_sub_channel_header { @@ -32,8 +43,8 @@ struct cd_sub_channel_position_data { u_char addr_type:4; u_char track_number; u_char index_number; - u_char absaddr[4]; - u_char reladdr[4]; + union msf_lba absaddr; + union msf_lba reladdr; }; struct cd_sub_channel_media_catalog { |