diff options
Diffstat (limited to 'usr')
27 files changed, 94 insertions, 1025 deletions
diff --git a/usr/src/man/man9f/Intro.9f b/usr/src/man/man9f/Intro.9f index 3b72a53425..cbf25e453c 100644 --- a/usr/src/man/man9f/Intro.9f +++ b/usr/src/man/man9f/Intro.9f @@ -8,7 +8,6 @@ .SH NAME Intro, intro \- introduction to DDI/DKI functions .SH DESCRIPTION -.LP Section 9F describes the kernel functions available for use by device drivers. See \fBIntro\fR(9E) for an overview of device driver interfaces. .sp @@ -123,7 +122,6 @@ which can be referred to for further information. Every driver MUST include <\fBsys/ddi.h\fR> and <\fBsys/sunddi.h\fR>, in that order, and as the last files the driver includes. .SH STREAMS KERNEL FUNCTION SUMMARY -.LP The following table summarizes the STREAMS functions described in this section. .sp @@ -410,14 +408,10 @@ _ \fBddi_get_pid\fR illumos DDI \fBddi_get_soft_iblock_cookie\fR illumos DDI \fBddi_get_soft_state\fR illumos DDI -\fBddi_getb\fR illumos DDI -\fBddi_getl\fR illumos DDI -\fBddi_getll\fR illumos DDI \fBddi_getlongprop\fR illumos DDI \fBddi_getlongprop_buf\fR illumos DDI \fBddi_getprop\fR illumos DDI \fBddi_getproplen\fR illumos DDI -\fBddi_getw\fR illumos DDI \fBddi_intr_add_handler\fR illumos DDI \fBddi_intr_add_softint\fR illumos DDI \fBddi_intr_alloc\fR illumos DDI @@ -446,27 +440,15 @@ _ \fBddi_io_get16\fR illumos DDI \fBddi_io_get32\fR illumos DDI \fBddi_io_get8\fR illumos DDI -\fBddi_io_getb\fR illumos DDI -\fBddi_io_getl\fR illumos DDI -\fBddi_io_getw\fR illumos DDI \fBddi_io_put16\fR illumos DDI \fBddi_io_put32\fR illumos DDI \fBddi_io_put8\fR illumos DDI -\fBddi_io_putb\fR illumos DDI -\fBddi_io_putl\fR illumos DDI -\fBddi_io_putw\fR illumos DDI \fBddi_io_rep_get16\fR illumos DDI \fBddi_io_rep_get32\fR illumos DDI \fBddi_io_rep_get8\fR illumos DDI -\fBddi_io_rep_getb\fR illumos DDI -\fBddi_io_rep_getl\fR illumos DDI -\fBddi_io_rep_getw\fR illumos DDI \fBddi_io_rep_put16\fR illumos DDI \fBddi_io_rep_put32\fR illumos DDI \fBddi_io_rep_put8\fR illumos DDI -\fBddi_io_rep_putb\fR illumos DDI -\fBddi_io_rep_putl\fR illumos DDI -\fBddi_io_rep_putw\fR illumos DDI \fBddi_iomin\fR illumos DDI \fBddi_log_sysevent\fR illumos DDI \fBddi_map_regs\fR illumos DDI @@ -478,34 +460,18 @@ _ \fBddi_mem_get32\fR illumos DDI \fBddi_mem_get64\fR illumos DDI \fBddi_mem_get8\fR illumos DDI -\fBddi_mem_getb\fR illumos DDI -\fBddi_mem_getl\fR illumos DDI -\fBddi_mem_getll\fR illumos DDI -\fBddi_mem_getw\fR illumos DDI \fBddi_mem_put16\fR illumos DDI \fBddi_mem_put32\fR illumos DDI \fBddi_mem_put64\fR illumos DDI \fBddi_mem_put8\fR illumos DDI -\fBddi_mem_putb\fR illumos DDI -\fBddi_mem_putl\fR illumos DDI -\fBddi_mem_putll\fR illumos DDI -\fBddi_mem_putw\fR illumos DDI \fBddi_mem_rep_get16\fR illumos DDI \fBddi_mem_rep_get32\fR illumos DDI \fBddi_mem_rep_get64\fR illumos DDI \fBddi_mem_rep_get8\fR illumos DDI -\fBddi_mem_rep_getb\fR illumos DDI -\fBddi_mem_rep_getl\fR illumos DDI -\fBddi_mem_rep_getll\fR illumos DDI -\fBddi_mem_rep_getw\fR illumos DDI \fBddi_mem_rep_put16\fR illumos DDI \fBddi_mem_rep_put32\fR illumos DDI \fBddi_mem_rep_put64\fR illumos DDI \fBddi_mem_rep_put8\fR illumos DDI -\fBddi_mem_rep_putb\fR illumos DDI -\fBddi_mem_rep_putl\fR illumos DDI -\fBddi_mem_rep_putll\fR illumos DDI -\fBddi_mem_rep_putw\fR illumos DDI \fBddi_mmap_get_model\fR illumos DDI \fBddi_model_convert_from\fR illumos DDI \fBddi_modopen\fR illumos DDI @@ -515,20 +481,12 @@ _ \fBddi_peek32\fR illumos DDI \fBddi_peek64\fR illumos DDI \fBddi_peek8\fR illumos DDI -\fBddi_peekc\fR illumos DDI -\fBddi_peekd\fR illumos DDI -\fBddi_peekl\fR illumos DDI -\fBddi_peeks\fR illumos DDI \fBddi_periodic_add\fR illumos DDI \fBddi_periodic_delete\fR illumos DDI \fBddi_poke16\fR illumos DDI \fBddi_poke32\fR illumos DDI \fBddi_poke64\fR illumos DDI \fBddi_poke8\fR illumos DDI -\fBddi_pokec\fR illumos DDI -\fBddi_poked\fR illumos DDI -\fBddi_pokel\fR illumos DDI -\fBddi_pokes\fR illumos DDI \fBddi_prop_create\fR illumos DDI \fBddi_prop_exists\fR illumos DDI \fBddi_prop_free\fR illumos DDI @@ -554,10 +512,6 @@ _ \fBddi_put32\fR illumos DDI \fBddi_put64\fR illumos DDI \fBddi_put8\fR illumos DDI -\fBddi_putb\fR illumos DDI -\fBddi_putl\fR illumos DDI -\fBddi_putll\fR illumos DDI -\fBddi_putw\fR illumos DDI \fBddi_regs_map_free\fR illumos DDI \fBddi_regs_map_setup\fR illumos DDI \fBddi_remove_event_handler\fR illumos DDI @@ -569,18 +523,10 @@ _ \fBddi_rep_get32\fR illumos DDI \fBddi_rep_get64\fR illumos DDI \fBddi_rep_get8\fR illumos DDI -\fBddi_rep_getb\fR illumos DDI -\fBddi_rep_getl\fR illumos DDI -\fBddi_rep_getll\fR illumos DDI -\fBddi_rep_getw\fR illumos DDI \fBddi_rep_put16\fR illumos DDI \fBddi_rep_put32\fR illumos DDI \fBddi_rep_put64\fR illumos DDI \fBddi_rep_put8\fR illumos DDI -\fBddi_rep_putb\fR illumos DDI -\fBddi_rep_putl\fR illumos DDI -\fBddi_rep_putll\fR illumos DDI -\fBddi_rep_putw\fR illumos DDI \fBddi_report_dev\fR illumos DDI \fBddi_root_node\fR illumos DDI \fBddi_segmap\fR illumos DDI @@ -710,16 +656,10 @@ _ \fBpci_config_get32\fR illumos DDI \fBpci_config_get64\fR illumos DDI \fBpci_config_get8\fR illumos DDI -\fBpci_config_getb\fR illumos DDI -\fBpci_config_getl\fR illumos DDI -\fBpci_config_getw\fR illumos DDI \fBpci_config_put16\fR illumos DDI \fBpci_config_put32\fR illumos DDI \fBpci_config_put64\fR illumos DDI \fBpci_config_put8\fR illumos DDI -\fBpci_config_putb\fR illumos DDI -\fBpci_config_putl\fR illumos DDI -\fBpci_config_putw\fR illumos DDI \fBpci_config_setup\fR illumos DDI \fBpci_config_teardown\fR illumos DDI \fBpci_ereport_setup\fR illumos DDI @@ -738,12 +678,6 @@ _ \fBproc_signal\fR illumos DDI \fBproc_unref\fR illumos DDI \fBptob\fR DDI/DKI -\fBrepinsb\fR illumos x86 DDI -\fBrepinsd\fR illumos x86 DDI -\fBrepinsw\fR illumos x86 DDI -\fBrepoutsb\fR illumos x86 DDI -\fBrepoutsd\fR illumos x86 DDI -\fBrepoutsw\fR illumos x86 DDI \fBrmalloc\fR DDI/DKI \fBrmalloc_wait\fR DDI/DKI \fBrmallocmap\fR DDI/DKI @@ -867,5 +801,4 @@ _ .TE .SH SEE ALSO -.LP \fBIntro\fR(9E), \fBmutex\fR(9F) diff --git a/usr/src/man/man9f/Makefile b/usr/src/man/man9f/Makefile index 766861e6e3..2cffca3e16 100644 --- a/usr/src/man/man9f/Makefile +++ b/usr/src/man/man9f/Makefile @@ -782,14 +782,10 @@ MANLINKS= AVL_NEXT.9f \ ddi_get_name.9f \ ddi_get_soft_iblock_cookie.9f \ ddi_get_soft_state.9f \ - ddi_getb.9f \ - ddi_getl.9f \ - ddi_getll.9f \ ddi_getlongprop.9f \ ddi_getlongprop_buf.9f \ ddi_getprop.9f \ ddi_getproplen.9f \ - ddi_getw.9f \ ddi_intr_block_disable.9f \ ddi_intr_block_enable.9f \ ddi_intr_clr_mask.9f \ @@ -805,70 +801,34 @@ MANLINKS= AVL_NEXT.9f \ ddi_intr_trigger_softint.9f \ ddi_io_get16.9f \ ddi_io_get32.9f \ - ddi_io_getb.9f \ - ddi_io_getl.9f \ - ddi_io_getw.9f \ ddi_io_put16.9f \ ddi_io_put32.9f \ - ddi_io_putb.9f \ - ddi_io_putl.9f \ - ddi_io_putw.9f \ ddi_io_rep_get16.9f \ ddi_io_rep_get32.9f \ - ddi_io_rep_getb.9f \ - ddi_io_rep_getl.9f \ - ddi_io_rep_getw.9f \ ddi_io_rep_put16.9f \ ddi_io_rep_put32.9f \ - ddi_io_rep_putb.9f \ - ddi_io_rep_putl.9f \ - ddi_io_rep_putw.9f \ ddi_mem_get16.9f \ ddi_mem_get32.9f \ ddi_mem_get64.9f \ - ddi_mem_getb.9f \ - ddi_mem_getl.9f \ - ddi_mem_getll.9f \ - ddi_mem_getw.9f \ ddi_mem_put16.9f \ ddi_mem_put32.9f \ ddi_mem_put64.9f \ - ddi_mem_putb.9f \ - ddi_mem_putl.9f \ - ddi_mem_putll.9f \ - ddi_mem_putw.9f \ ddi_mem_rep_get16.9f \ ddi_mem_rep_get32.9f \ ddi_mem_rep_get64.9f \ - ddi_mem_rep_getb.9f \ - ddi_mem_rep_getl.9f \ - ddi_mem_rep_getll.9f \ - ddi_mem_rep_getw.9f \ ddi_mem_rep_put16.9f \ ddi_mem_rep_put32.9f \ ddi_mem_rep_put64.9f \ - ddi_mem_rep_putb.9f \ - ddi_mem_rep_putl.9f \ - ddi_mem_rep_putll.9f \ - ddi_mem_rep_putw.9f \ ddi_modclose.9f \ ddi_modsym.9f \ ddi_peek16.9f \ ddi_peek32.9f \ ddi_peek64.9f \ ddi_peek8.9f \ - ddi_peekc.9f \ - ddi_peekd.9f \ - ddi_peekl.9f \ - ddi_peeks.9f \ ddi_poke16.9f \ ddi_poke32.9f \ ddi_poke64.9f \ ddi_poke8.9f \ - ddi_pokec.9f \ - ddi_poked.9f \ - ddi_pokel.9f \ - ddi_pokes.9f \ ddi_prop_free.9f \ ddi_prop_get_int64.9f \ ddi_prop_lookup_byte_array.9f \ @@ -891,26 +851,14 @@ MANLINKS= AVL_NEXT.9f \ ddi_put16.9f \ ddi_put32.9f \ ddi_put64.9f \ - ddi_putb.9f \ - ddi_putl.9f \ - ddi_putll.9f \ - ddi_putw.9f \ ddi_remove_intr.9f \ ddi_remove_softintr.9f \ ddi_rep_get16.9f \ ddi_rep_get32.9f \ ddi_rep_get64.9f \ - ddi_rep_getb.9f \ - ddi_rep_getl.9f \ - ddi_rep_getll.9f \ - ddi_rep_getw.9f \ ddi_rep_put16.9f \ ddi_rep_put32.9f \ ddi_rep_put64.9f \ - ddi_rep_putb.9f \ - ddi_rep_putl.9f \ - ddi_rep_putll.9f \ - ddi_rep_putw.9f \ ddi_segmap_setup.9f \ ddi_set_driver_private.9f \ ddi_soft_state_fini.9f \ @@ -1160,18 +1108,10 @@ MANLINKS= AVL_NEXT.9f \ pci_config_get16.9f \ pci_config_get32.9f \ pci_config_get64.9f \ - pci_config_getb.9f \ - pci_config_getl.9f \ - pci_config_getll.9f \ - pci_config_getw.9f \ pci_config_put16.9f \ pci_config_put32.9f \ pci_config_put64.9f \ pci_config_put8.9f \ - pci_config_putb.9f \ - pci_config_putl.9f \ - pci_config_putll.9f \ - pci_config_putw.9f \ pci_config_teardown.9f \ pci_ereport_post.9f \ pci_ereport_teardown.9f \ @@ -1185,12 +1125,6 @@ MANLINKS= AVL_NEXT.9f \ qprocsoff.9f \ qwait_sig.9f \ rd.9f \ - repinsb.9f \ - repinsd.9f \ - repinsw.9f \ - repoutsb.9f \ - repoutsd.9f \ - repoutsw.9f \ rmallocmap_wait.9f \ rmfreemap.9f \ rw_destroy.9f \ @@ -1612,10 +1546,6 @@ ddi_fm_fini.9f := LINKSRC = ddi_fm_init.9f ddi_get16.9f := LINKSRC = ddi_get8.9f ddi_get32.9f := LINKSRC = ddi_get8.9f ddi_get64.9f := LINKSRC = ddi_get8.9f -ddi_getb.9f := LINKSRC = ddi_get8.9f -ddi_getl.9f := LINKSRC = ddi_get8.9f -ddi_getll.9f := LINKSRC = ddi_get8.9f -ddi_getw.9f := LINKSRC = ddi_get8.9f ddi_set_driver_private.9f := LINKSRC = ddi_get_driver_private.9f @@ -1644,61 +1574,33 @@ ddi_intr_clr_mask.9f := LINKSRC = ddi_intr_set_mask.9f ddi_io_get16.9f := LINKSRC = ddi_io_get8.9f ddi_io_get32.9f := LINKSRC = ddi_io_get8.9f -ddi_io_getb.9f := LINKSRC = ddi_io_get8.9f -ddi_io_getl.9f := LINKSRC = ddi_io_get8.9f -ddi_io_getw.9f := LINKSRC = ddi_io_get8.9f ddi_io_put16.9f := LINKSRC = ddi_io_put8.9f ddi_io_put32.9f := LINKSRC = ddi_io_put8.9f -ddi_io_putb.9f := LINKSRC = ddi_io_put8.9f -ddi_io_putl.9f := LINKSRC = ddi_io_put8.9f -ddi_io_putw.9f := LINKSRC = ddi_io_put8.9f ddi_io_rep_get16.9f := LINKSRC = ddi_io_rep_get8.9f ddi_io_rep_get32.9f := LINKSRC = ddi_io_rep_get8.9f -ddi_io_rep_getb.9f := LINKSRC = ddi_io_rep_get8.9f -ddi_io_rep_getl.9f := LINKSRC = ddi_io_rep_get8.9f -ddi_io_rep_getw.9f := LINKSRC = ddi_io_rep_get8.9f ddi_io_rep_put16.9f := LINKSRC = ddi_io_rep_put8.9f ddi_io_rep_put32.9f := LINKSRC = ddi_io_rep_put8.9f -ddi_io_rep_putb.9f := LINKSRC = ddi_io_rep_put8.9f -ddi_io_rep_putl.9f := LINKSRC = ddi_io_rep_put8.9f -ddi_io_rep_putw.9f := LINKSRC = ddi_io_rep_put8.9f ddi_unmap_regs.9f := LINKSRC = ddi_map_regs.9f ddi_mem_get16.9f := LINKSRC = ddi_mem_get8.9f ddi_mem_get32.9f := LINKSRC = ddi_mem_get8.9f ddi_mem_get64.9f := LINKSRC = ddi_mem_get8.9f -ddi_mem_getb.9f := LINKSRC = ddi_mem_get8.9f -ddi_mem_getl.9f := LINKSRC = ddi_mem_get8.9f -ddi_mem_getll.9f := LINKSRC = ddi_mem_get8.9f -ddi_mem_getw.9f := LINKSRC = ddi_mem_get8.9f ddi_mem_put16.9f := LINKSRC = ddi_mem_put8.9f ddi_mem_put32.9f := LINKSRC = ddi_mem_put8.9f ddi_mem_put64.9f := LINKSRC = ddi_mem_put8.9f -ddi_mem_putb.9f := LINKSRC = ddi_mem_put8.9f -ddi_mem_putl.9f := LINKSRC = ddi_mem_put8.9f -ddi_mem_putll.9f := LINKSRC = ddi_mem_put8.9f -ddi_mem_putw.9f := LINKSRC = ddi_mem_put8.9f ddi_mem_rep_get16.9f := LINKSRC = ddi_mem_rep_get8.9f ddi_mem_rep_get32.9f := LINKSRC = ddi_mem_rep_get8.9f ddi_mem_rep_get64.9f := LINKSRC = ddi_mem_rep_get8.9f -ddi_mem_rep_getb.9f := LINKSRC = ddi_mem_rep_get8.9f -ddi_mem_rep_getl.9f := LINKSRC = ddi_mem_rep_get8.9f -ddi_mem_rep_getll.9f := LINKSRC = ddi_mem_rep_get8.9f -ddi_mem_rep_getw.9f := LINKSRC = ddi_mem_rep_get8.9f ddi_mem_rep_put16.9f := LINKSRC = ddi_mem_rep_put8.9f ddi_mem_rep_put32.9f := LINKSRC = ddi_mem_rep_put8.9f ddi_mem_rep_put64.9f := LINKSRC = ddi_mem_rep_put8.9f -ddi_mem_rep_putb.9f := LINKSRC = ddi_mem_rep_put8.9f -ddi_mem_rep_putl.9f := LINKSRC = ddi_mem_rep_put8.9f -ddi_mem_rep_putll.9f := LINKSRC = ddi_mem_rep_put8.9f -ddi_mem_rep_putw.9f := LINKSRC = ddi_mem_rep_put8.9f ddi_modclose.9f := LINKSRC = ddi_modopen.9f ddi_modsym.9f := LINKSRC = ddi_modopen.9f @@ -1707,19 +1609,11 @@ ddi_peek16.9f := LINKSRC = ddi_peek.9f ddi_peek32.9f := LINKSRC = ddi_peek.9f ddi_peek64.9f := LINKSRC = ddi_peek.9f ddi_peek8.9f := LINKSRC = ddi_peek.9f -ddi_peekc.9f := LINKSRC = ddi_peek.9f -ddi_peekd.9f := LINKSRC = ddi_peek.9f -ddi_peekl.9f := LINKSRC = ddi_peek.9f -ddi_peeks.9f := LINKSRC = ddi_peek.9f ddi_poke16.9f := LINKSRC = ddi_poke.9f ddi_poke32.9f := LINKSRC = ddi_poke.9f ddi_poke64.9f := LINKSRC = ddi_poke.9f ddi_poke8.9f := LINKSRC = ddi_poke.9f -ddi_pokec.9f := LINKSRC = ddi_poke.9f -ddi_poked.9f := LINKSRC = ddi_poke.9f -ddi_pokel.9f := LINKSRC = ddi_poke.9f -ddi_pokes.9f := LINKSRC = ddi_poke.9f ddi_prop_modify.9f := LINKSRC = ddi_prop_create.9f ddi_prop_remove.9f := LINKSRC = ddi_prop_create.9f @@ -1751,26 +1645,14 @@ ddi_prop_update_string_array.9f := LINKSRC = ddi_prop_update.9f ddi_put16.9f := LINKSRC = ddi_put8.9f ddi_put32.9f := LINKSRC = ddi_put8.9f ddi_put64.9f := LINKSRC = ddi_put8.9f -ddi_putb.9f := LINKSRC = ddi_put8.9f -ddi_putl.9f := LINKSRC = ddi_put8.9f -ddi_putll.9f := LINKSRC = ddi_put8.9f -ddi_putw.9f := LINKSRC = ddi_put8.9f ddi_rep_get16.9f := LINKSRC = ddi_rep_get8.9f ddi_rep_get32.9f := LINKSRC = ddi_rep_get8.9f ddi_rep_get64.9f := LINKSRC = ddi_rep_get8.9f -ddi_rep_getb.9f := LINKSRC = ddi_rep_get8.9f -ddi_rep_getl.9f := LINKSRC = ddi_rep_get8.9f -ddi_rep_getll.9f := LINKSRC = ddi_rep_get8.9f -ddi_rep_getw.9f := LINKSRC = ddi_rep_get8.9f ddi_rep_put16.9f := LINKSRC = ddi_rep_put8.9f ddi_rep_put32.9f := LINKSRC = ddi_rep_put8.9f ddi_rep_put64.9f := LINKSRC = ddi_rep_put8.9f -ddi_rep_putb.9f := LINKSRC = ddi_rep_put8.9f -ddi_rep_putl.9f := LINKSRC = ddi_rep_put8.9f -ddi_rep_putll.9f := LINKSRC = ddi_rep_put8.9f -ddi_rep_putw.9f := LINKSRC = ddi_rep_put8.9f ddi_segmap_setup.9f := LINKSRC = ddi_segmap.9f @@ -1846,9 +1728,6 @@ id32_lookup.9f := LINKSRC = id32_alloc.9f inl.9f := LINKSRC = inb.9f inw.9f := LINKSRC = inb.9f -repinsb.9f := LINKSRC = inb.9f -repinsd.9f := LINKSRC = inb.9f -repinsw.9f := LINKSRC = inb.9f kmem_free.9f := LINKSRC = kmem_alloc.9f kmem_zalloc.9f := LINKSRC = kmem_alloc.9f @@ -2058,25 +1937,14 @@ nvpair_value_uint8_array.9f := LINKSRC = nvpair_value_byte.9f outl.9f := LINKSRC = outb.9f outw.9f := LINKSRC = outb.9f -repoutsb.9f := LINKSRC = outb.9f -repoutsd.9f := LINKSRC = outb.9f -repoutsw.9f := LINKSRC = outb.9f pci_config_get16.9f := LINKSRC = pci_config_get8.9f pci_config_get32.9f := LINKSRC = pci_config_get8.9f pci_config_get64.9f := LINKSRC = pci_config_get8.9f -pci_config_getb.9f := LINKSRC = pci_config_get8.9f -pci_config_getl.9f := LINKSRC = pci_config_get8.9f -pci_config_getll.9f := LINKSRC = pci_config_get8.9f -pci_config_getw.9f := LINKSRC = pci_config_get8.9f pci_config_put16.9f := LINKSRC = pci_config_get8.9f pci_config_put32.9f := LINKSRC = pci_config_get8.9f pci_config_put64.9f := LINKSRC = pci_config_get8.9f pci_config_put8.9f := LINKSRC = pci_config_get8.9f -pci_config_putb.9f := LINKSRC = pci_config_get8.9f -pci_config_putl.9f := LINKSRC = pci_config_get8.9f -pci_config_putll.9f := LINKSRC = pci_config_get8.9f -pci_config_putw.9f := LINKSRC = pci_config_get8.9f pci_config_teardown.9f := LINKSRC = pci_config_setup.9f diff --git a/usr/src/man/man9f/ddi_get8.9f b/usr/src/man/man9f/ddi_get8.9f index 7ab78b1fe1..0218f8e139 100644 --- a/usr/src/man/man9f/ddi_get8.9f +++ b/usr/src/man/man9f/ddi_get8.9f @@ -5,8 +5,8 @@ .\" 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 DDI_GET8 9F "Nov 1, 2005" .SH NAME -ddi_get8, ddi_get16, ddi_get32, ddi_get64, ddi_getb, ddi_getw, ddi_getl, -ddi_getll \- read data from the mapped memory address, device register or +ddi_get8, ddi_get16, ddi_get32, ddi_get64, +\- read data from the mapped memory address, device register or allocated DMA memory address .SH SYNOPSIS .nf @@ -90,9 +90,7 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface Stability T{ -\fBddi_getb()\fR, \fBddi_getl()\fR, \fBddi_getll()\fR, and \fBddi_getw()\fR are Obsolete; \fBddi_get8()\fR, \fBddi_get16()\fR, \fBddi_get32()\fR, \fBddi_get64()\fR are Committed -T} +Interface Stability Committed .TE .SH SEE ALSO diff --git a/usr/src/man/man9f/ddi_io_get8.9f b/usr/src/man/man9f/ddi_io_get8.9f index 5ba4c455ce..7facb6081d 100644 --- a/usr/src/man/man9f/ddi_io_get8.9f +++ b/usr/src/man/man9f/ddi_io_get8.9f @@ -5,7 +5,7 @@ .\" 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 DDI_IO_GET8 9F "Nov 1, 2005" .SH NAME -ddi_io_get8, ddi_io_get16, ddi_io_get32, ddi_io_getb, ddi_io_getl, ddi_io_getw +ddi_io_get8, ddi_io_get16, ddi_io_get32 \- read data from the mapped device register in I/O space .SH SYNOPSIS .nf @@ -33,10 +33,8 @@ illumos DDI specific (illumos DDI). The \fBddi_io_get8()\fR, \fBddi_io_getl()\fR, and \fBddi_io_getw()\fR functions are obsolete. The \fBddi_get8\fR(9F) function replaces \fBddi_io_get8()\fR. The \fBddi_get16\fR(9F) function replaces \fBddi_io_get16()\fR. The -\fBddi_get32\fR(9F) function replaces \fBddi_io_get32()\fR. The -\fBddi_get8\fR(9F) function replaces \fBddi_io_getb()\fR. The -\fBddi_get32\fR(9F) function replaces \fBddi_io_getl()\fR. The -\fBddi_get16\fR(9F) function replaces \fBddi_io_getw()\fR. +\fBddi_get32\fR(9F) function replaces \fBddi_io_get32()\fR. + .SH PARAMETERS .ne 2 .na diff --git a/usr/src/man/man9f/ddi_io_put8.9f b/usr/src/man/man9f/ddi_io_put8.9f index 231bdfe938..957ef9bad9 100644 --- a/usr/src/man/man9f/ddi_io_put8.9f +++ b/usr/src/man/man9f/ddi_io_put8.9f @@ -5,7 +5,7 @@ .\" 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 DDI_IO_PUT8 9F "Nov 1, 2005" .SH NAME -ddi_io_put8, ddi_io_put16, ddi_io_put32, ddi_io_putb, ddi_io_putl, ddi_io_putw +ddi_io_put8, ddi_io_put16, ddi_io_put32 \- write data to the mapped device register in I/O space .SH SYNOPSIS .nf @@ -36,10 +36,7 @@ illumos DDI specific (illumos DDI). The \fBddi_io_put8()\fR, \fBddi_io_putl()\fR, and \fBddi_io_putw()\fR functions are obsolete. The \fBddi_put8\fR(9F) function replaces \fBddi_io_put8()\fR. The \fBddi_put16\fR(9F) function replaces \fBddi_io_put16()\fR. The -\fBddi_put32\fR(9F) function replaces \fBddi_io_put32()\fR. The -\fBddi_put8\fR(9F) function replaces \fBddi_io_putb()\fR. The -\fBddi_put32\fR(9F) function replaces \fBddi_io_putl()\fR. The -\fBddi_put16\fR(9F) function replaces \fBddi_io_putw()\fR. +\fBddi_put32\fR(9F) function replaces \fBddi_io_put32()\fR. .SH PARAMETERS .ne 2 .na diff --git a/usr/src/man/man9f/ddi_io_rep_get8.9f b/usr/src/man/man9f/ddi_io_rep_get8.9f index 695e6ef301..f626ee6e69 100644 --- a/usr/src/man/man9f/ddi_io_rep_get8.9f +++ b/usr/src/man/man9f/ddi_io_rep_get8.9f @@ -5,8 +5,8 @@ .\" 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 DDI_IO_REP_GET8 9F "Nov 1, 2005" .SH NAME -ddi_io_rep_get8, ddi_io_rep_get16, ddi_io_rep_get32, ddi_io_rep_getb, -ddi_io_rep_getl, ddi_io_rep_getw \- read multiple data from the mapped device +ddi_io_rep_get8, ddi_io_rep_get16, ddi_io_rep_get32 + \- read multiple data from the mapped device register in I/O space .SH SYNOPSIS .nf @@ -37,10 +37,7 @@ illumos DDI specific (illumos DDI). The \fBddi_io_rep_get8()\fR, \fBddi_io_rep_getl()\fR, and \fBddi_io_rep_getw()\fR functions are obsolete. The \fBddi_rep_get8\fR(9F) function replaces \fBddi_io_rep_get8()\fR. The \fBddi_rep_get16\fR(9F) function replaces \fBddi_io_rep_get16()\fR. The -\fBddi_rep_get32\fR(9F) function replaces \fBddi_io_rep_get32()\fR. The -\fBddi_rep_get8\fR(9F) function replaces \fBddi_io_rep_getb()\fR. The -\fBddi_rep_get32\fR(9F) function replaces \fBddi_io_rep_getl()\fR. The -\fBddi_rep_get16\fR(9F) function replaces \fBddi_io_rep_getw()\fR. +\fBddi_rep_get32\fR(9F) function replaces \fBddi_io_rep_get32()\fR. .SH PARAMETERS .ne 2 .na diff --git a/usr/src/man/man9f/ddi_io_rep_put8.9f b/usr/src/man/man9f/ddi_io_rep_put8.9f index decd7c7a8a..a353fd27d8 100644 --- a/usr/src/man/man9f/ddi_io_rep_put8.9f +++ b/usr/src/man/man9f/ddi_io_rep_put8.9f @@ -5,8 +5,8 @@ .\" 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 DDI_IO_REP_PUT8 9F "Nov 1, 2005" .SH NAME -ddi_io_rep_put8, ddi_io_rep_put16, ddi_io_rep_put32, ddi_io_rep_putb, -ddi_io_rep_putl, ddi_io_rep_putw \- write multiple data to the mapped device +ddi_io_rep_put8, ddi_io_rep_put16, ddi_io_rep_put32 + \- write multiple data to the mapped device register in I/O space .SH SYNOPSIS .nf @@ -37,10 +37,7 @@ illumos DDI specific (illumos DDI). The \fBddi_io_rep_put8()\fR, \fBddi_io_rep_putl()\fR, and \fBddi_io_rep_putw()\fR functions are obsolete. The \fBddi_rep_put8\fR(9F) function replaces \fBddi_io_rep_put8()\fR. The \fBddi_rep_put16\fR(9F) function replaces \fBddi_io_rep_put16()\fR. The -\fBddi_rep_put32\fR(9F) function replaces \fBddi_io_rep_put32()\fR. The -\fBddi_rep_put8\fR(9F) function replaces \fBddi_io_rep_putb()\fR. The -\fBddi_rep_put32\fR(9F) function replaces \fBddi_io_rep_putl()\fR. The -\fBddi_rep_put16\fR(9F) function replaces \fBddi_io_rep_putw()\fR. +\fBddi_rep_put32\fR(9F) function replaces \fBddi_io_rep_put32()\fR. .SH PARAMETERS .ne 2 .na diff --git a/usr/src/man/man9f/ddi_mem_get8.9f b/usr/src/man/man9f/ddi_mem_get8.9f index 11f3fa9802..48b8923e46 100644 --- a/usr/src/man/man9f/ddi_mem_get8.9f +++ b/usr/src/man/man9f/ddi_mem_get8.9f @@ -5,9 +5,8 @@ .\" 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 DDI_MEM_GET8 9F "Nov 1, 2005" .SH NAME -ddi_mem_get8, ddi_mem_get16, ddi_mem_get32, ddi_mem_get64, ddi_mem_getb, -ddi_mem_getl, ddi_mem_getll, ddi_mem_getw \- read data from mapped device in -the memory space or allocated DMA memory +ddi_mem_get8, ddi_mem_get16, ddi_mem_get32, ddi_mem_get64 +\- read data from mapped device in the memory space or allocated DMA memory .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -41,11 +40,7 @@ illumos DDI specific (illumos DDI). The \fBddi_mem_get8()\fR, replaces \fBddi_mem_get8()\fR. The \fBddi_get16\fR(9F) function replaces \fBddi_mem_get16()\fR. The \fBddi_get32\fR(9F) function replaces \fBddi_mem_get32()\fR. The \fBddi_get64\fR(9F) function replaces -\fBddi_mem_get64()\fR. The \fBddi_get8\fR(9F) function replaces -\fBddi_mem_getb()\fR. The \fBddi_get32\fR(9F) function replaces -\fBddi_mem_getl()\fR. The \fBddi_get64\fR(9F) function replaces -\fBddi_mem_getll()\fR. The \fBddi_get16\fR(9F) function replaces -\fBddi_mem_getw()\fR. +\fBddi_mem_get64()\fR. .SH PARAMETERS .ne 2 .na diff --git a/usr/src/man/man9f/ddi_mem_put8.9f b/usr/src/man/man9f/ddi_mem_put8.9f index a04a0670ac..35d42a138e 100644 --- a/usr/src/man/man9f/ddi_mem_put8.9f +++ b/usr/src/man/man9f/ddi_mem_put8.9f @@ -5,9 +5,8 @@ .\" 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 DDI_MEM_PUT8 9F "Nov 1, 2005" .SH NAME -ddi_mem_put8, ddi_mem_put16, ddi_mem_put32, ddi_mem_put64, ddi_mem_putb, -ddi_mem_putw, ddi_mem_putl, ddi_mem_putll \- write data to mapped device in the -memory space or allocated DMA memory +ddi_mem_put8, ddi_mem_put16, ddi_mem_put32, ddi_mem_put64, +\- write data to mapped device in the memory space or allocated DMA memory .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -73,11 +72,7 @@ illumos DDI specific (illumos DDI). The \fBddi_mem_put8()\fR, replaces \fBddi_mem_put8()\fR. The \fBddi_put16\fR(9F) function replaces \fBddi_mem_put16()\fR. The \fBddi_put32\fR(9F) function replaces \fBddi_mem_put32()\fR. The \fBddi_put64\fR(9F) function replaces -\fBddi_mem_put64()\fR. The \fBddi_put8\fR(9F) function replaces -\fBddi_mem_putb()\fR. The \fBddi_put32\fR(9F) function replaces -\fBddi_mem_putl()\fR. The \fBddi_put64\fR(9F) function replaces -\fBddi_mem_putll()\fR. The \fBddi_put16\fR(9F) function replaces -\fBddi_mem_putw()\fR. +\fBddi_mem_put64()\fR. .SH DESCRIPTION These routines generate a write of various sizes to memory space or allocated \fBDMA \fRmemory. The \fBddi_mem_put8()\fR, \fBddi_mem_put16()\fR, diff --git a/usr/src/man/man9f/ddi_mem_rep_get8.9f b/usr/src/man/man9f/ddi_mem_rep_get8.9f index 5aa5cd42ff..db29dcf6fc 100644 --- a/usr/src/man/man9f/ddi_mem_rep_get8.9f +++ b/usr/src/man/man9f/ddi_mem_rep_get8.9f @@ -6,8 +6,7 @@ .TH DDI_MEM_REP_GET8 9F "Nov 1, 2005" .SH NAME ddi_mem_rep_get8, ddi_mem_rep_get16, ddi_mem_rep_get32, ddi_mem_rep_get64, -ddi_mem_rep_getb, ddi_mem_rep_getl, ddi_mem_rep_getll, ddi_mem_rep_getw \- read -multiple data from mapped device in the memory space or allocated DMA memory +\- read multiple data from mapped device in the memory space or allocated DMA memory .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -49,11 +48,7 @@ illumos DDI specific (illumos DDI). The \fBddi_mem_rep_get8()\fR, The \fBddi_rep_get8\fR(9F) function replaces \fBddi_mem_rep_get8()\fR. The \fBddi_rep_get16\fR(9F) function replaces \fBddi_mem_rep_get16()\fR. The \fBddi_rep_get32\fR(9F) function replaces \fBddi_mem_rep_get32()\fR. The -\fBddi_rep_get64\fR(9F) function replaces \fBddi_mem_rep_get64()\fR. The -\fBddi_rep_get8\fR(9F) function replaces \fBddi_mem_rep_getb()\fR. The -\fBddi_rep_get32\fR(9F) function replaces \fBddi_mem_rep_getl()\fR. The -\fBddi_rep_get64\fR(9F) function replaces \fBddi_mem_rep_getll()\fR. The -\fBddi_rep_get16\fR(9F) function replaces \fBddi_mem_rep_getw()\fR. +\fBddi_rep_get64\fR(9F) function replaces \fBddi_mem_rep_get64()\fR. .SH PARAMETERS .ne 2 .na diff --git a/usr/src/man/man9f/ddi_mem_rep_put8.9f b/usr/src/man/man9f/ddi_mem_rep_put8.9f index 5d6c0eebfe..fea46be137 100644 --- a/usr/src/man/man9f/ddi_mem_rep_put8.9f +++ b/usr/src/man/man9f/ddi_mem_rep_put8.9f @@ -6,8 +6,7 @@ .TH DDI_MEM_REP_PUT8 9F "Nov 1, 2005" .SH NAME ddi_mem_rep_put8, ddi_mem_rep_put16, ddi_mem_rep_put32, ddi_mem_rep_put64, -ddi_mem_rep_putb, ddi_mem_rep_putl, ddi_mem_rep_putll, ddi_mem_rep_putw \- -write multiple data to mapped device in the memory space or allocated DMA +\- write multiple data to mapped device in the memory space or allocated DMA memory .SH SYNOPSIS .nf @@ -41,16 +40,11 @@ memory .SH INTERFACE LEVEL illumos DDI specific (illumos DDI). The \fBddi_mem_rep_put8()\fR, \fBddi_mem_rep_put16()\fR, \fBddi_mem_rep_put32()\fR, -\fBddi_mem_rep_put64()\fR, \fBddi_mem_rep_putb()\fR, \fBddi_mem_rep_putl()\fR, -\fBddi_mem_rep_putll()\fR, and \fBddi_mem_rep_putw()\fR functions are obsolete. +and \fBddi_mem_rep_put64()\fR functions are obsolete. The \fBddi_rep_put8\fR(9F) function replaces \fBddi_mem_rep_put8()\fR. The \fBddi_rep_put16\fR(9F) function replaces \fBddi_mem_rep_put16()\fR. The \fBddi_rep_put32\fR(9F) function replaces \fBddi_mem_rep_put32()\fR. The -\fBddi_rep_put64\fR(9F) function replaces \fBddi_mem_rep_put64()\fR. The -\fBddi_rep_put8\fR(9F) function replaces \fBddi_mem_rep_putb()\fR. The -\fBddi_rep_put32\fR(9F) function replaces \fBddi_mem_rep_putl()\fR. The -\fBddi_rep_put64\fR(9F) function replaces \fBddi_mem_rep_putll()\fR. The -\fBddi_rep_put16\fR(9F) function replaces \fBddi_mem_rep_putw()\fR. +\fBddi_rep_put64\fR(9F) function replaces \fBddi_mem_rep_put64()\fR. .SH PARAMETERS .ne 2 .na diff --git a/usr/src/man/man9f/ddi_peek.9f b/usr/src/man/man9f/ddi_peek.9f index 160e9b17de..4d4fd46876 100644 --- a/usr/src/man/man9f/ddi_peek.9f +++ b/usr/src/man/man9f/ddi_peek.9f @@ -5,8 +5,8 @@ .\" 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 DDI_PEEK 9F "Jan 16, 2006" .SH NAME -ddi_peek, ddi_peek8, ddi_peek16, ddi_peek32, ddi_peek64, ddi_peekc, ddi_peeks, -ddi_peekl, ddi_peekd \- read a value from a location +ddi_peek, ddi_peek8, ddi_peek16, ddi_peek32, ddi_peek64 +\- read a value from a location .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -151,22 +151,3 @@ failure: .sp .LP \fIWriting Device Drivers\fR -.SH NOTES -The functions described in this manual page previously used symbolic names -which specified their data access size; the function names have been changed so -they now specify a fixed-width data size. See the following table for the new -name equivalents: -.sp - -.sp -.TS -box; -l l -l l . -\fBPrevious Name\fR \fBNew Name\fR -\fBddi_peekc\fR \fBddi_peek8\fR -\fBddi_peeks\fR \fBddi_peek16\fR -\fBddi_peekl\fR \fBddi_peek32\fR -\fBddi_peekd\fR \fBddi_peek64\fR -.TE - diff --git a/usr/src/man/man9f/ddi_poke.9f b/usr/src/man/man9f/ddi_poke.9f index ec6813275b..140323cf3c 100644 --- a/usr/src/man/man9f/ddi_poke.9f +++ b/usr/src/man/man9f/ddi_poke.9f @@ -5,8 +5,8 @@ .\" 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 DDI_POKE 9F "Jan 16, 2006" .SH NAME -ddi_poke, ddi_poke8, ddi_poke16, ddi_poke32, ddi_poke64, ddi_pokec, ddi_pokes, -ddi_pokel, ddi_poked \- write a value to a location +ddi_poke, ddi_poke8, ddi_poke16, ddi_poke32, ddi_poke64 +\- write a value to a location .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -106,22 +106,3 @@ These functions can be called from user, interrupt, or kernel context. .sp .LP \fIWriting Device Drivers\fR -.SH NOTES -The functions described in this manual page previously used symbolic names -which specified their data access size; the function names have been changed so -they now specify a fixed-width data size. See the following table for the new -name equivalents: -.sp - -.sp -.TS -box; -l l -l l . -\fBPrevious Name\fR \fBNew Name\fR -\fBddi_pokec\fR \fBddi_poke8\fR -\fBddi_pokes\fR \fBddi_poke16\fR -\fBddi_pokel\fR \fBddi_poke32\fR -\fBddi_poked\fR \fBddi_poke64\fR -.TE - diff --git a/usr/src/man/man9f/ddi_put8.9f b/usr/src/man/man9f/ddi_put8.9f index 052053ca99..854981ab04 100644 --- a/usr/src/man/man9f/ddi_put8.9f +++ b/usr/src/man/man9f/ddi_put8.9f @@ -5,8 +5,8 @@ .\" 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 DDI_PUT8 9F "Nov 1, 2005" .SH NAME -ddi_put8, ddi_put16, ddi_put32, ddi_put64, ddi_putb, ddi_putl, ddi_putll, -ddi_putw \- write data to the mapped memory address, device register or +ddi_put8, ddi_put16, ddi_put32, ddi_put64, +\- write data to the mapped memory address, device register or allocated DMA memory address .SH SYNOPSIS .nf @@ -102,9 +102,7 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface Stability T{ -\fBddi_putb()\fR, \fBddi_putl()\fR, \fBddi_putll()\fR, and \fBddi_putw()\fR are Obsolete \fBddi_put8()\fR, \fBddi_put16()\fR, \fBddi_put32()\fR, \fBddi_put64()\fR are Committed -T} +Interface Stability Committed .TE .SH SEE ALSO diff --git a/usr/src/man/man9f/ddi_rep_get8.9f b/usr/src/man/man9f/ddi_rep_get8.9f index 22a3e5e63a..5241d3401a 100644 --- a/usr/src/man/man9f/ddi_rep_get8.9f +++ b/usr/src/man/man9f/ddi_rep_get8.9f @@ -5,8 +5,8 @@ .\" 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 DDI_REP_GET8 9F "Nov 1, 2005" .SH NAME -ddi_rep_get8, ddi_rep_get16, ddi_rep_get32, ddi_rep_get64, ddi_rep_getw, -ddi_rep_getl, ddi_rep_getll, ddi_rep_getb \- read data from the mapped memory +ddi_rep_get8, ddi_rep_get16, ddi_rep_get32, ddi_rep_get64, +\- read data from the mapped memory address, device register or allocated DMA memory address .SH SYNOPSIS .nf @@ -147,9 +147,7 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface Stability T{ -\fBddi_rep_getb()\fR, \fBddi_rep_getl()\fR, \fBddi_rep_getll()\fR, and \fBddi_rep_getw()\fR are Obsolete \fBddi_rep_get8()\fR, \fBddi_rep_get16()\fR, \fBddi_rep_get32()\fR, \fBddi_rep_get64()\fR are Committed -T} +Interface Stability Committed .TE .SH SEE ALSO diff --git a/usr/src/man/man9f/ddi_rep_put8.9f b/usr/src/man/man9f/ddi_rep_put8.9f index 602d459e69..49a8c293c0 100644 --- a/usr/src/man/man9f/ddi_rep_put8.9f +++ b/usr/src/man/man9f/ddi_rep_put8.9f @@ -5,9 +5,9 @@ .\" 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 DDI_REP_PUT8 9F "Nov 1, 2005" .SH NAME -ddi_rep_put8, ddi_rep_put16, ddi_rep_put32, ddi_rep_put64, ddi_rep_putb, -ddi_rep_putw, ddi_rep_putl, ddi_rep_putll \- write data to the mapped memory -address, device register or allocated DMA memory address +ddi_rep_put8, ddi_rep_put16, ddi_rep_put32, ddi_rep_put64, +\- write data to the mapped memory address, device register or allocated DMA +memory address .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -145,9 +145,7 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface Stability T{ -\fBddi_rep_putb()\fR, \fBddi_rep_putl()\fR, \fBddi_rep_putll()\fR, and \fBddi_rep_putw()\fR are Obsolete \fBddi_rep_put8()\fR, \fBddi_rep_put16()\fR, \fBddi_rep_put32()\fR, \fBddi_rep_put64()\fR are Committed -T} +Interface Stability Committed .TE .SH SEE ALSO diff --git a/usr/src/man/man9f/inb.9f b/usr/src/man/man9f/inb.9f index 686508d008..55aa03f83f 100644 --- a/usr/src/man/man9f/inb.9f +++ b/usr/src/man/man9f/inb.9f @@ -5,7 +5,7 @@ .\" 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 "September 12, 2020" .SH NAME -inb, inw, inl, repinsb, repinsw, repinsd \- read from an I/O port +inb, inw, inl \- read from an I/O port .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -25,30 +25,10 @@ inb, inw, inl, repinsb, repinsw, repinsd \- read from an I/O port \fBunsigned long\fR \fBinl\fR(\fBint\fR \fIport\fR); .fi -.LP -.nf -\fBvoid\fR \fBrepinsb\fR(\fBint\fR \fIport\fR, \fBunsigned char *\fR\fIaddr\fR, \fBint\fR -\fIcount\fR); -.fi - -.LP -.nf -\fBvoid\fR \fBrepinsw\fR(\fBint\fR \fIport\fR, \fBunsigned short *\fR\fIaddr\fR, \fBint\fR -\fIcount\fR); -.fi - -.LP -.nf -\fBvoid\fR \fBrepinsd\fR(\fBint\fR \fIport\fR, \fBunsigned long *\fR\fIaddr\fR, \fBint\fR -\fIcount\fR); -.fi - .SH INTERFACE LEVEL The functions described here are obsolete. For the \fBinb()\fR, \fBinw()\fR, and \fBinl()\fR functions, use, respectively, \fBddi_get8\fR(9F), -\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_get16\fR(9F), and \fBddi_rep_get32\fR(9F) instead. +\fBddi_get16\fR(9F), and \fBddi_get32\fR(9F) instead. .SH PARAMETERS .ne 2 .na @@ -83,13 +63,6 @@ specified by \fIport\fR. .LP The \fBinb()\fR, \fBinw()\fR, and \fBinl()\fR functions read 8 bits, 16 bits, and 32 bits of data respectively, returning the resulting values. -.sp -.LP -The \fBrepinsb()\fR, \fBrepinsw()\fR, and \fBrepinsd()\fR functions read -multiple 8-bit, 16-bit, and 32-bit values, respectively. \fIcount\fR specifies -the number of values to be read. A pointer to a buffer will receive the input -data; the buffer must be long enough to hold count values of the requested -size. .SH RETURN VALUES The \fBinb()\fR, \fBinw()\fR, and \fBinl()\fR functions return the value that was read from the I/O port. @@ -113,8 +86,7 @@ Stability Level Obsolete .SH SEE ALSO \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) +\fBddi_get32\fR(9F), \fBoutb\fR(9F) .sp .LP \fIWriting Device Drivers\fR diff --git a/usr/src/man/man9f/outb.9f b/usr/src/man/man9f/outb.9f index d839c2f012..9604e04e1c 100644 --- a/usr/src/man/man9f/outb.9f +++ b/usr/src/man/man9f/outb.9f @@ -5,9 +5,8 @@ .\" 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 "Oct 24, 2012" .SH NAME -outb, outw, outl, repoutsb, repoutsw, repoutsd \- write to an I/O port +outb, outw, outl \- write to an I/O port .SH SYNOPSIS -.LP .nf #include <sys/ddi.h> #include <sys/sunddi.h> @@ -25,32 +24,11 @@ outb, outw, outl, repoutsb, repoutsw, repoutsd \- write to an I/O port \fBvoid\fR \fBoutl\fR(\fBint\fR \fIport\fR, \fBunsigned long\fR \fIvalue\fR); .fi -.LP -.nf -\fBvoid\fR \fBrepoutsb\fR(\fBint\fR \fIport\fR, \fBunsigned char *\fR\fIaddr\fR, \fBint\fR \fIcount\fR); -.fi - -.LP -.nf -\fBvoid\fR \fBrepoutsw\fR(\fBint\fR \fIport\fR, \fBunsigned short *\fR\fIaddr\fR, \fBint\fR \fIcount\fR); -.fi - -.LP -.nf -\fBvoid\fR \fBrepoutsd\fR(\fBint\fR \fIport\fR, \fBunsigned long *\fR\fIaddr\fR, \fBint\fR \fIcount\fR); -.fi - .SH INTERFACE LEVEL -.sp -.LP The functions described here are obsolete. For the \fBoutb()\fR, \fBoutw()\fR, and \fBoutl()\fR functions use, respectively, \fBddi_put8\fR(9F), -\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_put16\fR(9F), and \fBddi_rep_put32\fR(9F) -instead. +\fBddi_put16\fR(9F), and \fBddi_put32\fR(9F) instead. .SH PARAMETERS -.sp .ne 2 .na \fB\fIport\fR\fR @@ -87,8 +65,6 @@ The number of values to be written to the \fBI/O\fR port. .RE .SH DESCRIPTION -.sp -.LP These routines write data of various sizes to the \fBI/O\fR port with the address specified by \fIport\fR. .sp @@ -97,18 +73,9 @@ The \fBoutb()\fR, \fBoutw()\fR, and \fBoutl()\fR functions write 8 bits, 16 bits, and 32 bits of data respectively, writing the data specified by \fIvalue\fR. .sp -.LP -The \fBrepoutsb()\fR, \fBrepoutsw()\fR, and \fBrepoutsd()\fR functions write -multiple 8-bit, 16-bit, and 32-bit values, respectively. \fIcount\fR specifies -the number of values to be written. \fIaddr\fR is a pointer to a buffer from -which the output values are fetched. .SH CONTEXT -.sp -.LP These functions may be called from user, interrupt, or kernel context. .SH ATTRIBUTES -.sp -.LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -121,15 +88,12 @@ ATTRIBUTE TYPE ATTRIBUTE VALUE _ Architecture x86 _ -Interface Stability Obsolete +Interface Stability Obsolete .TE .SH SEE ALSO -.sp -.LP \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) +\fBddi_put32\fR(9F), \fBinb\fR(9F) .sp .LP \fIWriting Device Drivers\fR diff --git a/usr/src/man/man9f/pci_config_get8.9f b/usr/src/man/man9f/pci_config_get8.9f index 07954c4780..b0d228028f 100644 --- a/usr/src/man/man9f/pci_config_get8.9f +++ b/usr/src/man/man9f/pci_config_get8.9f @@ -7,9 +7,7 @@ .SH NAME pci_config_get8, pci_config_get16, pci_config_get32, pci_config_get64, pci_config_put8, pci_config_put16, pci_config_put32, pci_config_put64, -pci_config_getb, pci_config_getl, pci_config_getll, pci_config_getw, -pci_config_putb, pci_config_putl, pci_config_putll, pci_config_putw \- read or -write single datum of various sizes to the PCI Local Bus Configuration space +\- read or write single datum of various sizes to the PCI Local Bus Configuration space .SH SYNOPSIS .nf #include <sys/ddi.h> @@ -133,9 +131,7 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface Stability T{ -\fBpci_config_getb()\fR, \fBpci_config_getl()\fR, \fBpci_config_getll()\fR, \fBpci_config_getw()\fR, \fBpci_config_putb()\fR, \fBpci_config_putl()\fR, \fBpci_config_putll()\fR, \fBpci_config_putw()\fR are Obsolete \fBpci_config_get8()\fR, \fBpci_config_get16()\fR, \fBpci_config_get32()\fR, \fBpci_config_get64()\fR, \fBpci_config_put8()\fR, \fBpci_config_put16()\fR, \fBpci_config_put32()\fR, \fBpci_config_put64()\fR are Committed -T} +Interface Stability Committed .TE .SH SEE ALSO diff --git a/usr/src/pkg/manifests/system-kernel.man9f.inc b/usr/src/pkg/manifests/system-kernel.man9f.inc index f0129536ae..f170e7c81c 100644 --- a/usr/src/pkg/manifests/system-kernel.man9f.inc +++ b/usr/src/pkg/manifests/system-kernel.man9f.inc @@ -758,14 +758,10 @@ link path=usr/share/man/man9f/ddi_get_name.9f target=ddi_binding_name.9f link path=usr/share/man/man9f/ddi_get_soft_iblock_cookie.9f \ target=ddi_add_softintr.9f link path=usr/share/man/man9f/ddi_get_soft_state.9f target=ddi_soft_state.9f -link path=usr/share/man/man9f/ddi_getb.9f target=ddi_get8.9f -link path=usr/share/man/man9f/ddi_getl.9f target=ddi_get8.9f -link path=usr/share/man/man9f/ddi_getll.9f target=ddi_get8.9f link path=usr/share/man/man9f/ddi_getlongprop.9f target=ddi_prop_op.9f link path=usr/share/man/man9f/ddi_getlongprop_buf.9f target=ddi_prop_op.9f link path=usr/share/man/man9f/ddi_getprop.9f target=ddi_prop_op.9f link path=usr/share/man/man9f/ddi_getproplen.9f target=ddi_prop_op.9f -link path=usr/share/man/man9f/ddi_getw.9f target=ddi_get8.9f link path=usr/share/man/man9f/ddi_intr_block_disable.9f \ target=ddi_intr_enable.9f link path=usr/share/man/man9f/ddi_intr_block_enable.9f \ @@ -789,70 +785,34 @@ link path=usr/share/man/man9f/ddi_intr_trigger_softint.9f \ target=ddi_intr_add_softint.9f link path=usr/share/man/man9f/ddi_io_get16.9f target=ddi_io_get8.9f link path=usr/share/man/man9f/ddi_io_get32.9f target=ddi_io_get8.9f -link path=usr/share/man/man9f/ddi_io_getb.9f target=ddi_io_get8.9f -link path=usr/share/man/man9f/ddi_io_getl.9f target=ddi_io_get8.9f -link path=usr/share/man/man9f/ddi_io_getw.9f target=ddi_io_get8.9f link path=usr/share/man/man9f/ddi_io_put16.9f target=ddi_io_put8.9f link path=usr/share/man/man9f/ddi_io_put32.9f target=ddi_io_put8.9f -link path=usr/share/man/man9f/ddi_io_putb.9f target=ddi_io_put8.9f -link path=usr/share/man/man9f/ddi_io_putl.9f target=ddi_io_put8.9f -link path=usr/share/man/man9f/ddi_io_putw.9f target=ddi_io_put8.9f link path=usr/share/man/man9f/ddi_io_rep_get16.9f target=ddi_io_rep_get8.9f link path=usr/share/man/man9f/ddi_io_rep_get32.9f target=ddi_io_rep_get8.9f -link path=usr/share/man/man9f/ddi_io_rep_getb.9f target=ddi_io_rep_get8.9f -link path=usr/share/man/man9f/ddi_io_rep_getl.9f target=ddi_io_rep_get8.9f -link path=usr/share/man/man9f/ddi_io_rep_getw.9f target=ddi_io_rep_get8.9f link path=usr/share/man/man9f/ddi_io_rep_put16.9f target=ddi_io_rep_put8.9f link path=usr/share/man/man9f/ddi_io_rep_put32.9f target=ddi_io_rep_put8.9f -link path=usr/share/man/man9f/ddi_io_rep_putb.9f target=ddi_io_rep_put8.9f -link path=usr/share/man/man9f/ddi_io_rep_putl.9f target=ddi_io_rep_put8.9f -link path=usr/share/man/man9f/ddi_io_rep_putw.9f target=ddi_io_rep_put8.9f link path=usr/share/man/man9f/ddi_mem_get16.9f target=ddi_mem_get8.9f link path=usr/share/man/man9f/ddi_mem_get32.9f target=ddi_mem_get8.9f link path=usr/share/man/man9f/ddi_mem_get64.9f target=ddi_mem_get8.9f -link path=usr/share/man/man9f/ddi_mem_getb.9f target=ddi_mem_get8.9f -link path=usr/share/man/man9f/ddi_mem_getl.9f target=ddi_mem_get8.9f -link path=usr/share/man/man9f/ddi_mem_getll.9f target=ddi_mem_get8.9f -link path=usr/share/man/man9f/ddi_mem_getw.9f target=ddi_mem_get8.9f link path=usr/share/man/man9f/ddi_mem_put16.9f target=ddi_mem_put8.9f link path=usr/share/man/man9f/ddi_mem_put32.9f target=ddi_mem_put8.9f link path=usr/share/man/man9f/ddi_mem_put64.9f target=ddi_mem_put8.9f -link path=usr/share/man/man9f/ddi_mem_putb.9f target=ddi_mem_put8.9f -link path=usr/share/man/man9f/ddi_mem_putl.9f target=ddi_mem_put8.9f -link path=usr/share/man/man9f/ddi_mem_putll.9f target=ddi_mem_put8.9f -link path=usr/share/man/man9f/ddi_mem_putw.9f target=ddi_mem_put8.9f link path=usr/share/man/man9f/ddi_mem_rep_get16.9f target=ddi_mem_rep_get8.9f link path=usr/share/man/man9f/ddi_mem_rep_get32.9f target=ddi_mem_rep_get8.9f link path=usr/share/man/man9f/ddi_mem_rep_get64.9f target=ddi_mem_rep_get8.9f -link path=usr/share/man/man9f/ddi_mem_rep_getb.9f target=ddi_mem_rep_get8.9f -link path=usr/share/man/man9f/ddi_mem_rep_getl.9f target=ddi_mem_rep_get8.9f -link path=usr/share/man/man9f/ddi_mem_rep_getll.9f target=ddi_mem_rep_get8.9f -link path=usr/share/man/man9f/ddi_mem_rep_getw.9f target=ddi_mem_rep_get8.9f link path=usr/share/man/man9f/ddi_mem_rep_put16.9f target=ddi_mem_rep_put8.9f link path=usr/share/man/man9f/ddi_mem_rep_put32.9f target=ddi_mem_rep_put8.9f link path=usr/share/man/man9f/ddi_mem_rep_put64.9f target=ddi_mem_rep_put8.9f -link path=usr/share/man/man9f/ddi_mem_rep_putb.9f target=ddi_mem_rep_put8.9f -link path=usr/share/man/man9f/ddi_mem_rep_putl.9f target=ddi_mem_rep_put8.9f -link path=usr/share/man/man9f/ddi_mem_rep_putll.9f target=ddi_mem_rep_put8.9f -link path=usr/share/man/man9f/ddi_mem_rep_putw.9f target=ddi_mem_rep_put8.9f link path=usr/share/man/man9f/ddi_modclose.9f target=ddi_modopen.9f link path=usr/share/man/man9f/ddi_modsym.9f target=ddi_modopen.9f link path=usr/share/man/man9f/ddi_peek16.9f target=ddi_peek.9f link path=usr/share/man/man9f/ddi_peek32.9f target=ddi_peek.9f link path=usr/share/man/man9f/ddi_peek64.9f target=ddi_peek.9f link path=usr/share/man/man9f/ddi_peek8.9f target=ddi_peek.9f -link path=usr/share/man/man9f/ddi_peekc.9f target=ddi_peek.9f -link path=usr/share/man/man9f/ddi_peekd.9f target=ddi_peek.9f -link path=usr/share/man/man9f/ddi_peekl.9f target=ddi_peek.9f -link path=usr/share/man/man9f/ddi_peeks.9f target=ddi_peek.9f link path=usr/share/man/man9f/ddi_poke16.9f target=ddi_poke.9f link path=usr/share/man/man9f/ddi_poke32.9f target=ddi_poke.9f link path=usr/share/man/man9f/ddi_poke64.9f target=ddi_poke.9f link path=usr/share/man/man9f/ddi_poke8.9f target=ddi_poke.9f -link path=usr/share/man/man9f/ddi_pokec.9f target=ddi_poke.9f -link path=usr/share/man/man9f/ddi_poked.9f target=ddi_poke.9f -link path=usr/share/man/man9f/ddi_pokel.9f target=ddi_poke.9f -link path=usr/share/man/man9f/ddi_pokes.9f target=ddi_poke.9f link path=usr/share/man/man9f/ddi_prop_free.9f target=ddi_prop_lookup.9f link path=usr/share/man/man9f/ddi_prop_get_int64.9f target=ddi_prop_get_int.9f link path=usr/share/man/man9f/ddi_prop_lookup_byte_array.9f \ @@ -886,27 +846,15 @@ link path=usr/share/man/man9f/ddi_ptob.9f target=ddi_btop.9f link path=usr/share/man/man9f/ddi_put16.9f target=ddi_put8.9f link path=usr/share/man/man9f/ddi_put32.9f target=ddi_put8.9f link path=usr/share/man/man9f/ddi_put64.9f target=ddi_put8.9f -link path=usr/share/man/man9f/ddi_putb.9f target=ddi_put8.9f -link path=usr/share/man/man9f/ddi_putl.9f target=ddi_put8.9f -link path=usr/share/man/man9f/ddi_putll.9f target=ddi_put8.9f -link path=usr/share/man/man9f/ddi_putw.9f target=ddi_put8.9f link path=usr/share/man/man9f/ddi_remove_intr.9f target=ddi_add_intr.9f link path=usr/share/man/man9f/ddi_remove_softintr.9f \ target=ddi_add_softintr.9f link path=usr/share/man/man9f/ddi_rep_get16.9f target=ddi_rep_get8.9f link path=usr/share/man/man9f/ddi_rep_get32.9f target=ddi_rep_get8.9f link path=usr/share/man/man9f/ddi_rep_get64.9f target=ddi_rep_get8.9f -link path=usr/share/man/man9f/ddi_rep_getb.9f target=ddi_rep_get8.9f -link path=usr/share/man/man9f/ddi_rep_getl.9f target=ddi_rep_get8.9f -link path=usr/share/man/man9f/ddi_rep_getll.9f target=ddi_rep_get8.9f -link path=usr/share/man/man9f/ddi_rep_getw.9f target=ddi_rep_get8.9f link path=usr/share/man/man9f/ddi_rep_put16.9f target=ddi_rep_put8.9f link path=usr/share/man/man9f/ddi_rep_put32.9f target=ddi_rep_put8.9f link path=usr/share/man/man9f/ddi_rep_put64.9f target=ddi_rep_put8.9f -link path=usr/share/man/man9f/ddi_rep_putb.9f target=ddi_rep_put8.9f -link path=usr/share/man/man9f/ddi_rep_putl.9f target=ddi_rep_put8.9f -link path=usr/share/man/man9f/ddi_rep_putll.9f target=ddi_rep_put8.9f -link path=usr/share/man/man9f/ddi_rep_putw.9f target=ddi_rep_put8.9f link path=usr/share/man/man9f/ddi_segmap_setup.9f target=ddi_segmap.9f link path=usr/share/man/man9f/ddi_set_driver_private.9f \ target=ddi_get_driver_private.9f @@ -1248,18 +1196,10 @@ link path=usr/share/man/man9f/outw.9f target=outb.9f link path=usr/share/man/man9f/pci_config_get16.9f target=pci_config_get8.9f link path=usr/share/man/man9f/pci_config_get32.9f target=pci_config_get8.9f link path=usr/share/man/man9f/pci_config_get64.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_getb.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_getl.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_getll.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_getw.9f target=pci_config_get8.9f link path=usr/share/man/man9f/pci_config_put16.9f target=pci_config_get8.9f link path=usr/share/man/man9f/pci_config_put32.9f target=pci_config_get8.9f link path=usr/share/man/man9f/pci_config_put64.9f target=pci_config_get8.9f link path=usr/share/man/man9f/pci_config_put8.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_putb.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_putl.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_putll.9f target=pci_config_get8.9f -link path=usr/share/man/man9f/pci_config_putw.9f target=pci_config_get8.9f link path=usr/share/man/man9f/pci_config_teardown.9f \ target=pci_config_setup.9f link path=usr/share/man/man9f/pci_ereport_post.9f target=pci_ereport_setup.9f @@ -1276,12 +1216,6 @@ link path=usr/share/man/man9f/proc_unref.9f target=proc_signal.9f link path=usr/share/man/man9f/qprocsoff.9f target=qprocson.9f link path=usr/share/man/man9f/qwait_sig.9f target=qwait.9f link path=usr/share/man/man9f/rd.9f target=RD.9f -link path=usr/share/man/man9f/repinsb.9f target=inb.9f -link path=usr/share/man/man9f/repinsd.9f target=inb.9f -link path=usr/share/man/man9f/repinsw.9f target=inb.9f -link path=usr/share/man/man9f/repoutsb.9f target=outb.9f -link path=usr/share/man/man9f/repoutsd.9f target=outb.9f -link path=usr/share/man/man9f/repoutsw.9f target=outb.9f link path=usr/share/man/man9f/rmallocmap_wait.9f target=rmallocmap.9f link path=usr/share/man/man9f/rmfreemap.9f target=rmallocmap.9f link path=usr/share/man/man9f/rw_destroy.9f target=rwlock.9f diff --git a/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c b/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c index 571ad7f01e..c8db6855f8 100644 --- a/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c +++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c @@ -15313,11 +15313,7 @@ ql_pci_config_get8(ql_adapter_state_t *ha, off_t off) (uint8_t *)(ha->sbus_config_base + off))); } -#ifdef KERNEL_32 - return (pci_config_getb(ha->pci_handle, off)); -#else return (pci_config_get8(ha->pci_handle, off)); -#endif } uint16_t @@ -15328,11 +15324,7 @@ ql_pci_config_get16(ql_adapter_state_t *ha, off_t off) (uint16_t *)(ha->sbus_config_base + off))); } -#ifdef KERNEL_32 - return (pci_config_getw(ha->pci_handle, off)); -#else return (pci_config_get16(ha->pci_handle, off)); -#endif } uint32_t @@ -15343,11 +15335,7 @@ ql_pci_config_get32(ql_adapter_state_t *ha, off_t off) (uint32_t *)(ha->sbus_config_base + off))); } -#ifdef KERNEL_32 - return (pci_config_getl(ha->pci_handle, off)); -#else return (pci_config_get32(ha->pci_handle, off)); -#endif } void @@ -15357,11 +15345,7 @@ ql_pci_config_put8(ql_adapter_state_t *ha, off_t off, uint8_t val) ddi_put8(ha->sbus_config_handle, (uint8_t *)(ha->sbus_config_base + off), val); } else { -#ifdef KERNEL_32 - pci_config_putb(ha->pci_handle, off, val); -#else pci_config_put8(ha->pci_handle, off, val); -#endif } } @@ -15372,11 +15356,7 @@ ql_pci_config_put16(ql_adapter_state_t *ha, off_t off, uint16_t val) ddi_put16(ha->sbus_config_handle, (uint16_t *)(ha->sbus_config_base + off), val); } else { -#ifdef KERNEL_32 - pci_config_putw(ha->pci_handle, off, val); -#else pci_config_put16(ha->pci_handle, off, val); -#endif } } @@ -15387,11 +15367,7 @@ ql_pci_config_put32(ql_adapter_state_t *ha, off_t off, uint32_t val) ddi_put32(ha->sbus_config_handle, (uint32_t *)(ha->sbus_config_base + off), val); } else { -#ifdef KERNEL_32 - pci_config_putl(ha->pci_handle, off, val); -#else pci_config_put32(ha->pci_handle, off, val); -#endif } } diff --git a/usr/src/uts/common/os/sunddi.c b/usr/src/uts/common/os/sunddi.c index f5a4551095..4df2b7e55f 100644 --- a/usr/src/uts/common/os/sunddi.c +++ b/usr/src/uts/common/os/sunddi.c @@ -250,7 +250,7 @@ ddi_unmap_regs(dev_info_t *dip, uint_t rnumber, caddr_t *kaddrp, off_t offset, int ddi_bus_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp, - off_t offset, off_t len, caddr_t *vaddrp) + off_t offset, off_t len, caddr_t *vaddrp) { return (i_ddi_bus_map(dip, rdip, mp, offset, len, vaddrp)); } @@ -265,7 +265,7 @@ ddi_bus_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp, */ int nullbusmap(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp, - off_t offset, off_t len, caddr_t *vaddrp) + off_t offset, off_t len, caddr_t *vaddrp) { _NOTE(ARGUNUSED(rdip)) if (mp->map_type == DDI_MT_RNUMBER) @@ -433,45 +433,6 @@ ddi_peek64(dev_info_t *dip, int64_t *addr, int64_t *val_p) val_p)); } - -/* - * We need to separate the old interfaces from the new ones and leave them - * in here for a while. Previous versions of the OS defined the new interfaces - * to the old interfaces. This way we can fix things up so that we can - * eventually remove these interfaces. - * e.g. A 3rd party module/driver using ddi_peek8 and built against S10 - * or earlier will actually have a reference to ddi_peekc in the binary. - */ -#ifdef _ILP32 -int -ddi_peekc(dev_info_t *dip, int8_t *addr, int8_t *val_p) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_PEEK, sizeof (*val_p), addr, - val_p)); -} - -int -ddi_peeks(dev_info_t *dip, int16_t *addr, int16_t *val_p) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_PEEK, sizeof (*val_p), addr, - val_p)); -} - -int -ddi_peekl(dev_info_t *dip, int32_t *addr, int32_t *val_p) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_PEEK, sizeof (*val_p), addr, - val_p)); -} - -int -ddi_peekd(dev_info_t *dip, int64_t *addr, int64_t *val_p) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_PEEK, sizeof (*val_p), addr, - val_p)); -} -#endif /* _ILP32 */ - int ddi_poke8(dev_info_t *dip, int8_t *addr, int8_t val) { @@ -497,40 +458,6 @@ ddi_poke64(dev_info_t *dip, int64_t *addr, int64_t val) } /* - * We need to separate the old interfaces from the new ones and leave them - * in here for a while. Previous versions of the OS defined the new interfaces - * to the old interfaces. This way we can fix things up so that we can - * eventually remove these interfaces. - * e.g. A 3rd party module/driver using ddi_poke8 and built against S10 - * or earlier will actually have a reference to ddi_pokec in the binary. - */ -#ifdef _ILP32 -int -ddi_pokec(dev_info_t *dip, int8_t *addr, int8_t val) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_POKE, sizeof (val), addr, &val)); -} - -int -ddi_pokes(dev_info_t *dip, int16_t *addr, int16_t val) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_POKE, sizeof (val), addr, &val)); -} - -int -ddi_pokel(dev_info_t *dip, int32_t *addr, int32_t val) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_POKE, sizeof (val), addr, &val)); -} - -int -ddi_poked(dev_info_t *dip, int64_t *addr, int64_t val) -{ - return (i_ddi_peekpoke(dip, DDI_CTLOPS_POKE, sizeof (val), addr, &val)); -} -#endif /* _ILP32 */ - -/* * ddi_peekpokeio() is used primarily by the mem drivers for moving * data to and from uio structures via peek and poke. Note that we * use "internal" routines ddi_peek and ddi_poke to make this go @@ -3115,7 +3042,7 @@ ddi_prop_1275_string(prop_handle_t *ph, uint_t cmd, char *data) */ int ddi_prop_1275_bytes(prop_handle_t *ph, uint_t cmd, uchar_t *data, - uint_t nelements) + uint_t nelements) { switch (cmd) { case DDI_PROP_CMD_DECODE: @@ -4922,7 +4849,7 @@ impl_ddi_callback_init(void) static void callback_insert(int (*funcp)(caddr_t), caddr_t arg, uintptr_t *listid, - int count) + int count) { struct ddi_callback *list, *marker, *new; size_t size = sizeof (struct ddi_callback); @@ -6944,7 +6871,7 @@ ddi_set_console_bell(void (*bellfunc)(clock_t duration)) int ddi_dma_alloc_handle(dev_info_t *dip, ddi_dma_attr_t *attr, - int (*waitfp)(caddr_t), caddr_t arg, ddi_dma_handle_t *handlep) + int (*waitfp)(caddr_t), caddr_t arg, ddi_dma_handle_t *handlep) { int (*funcp)() = ddi_dma_allochdl; ddi_dma_attr_t dma_attr; @@ -6974,9 +6901,9 @@ static uintptr_t dma_mem_list_id = 0; int ddi_dma_mem_alloc(ddi_dma_handle_t handle, size_t length, - ddi_device_acc_attr_t *accattrp, uint_t flags, - int (*waitfp)(caddr_t), caddr_t arg, caddr_t *kaddrp, - size_t *real_length, ddi_acc_handle_t *handlep) + ddi_device_acc_attr_t *accattrp, uint_t flags, + int (*waitfp)(caddr_t), caddr_t arg, caddr_t *kaddrp, + size_t *real_length, ddi_acc_handle_t *handlep) { ddi_dma_impl_t *hp = (ddi_dma_impl_t *)handle; dev_info_t *dip = hp->dmai_rdip; @@ -7067,8 +6994,8 @@ ddi_dma_mem_free(ddi_acc_handle_t *handlep) int ddi_dma_buf_bind_handle(ddi_dma_handle_t handle, struct buf *bp, - uint_t flags, int (*waitfp)(caddr_t), caddr_t arg, - ddi_dma_cookie_t *cookiep, uint_t *ccountp) + uint_t flags, int (*waitfp)(caddr_t), caddr_t arg, + ddi_dma_cookie_t *cookiep, uint_t *ccountp) { ddi_dma_impl_t *hp = (ddi_dma_impl_t *)handle; dev_info_t *dip, *rdip; @@ -7131,8 +7058,8 @@ ddi_dma_buf_bind_handle(ddi_dma_handle_t handle, struct buf *bp, int ddi_dma_addr_bind_handle(ddi_dma_handle_t handle, struct as *as, - caddr_t addr, size_t len, uint_t flags, int (*waitfp)(caddr_t), - caddr_t arg, ddi_dma_cookie_t *cookiep, uint_t *ccountp) + caddr_t addr, size_t len, uint_t flags, int (*waitfp)(caddr_t), + caddr_t arg, ddi_dma_cookie_t *cookiep, uint_t *ccountp) { ddi_dma_impl_t *hp = (ddi_dma_impl_t *)handle; dev_info_t *dip, *rdip; @@ -7270,7 +7197,7 @@ ddi_dma_numwin(ddi_dma_handle_t handle, uint_t *nwinp) int ddi_dma_getwin(ddi_dma_handle_t h, uint_t win, off_t *offp, - size_t *lenp, ddi_dma_cookie_t *cookiep, uint_t *ccountp) + size_t *lenp, ddi_dma_cookie_t *cookiep, uint_t *ccountp) { int (*funcp)() = ddi_dma_win; struct bus_ops *bop; @@ -7346,8 +7273,8 @@ i_ddi_dma_clr_fault(ddi_dma_handle_t handle) */ int ddi_regs_map_setup(dev_info_t *dip, uint_t rnumber, caddr_t *addrp, - offset_t offset, offset_t len, ddi_device_acc_attr_t *accattrp, - ddi_acc_handle_t *handle) + offset_t offset, offset_t len, ddi_device_acc_attr_t *accattrp, + ddi_acc_handle_t *handle) { ddi_map_req_t mr; ddi_acc_hdl_t *hp; @@ -7421,7 +7348,7 @@ ddi_regs_map_free(ddi_acc_handle_t *handlep) int ddi_device_zero(ddi_acc_handle_t handle, caddr_t dev_addr, size_t bytecount, - ssize_t dev_advcnt, uint_t dev_datasz) + ssize_t dev_advcnt, uint_t dev_datasz) { uint8_t *b; uint16_t *w; @@ -7615,7 +7542,7 @@ i_ddi_devtspectype_to_minorname(dev_info_t *dip, dev_t dev, int spec_type) */ int i_ddi_minorname_to_devtspectype(dev_info_t *dip, char *minor_name, - dev_t *devtp, int *spectypep) + dev_t *devtp, int *spectypep) { int circ; struct ddi_minor_data *dmdp; @@ -8354,8 +8281,8 @@ umem_decr_devlockmem(struct ddi_umem_cookie *cookie) */ int umem_lockmemory(caddr_t addr, size_t len, int flags, ddi_umem_cookie_t *cookie, - struct umem_callback_ops *ops_vector, - proc_t *procp) + struct umem_callback_ops *ops_vector, + proc_t *procp) { int error; struct ddi_umem_cookie *p; @@ -8826,8 +8753,8 @@ ddi_umem_unlock(ddi_umem_cookie_t cookie) */ struct buf * ddi_umem_iosetup(ddi_umem_cookie_t cookie, off_t off, size_t len, - int direction, dev_t dev, daddr_t blkno, - int (*iodone)(struct buf *), int sleepflag) + int direction, dev_t dev, daddr_t blkno, + int (*iodone)(struct buf *), int sleepflag) { struct ddi_umem_cookie *p = (struct ddi_umem_cookie *)cookie; struct buf *bp; @@ -8907,7 +8834,7 @@ ddi_get_devstate(dev_info_t *dip) void ddi_dev_report_fault(dev_info_t *dip, ddi_fault_impact_t impact, - ddi_fault_location_t location, const char *message) + ddi_fault_location_t location, const char *message) { struct ddi_fault_event_data fd; ddi_eventcookie_t ec; diff --git a/usr/src/uts/common/os/sunpci.c b/usr/src/uts/common/os/sunpci.c index 209b269838..b1098b4fcc 100644 --- a/usr/src/uts/common/os/sunpci.c +++ b/usr/src/uts/common/os/sunpci.c @@ -145,104 +145,6 @@ pci_config_put64(ddi_acc_handle_t handle, off_t offset, uint64_t value) ddi_put64(handle, (uint64_t *)cfgaddr, value); } -/* - * We need to separate the old interfaces from the new ones and leave them - * in here for a while. Previous versions of the OS defined the new interfaces - * to the old interfaces. This way we can fix things up so that we can - * eventually remove these interfaces. - * e.g. A 3rd party module/driver using pci_config_get8 and built against S10 - * or earlier will actually have a reference to pci_config_getb in the binary. - */ -#ifdef _ILP32 -uint8_t -pci_config_getb(ddi_acc_handle_t handle, off_t offset) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - return (ddi_get8(handle, (uint8_t *)cfgaddr)); -} - -uint16_t -pci_config_getw(ddi_acc_handle_t handle, off_t offset) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - return (ddi_get16(handle, (uint16_t *)cfgaddr)); -} - -uint32_t -pci_config_getl(ddi_acc_handle_t handle, off_t offset) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - return (ddi_get32(handle, (uint32_t *)cfgaddr)); -} - -uint64_t -pci_config_getll(ddi_acc_handle_t handle, off_t offset) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - return (ddi_get64(handle, (uint64_t *)cfgaddr)); -} - -void -pci_config_putb(ddi_acc_handle_t handle, off_t offset, uint8_t value) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - ddi_put8(handle, (uint8_t *)cfgaddr, value); -} - -void -pci_config_putw(ddi_acc_handle_t handle, off_t offset, uint16_t value) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - ddi_put16(handle, (uint16_t *)cfgaddr, value); -} - -void -pci_config_putl(ddi_acc_handle_t handle, off_t offset, uint32_t value) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - ddi_put32(handle, (uint32_t *)cfgaddr, value); -} - -void -pci_config_putll(ddi_acc_handle_t handle, off_t offset, uint64_t value) -{ - caddr_t cfgaddr; - ddi_acc_hdl_t *hp; - - hp = impl_acc_hdl_get(handle); - cfgaddr = hp->ah_addr + offset; - ddi_put64(handle, (uint64_t *)cfgaddr, value); -} -#endif /* _ILP32 */ - /*ARGSUSED*/ int pci_report_pmcap(dev_info_t *dip, int cap, void *arg) @@ -926,7 +828,7 @@ restoreconfig_err: /*ARGSUSED*/ static int pci_lookup_pmcap(dev_info_t *dip, ddi_acc_handle_t conf_hdl, - uint16_t *pmcap_offsetp) + uint16_t *pmcap_offsetp) { uint8_t cap_ptr; uint8_t cap_id; diff --git a/usr/src/uts/common/sys/ddi_obsolete.h b/usr/src/uts/common/sys/ddi_obsolete.h index c1d63bfc48..39ee6db8c4 100644 --- a/usr/src/uts/common/sys/ddi_obsolete.h +++ b/usr/src/uts/common/sys/ddi_obsolete.h @@ -74,87 +74,6 @@ void ddi_io_rep_put16(ddi_acc_handle_t handle, void ddi_io_rep_put32(ddi_acc_handle_t handle, uint32_t *host_addr, uint32_t *dev_addr, size_t repcount); -/* only support older interfaces on 32-bit systems */ -#ifdef _ILP32 -#define ddi_mem_getb ddi_mem_get8 -#define ddi_mem_getw ddi_mem_get16 -#define ddi_mem_getl ddi_mem_get32 -#define ddi_mem_getll ddi_mem_get64 -#define ddi_mem_rep_getb ddi_mem_rep_get8 -#define ddi_mem_rep_getw ddi_mem_rep_get16 -#define ddi_mem_rep_getl ddi_mem_rep_get32 -#define ddi_mem_rep_getll ddi_mem_rep_get64 -#define ddi_mem_putb ddi_mem_put8 -#define ddi_mem_putw ddi_mem_put16 -#define ddi_mem_putl ddi_mem_put32 -#define ddi_mem_putll ddi_mem_put64 -#define ddi_mem_rep_putb ddi_mem_rep_put8 -#define ddi_mem_rep_putw ddi_mem_rep_put16 -#define ddi_mem_rep_putl ddi_mem_rep_put32 -#define ddi_mem_rep_putll ddi_mem_rep_put64 -#define ddi_io_getb ddi_io_get8 -#define ddi_io_getw ddi_io_get16 -#define ddi_io_getl ddi_io_get32 -#define ddi_io_putb ddi_io_put8 -#define ddi_io_putw ddi_io_put16 -#define ddi_io_putl ddi_io_put32 -#define ddi_getb ddi_get8 -#define ddi_getw ddi_get16 -#define ddi_getl ddi_get32 -#define ddi_getll ddi_get64 -#define ddi_rep_getb ddi_rep_get8 -#define ddi_rep_getw ddi_rep_get16 -#define ddi_rep_getl ddi_rep_get32 -#define ddi_rep_getll ddi_rep_get64 -#define ddi_putb ddi_put8 -#define ddi_putw ddi_put16 -#define ddi_putl ddi_put32 -#define ddi_putll ddi_put64 -#define ddi_rep_putb ddi_rep_put8 -#define ddi_rep_putw ddi_rep_put16 -#define ddi_rep_putl ddi_rep_put32 -#define ddi_rep_putll ddi_rep_put64 - -/* These can't be define's since they're not asm routines */ -void ddi_io_rep_getb(ddi_acc_handle_t handle, uint8_t *host_addr, - uint8_t *dev_addr, size_t repcount); -void ddi_io_rep_getw(ddi_acc_handle_t handle, uint16_t *host_addr, - uint16_t *dev_addr, size_t repcount); -void ddi_io_rep_getl(ddi_acc_handle_t handle, uint32_t *host_addr, - uint32_t *dev_addr, size_t repcount); -void ddi_io_rep_putb(ddi_acc_handle_t handle, uint8_t *host_addr, - uint8_t *dev_addr, size_t repcount); -void ddi_io_rep_putw(ddi_acc_handle_t handle, uint16_t *host_addr, - uint16_t *dev_addr, size_t repcount); -void ddi_io_rep_putl(ddi_acc_handle_t handle, uint32_t *host_addr, - uint32_t *dev_addr, size_t repcount); - -int ddi_peekc(dev_info_t *dip, int8_t *addr, int8_t *val_p); -int ddi_peeks(dev_info_t *dip, int16_t *addr, int16_t *val_p); -int ddi_peekl(dev_info_t *dip, int32_t *addr, int32_t *val_p); -int ddi_peekd(dev_info_t *dip, int64_t *addr, int64_t *val_p); -int ddi_pokec(dev_info_t *dip, int8_t *addr, int8_t val); -int ddi_pokes(dev_info_t *dip, int16_t *addr, int16_t val); -int ddi_pokel(dev_info_t *dip, int32_t *addr, int32_t val); -int ddi_poked(dev_info_t *dip, int64_t *addr, int64_t val); - -uint8_t pci_config_getb(ddi_acc_handle_t handle, off_t offset); -uint16_t pci_config_getw(ddi_acc_handle_t handle, off_t offset); -uint32_t pci_config_getl(ddi_acc_handle_t handle, off_t offset); -uint64_t pci_config_getll(ddi_acc_handle_t handle, off_t offset); -void pci_config_putb(ddi_acc_handle_t handle, off_t offset, uint8_t value); -void pci_config_putw(ddi_acc_handle_t handle, off_t offset, uint16_t value); -void pci_config_putl(ddi_acc_handle_t handle, off_t offset, uint32_t value); -void pci_config_putll(ddi_acc_handle_t handle, off_t offset, uint64_t value); - -extern void repinsb(int port, uint8_t *addr, int count); -extern void repinsw(int port, uint16_t *addr, int count); -extern void repinsd(int port, uint32_t *addr, int count); -extern void repoutsb(int port, uint8_t *addr, int count); -extern void repoutsw(int port, uint16_t *addr, int count); -extern void repoutsd(int port, uint32_t *addr, int count); -#endif - /* Obsolete LDI event interfaces */ extern int ldi_get_eventcookie(ldi_handle_t, char *, ddi_eventcookie_t *); diff --git a/usr/src/uts/intel/ia32/ml/ddi_i86_asm.s b/usr/src/uts/intel/ia32/ml/ddi_i86_asm.s index c45f93e008..2fa9bd75e9 100644 --- a/usr/src/uts/intel/ia32/ml/ddi_i86_asm.s +++ b/usr/src/uts/intel/ia32/ml/ddi_i86_asm.s @@ -33,10 +33,7 @@ #include "assym.h" ENTRY(ddi_get8) - ALTENTRY(ddi_getb) - ALTENTRY(ddi_mem_getb) ALTENTRY(ddi_mem_get8) - ALTENTRY(ddi_io_getb) ALTENTRY(ddi_io_get8) movl ACC_ATTR(%rdi), %edx cmpl $_CONST(DDI_ACCATTR_IO_SPACE|DDI_ACCATTR_DIRECT), %edx @@ -54,18 +51,12 @@ movq ACC_GETB(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_get8) - SET_SIZE(ddi_getb) - SET_SIZE(ddi_mem_getb) SET_SIZE(ddi_mem_get8) - SET_SIZE(ddi_io_getb) SET_SIZE(ddi_io_get8) ENTRY(ddi_get16) - ALTENTRY(ddi_getw) - ALTENTRY(ddi_mem_getw) ALTENTRY(ddi_mem_get16) - ALTENTRY(ddi_io_getw) ALTENTRY(ddi_io_get16) movl ACC_ATTR(%rdi), %edx cmpl $_CONST(DDI_ACCATTR_IO_SPACE|DDI_ACCATTR_DIRECT), %edx @@ -83,18 +74,12 @@ movq ACC_GETW(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_get16) - SET_SIZE(ddi_getw) - SET_SIZE(ddi_mem_getw) SET_SIZE(ddi_mem_get16) - SET_SIZE(ddi_io_getw) SET_SIZE(ddi_io_get16) ENTRY(ddi_get32) - ALTENTRY(ddi_getl) - ALTENTRY(ddi_mem_getl) ALTENTRY(ddi_mem_get32) - ALTENTRY(ddi_io_getl) ALTENTRY(ddi_io_get32) movl ACC_ATTR(%rdi), %edx cmpl $_CONST(DDI_ACCATTR_IO_SPACE|DDI_ACCATTR_DIRECT), %edx @@ -111,30 +96,20 @@ movq ACC_GETL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_get32) - SET_SIZE(ddi_getl) - SET_SIZE(ddi_mem_getl) SET_SIZE(ddi_mem_get32) - SET_SIZE(ddi_io_getl) SET_SIZE(ddi_io_get32) ENTRY(ddi_get64) - ALTENTRY(ddi_getll) - ALTENTRY(ddi_mem_getll) ALTENTRY(ddi_mem_get64) movq ACC_GETLL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_get64) - SET_SIZE(ddi_getll) - SET_SIZE(ddi_mem_getll) SET_SIZE(ddi_mem_get64) ENTRY(ddi_put8) - ALTENTRY(ddi_putb) - ALTENTRY(ddi_mem_putb) ALTENTRY(ddi_mem_put8) - ALTENTRY(ddi_io_putb) ALTENTRY(ddi_io_put8) movl ACC_ATTR(%rdi), %ecx cmpl $_CONST(DDI_ACCATTR_IO_SPACE|DDI_ACCATTR_DIRECT), %ecx @@ -152,18 +127,12 @@ movq ACC_PUTB(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_put8) - SET_SIZE(ddi_putb) - SET_SIZE(ddi_mem_putb) SET_SIZE(ddi_mem_put8) - SET_SIZE(ddi_io_putb) SET_SIZE(ddi_io_put8) ENTRY(ddi_put16) - ALTENTRY(ddi_putw) - ALTENTRY(ddi_mem_putw) ALTENTRY(ddi_mem_put16) - ALTENTRY(ddi_io_putw) ALTENTRY(ddi_io_put16) movl ACC_ATTR(%rdi), %ecx cmpl $_CONST(DDI_ACCATTR_IO_SPACE|DDI_ACCATTR_DIRECT), %ecx @@ -181,18 +150,12 @@ movq ACC_PUTW(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_put16) - SET_SIZE(ddi_putw) - SET_SIZE(ddi_mem_putw) SET_SIZE(ddi_mem_put16) - SET_SIZE(ddi_io_putw) SET_SIZE(ddi_io_put16) ENTRY(ddi_put32) - ALTENTRY(ddi_putl) - ALTENTRY(ddi_mem_putl) ALTENTRY(ddi_mem_put32) - ALTENTRY(ddi_io_putl) ALTENTRY(ddi_io_put32) movl ACC_ATTR(%rdi), %ecx cmpl $_CONST(DDI_ACCATTR_IO_SPACE|DDI_ACCATTR_DIRECT), %ecx @@ -210,118 +173,79 @@ movq ACC_PUTL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_put32) - SET_SIZE(ddi_putl) - SET_SIZE(ddi_mem_putl) SET_SIZE(ddi_mem_put32) - SET_SIZE(ddi_io_putl) SET_SIZE(ddi_io_put32) ENTRY(ddi_put64) - ALTENTRY(ddi_putll) - ALTENTRY(ddi_mem_putll) ALTENTRY(ddi_mem_put64) movq ACC_PUTLL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_put64) - SET_SIZE(ddi_putll) - SET_SIZE(ddi_mem_putll) SET_SIZE(ddi_mem_put64) ENTRY(ddi_rep_get8) - ALTENTRY(ddi_rep_getb) - ALTENTRY(ddi_mem_rep_getb) ALTENTRY(ddi_mem_rep_get8) movq ACC_REP_GETB(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_get8) - SET_SIZE(ddi_rep_getb) - SET_SIZE(ddi_mem_rep_getb) SET_SIZE(ddi_mem_rep_get8) ENTRY(ddi_rep_get16) - ALTENTRY(ddi_rep_getw) - ALTENTRY(ddi_mem_rep_getw) ALTENTRY(ddi_mem_rep_get16) movq ACC_REP_GETW(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_get16) - SET_SIZE(ddi_rep_getw) - SET_SIZE(ddi_mem_rep_getw) SET_SIZE(ddi_mem_rep_get16) ENTRY(ddi_rep_get32) - ALTENTRY(ddi_rep_getl) - ALTENTRY(ddi_mem_rep_getl) ALTENTRY(ddi_mem_rep_get32) movq ACC_REP_GETL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_get32) - SET_SIZE(ddi_rep_getl) - SET_SIZE(ddi_mem_rep_getl) SET_SIZE(ddi_mem_rep_get32) ENTRY(ddi_rep_get64) - ALTENTRY(ddi_rep_getll) - ALTENTRY(ddi_mem_rep_getll) ALTENTRY(ddi_mem_rep_get64) movq ACC_REP_GETLL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_get64) - SET_SIZE(ddi_rep_getll) - SET_SIZE(ddi_mem_rep_getll) SET_SIZE(ddi_mem_rep_get64) ENTRY(ddi_rep_put8) - ALTENTRY(ddi_rep_putb) - ALTENTRY(ddi_mem_rep_putb) ALTENTRY(ddi_mem_rep_put8) movq ACC_REP_PUTB(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_put8) - SET_SIZE(ddi_rep_putb) - SET_SIZE(ddi_mem_rep_putb) SET_SIZE(ddi_mem_rep_put8) ENTRY(ddi_rep_put16) - ALTENTRY(ddi_rep_putw) - ALTENTRY(ddi_mem_rep_putw) ALTENTRY(ddi_mem_rep_put16) movq ACC_REP_PUTW(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_put16) - SET_SIZE(ddi_rep_putw) - SET_SIZE(ddi_mem_rep_putw) SET_SIZE(ddi_mem_rep_put16) ENTRY(ddi_rep_put32) - ALTENTRY(ddi_rep_putl) - ALTENTRY(ddi_mem_rep_putl) ALTENTRY(ddi_mem_rep_put32) movq ACC_REP_PUTL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_put32) - SET_SIZE(ddi_rep_putl) - SET_SIZE(ddi_mem_rep_putl) SET_SIZE(ddi_mem_rep_put32) ENTRY(ddi_rep_put64) - ALTENTRY(ddi_rep_putll) - ALTENTRY(ddi_mem_rep_putll) ALTENTRY(ddi_mem_rep_put64) movq ACC_REP_PUTLL(%rdi), %rax INDIRECT_JMP_REG(rax) SET_SIZE(ddi_rep_put64) - SET_SIZE(ddi_rep_putll) - SET_SIZE(ddi_mem_rep_putll) SET_SIZE(ddi_mem_rep_put64) ENTRY(i_ddi_vaddr_get8) @@ -596,4 +520,3 @@ pl_ioadv_done: rep; ret /* use 2 byte return instruction when branch target */ /* AMD Software Optimization Guide - Section 6.2 */ SET_SIZE(i_ddi_io_rep_put32) - diff --git a/usr/src/uts/intel/ia32/ml/i86_subr.s b/usr/src/uts/intel/ia32/ml/i86_subr.s index 213ab84c8f..1227ac69bf 100644 --- a/usr/src/uts/intel/ia32/ml/i86_subr.s +++ b/usr/src/uts/intel/ia32/ml/i86_subr.s @@ -690,75 +690,6 @@ str_valid: ret SET_SIZE(inb) - - ENTRY(repoutsw) - movl %edx, %ecx - movw %di, %dx - rep - D16 outsl - ret - SET_SIZE(repoutsw) - - - ENTRY(repinsw) - movl %edx, %ecx - movw %di, %dx - rep - D16 insl - ret - SET_SIZE(repinsw) - - - ENTRY(repinsb) - movl %edx, %ecx - movw %di, %dx - movq %rsi, %rdi - rep - insb - ret - SET_SIZE(repinsb) - - -/* - * Input a stream of 32-bit words. - * NOTE: count is a DWORD count. - */ - - ENTRY(repinsd) - movl %edx, %ecx - movw %di, %dx - movq %rsi, %rdi - rep - insl - ret - SET_SIZE(repinsd) - -/* - * Output a stream of bytes - * NOTE: count is a byte count - */ - - ENTRY(repoutsb) - movl %edx, %ecx - movw %di, %dx - rep - outsb - ret - SET_SIZE(repoutsb) - -/* - * Output a stream of 32-bit words - * NOTE: count is a DWORD count - */ - - ENTRY(repoutsd) - movl %edx, %ecx - movw %di, %dx - rep - outsl - ret - SET_SIZE(repoutsd) - /* * void int3(void) * void int18(void) @@ -1696,4 +1627,3 @@ vpanic_common: popq %rbx ret SET_SIZE(vmware_port) - diff --git a/usr/src/uts/sparc/v9/ml/ddi_v9_asm.s b/usr/src/uts/sparc/v9/ml/ddi_v9_asm.s index b2f0a87706..b7c6d11660 100644 --- a/usr/src/uts/sparc/v9/ml/ddi_v9_asm.s +++ b/usr/src/uts/sparc/v9/ml/ddi_v9_asm.s @@ -33,7 +33,7 @@ #include "assym.h" /* - * This file implements the following ddi common access + * This file implements the following ddi common access * functions: * * ddi_get{8,16,32,64} @@ -53,14 +53,14 @@ * the respective indirect function defined in the access handle. Use of * the access handle functions provides compatibility across platforms for * drivers. - * + * * By default, the indirect access handle functions are initialized to the * i_ddi_get/put routines to perform memory mapped IO. If memory mapped IO * is not possible or desired, the access handle must be intialized to another * valid routine to perform the sepcified IO operation. * * The alignment and placement of the following functions have been optimized - * such that the implementation specific versions, i_ddi*, fall within the + * such that the implementation specific versions, i_ddi*, fall within the * same cache-line of the generic versions, ddi_*. This insures that an * I-cache hit will occur thus minimizing the performance impact of using the * access handle. @@ -68,20 +68,14 @@ .align 32 ENTRY(ddi_get8) - ALTENTRY(ddi_getb) ALTENTRY(ddi_io_get8) - ALTENTRY(ddi_io_getb) ALTENTRY(ddi_mem_get8) - ALTENTRY(ddi_mem_getb) ldn [%o0 + AHI_GET8], %g1 /* hdl->ahi_get8 access hndl */ jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_get8) - SET_SIZE(ddi_getb) SET_SIZE(ddi_io_get8) - SET_SIZE(ddi_io_getb) SET_SIZE(ddi_mem_get8) - SET_SIZE(ddi_mem_getb) .align 16 ENTRY(i_ddi_get8) @@ -91,20 +85,14 @@ .align 32 ENTRY(ddi_get16) - ALTENTRY(ddi_getw) ALTENTRY(ddi_io_get16) - ALTENTRY(ddi_io_getw) ALTENTRY(ddi_mem_get16) - ALTENTRY(ddi_mem_getw) ldn [%o0 + AHI_GET16], %g1 /* hdl->ahi_get16 access hndl */ jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_get16) - SET_SIZE(ddi_getw) SET_SIZE(ddi_io_get16) - SET_SIZE(ddi_io_getw) SET_SIZE(ddi_mem_get16) - SET_SIZE(ddi_mem_getw) .align 16 ENTRY(i_ddi_get16) @@ -116,20 +104,14 @@ .align 32 ENTRY(ddi_get32) - ALTENTRY(ddi_getl) ALTENTRY(ddi_io_get32) - ALTENTRY(ddi_io_getl) ALTENTRY(ddi_mem_get32) - ALTENTRY(ddi_mem_getl) ldn [%o0 + AHI_GET32], %g1 /* hdl->ahi_get32 access handle */ jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_get32) - SET_SIZE(ddi_getl) SET_SIZE(ddi_io_get32) - SET_SIZE(ddi_io_getl) SET_SIZE(ddi_mem_get32) - SET_SIZE(ddi_mem_getl) .align 16 ENTRY(i_ddi_get32) @@ -141,20 +123,14 @@ .align 32 ENTRY(ddi_get64) - ALTENTRY(ddi_getll) ALTENTRY(ddi_io_get64) - ALTENTRY(ddi_io_getll) ALTENTRY(ddi_mem_get64) - ALTENTRY(ddi_mem_getll) ldn [%o0 + AHI_GET64], %g1 /* hdl->ahi_get64 access handle */ jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_get64) - SET_SIZE(ddi_getll) SET_SIZE(ddi_io_get64) - SET_SIZE(ddi_io_getll) SET_SIZE(ddi_mem_get64) - SET_SIZE(ddi_mem_getll) .align 16 ENTRY(i_ddi_get64) @@ -166,20 +142,14 @@ .align 32 ENTRY(ddi_put8) - ALTENTRY(ddi_putb) ALTENTRY(ddi_io_put8) - ALTENTRY(ddi_io_putb) ALTENTRY(ddi_mem_put8) - ALTENTRY(ddi_mem_putb) ldn [%o0 + AHI_PUT8], %g1 /* hdl->ahi_put8 access handle */ jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_put8) - SET_SIZE(ddi_putb) SET_SIZE(ddi_io_put8) - SET_SIZE(ddi_io_putb) SET_SIZE(ddi_mem_put8) - SET_SIZE(ddi_mem_putb) .align 16 ENTRY(i_ddi_put8) @@ -189,20 +159,14 @@ .align 32 ENTRY(ddi_put16) - ALTENTRY(ddi_putw) ALTENTRY(ddi_io_put16) - ALTENTRY(ddi_io_putw) ALTENTRY(ddi_mem_put16) - ALTENTRY(ddi_mem_putw) ldn [%o0 + AHI_PUT16], %g1 /* hdl->ahi_put16 access handle */ jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_put16) - SET_SIZE(ddi_putw) SET_SIZE(ddi_io_put16) - SET_SIZE(ddi_io_putw) SET_SIZE(ddi_mem_put16) - SET_SIZE(ddi_mem_putw) .align 16 ENTRY(i_ddi_put16) @@ -214,20 +178,14 @@ .align 32 ENTRY(ddi_put32) - ALTENTRY(ddi_putl) ALTENTRY(ddi_io_put32) - ALTENTRY(ddi_io_putl) ALTENTRY(ddi_mem_put32) - ALTENTRY(ddi_mem_putl) ldn [%o0 + AHI_PUT32], %g1 /* hdl->ahi_put16 access handle */ jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_put32) - SET_SIZE(ddi_putl) SET_SIZE(ddi_io_put32) - SET_SIZE(ddi_io_putl) SET_SIZE(ddi_mem_put32) - SET_SIZE(ddi_mem_putl) .align 16 ENTRY(i_ddi_put32) @@ -239,20 +197,14 @@ .align 32 ENTRY(ddi_put64) - ALTENTRY(ddi_putll) ALTENTRY(ddi_io_put64) - ALTENTRY(ddi_io_putll) ALTENTRY(ddi_mem_put64) - ALTENTRY(ddi_mem_putll) ldn [%o0 + AHI_PUT64], %g1 /* hdl->ahi_put64 access handle */ - jmpl %g1, %g0 /* jump to access handle routine */ + jmpl %g1, %g0 /* jump to access handle routine */ nop SET_SIZE(ddi_put64) - SET_SIZE(ddi_putll) SET_SIZE(ddi_io_put64) - SET_SIZE(ddi_io_putll) SET_SIZE(ddi_mem_put64) - SET_SIZE(ddi_mem_putll) .align 16 ENTRY(i_ddi_put64) @@ -264,16 +216,16 @@ /* * The ddi_io_rep_get/put routines don't take a flag argument like the "plain" - * and mem versions do. This flag is used to determine whether or not the + * and mem versions do. This flag is used to determine whether or not the * device address or port should be automatically incremented. For IO space, * the device port is never incremented and as such, the flag is always set * to DDI_DEV_NO_AUTOINCR. * - * This define processes the repetitive get functionality. Automatic - * incrementing of the device address is determined by the flag field - * %o4. If this is set for AUTOINCR, %o4 is updated with 1 for the + * This define processes the repetitive get functionality. Automatic + * incrementing of the device address is determined by the flag field + * %o4. If this is set for AUTOINCR, %o4 is updated with 1 for the * subsequent increment in 2:. - * + * * If this flag is not set for AUTOINCR, %o4 is update with a value of 0 thus * making the increment operation a non-operation. */ @@ -294,16 +246,12 @@ .align 32 ENTRY(ddi_rep_get8) - ALTENTRY(ddi_rep_getb) ALTENTRY(ddi_mem_rep_get8) - ALTENTRY(ddi_mem_rep_getb) ldn [%o0 + AHI_REP_GET8], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_get8) - SET_SIZE(ddi_rep_getb) SET_SIZE(ddi_mem_rep_get8) - SET_SIZE(ddi_mem_rep_getb) .align 16 ENTRY(i_ddi_rep_get8) @@ -311,19 +259,15 @@ retl nop SET_SIZE(i_ddi_rep_get8) - + .align 32 ENTRY(ddi_rep_get16) - ALTENTRY(ddi_rep_getw) ALTENTRY(ddi_mem_rep_get16) - ALTENTRY(ddi_mem_rep_getw) ldn [%o0 + AHI_REP_GET16], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_get16) - SET_SIZE(ddi_rep_getw) SET_SIZE(ddi_mem_rep_get16) - SET_SIZE(ddi_mem_rep_getw) .align 16 ENTRY(i_ddi_rep_get16) @@ -336,16 +280,12 @@ .align 32 ENTRY(ddi_rep_get32) - ALTENTRY(ddi_rep_getl) ALTENTRY(ddi_mem_rep_get32) - ALTENTRY(ddi_mem_rep_getl) ldn [%o0 + AHI_REP_GET32], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_get32) - SET_SIZE(ddi_rep_getl) SET_SIZE(ddi_mem_rep_get32) - SET_SIZE(ddi_mem_rep_getl) .align 16 ENTRY(i_ddi_rep_get32) @@ -358,16 +298,12 @@ .align 32 ENTRY(ddi_rep_get64) - ALTENTRY(ddi_rep_getll) ALTENTRY(ddi_mem_rep_get64) - ALTENTRY(ddi_mem_rep_getll) ldn [%o0 + AHI_REP_GET64], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_get64) - SET_SIZE(ddi_rep_getll) SET_SIZE(ddi_mem_rep_get64) - SET_SIZE(ddi_mem_rep_getll) .align 16 ENTRY(i_ddi_rep_get64) @@ -378,12 +314,12 @@ SET_SIZE(i_ddi_rep_get64) SET_SIZE(i_ddi_swap_rep_get64) -/* - * This define processes the repetitive put functionality. Automatic - * incrementing of the device address is determined by the flag field - * %o4. If this is set for AUTOINCR, %o4 is updated with 1 for the +/* + * This define processes the repetitive put functionality. Automatic + * incrementing of the device address is determined by the flag field + * %o4. If this is set for AUTOINCR, %o4 is updated with 1 for the * subsequent increment in 2:. - * + * * If this flag is not set for AUTOINCR, %o4 is update with a value of 0 thus * making the increment operation a non-operation. */ @@ -403,16 +339,12 @@ .align 32 ENTRY(ddi_rep_put8) - ALTENTRY(ddi_rep_putb) ALTENTRY(ddi_mem_rep_put8) - ALTENTRY(ddi_mem_rep_putb) ldn [%o0 + AHI_REP_PUT8], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_put8) - SET_SIZE(ddi_rep_putb) SET_SIZE(ddi_mem_rep_put8) - SET_SIZE(ddi_mem_rep_putb) .align 16 ENTRY(i_ddi_rep_put8) @@ -423,16 +355,12 @@ .align 32 ENTRY(ddi_rep_put16) - ALTENTRY(ddi_rep_putw) ALTENTRY(ddi_mem_rep_put16) - ALTENTRY(ddi_mem_rep_putw) ldn [%o0 + AHI_REP_PUT16], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_put16) - SET_SIZE(ddi_rep_putw) SET_SIZE(ddi_mem_rep_put16) - SET_SIZE(ddi_mem_rep_putw) .align 16 ENTRY(i_ddi_rep_put16) @@ -445,16 +373,12 @@ .align 32 ENTRY(ddi_rep_put32) - ALTENTRY(ddi_rep_putl) ALTENTRY(ddi_mem_rep_put32) - ALTENTRY(ddi_mem_rep_putl) ldn [%o0 + AHI_REP_PUT32], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_put32) - SET_SIZE(ddi_rep_putl) SET_SIZE(ddi_mem_rep_put32) - SET_SIZE(ddi_mem_rep_putl) .align 16 ENTRY(i_ddi_rep_put32) @@ -467,16 +391,12 @@ .align 32 ENTRY(ddi_rep_put64) - ALTENTRY(ddi_rep_putll) ALTENTRY(ddi_mem_rep_put64) - ALTENTRY(ddi_mem_rep_putll) ldn [%o0 + AHI_REP_PUT64], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_rep_put64) - SET_SIZE(ddi_rep_putll) SET_SIZE(ddi_mem_rep_put64) - SET_SIZE(ddi_mem_rep_putll) .align 16 ENTRY(i_ddi_rep_put64) @@ -489,43 +409,35 @@ .align 16 ENTRY(ddi_io_rep_get8) - ALTENTRY(ddi_io_rep_getb) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_GET8], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_get8) - SET_SIZE(ddi_io_rep_getb) .align 16 ENTRY(ddi_io_rep_get16) - ALTENTRY(ddi_io_rep_getw) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_GET16], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_get16) - SET_SIZE(ddi_io_rep_getw) .align 16 ENTRY(ddi_io_rep_get32) - ALTENTRY(ddi_io_rep_getl) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_GET32], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_get32) - SET_SIZE(ddi_io_rep_getl) .align 16 ENTRY(ddi_io_rep_get64) - ALTENTRY(ddi_io_rep_getll) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_GET64], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_get64) - SET_SIZE(ddi_io_rep_getll) .align 64 ENTRY(ddi_check_acc_handle) @@ -534,7 +446,7 @@ jmpl %g1, %o7 mov %i0, %o0 brnz,a,pn %o0, 0f ! if (return_value != 0) - mov -1, %o0 ! return (DDI_FAILURE) + mov -1, %o0 ! return (DDI_FAILURE) 0: ! else return (DDI_SUCCESS) sra %o0, 0, %i0 ret @@ -549,43 +461,35 @@ .align 16 ENTRY(ddi_io_rep_put8) - ALTENTRY(ddi_io_rep_putb) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_PUT8], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_put8) - SET_SIZE(ddi_io_rep_putb) .align 16 ENTRY(ddi_io_rep_put16) - ALTENTRY(ddi_io_rep_putw) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_PUT16], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_put16) - SET_SIZE(ddi_io_rep_putw) .align 16 ENTRY(ddi_io_rep_put32) - ALTENTRY(ddi_io_rep_putl) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_PUT32], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_put32) - SET_SIZE(ddi_io_rep_putl) .align 16 ENTRY(ddi_io_rep_put64) - ALTENTRY(ddi_io_rep_putll) set DDI_DEV_NO_AUTOINCR, %o4 /* Set flag to DDI_DEV_NO_AUTOINCR */ ldn [%o0 + AHI_REP_PUT64], %g1 jmpl %g1, %g0 nop SET_SIZE(ddi_io_rep_put64) - SET_SIZE(ddi_io_rep_putll) ENTRY(do_peek) rdpr %pstate, %o3 ! check ints @@ -620,7 +524,7 @@ bnz 1f nop wrpr %o3, PSTATE_IE, %pstate -1: +1: mov %g0, %o0 done: retl @@ -683,7 +587,7 @@ done: bnz 1f nop wrpr %o3, PSTATE_IE, %pstate -1: +1: retl sub %g0, 1, %o0 ! return (DDI_FAILURE); .peekfail: @@ -743,7 +647,7 @@ done: * To prevent an access from causing a system panic, * we use on_trap semantics to catch the error and * set error status. - * + * * If a read access error is detected and DDI_CAUTIOUS_ACC or * DDI_FLAGERR_ACC protection was requested, we will trampoline to the * error handler, i_ddi_trampoline. i_ddi_trampoline will: @@ -756,8 +660,8 @@ done: * generated and claimed by a bus nexus responsible for the write * transaction. The nexus error handler is expected to set the * error status and the IO initiating driver is expected to check - * for a failed transaction via ddi_fm_acc_err_get(). - * + * for a failed transaction via ddi_fm_acc_err_get(). + * */ .seg ".data" @@ -783,7 +687,7 @@ done: stx %g0, [%o4 + ERR_ENA] ! ahi_err->err_ena = 0 mov -2, %o0 st %o0, [%o4 + ERR_STATUS] ! ahi_err->err_status = NONFATAL - b longjmp ! longjmp back + b longjmp ! longjmp back add %o5, OT_JMPBUF, %o0 ! %o0 = &ot_jmpbuf .cautaccfail: set .acc_panic, %o0 ! Load panic message @@ -844,7 +748,7 @@ done: ldn [%o5 + OT_PREV], %o0 ! restore ontrap membar #Sync ! force error barrier stn %o0, [THREAD_REG + T_ONTRAP]; - b longjmp ! longjmp back + b longjmp ! longjmp back add %o5, OT_JMPBUF, %o0 ! %o0 = &ot_jmpbuf .protaccfail: set .acc_panic, %o0 ! Load panic message @@ -1057,4 +961,3 @@ cautdone: retl nop SET_SIZE(i_ddi_caut_get) - |