Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
c26b7dba
Commit
c26b7dba
authored
May 19, 2003
by
Yorick Hardy
Committed by
Alexandre Julliard
May 19, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added the implementation for CDROM_GetIdeInterface on NetBSD.
parent
d21e32a0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
1 deletion
+27
-1
configure
configure
+2
-0
configure.ac
configure.ac
+1
-0
cdrom.c
dlls/ntdll/cdrom.c
+21
-1
config.h.in
include/config.h.in
+3
-0
No files found.
configure
View file @
c26b7dba
...
...
@@ -13238,6 +13238,7 @@ done
for
ac_header
in
\
arpa/inet.h
\
arpa/nameser.h
\
...
...
@@ -13289,6 +13290,7 @@ for ac_header in \
sys/poll.h
\
sys/ptrace.h
\
sys/reg.h
\
sys/scsiio.h
\
sys/shm.h
\
sys/signal.h
\
sys/socket.h
\
...
...
configure.ac
View file @
c26b7dba
...
...
@@ -1007,6 +1007,7 @@ AC_CHECK_HEADERS(\
sys/poll.h \
sys/ptrace.h \
sys/reg.h \
sys/scsiio.h \
sys/shm.h \
sys/signal.h \
sys/socket.h \
...
...
dlls/ntdll/cdrom.c
View file @
c26b7dba
...
...
@@ -60,6 +60,9 @@
#ifdef HAVE_SYS_CDIO_H
# include <sys/cdio.h>
#endif
#ifdef HAVE_SYS_SCSIIO_H
# include <sys/scsiio.h>
#endif
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
...
...
@@ -379,7 +382,24 @@ static int CDROM_GetIdeInterface(int fd, int* iface, int* device)
*
device
=
(
minor
(
st
.
st_rdev
)
==
63
?
1
:
0
);
return
1
;
}
#elif defined(__FreeBSD__) || defined(__NetBSD__)
#elif defined(__NetBSD__)
{
struct
scsi_addr
addr
;
if
(
ioctl
(
fd
,
SCIOCIDENTIFY
,
&
addr
)
!=
-
1
)
{
switch
(
addr
.
type
)
{
/* for SCSI copy linux case, i.e. start at *iface = 11 */
case
TYPE_SCSI
:
*
iface
=
11
+
addr
.
addr
.
scsi
.
scbus
;
*
device
=
addr
.
addr
.
scsi
.
target
;
break
;
case
TYPE_ATAPI
:
*
iface
=
addr
.
addr
.
atapi
.
atbus
;
*
device
=
addr
.
addr
.
atapi
.
drive
;
break
;
}
return
1
;
}
return
0
;
}
#elif defined(__FreeBSD__)
FIXME
(
"not implemented for BSD
\n
"
);
return
0
;
#else
...
...
include/config.h.in
View file @
c26b7dba
...
...
@@ -560,6 +560,9 @@
/* Define to 1 if you have the <sys/reg.h> header file. */
#undef HAVE_SYS_REG_H
/* Define to 1 if you have the <sys/scsiio.h> header file. */
#undef HAVE_SYS_SCSIIO_H
/* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment