>Number:         3675
>Category:       lib
>Synopsis:       *BSD compatibility patch to sys/cdio.h.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lib-bug-people (Library Bug People)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 26 17:05:02 1997
>Last-Modified:
>Originator:     Nick Brok
>Organization:
>Release:        NetBSD-current Mon May 26 16:49:37 PDT 1997
>Environment:
	Unrelated.
System: NetBSD mobeius 1.2E NetBSD 1.2E (MOBEIUS) #2: Thu May 15 15:17:37 PDT 1997 jeremy@mobeius:/usr/home/netbsd/src/sys/arch/sparc/compile/MOBEIUS sparc


>Description:

Structures used in ioctl() calls to the Audio CD-ROM subsystem are lacking
definitions used by other BSDs for Audio-CD control.

This patch was submitted by Nick Brok <nick@nbrok.iaehv.nl> and is reported
to allow FreeBSD's cdcontrol and cdplay programs to work on a NetBSD/sun3x
system.

>How-To-Repeat:
N/A
>Fix:

*** /src/sys/sys/cdio.h	Tue Feb 20 04:41:23 1996
--- cdiopatch	Mon May 26 16:56:43 1997
***************
*** 5,10 ****
--- 5,22 ----
  
  /* 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;
  #if BYTE_ORDER == LITTLE_ENDIAN
***************
*** 17,23 ****
  #endif
  	u_char	track;
  	u_char	nothing2;
! 	u_char	addr[4];
  };
  
  struct cd_sub_channel_header {
--- 29,35 ----
  #endif
  	u_char	track;
  	u_char	nothing2;
! 	union	msf_lba addr;
  };
  
  struct cd_sub_channel_header {
***************
*** 44,51 ****
  #endif
  	u_char	track_number;
  	u_char	index_number;
! 	u_char	absaddr[4];
! 	u_char	reladdr[4];
  };
  
  struct cd_sub_channel_media_catalog {
--- 56,63 ----
  #endif
  	u_char	track_number;
  	u_char	index_number;
! 	union	msf_lba	absaddr;
! 	union	msf_lba	reladdr;
  };
  
  struct cd_sub_channel_media_catalog {
>Audit-Trail:
>Unformatted: