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
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
|
Fix the cdda_enable bug that would cause the -A tests to fail on
drives that require a density set
Correct a bug that would cause a failed density set to abort out of
verify_read_command
Improve autosense order; non-density-set modes should be chacked
before even NULL-density modes because there's not necessarily any
going back (eg, Plextor lets you *set* the mode descriptor density,
but does not let you read it; it always reports '0')
Index: interface/interface.c
===================================================================
--- interface/interface.c (revision 15313)
+++ interface/interface.c (revision 15314)
@@ -90,11 +90,11 @@
}
}
+ if(d->bigendianp==-1)d->bigendianp=data_bigendianp(d);
+
if((ret=d->enable_cdda(d,1)))
return(ret);
- /* d->select_speed(d,d->maxspeed); most drives are full speed by default */
- if(d->bigendianp==-1)d->bigendianp=data_bigendianp(d);
return(0);
}
Index: interface/scsi_interface.c
===================================================================
--- interface/scsi_interface.c (revision 15313)
+++ interface/scsi_interface.c (revision 15314)
@@ -1298,7 +1298,7 @@
static int verify_read_command(cdrom_drive *d){
int i,j,k;
- int audioflag=0;
+ int audioflag=1;
int (*enablecommand) (struct cdrom_drive *d, int speed);
long (*readcommand) (struct cdrom_drive *d, void *p, long begin,
@@ -1313,7 +1313,7 @@
for data */
if(d->enable_cdda(d,1)==0){
-
+ audioflag=0;
for(i=1;i<=d->tracks;i++){
if(cdda_track_audiop(d,i)==1){
long firstsector=cdda_track_firstsector(d,i);
@@ -1358,115 +1358,111 @@
/* NEC test must come before sony; the nec drive expects d8 to be
10 bytes, and a 12 byte verson (Sony) crashes the drive */
- for(j=0;j<15;j++){
- int densitypossible=1;
-
- switch(j){
+ for(i=0;i<5;i++){
+ switch(i){
case 0:
- d->read_audio=scsi_read_28;
- rs="28 0x,00";
+ d->density=0;
+ d->enable_cdda=Dummy;
+ es="none ";
break;
case 1:
- d->read_audio=scsi_read_A8;
- rs="a8 0x,00";
+ d->density=0;
+ d->enable_cdda=scsi_enable_cdda;
+ es="yes/0x00";
break;
-
case 2:
- d->read_audio=scsi_read_mmcB;
- rs="be 02,10";
- densitypossible=0;
+ d->density=0x04;
+ d->enable_cdda=scsi_enable_cdda;
+ es="yes/0x04";
break;
case 3:
- d->read_audio=scsi_read_mmc2B;
- rs="be 02,f8";
- densitypossible=0;
+ d->density=0x82;
+ d->enable_cdda=scsi_enable_cdda;
+ es="yes/0x82";
break;
case 4:
- d->read_audio=scsi_read_mmc3B;
- rs="be 06,f8";
- densitypossible=0;
+ d->density=0x81;
+ d->enable_cdda=scsi_enable_cdda;
+ es="yes/0x81";
break;
+ }
- case 5:
- d->read_audio=scsi_read_mmc;
- rs="be 00,10";
- densitypossible=0;
- break;
- case 6:
- d->read_audio=scsi_read_mmc2;
- rs="be 00,f8";
- densitypossible=0;
- break;
- case 7:
- d->read_audio=scsi_read_mmc3;
- rs="be 04,f8";
- densitypossible=0;
- break;
-
- case 8:
- d->read_audio=scsi_read_msf;
- rs="b9 00,10";
- densitypossible=0;
- break;
- case 9:
- d->read_audio=scsi_read_msf2;
- rs="b9 00,f8";
- densitypossible=0;
- break;
- case 10:
- d->read_audio=scsi_read_msf3;
- rs="b9 04,f8";
- densitypossible=0;
- break;
-
- case 11:
- d->read_audio=scsi_read_D4_10;
- rs="d4(10)0x";
- break;
- case 12:
- d->read_audio=scsi_read_D4_12;
- rs="d4(12)0x";
- break;
- case 13:
- d->read_audio=scsi_read_D5;
- rs="d5 0x,00";
- break;
- case 14:
- d->read_audio=scsi_read_D8;
- rs="d8 0x,00";
- break;
- }
-
- for(i=0;i<5;i++){
- switch(i){
+ for(j=0;j<15;j++){
+
+ switch(j){
case 0:
- d->density=0;
- d->enable_cdda=Dummy;
- es="none ";
- if(!densitypossible)i=5; /* short circuit MMC style commands */
+ d->read_audio=scsi_read_28;
+ rs="28 0x,00";
break;
case 1:
- d->density=0;
- d->enable_cdda=scsi_enable_cdda;
- es="yes/0x00";
+ d->read_audio=scsi_read_A8;
+ rs="a8 0x,00";
break;
+
+ /* 2 through 10 do not allow/require density */
case 2:
- d->density=0x04;
- d->enable_cdda=scsi_enable_cdda;
- es="yes/0x04";
- break;
+ d->read_audio=scsi_read_mmcB;
+ rs="be 02,10";
+ if(i==0)break;
case 3:
- d->density=0x82;
- d->enable_cdda=scsi_enable_cdda;
- es="yes/0x82";
- break;
+ j=3;
+ d->read_audio=scsi_read_mmc2B;
+ rs="be 02,f8";
+ if(i==0)break;
case 4:
- d->density=0x81;
- d->enable_cdda=scsi_enable_cdda;
- es="yes/0x81";
+ j=4;
+ d->read_audio=scsi_read_mmc3B;
+ rs="be 06,f8";
+ if(i==0)break;
+ case 5:
+ j=5;
+ d->read_audio=scsi_read_mmc;
+ rs="be 00,10";
+ if(i==0)break;
+ case 6:
+ j=6;
+ d->read_audio=scsi_read_mmc2;
+ rs="be 00,f8";
+ if(i==0)break;
+ case 7:
+ j=7;
+ d->read_audio=scsi_read_mmc3;
+ rs="be 04,f8";
+ if(i==0)break;
+ case 8:
+ j=8;
+ d->read_audio=scsi_read_msf;
+ rs="b9 00,10";
+ if(i==0)break;
+ case 9:
+ j=9;
+ d->read_audio=scsi_read_msf2;
+ rs="b9 00,f8";
+ if(i==0)break;
+ case 10:
+ j=10;
+ d->read_audio=scsi_read_msf3;
+ rs="b9 04,f8";
+ if(i==0)break;
+
+ case 11:
+ d->read_audio=scsi_read_D4_10;
+ rs="d4(10)0x";
break;
+ case 12:
+ d->read_audio=scsi_read_D4_12;
+ rs="d4(12)0x";
+ break;
+ case 13:
+ d->read_audio=scsi_read_D5;
+ rs="d5 0x,00";
+ break;
+ case 14:
+ d->read_audio=scsi_read_D8;
+ rs="d8 0x,00";
+ break;
}
-
+
cdmessage(d,"\ttest -> density: [");
cdmessage(d,es);
cdmessage(d,"] command: [");
@@ -1525,21 +1521,21 @@
if(zeroflag){
char buffer[256];
sprintf(buffer,"\t\tDrive returned %d packet(s), but contents\n"
- "\t\twere entirely zero\n",zeroflag);
+ "\t\twere entirely zero\n",zeroflag);
cdmessage(d,buffer);
}
}
}
}
-
+
/* D'oh. */
d->density=density;
d->read_audio=readcommand;
d->enable_cdda=enablecommand;
-
+
cdmessage(d,"\tUnable to find any suitable command set from probe;\n"
"\tdrive probably not CDDA capable.\n");
-
+
cderror(d,"006: Could not read any data from drive\n");
}
@@ -1690,33 +1686,20 @@
if(d->is_atapi)d->lun=0; /* it should already be; just to make sure */
if(d->is_mmc){
-
d->read_audio = scsi_read_mmc2B;
d->bigendianp=0;
-
check_exceptions(d,mmc_list);
-
}else{
-
if(d->is_atapi){
/* Not MMC maybe still uses 0xbe */
-
d->read_audio = scsi_read_mmc2B;
d->bigendianp=0;
-
check_exceptions(d,atapi_list);
-
}else{
-
check_exceptions(d,scsi_list);
-
}
}
- if(!d->is_atapi)set_sectorsize(d,2048); /* we really do want the
- sector size at 2048 to begin.*/
- d->enable_cdda(d,0);
-
d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 :
scsi_read_toc;
d->set_speed = scsi_set_speed;
|
