9 files changed, 32 insertions, 38 deletions
diff --git a/usr/src/man/man9e/mac.9e b/usr/src/man/man9e/mac.9e
index deab66fe27..52984f9791 100644
--- a/usr/src/man/man9e/mac.9e
+++ b/usr/src/man/man9e/mac.9e
@@ -109,7 +109,7 @@ function fails, then the driver must be removed by a call to
 .Xr mac_fini_ops 9F .
 .Pp
 Conversely, in the driver's
-.Xr _fini 9F
+.Xr _fini 9E
 routine, it should call
 .Xr mac_fini_ops 9F
 after it successfully calls
@@ -193,10 +193,10 @@ A device driver should make no assumptions about when the various
 callbacks will be called and whether or not they will be called
 simultaneously.
 For example, a device driver may be asked to transmit data through a call to its
-.Xr mc_tx 9F
+.Xr mc_tx 9E
 entry point while it is being asked to get a device property through a
 call to its
-.Xr mc_getprop 9F
+.Xr mc_getprop 9E
 entry point.
 As such, while some calls may be serialized to the device, such as setting
 properties, the device driver should always presume that all of its data needs
@@ -255,7 +255,7 @@ First check whether or not the frame has errors.
 If errors were detected, then the frame should not be sent to the operating
 system.
 It is recommended that devices keep kstats (see
-.Xr kstat_create 9S
+.Xr kstat_create 9F
 for more information) and bump the counter whenever such an error is
 detected.
 If the device distinguishes between the types of errors, then separate kstats
@@ -1575,7 +1575,7 @@ so as to allow the driver to report issues that it detects.
 If the driver registers with the fault management framework during its
 .Xr attach 9E
 entry point, it must call
-.Xr ddi_fm_fini 9E
+.Xr ddi_fm_fini 9F
 during its
 .Xr detach 9E
 entry point.
@@ -1589,7 +1589,7 @@ and
 or they use direct memory access (DMA).
 New device drivers should always enable checking of the transport layer by
 marking their support in the
-.Xr ddi_device_acc_attr_t 9S
+.Xr ddi_device_acc_attr 9S
 structure and using routines like
 .Xr ddi_fm_acc_err_get 9F
 and
@@ -1745,7 +1745,7 @@ two different cases: copying and binding.
 The first way that device drivers handle interfacing between the two is
 by having two separate regions of memory.
 One part is memory which has been allocated for DMA through a call to
-.Xr ddi_dma_alloc 9F
+.Xr ddi_dma_mem_alloc 9F
 and the other is memory associated with the memory block.
 .Pp
 In this case, a driver will use
@@ -1858,7 +1858,7 @@ a given platform.
 .Xr allocb 9F ,
 .Xr bcopy 9F ,
 .Xr ddi_dma_addr_bind_handle 9F ,
-.Xr ddi_dma_alloc 9F ,
+.Xr ddi_dma_mem_alloc 9F ,
 .Xr ddi_fm_acc_err_get 9F ,
 .Xr ddi_fm_dma_err_get 9F ,
 .Xr ddi_fm_ereport_post 9F ,
@@ -1888,16 +1888,13 @@ a given platform.
 .Xr mac_register 9F ,
 .Xr mac_rx 9F ,
 .Xr mac_unregister 9F ,
-.Xr mc_getprop 9F ,
-.Xr mc_tx 9F ,
 .Xr mod_install 9F ,
 .Xr mod_remove 9F ,
 .Xr strcmp 9F ,
 .Xr timeout 9F ,
 .Xr cb_ops 9S ,
-.Xr ddi_device_acc_attr_t 9S ,
+.Xr ddi_device_acc_attr 9S ,
 .Xr dev_ops 9S ,
-.Xr kstat_create 9S ,
 .Xr mac_callbacks 9S ,
 .Xr mac_register 9S ,
 .Xr mblk 9S ,
diff --git a/usr/src/man/man9e/mc_getcapab.9e b/usr/src/man/man9e/mc_getcapab.9e
index 8f553ac00d..2c2daf65ff 100644
--- a/usr/src/man/man9e/mc_getcapab.9e
+++ b/usr/src/man/man9e/mc_getcapab.9e
@@ -107,7 +107,7 @@ It is recommended that any capability that is supported have some form of
 tunable, whether in the form of a
 .Sy MAC_PROP_PRIVATE
 driver-specific property and/or a
-.Xr driver.conf 5
+.Xr driver.conf 4
 property to disable it.
 This way when problems are discovered in the field, they can be worked around
 without requiring initial changes to the device driver.
@@ -135,7 +135,7 @@ entry point.
  * the purpose of this example, we assume that we have a device which
  * has members that indicate whether the various capabilities have been
  * enabled and that they are read-only after the driver has had its
- * mc_start(9F) entry point called.
+ * mc_start(9E) entry point called.
  */
 
 #define	EXAMPLE_LSO_MAX		65535
diff --git a/usr/src/man/man9e/srv.9e b/usr/src/man/man9e/srv.9e
index 2df363f0e9..1d124bf219 100644
--- a/usr/src/man/man9e/srv.9e
+++ b/usr/src/man/man9e/srv.9e
@@ -171,5 +171,5 @@ Each stream module must specify a read and a write service \fBsrv()\fR routine.
 If a service routine is not needed (because the \fBput()\fR routine processes
 all messages), a \fBNULL\fR pointer should be placed in module's
 \fBqinit\fR(9S) structure. Do not use \fBnulldev\fR(9F) instead of the
-\fBNULL\fR pointer. Use  of\fBnulldev\fR(9F) for a \fBsrv()\fR routine can
+\fBNULL\fR pointer. Use of \fBnulldev\fR(9F) for a \fBsrv()\fR routine can
 result in flow control errors.
diff --git a/usr/src/man/man9e/tran_init_pkt.9e b/usr/src/man/man9e/tran_init_pkt.9e
index 781422e5b3..0e20c8d489 100644
--- a/usr/src/man/man9e/tran_init_pkt.9e
+++ b/usr/src/man/man9e/tran_init_pkt.9e
@@ -132,7 +132,7 @@ allocate and initialize a \fBscsi_pkt\fR structure on behalf of a \fBSCSI
 .LP
 If \fIbp\fR is non-\fINULL\fR, the \fBHBA \fRdriver must allocate appropriate
 \fBDMA \fRresources for the \fIpkt\fR, for example,
-through\fBddi_dma_buf_setup\fR(9F) or \fBddi_dma_buf_bind_handle\fR(9F).
+through \fBddi_dma_buf_setup\fR(9F) or \fBddi_dma_buf_bind_handle\fR(9F).
 .sp
 .LP
 If the \fBPKT_CONSISTENT\fR bit is set in \fIflags\fR, the buffer was allocated
@@ -229,7 +229,7 @@ on success, or \fINULL\fR on failure.
 .sp
 .LP
 If \fIpkt\fR is \fINULL\fR on entry, and \fBtran_init_pkt()\fR allocated a
-packet through\fBscsi_hba_pkt_alloc\fR(9F) but was unable to allocate \fBDMA
+packet through \fBscsi_hba_pkt_alloc\fR(9F) but was unable to allocate \fBDMA
 \fRresources, \fBtran_init_pkt()\fR must free the packet through
 \fBscsi_hba_pkt_free\fR(9F) before returning \fINULL\fR.
 .SH SEE ALSO
diff --git a/usr/src/man/man9e/usba_hcdi.9e b/usr/src/man/man9e/usba_hcdi.9e
index 28d1fbe207..f1216181e7 100644
--- a/usr/src/man/man9e/usba_hcdi.9e
+++ b/usr/src/man/man9e/usba_hcdi.9e
@@ -186,7 +186,7 @@ For example, open an endpoint, the host controller has to implement
 .Xr usba_hcdi_pipe_open 9E
 and for each transfer type, there is a different transfer function.
 One example is
-.Xr usba_hcdi_bulk_xfer 9E .
+.Xr usba_hcdi_pipe_bulk_xfer 9E .
 See
 .Xr usba_hcdi_ops 9S
 for a full list of the different function endpoints.
@@ -268,7 +268,7 @@ are not packed for this purpose.
 They should not be used as they have gaps added by the compiler for alignment.
 .Pp
 Once assembled, the device driver should call
-.Xr usb_hubdi_bind_root_hub 9F .
+.Xr usba_hubdi_bind_root_hub 9F .
 This will cause an instance of the
 .Xr hubd 7D
 driver to be attached and associated with the root controller.
@@ -276,10 +276,10 @@ As such, driver writers need to ensure that all initialization is done prior to
 loading the root hub.
 Once successfully loaded, driver writers should assume that they'll get other
 calls into the driver's operation vector before the call to
-.Xr usb_hcdi_bind_root_hub 9F.
+.Xr usba_hubdi_bind_root_hub 9F.
 .Pp
 If the call to
-.Xr usb_hcdi_bind_root_hub 9F
+.Xr usba_hubdi_bind_root_hub 9F
 failed for whatever reason, the driver should unregister from USBA (see
 the next section), unwind all of the resources it has allocated, and
 return
@@ -355,7 +355,7 @@ The
 member should be set to the symbol
 .Sy usba_hubdi_busops .
 See
-.Xr usba_hubdi_devops 9F
+.Xr usba_hubdi_dev_ops 9F
 for more information.
 .It Sy devo_power
 The
@@ -363,7 +363,7 @@ The
 member should be set to the symbol
 .Sy usba_hubdi_root_hub_power .
 See
-.Xr usba_hubdi_Devops 9F
+.Xr usba_hubdi_dev_ops 9F
 for more information.
 .El
 .Pp
@@ -832,7 +832,7 @@ The device is running as a super speed device.
 This is a USB 3.0 device.
 .It Vt usb_cr_t
 This is a set of codes that may be returned as a part of the call to
-.Xr usb_hcdi_cb 9F .
+.Xr usba_hcdi_cb 9F .
 The best place for the full set of these is currently in the source
 control headers.
 .El
@@ -859,7 +859,6 @@ file.
 .Xr getinfo 9E ,
 .Xr ioctl 9E ,
 .Xr open 9E ,
-.Xr usba_hcdi_bulk_xfer 9E ,
 .Xr usba_hcdi_cb_close 9E ,
 .Xr usba_hcdi_cb_ioctl 9E ,
 .Xr usba_hcdi_cb_open 9E ,
@@ -875,17 +874,15 @@ file.
 .Xr nochpoll 9F ,
 .Xr nodev 9F ,
 .Xr timeout 9F ,
-.Xr usb_hcdi_bind_root_hub 9F ,
-.Xr usb_hubdi_bind_root_hub 9F ,
 .Xr usba_alloc_hcdi_ops 9F ,
 .Xr usba_hcdi_cb 9F ,
 .Xr usba_hcdi_dup_intr_req 9F ,
 .Xr usba_hcdi_dup_isoc_req 9F ,
 .Xr usba_hcdi_register 9F ,
 .Xr usba_hcdi_unregister 9F ,
+.Xr usba_hubdi_bind_root_hub 9F ,
 .Xr usba_hubdi_close 9F ,
-.Xr usba_hubdi_devops 9F ,
-.Xr usba_hubdi_Devops 9F ,
+.Xr usba_hubdi_dev_ops 9F ,
 .Xr usba_hubdi_ioctl 9F ,
 .Xr usba_hubdi_open 9F ,
 .Xr usba_hubdi_unbind_root_hub 9F ,
diff --git a/usr/src/man/man9e/usba_hcdi_device_init.9e b/usr/src/man/man9e/usba_hcdi_device_init.9e
index 2af06e7cf2..11ed25dccd 100644
--- a/usr/src/man/man9e/usba_hcdi_device_init.9e
+++ b/usr/src/man/man9e/usba_hcdi_device_init.9e
@@ -104,6 +104,6 @@ function should return
 .Sy USB_SUCCESS .
 Otherwise, it should return the appropriate error.
 .Sh SEE ALSO
-.Xr usba_hcd 9E ,
+.Xr usba_hcdi 9E ,
 .Xr usba_hcdi_pipe_close 9E ,
 .Xr usba_hcdi_pipe_open 9E
diff --git a/usr/src/man/man9e/usba_hcdi_pipe_intr_xfer.9e b/usr/src/man/man9e/usba_hcdi_pipe_intr_xfer.9e
index 033437e0fb..086193b298 100644
--- a/usr/src/man/man9e/usba_hcdi_pipe_intr_xfer.9e
+++ b/usr/src/man/man9e/usba_hcdi_pipe_intr_xfer.9e
@@ -178,7 +178,7 @@ conditions:
 .Bl -bullet
 .It
 A pipe reset request came in from the
-.Xr usba_hcdi_pipe_rest 9E
+.Xr usba_hcdi_pipe_reset 9E
 entry point.
 .It
 A request to stop polling came in from the
@@ -263,7 +263,7 @@ If uncertain, use
 .Sh SEE ALSO
 .Xr usba_hcdi 9E ,
 .Xr usba_hcdi_pipe_close 9E ,
-.Xr usba_hcdi_pipe_rest 9E ,
+.Xr usba_hcdi_pipe_reset 9E ,
 .Xr usba_hcdi_pipe_stop_intr_polling 9E ,
 .Xr allocb 9F ,
 .Xr usba_hcdi_cb 9F ,
diff --git a/usr/src/man/man9e/usba_hcdi_pipe_isoc_xfer.9e b/usr/src/man/man9e/usba_hcdi_pipe_isoc_xfer.9e
index a1b90640b3..d8d59f6e39 100644
--- a/usr/src/man/man9e/usba_hcdi_pipe_isoc_xfer.9e
+++ b/usr/src/man/man9e/usba_hcdi_pipe_isoc_xfer.9e
@@ -173,7 +173,7 @@ conditions:
 .Bl -bullet
 .It
 A pipe reset request came in from the
-.Xr usba_hcdi_pipe_rest 9E
+.Xr usba_hcdi_pipe_reset 9E
 entry point.
 .It
 A request to stop polling came in from the
@@ -258,7 +258,7 @@ If uncertain, use
 .Sh SEE ALSO
 .Xr usba_hcdi 9E ,
 .Xr usba_hcdi_pipe_close 9E ,
-.Xr usba_hcdi_pipe_rest 9E ,
+.Xr usba_hcdi_pipe_reset 9E ,
 .Xr usba_hcdi_pipe_stop_isoc_polling 9E ,
 .Xr usba_hcdi_cb 9F ,
 .Xr usba_hcdi_dup_isoc_req 9F ,
diff --git a/usr/src/man/man9e/usba_hcdi_pipe_reset.9e b/usr/src/man/man9e/usba_hcdi_pipe_reset.9e
index 0b02465039..1707fa122d 100644
--- a/usr/src/man/man9e/usba_hcdi_pipe_reset.9e
+++ b/usr/src/man/man9e/usba_hcdi_pipe_reset.9e
@@ -59,9 +59,9 @@ entry point is designed to take a pipe in an arbitrary state and return
 it to the same state it was in after a call to
 .Xr usba_hcdi_pipe_open 9E .
 While this entry point does some similar things to the
-.Xr usba_hcdi_stop_intr_polling 9E
+.Xr usba_hcdi_pipe_stop_intr_polling 9E
 and
-.Xr usba_hcdi_stop_isoc_polling 9E
+.Xr usba_hcdi_pipe_stop_isoc_polling 9E
 entry points, there are some notable differences.
 .Pp
 This entry point is synchronous.
@@ -95,7 +95,7 @@ If uncertain, use
 .Sy USB_FAILURE .
 .Sh SEE ALSO
 .Xr usba_hcdi_pipe_open 9E ,
-.Xr usba_hcdi_stop_intr_polling 9E ,
-.Xr usba_hcdi_stop_isoc_polling 9E ,
+.Xr usba_hcdi_pipe_stop_intr_polling 9E ,
+.Xr usba_hcdi_pipe_stop_isoc_polling 9E ,
 .Xr usba_hcdi_cb 9F ,
 .Xr usba_pipe_handle_data 9S