device_is_alive already was documented in device_get_state, so remove the

separate man page.  Document new device_is_attached there and remove that
new man page too.

Connect device_get_name to build, and install a link for
device_get_nameunit.

strangely nobody noticed this yet...

4 files changed, 12 insertions, 102 deletions

diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index ed10747..e3f8966 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -35,8 +35,9 @@ MAN=	BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \
 	device.9 device_add_child.9 device_delete_child.9 \
 	device_enable.9 device_find_child.9 device_get_children.9 \
 	device_get_devclass.9 device_get_driver.9 device_get_ivars.9 \
+	device_get_name.9 \
 	device_get_softc.9 device_get_state.9 device_get_unit.9 \
-	device_ids.9 device_is_alive.9 device_is_attached.9 \
+	device_ids.9 \
 	device_probe_and_attach.9 device_quiet.9 device_set_desc.9 \
 	device_set_flags.9 devstat.9 devsw.9 devtoname.9 driver.9 \
 	domain.9 \
@@ -258,9 +259,11 @@ MLINKS+=zero_copy.9 zero_copy_sockets.9
 MLINKS+=device_add_child.9 device_add_child_ordered.9
 MLINKS+=device_enable.9 device_disable.9
 MLINKS+=device_enable.9 device_is_enabled.9
+MLINKS+=device_get_name.9 device_get_nameunit.9
 MLINKS+=device_get_state.9 device_busy.9
 MLINKS+=device_get_state.9 device_unbusy.9
 MLINKS+=device_get_state.9 device_is_alive.9
+MLINKS+=device_get_state.9 device_is_attached.9
 MLINKS+=device_quiet.9 device_verbose.9
 MLINKS+=device_quiet.9 device_is_quiet.9
 MLINKS+=device_set_desc.9 device_get_desc.9
diff --git a/share/man/man9/device_get_state.9 b/share/man/man9/device_get_state.9
index 20695bd..d5800c9 100644
--- a/share/man/man9/device_get_state.9
+++ b/share/man/man9/device_get_state.9
@@ -35,7 +35,8 @@
 .Nm device_get_state ,
 .Nm device_busy ,
 .Nm device_unbusy ,
-.Nm device_is_alive
+.Nm device_is_alive ,
+.Nm device_is_attached
 .Nd manipulate device state
 .Sh SYNOPSIS
 .In sys/param.h
@@ -48,6 +49,8 @@
 .Fn device_unbusy "device_t dev"
 .Ft int
 .Fn device_is_alive "device_t dev"
+.Ft int
+.Fn device_is_attached "device_t dev"
 .Sh DESCRIPTION
 The current state of a device is accessed by calling
 .Fn device_get_state
@@ -63,6 +66,10 @@ To test see if a device was successfully probed, call
 .Fn device_is_alive
 which simply returns if the state is greater or equal to
 .Dv DS_ALIVE .
+To test see if a device was successfully attached, call
+.Fn device_is_attached
+which simply returns if the state is greater or equal to
+.Dv DS_ATTACHED .
 .Pp
 Each device has a busy count which is incremented when
 .Fn device_busy
diff --git a/share/man/man9/device_is_alive.9 b/share/man/man9/device_is_alive.9
deleted file mode 100644
index 0025ed2..0000000
--- a/share/man/man9/device_is_alive.9
+++ /dev/null
@@ -1,50 +0,0 @@
-.\" -*- nroff -*-
-.\"
-.\" Copyright (c) 2003 M. Waner Losh
-.\"
-.\" All rights reserved.
-.\"
-.\" This program is free software.
-.\"
-.\" 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. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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$
-.\"
-.Dd April 21, 2003
-.Dt DEVICE_IS_ALIVE 9
-.Os
-.Sh NAME
-.Nm device_is_alive
-.Nd has the device successfully probed?
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/bus.h
-.Ft void *
-.Fn device_is_alive "device_t dev"
-.Sh DESCRIPTION
-Returns true if the device has successfully probed (but maybe not attached).
-Otherwise returns false.
-.Sh SEE ALSO
-.Xr device 9
-.Xr device_is_attached 9
-.Sh AUTHORS
-This man page was written by
-.An Warner Losh .
diff --git a/share/man/man9/device_is_attached.9 b/share/man/man9/device_is_attached.9
deleted file mode 100644
index 01674e2..0000000
--- a/share/man/man9/device_is_attached.9
+++ /dev/null
@@ -1,50 +0,0 @@
-.\" -*- nroff -*-
-.\"
-.\" Copyright (c) 2003 M. Waner Losh
-.\"
-.\" All rights reserved.
-.\"
-.\" This program is free software.
-.\"
-.\" 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. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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$
-.\"
-.Dd April 21, 2003
-.Dt DEVICE_IS_ATTACHED 9
-.Os
-.Sh NAME
-.Nm device_is_attached
-.Nd has the device successfully attached?
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/bus.h
-.Ft void *
-.Fn device_is_attached "device_t dev"
-.Sh DESCRIPTION
-Returns true if the device has successfully attached.
-Otherwise returns false.
-.Sh SEE ALSO
-.Xr device 9
-.Xr device_is_alive 9
-.Sh AUTHORS
-This man page was written by
-.An Warner Losh .