summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2005-08-16 19:08:01 +0000
committerphk <phk@FreeBSD.org>2005-08-16 19:08:01 +0000
commite89ebd411994ee67633800f6278c77c01947520f (patch)
tree372fa69402f5c148d1ee1fbac42e6a3cdea66a9b
parent372c5a7d070d26ae5777e72e5403b62d9f0da99e (diff)
downloadFreeBSD-src-e89ebd411994ee67633800f6278c77c01947520f.zip
FreeBSD-src-e89ebd411994ee67633800f6278c77c01947520f.tar.gz
Create a new internal .h file to communicate very private stuff
from kern_conf.c to devfs. For now just two prototypes, more to come.
-rw-r--r--sys/fs/devfs/devfs_devs.c1
-rw-r--r--sys/fs/devfs/devfs_int.h45
-rw-r--r--sys/kern/kern_conf.c2
-rw-r--r--sys/sys/conf.h3
4 files changed, 48 insertions, 3 deletions
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index e59f6c0..37d3d90 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -46,6 +46,7 @@
#include <machine/atomic.h>
#include <fs/devfs/devfs.h>
+#include <fs/devfs/devfs_int.h>
static struct cdev *devfs_inot[NDEVFSINO];
static struct cdev **devfs_overflow;
diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h
new file mode 100644
index 0000000..9c4c5f9
--- /dev/null
+++ b/sys/fs/devfs/devfs_int.h
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2005 Poul-Henning Kamp. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * This file documents a private interface and it SHALL only be used
+ * by kern/kern_conf.c and fs/devfs/...
+ */
+
+#ifndef _FS_DEVFS_DEVFS_INT_H_
+#define _FS_DEVFS_DEVFS_INT_H_
+
+#include <sys/queue.h>
+
+#ifdef _KERNEL
+
+void devfs_create(struct cdev *dev);
+void devfs_destroy(struct cdev *dev);
+
+#endif /* _KERNEL */
+
+#endif /* !_FS_DEVFS_DEVFS_INT_H_ */
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 3c4ab29..d6eeb9c 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -45,6 +45,8 @@ __FBSDID("$FreeBSD$");
#include <sys/ucred.h>
#include <machine/stdarg.h>
+#include <fs/devfs/devfs_int.h>
+
static MALLOC_DEFINE(M_DEVT, "cdev", "cdev storage");
/* Built at compile time from sys/conf/majors */
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 2dfa956..f9f13ea 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -265,9 +265,6 @@ int unit2minor(int _unit);
u_int minor2unit(u_int _minor);
void setconf(void);
-void devfs_create(struct cdev *dev);
-void devfs_destroy(struct cdev *dev);
-
#define UID_ROOT 0
#define UID_BIN 3
#define UID_UUCP 66
OpenPOWER on IntegriCloud