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
|
$NetBSD: patch-af,v 1.2 2001/04/17 16:03:19 skrll Exp $
--- kscd/libwm/plat_freebsd.c.orig Sun Feb 18 15:30:03 2001
+++ kscd/libwm/plat_freebsd.c
@@ -34,3 +34,3 @@
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD)
+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__)
@@ -52,3 +52,3 @@
-#if defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__OpenBSD__)
# define MSF_MINUTES 1
@@ -59,2 +59,5 @@
# include "/sys/scsi/scsi_cd.h"
+#elif defined(__NetBSD__)
+#include <sys/scsiio.h>
+#include <dev/scsipi/scsipi_cd.h>
#else
@@ -232,7 +235,2 @@
dopos:
-#ifdef __NetBSD__
- *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 +
- scd.what.position.absaddr[MSF_SECONDS] * 75 +
- scd.what.position.absaddr[MSF_FRAMES];
-#else
*pos = scd.what.position.absaddr.msf.minute * 60 * 75 +
@@ -240,3 +238,2 @@
scd.what.position.absaddr.msf.frame;
-#endif
*track = scd.what.position.track_number;
@@ -307,7 +304,2 @@
-#ifdef __NetBSD__
- *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 +
- toc_buffer.addr[MSF_SECONDS] * 75 +
- toc_buffer.addr[MSF_FRAMES];
-#else
*startframe = toc_buffer.addr.msf.minute*60*75 +
@@ -315,3 +307,2 @@
toc_buffer.addr.msf.frame;
-#endif
|
