changeset 13866:040f4b0699ee

3301 lapsus calami multum Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Robert Mustacchi <rm@joyent.com>
author Joshua M. Clulow <josh@sysmgr.org>
date Thu, 25 Oct 2012 10:16:36 -0700
parents 6fa12cf47ebb
children 5190033d0d57
files usr/src/man/man9f/inb.9f usr/src/man/man9f/ldi_ev_register_callbacks.9f usr/src/man/man9f/ldi_ev_remove_callbacks.9f usr/src/man/man9f/outb.9f usr/src/uts/common/fs/zfs/vdev_disk.c usr/src/uts/common/os/sunmdi.c
diffstat 6 files changed, 27 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/man/man9f/inb.9f	Thu Oct 18 12:22:08 2012 -0500
+++ b/usr/src/man/man9f/inb.9f	Thu Oct 25 10:16:36 2012 -0700
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH INB 9F "Jan 16, 2006"
+.TH INB 9F "Oct 24, 2012"
 .SH NAME
 inb, inw, inl, repinsb, repinsw, repinsd \- read from an I/O port
 .SH SYNOPSIS
@@ -49,9 +49,9 @@
 .LP
 The functions described here are obsolete. For the \fBinb()\fR, \fBinw()\fR,
 and \fBinl()\fR functions, use, respectively, \fBddi_get8\fR(9F),
-\fBddi_get8\fR(9F), and \fBddi_get8\fR(9F) instead. For \fBrepinsb()\fR,
+\fBddi_get16\fR(9F), and \fBddi_get32\fR(9F) instead. For \fBrepinsb()\fR,
 \fBrepinsw()\fR, and\fBrepinsl()\fR, use, respectively, \fBddi_rep_get8\fR(9F),
-\fBddi_rep_get8\fR(9F), and \fBddi_rep_get8\fR(9F) instead.
+\fBddi_rep_get16\fR(9F), and \fBddi_rep_get32\fR(9F) instead.
 .SH PARAMETERS
 .sp
 .ne 2
@@ -126,9 +126,9 @@
 .SH SEE ALSO
 .sp
 .LP
-\fBisa\fR(4), \fBattributes\fR(5), \fBddi_get8\fR(9F), \fBddi_get8\fR(9F),
-\fBddi_get8\fR(9F), \fBddi_rep_get8\fR(9F), \fBddi_rep_get8\fR(9F),
-\fBddi_rep_get8\fR(9F), \fBoutb\fR(9F)
+\fBisa\fR(4), \fBattributes\fR(5), \fBddi_get8\fR(9F), \fBddi_get16\fR(9F),
+\fBddi_get32\fR(9F), \fBddi_rep_get8\fR(9F), \fBddi_rep_get16\fR(9F),
+\fBddi_rep_get32\fR(9F), \fBoutb\fR(9F)
 .sp
 .LP
 \fIWriting Device Drivers\fR
--- a/usr/src/man/man9f/ldi_ev_register_callbacks.9f	Thu Oct 18 12:22:08 2012 -0500
+++ b/usr/src/man/man9f/ldi_ev_register_callbacks.9f	Thu Oct 25 10:16:36 2012 -0700
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LDI_EV_REGISTER_CALLBACKS 9F "Aug 21, 2007"
+.TH LDI_EV_REGISTER_CALLBACKS 9F "Oct 24, 2012"
 .SH NAME
 ldi_ev_register_callbacks \- add a notify and/or finalize callback
 .SH SYNOPSIS
@@ -11,8 +11,9 @@
 .nf
 #include <sys/sunldi.h>
 
-\fBint\fR \fBldi_ev_get_cookie\fR(\fIldi_handle_t lh\fR, \fIldi_ev_cookie_t *cookie\fR,
-      \fIldi_ev_callback_t *callb\fR, \fBvoid\fR \fI*arg\fR, \fIldi_ev_callback_id_t *id\fR);
+\fBint\fR \fBldi_ev_register_callbacks\fR(\fIldi_handle_t lh\fR,
+      \fIldi_ev_cookie_t *cookie\fR, \fIldi_ev_callback_t *callb\fR,
+      \fBvoid\fR \fI*arg\fR, \fIldi_callback_id_t *id\fR);
 .fi
 
 .SH INTERFACE LEVEL
@@ -106,7 +107,7 @@
 .sp
 .ne 2
 .na
-\fB\fBvoid *arg\fR\fR
+\fB\fBvoid\fR *\fIarg\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -116,7 +117,7 @@
 .sp
 .ne 2
 .na
-\fB\fBldi_ev_callback_id_t *id\fR\fR
+\fB\fIldi_callback_id_t *id\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -322,7 +323,7 @@
 .sp
 .LP
 Once the registration of the callback(s) is successful, an opaque
-\fIldi_ev_callback_id_t\fR structure is returned which may be used to
+\fIldi_callback_id_t\fR structure is returned which may be used to
 unregister the callback(s) later.
 .SH RETURN VALUES
 .sp
@@ -385,7 +386,7 @@
 }
 
 static void
-event_unregister(ldi_ev_callback_id_t id)
+event_unregister(ldi_callback_id_t id)
 {
         ldi_ev_remove_callbacks(id);
 }
@@ -495,7 +496,7 @@
 }
 
 static void
-event_unregister(ldi_ev_callback_id_t id)
+event_unregister(ldi_callback_id_t id)
 {
         ldi_ev_remove_callbacks(id);
 }
--- a/usr/src/man/man9f/ldi_ev_remove_callbacks.9f	Thu Oct 18 12:22:08 2012 -0500
+++ b/usr/src/man/man9f/ldi_ev_remove_callbacks.9f	Thu Oct 25 10:16:36 2012 -0700
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LDI_EV_REMOVE_CALLBACKS 9F "Aug 21, 2007"
+.TH LDI_EV_REMOVE_CALLBACKS 9F "Oct 24, 2012"
 .SH NAME
 ldi_ev_remove_callbacks \- remove all callbacks for a given callback ID
 .SH SYNOPSIS
@@ -11,7 +11,7 @@
 .nf
 #include <sys/sunldi.h>
 
-\fBvoid\fR \fBldi_ev_remove_callbacks\fR(\fIldi_ev_callback_id_t id\fR);
+\fBvoid\fR \fBldi_ev_remove_callbacks\fR(\fIldi_callback_id_t id\fR);
 .fi
 
 .SH INTERFACE LEVEL
@@ -22,7 +22,7 @@
 .sp
 .ne 2
 .na
-\fB\fIldi_ev_callback_id_t id\fR\fR
+\fB\fIldi_callback_id_t id\fR\fR
 .ad
 .sp .6
 .RS 4n
--- a/usr/src/man/man9f/outb.9f	Thu Oct 18 12:22:08 2012 -0500
+++ b/usr/src/man/man9f/outb.9f	Thu Oct 25 10:16:36 2012 -0700
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH OUTB 9F "Jan 16, 2006"
+.TH OUTB 9F "Oct 24, 2012"
 .SH NAME
 outb, outw, outl, repoutsb, repoutsw, repoutsd \- write to an I/O port
 .SH SYNOPSIS
@@ -45,9 +45,9 @@
 .LP
 The functions described here are obsolete. For the \fBoutb()\fR, \fBoutw()\fR,
 and \fBoutl()\fR functions use, respectively, \fBddi_put8\fR(9F),
-\fBddi_put8\fR(9F), and \fBddi_put8\fR(9F) instead. For \fBrepoutsb()\fR,
+\fBddi_put16\fR(9F), and \fBddi_put32\fR(9F) instead. For \fBrepoutsb()\fR,
 \fBrepoutsw()\fR, and\fBrepoutsl()\fR, use, respectively,
-\fBddi_rep_put8\fR(9F), \fBddi_rep_put8\fR(9F), and \fBddi_rep_put8\fR(9F)
+\fBddi_rep_put8\fR(9F), \fBddi_rep_put16\fR(9F), and \fBddi_rep_put32\fR(9F)
 instead.
 .SH PARAMETERS
 .sp
@@ -127,9 +127,9 @@
 .SH SEE ALSO
 .sp
 .LP
-\fBisa\fR(4), \fBattributes\fR(5), \fBddi_put8\fR(9F), \fBddi_put8\fR(9F),
-\fBddi_put8\fR(9F), \fBddi_rep_put8\fR(9F), \fBddi_rep_put8\fR(9F),
-\fBddi_rep_put8\fR(9F), \fBinb\fR(9F)
+\fBisa\fR(4), \fBattributes\fR(5), \fBddi_put8\fR(9F), \fBddi_put16\fR(9F),
+\fBddi_put32\fR(9F), \fBddi_rep_put8\fR(9F), \fBddi_rep_put16\fR(9F),
+\fBddi_rep_put32\fR(9F), \fBinb\fR(9F)
 .sp
 .LP
 \fIWriting Device Drivers\fR
--- a/usr/src/uts/common/fs/zfs/vdev_disk.c	Thu Oct 18 12:22:08 2012 -0500
+++ b/usr/src/uts/common/fs/zfs/vdev_disk.c	Thu Oct 25 10:16:36 2012 -0700
@@ -168,7 +168,7 @@
 	/*
 	 * When opening a disk device, we want to preserve the user's original
 	 * intent.  We always want to open the device by the path the user gave
-	 * us, even if it is one of multiple paths to the save device.  But we
+	 * us, even if it is one of multiple paths to the same device.  But we
 	 * also want to be able to survive disks being removed/recabled.
 	 * Therefore the sequence of opening devices is:
 	 *
--- a/usr/src/uts/common/os/sunmdi.c	Thu Oct 18 12:22:08 2012 -0500
+++ b/usr/src/uts/common/os/sunmdi.c	Thu Oct 25 10:16:36 2012 -0700
@@ -23,8 +23,8 @@
  */
 
 /*
- * Multipath driver interface (MDI) implementation; see mdi_impl.h for a more
- * detailed discussion of the overall mpxio architecture.
+ * Multipath driver interface (MDI) implementation; see mdi_impldefs.h for a
+ * more detailed discussion of the overall mpxio architecture.
  *
  * Default locking order:
  *