Date: Fri, 30 May 2003 15:06:15 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32127 for review Message-ID: <200305302206.h4UM6FeW074569@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32127 Change 32127 by marcel@marcel_nfs on 2003/05/30 15:06:11 IFC @32125 Affected files ... .. //depot/projects/ia64/lib/libc/db/btree/bt_put.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/dlfcn.c#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#11 integrate .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#54 integrate .. //depot/projects/ia64/share/man/man9/CTASSERT.9#2 integrate .. //depot/projects/ia64/share/man/man9/bus_activate_resource.9#2 integrate .. //depot/projects/ia64/share/man/man9/bus_child_present.9#2 integrate .. //depot/projects/ia64/share/man/man9/bus_set_resource.9#2 integrate .. //depot/projects/ia64/share/man/man9/device_get_name.9#2 integrate .. //depot/projects/ia64/share/man/man9/device_get_parent.9#2 integrate .. //depot/projects/ia64/share/man/man9/device_printf.9#2 integrate .. //depot/projects/ia64/share/man/man9/device_set_driver.9#2 integrate .. //depot/projects/ia64/share/man/man9/rman.9#2 integrate .. //depot/projects/ia64/sys/alpha/include/bus.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/ia64/sys/amd64/include/bus_dma.h#5 integrate .. //depot/projects/ia64/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/ia64/sys/boot/forth/frames.4th#1 branch .. //depot/projects/ia64/sys/boot/forth/screen.4th#1 branch .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#10 integrate .. //depot/projects/ia64/sys/conf/kern.mk#7 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#18 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#11 integrate .. //depot/projects/ia64/sys/i386/include/bus_dma.h#7 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_pci.c#7 integrate .. //depot/projects/ia64/sys/ia64/include/bus.h#12 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#15 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#16 integrate .. //depot/projects/ia64/sys/sparc64/ebus/ebus.c#8 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#15 integrate .. //depot/projects/ia64/sys/sparc64/include/ofw_bus.h#4 integrate .. //depot/projects/ia64/sys/sparc64/isa/isa.c#6 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.c#11 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.h#5 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#24 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychovar.h#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/ofw_bus.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/sparcbus_if.m#2 integrate .. //depot/projects/ia64/usr.bin/usbhidaction/usbhidaction.1#2 integrate Differences ... ==== //depot/projects/ia64/lib/libc/db/btree/bt_put.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.3 2003/02/16 17:29:09 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.4 2003/05/30 11:05:08 tmm Exp $"); #include <sys/types.h> @@ -78,7 +78,7 @@ PAGE *h; indx_t index, nxtindex; pgno_t pg; - u_int32_t nbytes; + u_int32_t nbytes, tmp; int dflags, exact, status; char *dest, db[NOVFLSIZE], kb[NOVFLSIZE]; @@ -131,8 +131,9 @@ tkey.data = kb; tkey.size = NOVFLSIZE; memmove(kb, &pg, sizeof(pgno_t)); + tmp = key->size; memmove(kb + sizeof(pgno_t), - &key->size, sizeof(u_int32_t)); + &tmp, sizeof(u_int32_t)); dflags |= P_BIGKEY; key = &tkey; } @@ -142,8 +143,9 @@ tdata.data = db; tdata.size = NOVFLSIZE; memmove(db, &pg, sizeof(pgno_t)); + tmp = data->size; memmove(db + sizeof(pgno_t), - &data->size, sizeof(u_int32_t)); + &tmp, sizeof(u_int32_t)); dflags |= P_BIGDATA; data = &tdata; } ==== //depot/projects/ia64/lib/libc/gen/dlfcn.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.10 2003/02/13 17:47:44 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.11 2003/05/30 00:58:37 kan Exp $"); /* * Linkage to services provided by the dynamic linker. @@ -111,3 +111,10 @@ _rtld_error(sorry); return NULL; } + +#pragma weak _rtld_thread_init +void +_rtld_thread_init(void * li) +{ + _rtld_error(sorry); +} ==== //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.52 2003/05/29 17:10:45 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.53 2003/05/30 14:50:16 davidxu Exp $ */ #include <sys/param.h> #include <sys/types.h> @@ -893,7 +893,8 @@ thr_sigframe_save(struct pthread *thread, struct pthread_sigframe *psf) { /* This has to initialize all members of the sigframe. */ - psf->psf_flags = thread->flags & THR_FLAGS_PRIVATE; + psf->psf_flags = + thread->flags & (THR_FLAGS_PRIVATE|THR_FLAGS_IN_TDLIST); psf->psf_interrupted = thread->interrupted; psf->psf_signo = thread->signo; psf->psf_state = thread->state; ==== //depot/projects/ia64/libexec/rtld-elf/libmap.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.5 2003/05/29 22:58:22 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.6 2003/05/30 00:49:16 mdodd Exp $ */ #include <stdio.h> @@ -31,7 +31,7 @@ TAILQ_ENTRY(lmp) lmp_link; }; -static void lm_add (char *, char *, char *); +static void lm_add (const char *, const char *, const char *); static void lm_free (struct lm_list *); static char * lml_find (struct lm_list *, const char *); static struct lm_list * lmp_find (const char *); @@ -45,7 +45,7 @@ { FILE *fp; char *cp; - char *f, *t, *p; + char *f, *t, *p, *c; char prog[MAXPATHLEN]; char line[MAXPATHLEN + 2]; @@ -56,7 +56,7 @@ p = NULL; while ((cp = fgets(line, MAXPATHLEN + 1, fp)) != NULL) { - t = f = NULL; + t = f = c = NULL; /* Skip over leading space */ while (isspace(*cp)) cp++; @@ -75,7 +75,7 @@ if (iseol(*cp) || *cp == ']') continue; - p = cp++; + c = cp++; /* Skip to end of word */ while (!isspace(*cp) && !iseol(*cp) && *cp != ']') cp++; @@ -93,10 +93,10 @@ * There should be nothing except whitespace or comment from this point to the end of the line. */ - while(isspace(*cp++)); + while(isspace(*cp)) *cp++; if (!iseol(*cp)) continue; - strcpy(prog, p); + strcpy(prog, c); p = prog; continue; } @@ -122,7 +122,7 @@ if (!iseol(*cp)) continue; *cp = '\0'; - lm_add(p, xstrdup(f), xstrdup(t)); + lm_add(p, f, t); } fclose(fp); return; @@ -159,7 +159,7 @@ } static void -lm_add (char *p, char *f, char *t) +lm_add (const char *p, const char *f, const char *t) { struct lm_list *lml; struct lm *lm; @@ -171,8 +171,8 @@ lml = lmp_init(xstrdup(p)); lm = xmalloc(sizeof(struct lm)); - lm->f = f; - lm->t = t; + lm->f = xstrdup(f); + lm->t = xstrdup(t); TAILQ_INSERT_HEAD(lml, lm, lm_link); } @@ -189,7 +189,7 @@ * Add a global mapping if we have * a successful constrained match. */ - lm_add(NULL, xstrdup(f), xstrdup(t)); + lm_add(NULL, f, t); return (t); } } ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#54 (text+ko) ==== @@ -31,7 +31,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.156 2003/05/28 21:01:22 hrs Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.157 2003/05/30 11:24:00 nyan Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -250,6 +250,58 @@ </itemizedlist> </para> + <para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (ct driver) + <itemizedlist> + <listitem> + <para>NEC PC-9801-55, 92 and their compatibles</para> + <para>ICM IF-2660</para> + <para>Midori-Denshi MDC-554NA</para> + <para>Logitec LHA-N151</para> + <note> + <para><literal>flags 0x00000</literal> is necessary in + kernel configuration for DMA transfer mode.</para> + </note> + </listitem> + <listitem> + <para>I-O DATA SC-98II</para> + <note> + <para><literal>flags 0x10000</literal> is necessary in + kernel configuration for DMA transfer mode.</para> + </note> + </listitem> + <listitem> + <para>TEXA HA-55BS2 and later</para> + <para>Midori-Denshi MDC-926Rs</para> + <note> + <para><literal>flags 0x20000</literal> is necessary in + kernel configuration for Bus-master transfer mode.</para> + </note> + </listitem> + <listitem> + <para>ELECOM Bus-master SCSI interfaces</para> + <note> + <para><literal>flags 0x30000</literal> is necessary in + kernel configuration for Bus-master transfer mode.</para> + </note> + </listitem> + <listitem> + <para>All SMIT transfer type SCSI interfaces</para> + <note> + <para><literal>flags 0x40000</literal> is necessary in + kernel configuration for SMIT transfer mode.</para> + </note> + </listitem> + <listitem> + <para>Logitec LHA-20x series</para> + <para>ICM IF-2766, IF-2766ET, IF-2767 and IF-2769</para> + <note> + <para><literal>flags 0x50000</literal> is necessary in + kernel configuration for Bus-master transfer mode.</para> + </note> + </listitem> + </itemizedlist> + </para> + <para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (bs driver) <itemizedlist> <listitem> ==== //depot/projects/ia64/share/man/man9/CTASSERT.9#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/CTASSERT.9,v 1.1 2003/05/16 15:24:07 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/CTASSERT.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd May 15, 2003 .Os @@ -33,19 +33,18 @@ .Nm CTASSERT .Nd compile time assertion macro .Sh SYNOPSIS -.Pp .In sys/param.h .In sys/systm.h .Fn CTASSERT expression .Sh DESCRIPTION The -.Nm +.Fn CTASSERT macro evaluates .Fa expression at compile time and causes a compiler error if it is false. .Pp The -.Nm +.Fn CTASSERT macro is useful for asserting the size or alignment of important data structures and variables during compilation, which would otherwise cause the code to fail at run time. @@ -53,12 +52,11 @@ Assert that the size of the .Vt uuid structure is 16 bytes. -.Bd -literal -offset indent -CTASSERT(sizeof(struct uuid) == 16); -.Ed +.Pp +.Dl "CTASSERT(sizeof(struct uuid) == 16);" .Sh SEE ALSO .Xr KASSERT 9 .Sh AUTHORS This manual page was written by .An Hiten M. Pandya -.Aq hmp@FreeBSD.ORG . +.Aq hmp@FreeBSD.org . ==== //depot/projects/ia64/share/man/man9/bus_activate_resource.9#2 (text+ko) ==== @@ -26,14 +26,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_activate_resource.9,v 1.2 2003/03/30 00:30:29 imp Exp $ +.\" $FreeBSD: src/share/man/man9/bus_activate_resource.9,v 1.3 2003/05/30 21:13:32 ru Exp $ .\" .Dd March 28, 2003 .Dt BUS_ACTIVATE_RESOURCE 9 .Os .Sh NAME -.Nm bus_activate_resource, bus_deactivate_resources -.Nd activates or deactivates a resources +.Nm bus_activate_resource , bus_deactivate_resource +.Nd activate or deactivate a resource .Sh SYNOPSIS .In sys/param.h .In sys/bus.h @@ -42,26 +42,29 @@ .In sys/rman.h .In machine/resource.h .Ft int -.Fn bus_activate_resource "device_t dev" "int type" "int rid" "struct resource *r" +.Fo bus_activate_resource +.Fa "device_t dev" "int type" "int rid" "struct resource *r" +.Fc .Ft int -.Fn bus_deactivate_resource "device_t dev" "int type" "int rid" "struct resource *r" +.Fo bus_deactivate_resource +.Fa "device_t dev" "int type" "int rid" "struct resource *r" +.Fc .Sh DESCRIPTION -Activates or deactivates a previously allocated resource. +These functions activate or deactivate a previously allocated resource. In general, resources must be activated before they can be accessed by the driver so that the bus driver can map the resource into the devices space. .Pp -Its arguments are as follows: -.Bl -item -.It -.Fa dev -is the device that requests ownership of the resource. +The arguments are as follows: +.Bl -tag -width indent +.It Fa dev +The device that requests ownership of the resource. Before allocation, the resource is owned by the parent bus. -.It -.Fa type -is the type of resource you want to allocate. +.It Fa type +The type of resource you want to allocate. It is one of: -.Bl -tag -width SYS_RES_MEMORY +.Pp +.Bl -tag -width ".Dv SYS_RES_MEMORY" -compact .It Dv SYS_RES_IRQ for IRQs .It Dv SYS_RES_DRQ @@ -71,27 +74,20 @@ .It Dv SYS_RES_MEMORY for I/O memory .El -.It -.Fa rid -points to a bus specific handle that identifies the resource being allocated. -.It -.Fa r -points to the -.Ft struct resource +.It Fa rid +A pointer to a bus specific handle that identifies the resource being allocated. +.It Fa r +A pointer to the +.Vt "struct resource" returned by .Xr bus_alloc_resource 9 . .El .Sh RETURN VALUES -Zero indicates success. -Non-zero is an error from errno.h. -.\".Sh EXAMPLES -.\".Bd -literal -.\".Ed +Zero is returned on success, otherwise an error is returned. .Sh SEE ALSO .Xr bus_alloc_resource 9 , .Xr device 9 , .Xr driver 9 .Sh AUTHORS -.An -nosplit -This man page was written by +This manual page was written by .An Warner Losh Aq imp@FreeBSD.org . ==== //depot/projects/ia64/share/man/man9/bus_child_present.9#2 (text+ko) ==== @@ -26,14 +26,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_child_present.9,v 1.1 2003/03/28 07:09:17 imp Exp $ +.\" $FreeBSD: src/share/man/man9/bus_child_present.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd March 27, 2003 .Dt BUS_CHILD_PRESENT 9 .Os .Sh NAME .Nm bus_child_present -.Nd Ask the bus driver to see if this device is still really present. +.Nd "ask the bus driver to see if this device is still really present" .Sh SYNOPSIS .In sys/param.h .In sys/bus.h @@ -44,18 +44,22 @@ .Ft int .Fn bus_child_present "device_t dev" .Sh DESCRIPTION -Requests that the parent device driver of +The +.Fn bus_child_present +function requests that the parent device driver of .Fa dev check to see if the hardware represented by -.Fa dev +.Fa dev is still physically accessible at this time. While the notion of accessible varies from bus to bus, generally -hardware that is not acceessible cannot be accessed via the bus_space -methods that would otherwise be used to acceess the device. +hardware that is not acceessible cannot be accessed via the +.Fn bus_space* +methods that would otherwise be used to access the device. .Pp -This does not ask the question 'does this device have children?' which -can better be answered by +This does not ask the question +.Dq does this device have children? +which can better be answered by .Xr device_get_children 9 . .Sh RETURN VALUES A zero return value indicates that the device is not present in the @@ -64,19 +68,20 @@ system, or that the state of the device cannot be determined. .Sh EXAMPLES This is some example code. -It only calls stop when the dc device is actually present. -.Bd -literal - device_t dev; - dc_softc *sc; +It only calls stop when the +.Xr dc 4 +device is actually present. +.Bd -literal -offset indent +device_t dev; +dc_softc *sc; - sc = device_get_softc(dev); - if (bus_child_present(dev)) - dc_stop(sc); +sc = device_get_softc(dev); +if (bus_child_present(dev)) + dc_stop(sc); .Ed .Sh SEE ALSO .Xr device 9 , .Xr driver 9 .Sh AUTHORS -.An -nosplit This man page was written by .An Warner Losh Aq imp@FreeBSD.org . ==== //depot/projects/ia64/share/man/man9/bus_set_resource.9#2 (text+ko) ==== @@ -26,14 +26,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_set_resource.9,v 1.1 2003/03/30 00:25:23 imp Exp $ +.\" $FreeBSD: src/share/man/man9/bus_set_resource.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd March 29, 2003 .Dt BUS_SET_RESOURCE 9 .Os .Sh NAME .Nm bus_set_resource -.Nd Associates a definite resource with a given rid. +.Nd "associate a definite resource with a given resource ID" .Sh SYNOPSIS .In sys/param.h .In sys/bus.h @@ -42,23 +42,31 @@ .In sys/rman.h .In machine/resource.h .Ft int -.Fn bus_set_resource "device_t dev" "int type" "int rid" "u_long start" "u_long count" +.Fo bus_set_resource +.Fa "device_t dev" "int type" "int rid" "u_long start" "u_long count" +.Fc .Sh DESCRIPTION -Set the start address of the resource type, rid pair to be count long. -Typically client drivers do not use this interface. -Bus drivers, however, often use it to setup the resources a client -driver users. +The +.Fn bus_set_resource +function +sets the start address of the resource +.Fa type , rid +pair to be +.Fa count +long. +Typically, client drivers do not use this interface. +Bus drivers, however, often use it to set up the resources a client +driver uses. .Pp -Its arguments are as follows: -.Bl -item -.It -.Fa dev -is the device to set the resource on. -.It -.Fa type -is the type of resource you want to allocate. +The arguments are as follows: +.Bl -tag -width indent +.It Fa dev +The device to set the resource on. +.It Fa type +The type of resource you want to allocate. It is one of: -.Bl -tag -width SYS_RES_MEMORY +.Pp +.Bl -tag -width ".Dv SYS_RES_MEMORY" -compact .It Dv SYS_RES_IRQ for IRQs .It Dv SYS_RES_DRQ @@ -68,28 +76,20 @@ .It Dv SYS_RES_MEMORY for I/O memory .El -.It -.Fa rid -points to a bus specific handle that identifies the resource being allocated. -.It -.Fa start -is the beginning address of this resource. -.It -.Fa count -is the length of the resource. +.It Fa rid +A pointer to a bus specific handle that identifies the resource being allocated. +.It Fa start +The start address of this resource. +.It Fa count +The length of the resource. .El .Sh RETURN VALUES -Zero indicates success. -Non-zero is an error from errno.h. -.\".Sh EXAMPLES -.\".Bd -literal -.\".Ed +Zero is returned on success, otherwise an error is returned. .Sh SEE ALSO .Xr bus_alloc_resource 9 , .Xr bus_get_resource 9 , .Xr device 9 , .Xr driver 9 .Sh AUTHORS -.An -nosplit This man page was written by .An Warner Losh Aq imp@FreeBSD.org . ==== //depot/projects/ia64/share/man/man9/device_get_name.9#2 (text+ko) ==== @@ -26,15 +26,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_get_name.9,v 1.1 2003/04/22 00:18:55 imp Exp $ +.\" $FreeBSD: src/share/man/man9/device_get_name.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd April 21, 2003 .Dt DEVICE_GET_NAME 9 .Os .Sh NAME -.Nm device_get_name -.Nm device_get_nameunit -.Nd access the name of a device's device class or instance. +.Nm device_get_name , device_get_nameunit +.Nd access the name of a device's device class or instance .Sh SYNOPSIS .In sys/param.h .In sys/bus.h @@ -43,11 +42,13 @@ .Ft int .Fn device_get_nameunit "device_t dev" .Sh DESCRIPTION +The .Fn device_get_name -Returns the name of the device's device class. +function returns the name of the device's device class. .Pp +The .Fn device_get_nameunit -Returns the name of the device's instance. +function returns the name of the device's instance. .Sh SEE ALSO .Xr device 9 .Sh AUTHORS ==== //depot/projects/ia64/share/man/man9/device_get_parent.9#2 (text+ko) ==== @@ -26,22 +26,23 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_get_parent.9,v 1.1 2003/04/22 00:26:02 imp Exp $ +.\" $FreeBSD: src/share/man/man9/device_get_parent.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd April 21, 2003 .Dt DEVICE_GET_PARENT 9 .Os .Sh NAME .Nm device_get_parent -.Nd returns the device's parent. +.Nd return the device's parent .Sh SYNOPSIS .In sys/param.h .In sys/bus.h .Ft device_t .Fn device_get_parent "device_t dev" .Sh DESCRIPTION +The .Fn device_get_parent -Returns the name of the device's parent device. +function returns the name of the device's parent device. .Sh SEE ALSO .Xr device 9 .Sh AUTHORS ==== //depot/projects/ia64/share/man/man9/device_printf.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_printf.9,v 1.1 2003/04/22 03:32:31 imp Exp $ +.\" $FreeBSD: src/share/man/man9/device_printf.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd April 21, 2003 .Dt DEVICE_PRINTF 9 @@ -35,19 +35,19 @@ .In sys/param.h .In sys/bus.h .Ft int -.Fn device_printf "device_t dev" "const char *fmt" "..." +.Fn device_printf "device_t dev" "const char *fmt" ... .Sh DESCRIPTION The -.Xr device_printf 9 +.Fn device_printf function is a convenience interface to the .Xr printf 9 function. It outputs the name of the -.Ar dev +.Fa dev device, followed by a colon and a space, and then what .Xr printf 9 -woult print if you passed -.Ar fmt +would print if you passed +.Fa fmt and the remaining arguments to it. .Sh RETURN VALUES The ==== //depot/projects/ia64/share/man/man9/device_set_driver.9#2 (text+ko) ==== @@ -26,14 +26,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_set_driver.9,v 1.1 2003/04/22 03:43:44 imp Exp $ +.\" $FreeBSD: src/share/man/man9/device_set_driver.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd April 21, 2003 .Dt DEVICE_SET_DRIVER 9 .Os .Sh NAME .Nm device_set_driver -.Nd associate a specific driver with a device node in the tree. +.Nd "associate a specific driver with a device node in the tree" .Sh SYNOPSIS .In sys/param.h .In sys/bus.h ==== //depot/projects/ia64/share/man/man9/rman.9#2 (text+ko) ==== @@ -23,35 +23,35 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/rman.9,v 1.1 2003/05/16 19:22:27 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/rman.9,v 1.2 2003/05/30 21:13:32 ru Exp $ .\" .Dd May 12, 2003 .Dt RMAN 9 .Os .Sh NAME .Nm rman , -.Nm rman_activate_resource , -.Nm rman_await_resource , -.Nm rman_deactivate_resource , -.Nm rman_fini , -.Nm rman_init , -.Nm rman_manage_region , -.Nm rman_release_resource , -.Nm rman_reserve_resource , -.Nm rman_reserve_resource_bound , -.Nm rman_make_alignment_flags , -.Nm rman_get_start , -.Nm rman_get_end , -.Nm rman_get_size , -.Nm rman_get_flags , -.Nm rman_set_virtual , -.Nm rman_get_virtual , -.Nm rman_set_bustag , -.Nm rman_get_bustag , -.Nm rman_set_bushandle , -.Nm rman_get_bushandle , -.Nm rman_set_rid , -.Nm rman_get_rid +.Nm rman_activate_resource , +.Nm rman_await_resource , +.Nm rman_deactivate_resource , +.Nm rman_fini , +.Nm rman_init , +.Nm rman_manage_region , +.Nm rman_release_resource , +.Nm rman_reserve_resource , +.Nm rman_reserve_resource_bound , +.Nm rman_make_alignment_flags , +.Nm rman_get_start , +.Nm rman_get_end , +.Nm rman_get_size , +.Nm rman_get_flags , +.Nm rman_set_virtual , +.Nm rman_get_virtual , +.Nm rman_set_bustag , +.Nm rman_get_bustag , +.Nm rman_set_bushandle , +.Nm rman_get_bushandle , +.Nm rman_set_rid , +.Nm rman_get_rid .Nd resource management functions .Sh SYNOPSIS .In sys/rman.h @@ -69,36 +69,42 @@ .Fn rman_manage_region "struct rman *rm" "u_long start" "u_long end" .Ft int .Fn rman_release_resource "struct resource *r" -.Ft struct resource * -.Fn rman_reserve_resource "struct rman *rm" "u_long start" "u_long end" "u_long count" "u_int flags" "struct device *dev" -.Ft struct resource * -.Fn rman_reserve_resource_bound "struct rman *rm" "u_long start" "u_long end" "u_long count" "u_long bound" "u_int flags" "struct device *dev" +.Ft "struct resource *" +.Fo rman_reserve_resource +.Fa "struct rman *rm" "u_long start" "u_long end" "u_long count" +.Fa "u_int flags" "struct device *dev" +.Fc +.Ft "struct resource *" +.Fo rman_reserve_resource_bound +.Fa "struct rman *rm" "u_long start" "u_long end" "u_long count" +.Fa "u_long bound" "u_int flags" "struct device *dev" +.Fc .Ft uint32_t .Fn rman_make_alignment_flags "uint32_t size" -.Ft u_long -.Fn rman_get_start "struct resource *_r" +.Ft u_long +.Fn rman_get_start "struct resource *r" .Ft u_long -.Fn rman_get_end "struct resource *_r" +.Fn rman_get_end "struct resource *r" .Ft u_long -.Fn rman_get_size "struct resource *_r" +.Fn rman_get_size "struct resource *r" .Ft u_int -.Fn rman_get_flags "struct resource *_r" +.Fn rman_get_flags "struct resource *r" .Ft void -.Fn rman_set_virtual "struct resource *_r" "void *_v" -.Ft void * -.Fn rman_get_virtual "struct resource *_r" +.Fn rman_set_virtual "struct resource *r" "void *v" +.Ft "void *" +.Fn rman_get_virtual "struct resource *r" .Ft void -.Fn rman_set_bustag "struct resource *_r" "bus_space_tag_t _t" +.Fn rman_set_bustag "struct resource *r" "bus_space_tag_t t" .Ft bus_space_tag_t -.Fn rman_get_bustag "struct resource *_r" +.Fn rman_get_bustag "struct resource *r" .Ft void -.Fn rman_set_bushandle "struct resource *_r" "bus_space_handle_t _h" +.Fn rman_set_bushandle "struct resource *r" "bus_space_handle_t h" .Ft bus_space_handle_t -.Fn rman_get_bushandle "struct resource *_r" +.Fn rman_get_bushandle "struct resource *r" .Ft void -.Fn rman_set_rid "struct resource *_r" "int _rid" -.Ft int -.Fn rman_get_rid "struct resource *_r" +.Fn rman_set_rid "struct resource *r" "int rid" +.Ft int +.Fn rman_get_rid "struct resource *r" .Sh DESCRIPTION The .Nm @@ -137,8 +143,8 @@ function frees any structures associated with the structure pointed to by the .Fa rm -argument. If any of the resources within the managed -region have the +argument. +If any of the resources within the managed region have the .Dv RF_ALLOCATED flag set, it will return .Er EBUSY ; @@ -153,7 +159,11 @@ The .Fa rman argument points to the region descriptor. -The start and end arguments specify the bounds of the region. +The +.Fa start +and +.Fa end +arguments specify the bounds of the region. .Pp .Em NOTE : This interface is not robust against programming errors which @@ -162,12 +172,17 @@ The .Fn rman_reserve_resource_bound function is where the bulk of the -.Nm logic is located. +.Nm +logic is located. It attempts to reserve a contiguous range in the specified region .Fa rm for the use of the device .Fa dev . -The caller can specify the start and end of an acceptable range, as well as +The caller can specify the +.Fa start +and +.Fa end +of an acceptable range, as well as alignment, and the code will attempt to find a free segment which fits. The default behavior is to allocate an exclusive segment, unless the .Dv RF_SHAREABLE @@ -207,7 +222,7 @@ flag. If this is a time shared resource, and the caller has not yet acquired the resource, the function returns -.Er EBUSY. +.Er EBUSY . .Pp The .Fn rman_deactivate_resource @@ -238,7 +253,8 @@ The .Fn rman_get_start , .Fn rman_get_end , -.Fn rman_get_size , and +.Fn rman_get_size , +and .Fn rman_get_flags functions return the bounds, size and flags of the previously reserved resource @@ -246,7 +262,8 @@ .Pp The .Fn rman_set_bustag -function associates a bus_space_tag_t +function associates a +.Vt bus_space_tag_t .Fa t with the resource .Fa r . @@ -256,7 +273,8 @@ .Pp The .Fn rman_set_bushandle -function associates a bus_space_handle_t +function associates a +.Vt bus_space_handle_t .Fa h with the resource .Fa r . @@ -276,7 +294,9 @@ .Fn rman_set_rid function associates a resource identifier with a resource .Fa r . -The rman_get_rid function retrieves this RID. +The +.Fn rman_get_rid +function retrieves this RID. .Pp The .Fn rman_get_device ==== //depot/projects/ia64/sys/alpha/include/bus.h#11 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.20 2003/05/27 04:59:56 scottl Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.21 2003/05/30 20:40:32 hmp Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -469,7 +469,7 @@ #define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ #define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */ +#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ #define BUS_DMA_ISA 0x10 /* map memory for ISA dma */ #define BUS_DMA_BUS2 0x20 /* placeholders for bus functions... */ #define BUS_DMA_BUS3 0x40 ==== //depot/projects/ia64/sys/amd64/include/bus_dma.h#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305302206.h4UM6FeW074569>