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
|
--- src/cd-drive.c.orig Tue Sep 28 23:37:37 2004
+++ src/cd-drive.c Wed Nov 10 22:37:44 2004
@@ -578,7 +578,49 @@
#if defined(__linux__) || defined(__FreeBSD__)
+#if !defined(__linux__)
+static int
+get_device_max_read_speed (char *device)
+{
+ int fd;
+ int max_speed;
+ int read_speed, write_speed;
+
+ max_speed = -1;
+
+ fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
+ if (fd < 0) {
+ return -1;
+ }
+
+ get_read_write_speed (fd, &read_speed, &write_speed);
+ close (fd);
+ max_speed = (int)floor (read_speed) / CD_ROM_SPEED;
+
+ return max_speed;
+}
+#endif
+static int
+get_device_max_write_speed (char *device)
+{
+ int fd;
+ int max_speed;
+ int read_speed, write_speed;
+
+ max_speed = -1;
+
+ fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
+ if (fd < 0) {
+ return -1;
+ }
+
+ get_read_write_speed (fd, &read_speed, &write_speed);
+ close (fd);
+ max_speed = (int)floor (write_speed) / CD_ROM_SPEED;
+
+ return max_speed;
+}
#endif /* __linux__ || __FreeBSD__ */
@@ -782,49 +824,6 @@
return NULL;
}
-#if !defined(__linux)
-static int
-get_device_max_read_speed (char *device)
-{
- int fd;
- int max_speed;
- int read_speed, write_speed;
-
- max_speed = -1;
-
- fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
- if (fd < 0) {
- return -1;
- }
-
- get_read_write_speed (fd, &read_speed, &write_speed);
- close (fd);
- max_speed = (int)floor (read_speed) / CD_ROM_SPEED;
-
- return max_speed;
-}
-#endif
-
-static int
-get_device_max_write_speed (char *device)
-{
- int fd;
- int max_speed;
- int read_speed, write_speed;
-
- max_speed = -1;
-
- fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
- if (fd < 0) {
- return -1;
- }
-
- get_read_write_speed (fd, &read_speed, &write_speed);
- close (fd);
- max_speed = (int)floor (write_speed) / CD_ROM_SPEED;
-
- return max_speed;
-}
static char *
get_scsi_cd_name (int bus, int id, int lun, const char *dev,
|
