X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..6d2010ae8f7a6078e10b361c6962983bab233e0f:/bsd/sys/conf.h

diff --git a/bsd/sys/conf.h b/bsd/sys/conf.h
index 319dd704e..39e4fef37 100644
--- a/bsd/sys/conf.h
+++ b/bsd/sys/conf.h
@@ -71,6 +71,8 @@
 
 #include <sys/appleapiopts.h>
 #include <sys/cdefs.h>
+#include <sys/queue.h>
+#include <stdint.h>
 
 /*
  * Definitions of device driver entry switches
@@ -109,9 +111,6 @@ typedef	int  stop_fcn_t(struct tty *tp, int rw);
 typedef	int  reset_fcn_t(int uban);
 typedef	int  select_fcn_t(dev_t dev, int which, void * wql, struct proc *p);
 typedef	int  mmap_fcn_t(void);
-typedef	int  getc_fcn_t(dev_t dev);
-typedef	int  putc_fcn_t(dev_t dev, char c);
-typedef int  d_poll_t(dev_t dev, int events, struct proc *p);
 
 #define	d_open_t	open_close_fcn_t
 #define	d_close_t	open_close_fcn_t
@@ -123,8 +122,6 @@ typedef int  d_poll_t(dev_t dev, int events, struct proc *p);
 #define	d_select_t	select_fcn_t
 #define	d_mmap_t	mmap_fcn_t
 #define	d_strategy_t	strategy_fcn_t
-#define	d_getc_t	getc_fcn_t
-#define	d_putc_t	putc_fcn_t
 
 __BEGIN_DECLS
 int		enodev(void);		
@@ -144,10 +141,11 @@ __END_DECLS
 #define eno_stop		((stop_fcn_t *)&enodev)
 #define eno_reset		((reset_fcn_t *)&enodev)
 #define eno_mmap		((mmap_fcn_t *)&enodev)
-#define eno_getc		((getc_fcn_t *)&enodev)
-#define eno_putc		((putc_fcn_t *)&enodev)
 #define eno_select		((select_fcn_t *)&enodev)
 
+/* For source backward compatibility only! */
+#define eno_getc		((void *)&enodev)
+#define eno_putc		((void *)&enodev)
 
 /*
  * Block device switch table
@@ -186,22 +184,36 @@ struct cdevsw {
 	open_close_fcn_t	*d_close;
 	read_write_fcn_t	*d_read;
 	read_write_fcn_t	*d_write;
-	ioctl_fcn_t			*d_ioctl;
-	stop_fcn_t			*d_stop;
-	reset_fcn_t			*d_reset;
+	ioctl_fcn_t		*d_ioctl;
+	stop_fcn_t		*d_stop;
+	reset_fcn_t		*d_reset;
 	struct	tty 		**d_ttys;
 	select_fcn_t		*d_select;
-	mmap_fcn_t			*d_mmap;
+	mmap_fcn_t		*d_mmap;
 	strategy_fcn_t		*d_strategy;
-	getc_fcn_t			*d_getc;
-	putc_fcn_t			*d_putc;
-	int					d_type;
+	void			*d_reserved_1;
+	void			*d_reserved_2;
+	int			d_type;
 };
 
+#ifdef BSD_KERNEL_PRIVATE
+void devsw_init(void);
+
+extern uint64_t cdevsw_flags[];
+#define CDEVSW_SELECT_KQUEUE	0x01
+#define CDEVSW_USE_OFFSET	0x02
+
+struct thread;
+
+typedef struct devsw_lock {
+	TAILQ_ENTRY(devsw_lock) 	dl_list;
+	struct thread			*dl_thread;
+	dev_t				dl_dev;
+	int 				dl_mode;
+} *devsw_lock_t;
+
+#endif /* BSD_KERNEL_PRIVATE */
 
-#ifdef KERNEL_PRIVATE
-extern struct cdevsw cdevsw[];
-#endif /* KERNEL_PRIVATE */
 
 /*
  * Contents of empty cdevsw slot.
@@ -280,6 +292,16 @@ extern struct swdevt swdevt[];
  *  else -1
  */
 __BEGIN_DECLS
+#ifdef KERNEL_PRIVATE
+extern struct cdevsw cdevsw[];
+extern int cdevsw_setkqueueok(int, struct cdevsw*, int);
+#endif /* KERNEL_PRIVATE */
+
+#ifdef BSD_KERNEL_PRIVATE
+extern void devsw_lock(dev_t, int);
+extern void devsw_unlock(dev_t, int);
+#endif /* BSD_KERNEL_PRIVATE */
+
 int  bdevsw_isfree(int);
 int  bdevsw_add(int, struct bdevsw *);
 int  bdevsw_remove(int, struct bdevsw *);
@@ -287,6 +309,7 @@ int  cdevsw_isfree(int);
 int  cdevsw_add(int, struct cdevsw *);
 int  cdevsw_add_with_bdev(int index, struct cdevsw * csw, int bdev);
 int  cdevsw_remove(int, struct cdevsw *);
+int  isdisk(dev_t, int);
 __END_DECLS
 #endif /* KERNEL */