Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put the 2 extra ioctls I added recently inside '#ifdef _KERNEL' and adjust

Browse Source 
comments.
This commit is contained in:
dsl 2007-07-10 17:16:49 +00:00
parent ff92ad95e2
commit b2278f08fe
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/sys/cdio.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cdio.h,v 1.27 2007/06/30 22:16:39 dsl Exp $ */ /* $NetBSD: cdio.h,v 1.28 2007/07/10 17:16:49 dsl Exp $ */
#ifndef _SYS_CDIO_H_ #ifndef _SYS_CDIO_H_
#define _SYS_CDIO_H_ #define _SYS_CDIO_H_
@ -167,12 +167,14 @@ struct ioc_read_subchannel {
}; };
#define CDIOCREADSUBCHANNEL _IOWR('c', 3, struct ioc_read_subchannel ) #define CDIOCREADSUBCHANNEL _IOWR('c', 3, struct ioc_read_subchannel )
/* And the same, but with the buffer following the request */ #ifdef _KERNEL
/* As above, but with the buffer following the request for in-kernel users. */
struct ioc_read_subchannel_buf { struct ioc_read_subchannel_buf {
struct ioc_read_subchannel req; struct ioc_read_subchannel req;
struct cd_sub_channel_info info; struct cd_sub_channel_info info;
}; };
#define CDIOCREADSUBCHANNEL_BUF _IOWR('c', 3, struct ioc_read_subchannel_buf) #define CDIOCREADSUBCHANNEL_BUF _IOWR('c', 3, struct ioc_read_subchannel_buf)
#endif
struct ioc_toc_header { struct ioc_toc_header {
u_short len; u_short len;
@ -191,12 +193,14 @@ struct ioc_read_toc_entry {
#define CDIOREADTOCENTRIES _IOWR('c', 5, struct ioc_read_toc_entry) #define CDIOREADTOCENTRIES _IOWR('c', 5, struct ioc_read_toc_entry)
#define CDIOREADTOCENTRYS CDIOREADTOCENTRIES #define CDIOREADTOCENTRYS CDIOREADTOCENTRIES
/* And the same, but with the buffer following the request */ #ifdef _KERNEL
/* As above, but with the buffer following the request for in-kernel users. */
struct ioc_read_toc_entry_buf { struct ioc_read_toc_entry_buf {
struct ioc_read_toc_entry req; struct ioc_read_toc_entry req;
struct cd_toc_entry entry[100]; /* NB: 8 bytes each */ struct cd_toc_entry entry[100]; /* NB: 8 bytes each */
}; };
#define CDIOREADTOCENTRIES_BUF _IOWR('c', 5, struct ioc_read_toc_entry_buf) #define CDIOREADTOCENTRIES_BUF _IOWR('c', 5, struct ioc_read_toc_entry_buf)
#endif
/* read LBA start of a given session; 0=last, others not yet supported */ /* read LBA start of a given session; 0=last, others not yet supported */
#define CDIOREADMSADDR _IOWR('c', 6, int) #define CDIOREADMSADDR _IOWR('c', 6, int)