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
|
$NetBSD: patch-an,v 1.6 2006/07/24 20:42:07 drochner Exp $
--- src/input/input_cdda.c.orig 2005-10-08 15:57:42.000000000 +0200
+++ src/input/input_cdda.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <sys/types.h>
-#ifdef SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#ifdef HAVE_DIRENT_H
@@ -613,14 +613,20 @@ static int read_cdrom_frames(cdda_input_
return 0;
}
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/cdio.h>
+#include <sys/scsiio.h>
static int read_cdrom_toc(int fd, cdrom_toc *toc) {
struct ioc_toc_header tochdr;
+#if defined(__FreeBSD__)
struct ioc_read_toc_single_entry tocentry;
+#elif defined(__NetBSD__)
+ struct ioc_read_toc_entry tocentry;
+ struct cd_toc_entry data;
+#endif
int i;
/* fetch the table of contents */
@@ -646,13 +652,26 @@ static int read_cdrom_toc(int fd, cdrom_
memset(&tocentry, 0, sizeof(tocentry));
+#if defined(__FreeBSD__)
tocentry.track = i;
tocentry.address_format = CD_MSF_FORMAT;
if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) {
perror("CDIOREADTOCENTRY");
return -1;
}
+#elif defined(__NetBSD__)
+ memset(&data, 0, sizeof(data));
+ tocentry.data_len = sizeof(data);
+ tocentry.data = &data;
+ tocentry.starting_track = i;
+ tocentry.address_format = CD_MSF_FORMAT;
+ if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) {
+ perror("CDIOREADTOCENTRYS");
+ return -1;
+ }
+#endif
+#if defined(__FreeBSD__)
toc->toc_entries[i-1].track_mode = (tocentry.entry.control & 0x04) ? 1 : 0;
toc->toc_entries[i-1].first_frame_minute = tocentry.entry.addr.msf.minute;
toc->toc_entries[i-1].first_frame_second = tocentry.entry.addr.msf.second;
@@ -661,18 +680,41 @@ static int read_cdrom_toc(int fd, cdrom_
(tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
(tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
tocentry.entry.addr.msf.frame;
+#elif defined(__NetBSD__)
+ toc->toc_entries[i-1].track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
+ toc->toc_entries[i-1].first_frame_minute = tocentry.data->addr.msf.minute;
+ toc->toc_entries[i-1].first_frame_second = tocentry.data->addr.msf.second;
+ toc->toc_entries[i-1].first_frame_frame = tocentry.data->addr.msf.frame;
+ toc->toc_entries[i-1].first_frame =
+ (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
+ (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) +
+ tocentry.data->addr.msf.frame;
+#endif
}
/* fetch the leadout as well */
memset(&tocentry, 0, sizeof(tocentry));
+#if defined(__FreeBSD__)
tocentry.track = CD_LEADOUT_TRACK;
tocentry.address_format = CD_MSF_FORMAT;
if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) {
perror("CDIOREADTOCENTRY");
return -1;
}
+#elif defined(__NetBSD__)
+ memset(&data, 0, sizeof(data));
+ tocentry.data_len = sizeof(data);
+ tocentry.data = &data;
+ tocentry.starting_track = CD_LEADOUT_TRACK;
+ tocentry.address_format = CD_MSF_FORMAT;
+ if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) {
+ perror("CDIOREADTOCENTRYS");
+ return -1;
+ }
+#endif
+#if defined(__FreeBSD__)
toc->leadout_track.track_mode = (tocentry.entry.control & 0x04) ? 1 : 0;
toc->leadout_track.first_frame_minute = tocentry.entry.addr.msf.minute;
toc->leadout_track.first_frame_second = tocentry.entry.addr.msf.second;
@@ -681,6 +723,16 @@ static int read_cdrom_toc(int fd, cdrom_
(tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
(tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
tocentry.entry.addr.msf.frame;
+#elif defined(__NetBSD__)
+ toc->leadout_track.track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
+ toc->leadout_track.first_frame_minute = tocentry.data->addr.msf.minute;
+ toc->leadout_track.first_frame_second = tocentry.data->addr.msf.second;
+ toc->leadout_track.first_frame_frame = tocentry.data->addr.msf.frame;
+ toc->leadout_track.first_frame =
+ (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
+ (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) +
+ tocentry.data->addr.msf.frame;
+#endif
return 0;
}
@@ -689,12 +741,12 @@ static int read_cdrom_frames(cdda_input_
unsigned char *data) {
int fd = this_gen->fd;
-#if __FreeBSD_version < 501106
- struct ioc_read_audio cdda;
-#endif
while( num_frames ) {
+#if defined(__FreeBSD__)
#if __FreeBSD_version < 501106
+ struct ioc_read_audio cdda;
+
cdda.address_format = CD_MSF_FORMAT;
cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND;
cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE;
@@ -712,6 +764,33 @@ static int read_cdrom_frames(cdda_input_
perror("CDIOCREADAUDIO");
return -1;
}
+#elif defined(__NetBSD__)
+ scsireq_t req;
+ int nblocks = 1;
+
+ memset(&req, 0, sizeof(req));
+ req.cmd[0] = 0xbe;
+ req.cmd[1] = 0;
+ req.cmd[2] = (frame >> 24) & 0xff;
+ req.cmd[3] = (frame >> 16) & 0xff;
+ req.cmd[4] = (frame >> 8) & 0xff;
+ req.cmd[5] = (frame >> 0) & 0xff;
+ req.cmd[6] = (nblocks >> 16) & 0xff;
+ req.cmd[7] = (nblocks >> 8) & 0xff;
+ req.cmd[8] = (nblocks >> 0) & 0xff;
+ req.cmd[9] = 0x78;
+ req.cmdlen = 10;
+
+ req.datalen = nblocks * CD_RAW_FRAME_SIZE;
+ req.databuf = data;
+ req.timeout = 10000;
+ req.flags = SCCMD_READ;
+
+ if(ioctl(fd, SCIOCCOMMAND, &req) < 0) {
+ perror("SCIOCCOMMAND");
+ return -1;
+ }
+#endif
data += CD_RAW_FRAME_SIZE;
frame++;
|
