1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
diff -rc ../old/cdrdao-1.1.4/configure ./configure
*** ../old/cdrdao-1.1.4/configure Sun Aug 27 13:37:08 2000
--- ./configure Fri Oct 20 10:32:47 2000
***************
*** 3234,3239 ****
--- 3234,3240 ----
+ xdao=no
if test $xdao != xdao; then
xdao=
***************
*** 3263,3269 ****
scsi_if_src=ScsiIf-lib.cc
case "$host" in
! *-freebsd3* | *-freebsd4*)
scsilib_libs="$scsilib_libs -lcam"
;;
esac
--- 3264,3270 ----
scsi_if_src=ScsiIf-lib.cc
case "$host" in
! *-freebsd3* | *-freebsd4* | *-freebsd5*)
scsilib_libs="$scsilib_libs -lcam"
;;
esac
***************
*** 3279,3285 ****
scsi_if_src="ScsiIf-linux.cc sg_err.cc"
;;
! *-freebsd3* | *-freebsd4*)
scsi_if_src="ScsiIf-freebsd-cam.cc"
scsilib_libs="-lcam"
;;
--- 3280,3286 ----
scsi_if_src="ScsiIf-linux.cc sg_err.cc"
;;
! *-freebsd3* | *-freebsd4* | *-freebsd5*)
scsi_if_src="ScsiIf-freebsd-cam.cc"
scsilib_libs="-lcam"
;;
***************
*** 3311,3317 ****
esac
case "$host" in
! *-linux-*)
sound_if_src=SoundIF-linux.cc
;;
--- 3312,3318 ----
esac
case "$host" in
! *-linux-* | *-freebsd*)
sound_if_src=SoundIF-linux.cc
;;
diff -rc ../old/cdrdao-1.1.4/scsilib/include/scg/scsireg.h ./scsilib/include/scg/scsireg.h
*** ../old/cdrdao-1.1.4/scsilib/include/scg/scsireg.h Sat Apr 15 02:54:35 2000
--- ./scsilib/include/scg/scsireg.h Fri Oct 20 10:32:22 2000
***************
*** 244,255 ****
#if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */
! struct scsi_mode_page_header {
Ucbit p_code : 6;
Ucbit res : 1;
Ucbit parsave : 1;
u_char p_len;
! };
/*
* This is a hack that allows mode pages without
--- 244,255 ----
#if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */
! /*struct scsi_mode_page_header {
Ucbit p_code : 6;
Ucbit res : 1;
Ucbit parsave : 1;
u_char p_len;
! };*/
/*
* This is a hack that allows mode pages without
***************
*** 262,273 ****
#else /* Motorola byteorder */
! struct scsi_mode_page_header {
Ucbit parsave : 1;
Ucbit res : 1;
Ucbit p_code : 6;
u_char p_len;
! };
/*
* This is a hack that allows mode pages without
--- 262,273 ----
#else /* Motorola byteorder */
! /*struct scsi_mode_page_header {
Ucbit parsave : 1;
Ucbit res : 1;
Ucbit p_code : 6;
u_char p_len;
! };*/
/*
* This is a hack that allows mode pages without
diff -rc ../old/cdrdao-1.1.4/scsilib/libscg/scg/scsireg.h ./scsilib/libscg/scg/scsireg.h
*** ../old/cdrdao-1.1.4/scsilib/libscg/scg/scsireg.h Sat Apr 15 02:54:50 2000
--- ./scsilib/libscg/scg/scsireg.h Fri Oct 20 10:32:22 2000
***************
*** 244,255 ****
#if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */
! struct scsi_mode_page_header {
Ucbit p_code : 6;
Ucbit res : 1;
Ucbit parsave : 1;
u_char p_len;
! };
/*
* This is a hack that allows mode pages without
--- 244,255 ----
#if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */
! /*struct scsi_mode_page_header {
Ucbit p_code : 6;
Ucbit res : 1;
Ucbit parsave : 1;
u_char p_len;
! };*/
/*
* This is a hack that allows mode pages without
***************
*** 262,273 ****
#else /* Motorola byteorder */
! struct scsi_mode_page_header {
Ucbit parsave : 1;
Ucbit res : 1;
Ucbit p_code : 6;
u_char p_len;
! };
/*
* This is a hack that allows mode pages without
--- 262,273 ----
#else /* Motorola byteorder */
! /*struct scsi_mode_page_header {
Ucbit parsave : 1;
Ucbit res : 1;
Ucbit p_code : 6;
u_char p_len;
! };*/
/*
* This is a hack that allows mode pages without
diff -rc ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc ./xdao/SoundIF-linux.cc
*** ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc Sun Aug 27 13:37:11 2000
--- ./xdao/SoundIF-linux.cc Fri Oct 20 10:32:22 2000
***************
*** 34,40 ****
--- 34,47 ----
*
*/
+ # if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ # if !defined(SNDCTL_DSP_CHANNELS)
+ # define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
+ # endif
+ # else
#include <linux/soundcard.h>
+ # endif
#include <stdio.h>
#include <assert.h>
|
