Module Name: src
Committed By: knakahara
Date: Tue Jul 12 03:39:55 UTC 2016
Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: Makefile pci.9 pci_intr.9 pci_msi.9
Log Message:
fix missing mans about pci.9 and pci_intr.9
- add links from pci.9 and pci_intr.9 to pci_msi.9
- add pci_intr_establish_xname entries
- add pci_intr_setattr entries
- add pci_intr_type descriptions
- fix pci_*_alloc functions' argument type
pointed out by nonaka@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.2050 -r1.2051 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.395 -r1.396 src/share/man/man9/Makefile
cvs rdiff -u -r1.43 -r1.44 src/share/man/man9/pci.9
cvs rdiff -u -r1.23 -r1.24 src/share/man/man9/pci_intr.9
cvs rdiff -u -r1.9 -r1.10 src/share/man/man9/pci_msi.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2050 src/distrib/sets/lists/comp/mi:1.2051
--- src/distrib/sets/lists/comp/mi:1.2050 Tue Jul 5 21:13:12 2016
+++ src/distrib/sets/lists/comp/mi Tue Jul 12 03:39:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2050 2016/07/05 21:13:12 christos Exp $
+# $NetBSD: mi,v 1.2051 2016/07/12 03:39:55 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -10593,9 +10593,11 @@
./usr/share/man/cat9/pci_intr_disestablish.0 comp-sys-catman .cat
./usr/share/man/cat9/pci_intr_distribute.0 comp-obsolete obsolete
./usr/share/man/cat9/pci_intr_establish.0 comp-sys-catman .cat
+./usr/share/man/cat9/pci_intr_establish_xname.0 comp-sys-catman .cat
./usr/share/man/cat9/pci_intr_evcnt.0 comp-sys-catman .cat
./usr/share/man/cat9/pci_intr_map.0 comp-sys-catman .cat
./usr/share/man/cat9/pci_intr_release.0 comp-sys-catman .cat
+./usr/share/man/cat9/pci_intr_setattr.0 comp-sys-catman .cat
./usr/share/man/cat9/pci_intr_string.0 comp-sys-catman .cat
./usr/share/man/cat9/pci_intr_type.0 comp-sys-catman .cat
./usr/share/man/cat9/pci_intx_alloc.0 comp-sys-catman .cat
@@ -17741,9 +17743,11 @@
./usr/share/man/html9/pci_intr_disestablish.html comp-sys-htmlman html
./usr/share/man/html9/pci_intr_distribute.html comp-obsolete obsolete
./usr/share/man/html9/pci_intr_establish.html comp-sys-htmlman html
+./usr/share/man/html9/pci_intr_establish_xname.html comp-sys-htmlman html
./usr/share/man/html9/pci_intr_evcnt.html comp-sys-htmlman html
./usr/share/man/html9/pci_intr_map.html comp-sys-htmlman html
./usr/share/man/html9/pci_intr_release.html comp-sys-htmlman html
+./usr/share/man/html9/pci_intr_setattr.html comp-sys-htmlman html
./usr/share/man/html9/pci_intr_string.html comp-sys-htmlman html
./usr/share/man/html9/pci_intr_type.html comp-sys-htmlman html
./usr/share/man/html9/pci_intx_alloc.html comp-sys-htmlman html
@@ -25049,9 +25053,11 @@
./usr/share/man/man9/pci_intr_disestablish.9 comp-sys-man .man
./usr/share/man/man9/pci_intr_distribute.9 comp-obsolete obsolete
./usr/share/man/man9/pci_intr_establish.9 comp-sys-man .man
+./usr/share/man/man9/pci_intr_establish_xname.9 comp-sys-man .man
./usr/share/man/man9/pci_intr_evcnt.9 comp-sys-man .man
./usr/share/man/man9/pci_intr_map.9 comp-sys-man .man
./usr/share/man/man9/pci_intr_release.9 comp-sys-man .man
+./usr/share/man/man9/pci_intr_setattr.9 comp-sys-man .man
./usr/share/man/man9/pci_intr_string.9 comp-sys-man .man
./usr/share/man/man9/pci_intr_type.9 comp-sys-man .man
./usr/share/man/man9/pci_intx_alloc.9 comp-sys-man .man
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.395 src/share/man/man9/Makefile:1.396
--- src/share/man/man9/Makefile:1.395 Sat Apr 9 06:21:16 2016
+++ src/share/man/man9/Makefile Tue Jul 12 03:39:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.395 2016/04/09 06:21:16 riastradh Exp $
+# $NetBSD: Makefile,v 1.396 2016/07/12 03:39:55 knakahara Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -567,7 +567,9 @@ MLINKS+=pci.9 pci_conf_read.9 \
pci.9 pci_intr_string.9 \
pci.9 pci_intr_evcnt.9 \
pci.9 pci_intr_establish.9 \
+ pci.9 pci_intr_establish_xname.9 \
pci.9 pci_intr_disestablish.9 \
+ pci.9 pci_intr_setattr.9 \
pci.9 pci_get_powerstate.9 \
pci.9 pci_set_powerstate.9 \
pci.9 pci_vpd_read.9 \
Index: src/share/man/man9/pci.9
diff -u src/share/man/man9/pci.9:1.43 src/share/man/man9/pci.9:1.44
--- src/share/man/man9/pci.9:1.43 Sun Oct 4 12:10:51 2015
+++ src/share/man/man9/pci.9 Tue Jul 12 03:39:55 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci.9,v 1.43 2015/10/04 12:10:51 wiz Exp $
+.\" $NetBSD: pci.9,v 1.44 2016/07/12 03:39:55 knakahara Exp $
.\"
.\" Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 2, 2015
+.Dd July 12, 2016
.Dt PCI 9
.Os
.Sh NAME
@@ -52,7 +52,10 @@
.Nm pci_intr_string ,
.Nm pci_intr_evcnt ,
.Nm pci_intr_establish ,
+.Nm pci_intr_establish_xname ,
.Nm pci_intr_disestablish ,
+.Nm pci_intr_type ,
+.Nm pci_intr_setattr ,
.Nm pci_get_powerstate ,
.Nm pci_set_powerstate ,
.Nm pci_vpd_read ,
@@ -129,8 +132,15 @@
.Ft void *
.Fn pci_intr_establish "pci_chipset_tag_t pc" "pci_intr_handle_t ih" \
"int level" "int (*handler)(void *)" "void *arg"
+.Ft void *
+.Fn pci_intr_establish_xname "pci_chipset_tag_t pc" "pci_intr_handle_t ih" \
+"int level" "int (*handler)(void *)" "void *arg" "const char *xname"
.Ft void
.Fn pci_intr_disestablish "pci_chipset_tag_t pc" "void *ih"
+.Ft pci_intr_type_t
+.Fn pci_intr_type "pci_chipset_tag_t pc" "pci_intr_handle_t ih"
+.Ft int
+.Fn pci_intr_setattr "pci_chipset_tag_t pc" "pci_intr_handle_t *ih" "int attr" "uint64_t data"
.Ft int
.Fn pci_set_powerstate "pci_chipset_tag_t pc" "pcitag_t tag" \
"pcireg_t newstate"
@@ -670,8 +680,17 @@ See
.It Fn pci_intr_establish "pc" "ih" "level" "handler" "arg"
See
.Xr pci_intr 9 .
+.It Fn pci_intr_establish_xname "pc" "ih" "level" "handler" "arg" "xname"
+See
+.Xr pci_intr 9 .
.It Fn pci_intr_disestablish "pc" "ih"
See
+.Xr pci_msi 9 .
+.It Fn pci_intr_type "pc" "ih"
+See
+.Xr pci_intr 9 .
+.It Fn pci_intr_setattr "pc" "ih" "attr" "data"
+See
.Xr pci_intr 9 .
.It Fn pci_set_powerstate "pc" "tag" "newstate"
Set power state of the device to newstate.
@@ -841,6 +860,7 @@ The database can be regenerated using th
.Xr driver 9 ,
.Xr pci_configure_bus 9 ,
.Xr pci_intr 9 ,
+.Xr pci_msi 9 ,
.Xr pmf 9
.Sh HISTORY
The machine-independent PCI subsystem appeared in
Index: src/share/man/man9/pci_intr.9
diff -u src/share/man/man9/pci_intr.9:1.23 src/share/man/man9/pci_intr.9:1.24
--- src/share/man/man9/pci_intr.9:1.23 Tue Oct 13 09:21:56 2015
+++ src/share/man/man9/pci_intr.9 Tue Jul 12 03:39:55 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci_intr.9,v 1.23 2015/10/13 09:21:56 msaitoh Exp $
+.\" $NetBSD: pci_intr.9,v 1.24 2016/07/12 03:39:55 knakahara Exp $
.\"
.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 13, 2015
+.Dd July 12, 2016
.Dt PCI_INTR 9
.Os
.Sh NAME
@@ -36,7 +36,9 @@
.Nm pci_intr_string ,
.Nm pci_intr_evcnt ,
.Nm pci_intr_establish ,
+.Nm pci_intr_establish_xname ,
.Nm pci_intr_disestablish ,
+.Nm pci_intr_type ,
.Nm pci_intr_setattr
.Nd PCI bus interrupt manipulation functions
.Sh SYNOPSIS
@@ -50,6 +52,9 @@
.Ft void *
.Fn pci_intr_establish "pci_chipset_tag_t pc" "pci_intr_handle_t ih" \
"int ipl" "int (*intrhand)(void *)" "void *intrarg"
+.Ft void *
+.Fn pci_intr_establish_xname "pci_chipset_tag_t pc" "pci_intr_handle_t ih" \
+"int ipl" "int (*intrhand)(void *)" "void *intrarg" "const char *xname"
.Ft void
.Fn pci_intr_disestablish "pci_chipset_tag_t pc" "void *ih"
.Ft int
@@ -113,6 +118,15 @@ may be saved and passed to
to disable the interrupt handler
when the driver is no longer interested in interrupts from the device.
.Pp
+.Fn pci_intr_establish_xname
+is almost the same as
+.Fn pci_intr_establish .
+The difference is only
+.Fa xname
+which is used by
+.Xr intrctl 8
+to show the device name(s) of the interrupt id.
+.Pp
The
.Fn pci_intr_setattr
function sets an attribute
@@ -186,4 +200,5 @@ contains the PCI tag of the device itsel
contains the PCI tag of the uppermost bridge device.
.Sh SEE ALSO
.Xr evcnt 9 ,
-.Xr pci 9
+.Xr pci 9 ,
+.Xr pci_msi 9
Index: src/share/man/man9/pci_msi.9
diff -u src/share/man/man9/pci_msi.9:1.9 src/share/man/man9/pci_msi.9:1.10
--- src/share/man/man9/pci_msi.9:1.9 Mon Jul 11 10:47:52 2016
+++ src/share/man/man9/pci_msi.9 Tue Jul 12 03:39:55 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci_msi.9,v 1.9 2016/07/11 10:47:52 wiz Exp $
+.\" $NetBSD: pci_msi.9,v 1.10 2016/07/12 03:39:55 knakahara Exp $
.\"
.\" Copyright (c) 2015 Internet Initiative Japan Inc.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 11, 2016
+.Dd July 12, 2016
.Dt PCI_MSI 9
.Os
.Sh NAME
@@ -47,28 +47,28 @@
.Fn pci_msi_count "pci_chipset_tag_t pc" \
"pcitag_t tag"
.Ft int
-.Fn pci_msi_alloc "struct pci_attach_args *pa" \
+.Fn pci_msi_alloc "const struct pci_attach_args *pa" \
"pci_intr_handle_t **ihps" "int *count"
.Ft int
-.Fn pci_msi_alloc_exect "struct pci_attach_args *pa" \
+.Fn pci_msi_alloc_exect "const struct pci_attach_args *pa" \
"pci_intr_handle_t **ihps" "int count"
.Ft int
.Fn pci_msix_count "pci_chipset_tag_t pc" \
"pcitag_t tag"
.Ft int
-.Fn pci_msix_alloc "struct pci_attach_args *pa" \
+.Fn pci_msix_alloc "const struct pci_attach_args *pa" \
"pci_intr_handle_t **ihps" "int *count"
.Ft int
-.Fn pci_msix_alloc_exect "struct pci_attach_args *pa" \
+.Fn pci_msix_alloc_exect "const struct pci_attach_args *pa" \
"pci_intr_handle_t **ihps" "int count"
.Ft int
-.Fn pci_msix_alloc_map "struct pci_attach_args *pa" \
+.Fn pci_msix_alloc_map "const struct pci_attach_args *pa" \
"pci_intr_handle_t **ihps" "u_int *table_indexes" "int count"
.Ft int
-.Fn pci_intx_alloc "struct pci_attach_args *pa" \
+.Fn pci_intx_alloc "const struct pci_attach_args *pa" \
"pci_intr_handle_t **ihp"
.Ft int
-.Fn pci_intr_alloc "struct pci_attach_args *pa" \
+.Fn pci_intr_alloc "const struct pci_attach_args *pa" \
"pci_intr_handle_t **ihp" "int *counts" \
"pci_intr_type_t max_type"
.Ft void
