Date: Sun, 7 Mar 2004 11:47:53 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 48363 for review Message-ID: <200403071947.i27Jlrfi072531@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=48363 Change 48363 by peter@peter_daintree on 2004/03/07 11:47:51 IFC @48354 Affected files ... .. //depot/projects/hammer/lib/libgeom/Makefile#6 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#29 integrate .. //depot/projects/hammer/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/hammer/share/misc/bsd-family-tree#14 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#25 integrate .. //depot/projects/hammer/sys/conf/files.pc98#23 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#12 integrate .. //depot/projects/hammer/sys/dev/trm/trm.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#28 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#28 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#24 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#21 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#8 integrate .. //depot/projects/hammer/sys/net/if_stf.c#10 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#15 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio_cbus.c#4 integrate .. //depot/projects/hammer/sys/pc98/pc98/wd_cd.h#3 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#22 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#9 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#5 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#3 integrate Differences ... ==== //depot/projects/hammer/lib/libgeom/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.9 2003/08/18 15:25:38 obrien Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.10 2004/03/07 16:07:57 phk Exp $ LIB= geom SHLIBDIR?= /lib @@ -25,6 +25,12 @@ libgeom.3 geom_stats_snapshot_free.3 \ libgeom.3 geom_stats_snapshot_timestamp.3 \ libgeom.3 geom_stats_snapshot_reset.3 \ - libgeom.3 geom_stats_snapshot_next.3 + libgeom.3 geom_stats_snapshot_next.3 \ + libgeom.3 gctl_get_handle.3 \ + libgeom.3 gctl_ro_param.3 \ + libgeom.3 gctl_rw_param.3 \ + libgeom.3 gctl_issue.3 \ + libgeom.3 gctl_free.3 \ + libgeom.3 gctl_dump.3 .include <bsd.lib.mk> ==== //depot/projects/hammer/lib/libgeom/libgeom.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.4 2003/06/18 19:43:17 charnier Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.5 2004/03/07 16:07:57 phk Exp $ .\" .Dd February 8, 2003 .Dt LIBGEOM 3 @@ -38,7 +38,13 @@ .Nm geom_stats_snapshot_free , .Nm geom_stats_snapshot_timestamp , .Nm geom_stats_snapshot_reset , -.Nm geom_stats_snapshot_next +.Nm geom_stats_snapshot_next , +.Nm gctl_get_handle , +.Nm gctl_ro_param , +.Nm gctl_rw_param , +.Nm gctl_issue , +.Nm gctl_free , +.Nm gctl_dump .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -61,6 +67,19 @@ .Fn geom_stats_snapshot_reset "void *arg" .Ft "struct g_stat *" .Fn geom_stats_snapshot_next "void *arg" +.Ss "Control Functions" +.Ft "struct gctl_req *" +.Fn gctl_get_handle "void" +.Ft void +.Fn gctl_ro_param "struct gctl_req *req" "const char *name" "int len" "const void *value" +.Ft void +.Fn gctl_rw_param "struct gctl_req *req" "const char *name" "int len" "void *value" +.Ft "const char *" +.Fn gctl_issue "struct gctl_req *req" +.Ft void +.Fn gctl_free "struct gctl_req *req" +.Ft void +.Fn gctl_dump "struct gctl_req *req" "FILE *f" .Sh DESCRIPTION The .Nm geom @@ -129,10 +148,99 @@ returns the next item, and .Dv NULL if there are no more items in the snapshot. -.Sh AUTHORS -.An Poul-Henning Kamp Aq phk@FreeBSD.org +.Ss "Control Functions" +The +.Fn gctl_* +functions are used to send requests to GEOM classes. In order for a GEOM +class to actually be able to receive these requests, it must have defined a +"ctlreq" method. +.Pp +A +.Ar struct gctl_req * , +obtained with +.Fn gctl_get_handle , +can hold any number of parameters, which must be added to it with +.Fn gctl_ro_param +(for read-only parameters) or +.Fn gctl_rw_param +(for read/write parameters). +.Pp +Both +.Fn gctl_ro_param +and +.Fn gctl_rw_param +take a string +.Ar name , +which is used to identify the parameter, and a +.Ar value , +which contains - in the read-only case - the data to be passed to the +GEOM class, or - in the read/write case - a pointer to preallocated memory +that the GEOM class should fill with the desired data. If +.Ar len +is negative, it is assumed that +.Ar value +is an ASCII string and the actual length is taken from the string length of +.Ar value ; +otherwise it must hold the size of +.Ar value . +.Pp +A parameter with a +.Ar name +containing the string "class" is mandatory for each request, and the +corresponding +.Ar value +must hold the name of the GEOM class where the request should be sent to. +.Pp +Also mandatory for each request is a parameter with a +.Ar name +called "verb", and the corresponding +.Ar value +needs to hold the command string that the GEOM class should react upon. +.Pp +Once all desired parameters are filled in, the request must be sent to +the GEOM subsystem with +.Fn gctl_issue , +which returns NULL on success, or a string containing the error message +on failure. +.Pp +After the request is finished, the allocated memory should be released with +.Fn gctl_free . +.Pp +.Fn gctl_dump +can be used to format the contents of +.Ar req +to the open file handle pointed to by +.Ar f +for debugging purposes. +.Pp +Error handling for the control functions is postponed until the call +to +.Fn gctl_issue +which returns NULL on success or an error message corresponding to the +first error which happened. +.Sh EXAMPLES +Create a request that is to be sent to the CCD class and tell +it to destroy a specific geom: +.Bd -literal -offset indent +H = gctl_get_handle(); +gctl_ro_param(H, "verb", -1, "destroy geom"); +gctl_ro_param(H, "class", -1, "CCD"); +sprintf(buf, "ccd%d", ccd); +gctl_ro_param(H, "geom", -1, buf); +errstr = gctl_issue(H); +if (errstr != NULL) + err(1, "Could not destroy ccd: %s", errstr); +gctl_free(H); +.Ed +.Sh SEE ALSO +.Rs +http://ezine.daemonnews.org/200308/blueprints.html +.Re .Sh HISTORY The .Nm geom library appeared in .Fx 5.1 . +.Sh AUTHORS +.An Poul-Henning Kamp Aq phk@FreeBSD.org +.An Lukas Ertl Aq le@FreeBSD.org ==== //depot/projects/hammer/share/man/man9/Makefile#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.225 2004/03/06 08:01:16 jkoshy Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.226 2004/03/07 15:22:08 josef Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -186,6 +186,7 @@ runqueue.9 \ sbuf.9 \ scheduler.9 \ + securelevel_gt.9 \ selrecord.9 \ sema.9 \ signal.9 \ @@ -732,6 +733,7 @@ scheduler.9 sched_setup.9 \ scheduler.9 setrunnable.9 \ scheduler.9 updatepri.9 +MLINKS+=securelevel_gt.9 securelevel_ge.9 MLINKS+=selrecord.9 selwakeup.9 MLINKS+=sema.9 sema_destroy.9 \ sema.9 sema_init.9 \ ==== //depot/projects/hammer/share/misc/bsd-family-tree#14 (text+ko) ==== @@ -158,17 +158,17 @@ | | | NetBSD 1.6 OpenBSD 3.2 | | FreeBSD 4.8 | | | | | | | | | NetBSD 1.6.1 | | - | | | | | OpenBSD 3.3 | + | | | | | OpenBSD 3.3 BSD/OS 5.0 | | | | | | | - | FreeBSD 4.9 | | | OpenBSD 3.4 | - | | | | | | | - | v | | NetBSD 1.6.2 | | - | | | | | | - | | | v | | -FreeBSD 5.0 | | | | - | | | | BSD/OS 5.0 -FreeBSD 5.1 | NetBSD -current OpenBSD -current | - | \ | | | v + | FreeBSD 4.9 | | | OpenBSD 3.4 BSD/OS 5.1 ISE + | | | | | | + | v | | NetBSD 1.6.2 | + | | | | | + | | | v | +FreeBSD 5.0 | | | + | | | | +FreeBSD 5.1 | NetBSD -current OpenBSD -current + | \ | | | | ----- Mac OS X | | | 10.3 | | FreeBSD 5.2 | | | @@ -391,6 +391,7 @@ FreeBSD 5.1 2003-06-09 [FBD] Mac OS X 10.3 2003-10-24 [APL] FreeBSD 4.9 2003-10-28 [FBD] +BSD/OS 5.1 ISE 2003-10-?? [WRS] (final version) OpenBSD 3.4 2003-11-01 [OBD] FreeBSD 5.2 2004-01-12 [FBD] FreeBSD 5.2.1 2004-02-22 [FBD] (patch release) @@ -451,4 +452,4 @@ Copyright (c) 1997-2004 Wolfram Schneider <wosch@FreeBSD.ORG> URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.78 2004/03/04 05:34:29 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.79 2004/03/07 16:44:10 wosch Exp $ ==== //depot/projects/hammer/sys/alpha/include/pmap.h#6 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.24 2003/10/06 01:47:11 bms Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.25 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -212,8 +212,6 @@ extern pt_entry_t *CMAP1; extern vm_offset_t avail_end; extern vm_offset_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/hammer/sys/amd64/include/pmap.h#25 (text+ko) ==== @@ -43,7 +43,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.109 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.110 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -262,8 +262,6 @@ extern pt_entry_t *CMAP1; extern vm_paddr_t avail_end; extern vm_paddr_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_paddr_t phys_avail[]; extern char *ptvmmap; /* poor name! */ extern vm_offset_t virtual_avail; ==== //depot/projects/hammer/sys/conf/files.pc98#23 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.286 2004/02/19 13:10:39 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.287 2004/03/07 05:38:20 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -43,12 +43,6 @@ compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/freebsd/i386-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/freebsd/i386-elf.hal.o.uu" \ - no-implicit-rule -# -# compat/linux/linux_file.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux compat/linux/linux_ioctl.c optional compat_linux @@ -205,14 +199,9 @@ i386/isa/bs/bsfunc.c optional bs i386/isa/bs/bshw.c optional bs i386/isa/bs/bsif.c count bs -i386/isa/ctx.c optional ctx i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/gpib.c optional gp -i386/isa/if_el.c count el -i386/isa/if_le.c count le -i386/isa/if_rdp.c count rdp i386/isa/isa.c optional isa i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." @@ -221,9 +210,7 @@ i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spkr.c optional speaker -i386/isa/spigot.c count spigot i386/isa/stallion.c optional stl nowerror -i386/isa/wt.c count wt i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/hammer/sys/dev/trm/trm.c#12 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.19 2004/02/20 20:36:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.20 2004/03/07 17:23:39 cognet Exp $"); /* * HISTORY: @@ -2992,6 +2992,25 @@ return; } +static void +trm_destroySRB(PACB pACB) +{ + PSRB pSRB; + + pSRB = pACB->pFreeSRB; + while (pSRB) { + if (pSRB->sg_dmamap) { + bus_dmamap_unload(pACB->sg_dmat, pSRB->sg_dmamap); + bus_dmamem_free(pACB->sg_dmat, pSRB->pSRBSGL, + pSRB->sg_dmamap); + bus_dmamap_destroy(pACB->sg_dmat, pSRB->sg_dmamap); + } + if (pSRB->dmamap) + bus_dmamap_destroy(pACB->buffer_dmat, pSRB->dmamap); + pSRB = pSRB->pNextSRB; + } +} + static int trm_initSRB(PACB pACB) { @@ -3002,29 +3021,11 @@ for (i = 0; i < TRM_MAX_SRB_CNT; i++) { pSRB = (PSRB)&pACB->pFreeSRB[i]; - /* DMA tag for our S/G structures */ - if (bus_dma_tag_create( - /*parent_dmat*/pSRB->parent_dmat, - /*alignment*/ 1, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ TRM_MAX_SG_LISTENTRY * sizeof(SGentry), - /*nsegments*/ 1, - /*maxsegsz*/ TRM_MAXTRANSFER_SIZE, - /*flags*/ 0, - /*lockfunc*/ busdma_lock_mutex, - /*lockarg*/ &Giant, - /*dmat*/ &pSRB->sg_dmat) != 0) { - return ENXIO; - } - if (bus_dmamem_alloc(pSRB->sg_dmat, (void **)&pSRB->pSRBSGL, + if (bus_dmamem_alloc(pACB->sg_dmat, (void **)&pSRB->pSRBSGL, BUS_DMA_NOWAIT, &pSRB->sg_dmamap) !=0 ) { return ENXIO; } - bus_dmamap_load(pSRB->sg_dmat, pSRB->sg_dmamap, pSRB->pSRBSGL, + bus_dmamap_load(pACB->sg_dmat, pSRB->sg_dmamap, pSRB->pSRBSGL, TRM_MAX_SG_LISTENTRY * sizeof(SGentry), trm_srbmapSG, pSRB, /*flags*/0); if (i != TRM_MAX_SRB_CNT - 1) { @@ -3042,9 +3043,6 @@ /* * Create the dmamap. This is no longer optional! - * - * XXX This is not freed on unload! None of the other - * allocations in this function are either! */ if ((error = bus_dmamap_create(pACB->buffer_dmat, 0, &pSRB->dmamap)) != 0) @@ -3499,6 +3497,23 @@ } } bzero(pACB->pFreeSRB, TRM_MAX_SRB_CNT * sizeof(TRM_SRB)); + if (bus_dma_tag_create( + /*parent_dmat*/NULL, + /*alignment*/ 1, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ TRM_MAX_SG_LISTENTRY * sizeof(SGentry), + /*nsegments*/ 1, + /*maxsegsz*/ TRM_MAXTRANSFER_SIZE, + /*flags*/ 0, + /*lockfunc*/ busdma_lock_mutex, + /*lockarg*/ &Giant, + /*dmat*/ &pACB->sg_dmat) != 0) + goto bad; + if (trm_initSRB(pACB)) { printf("trm_initSRB: error\n"); goto bad; @@ -3520,6 +3535,10 @@ } if (pACB->sense_dmat) bus_dma_tag_destroy(pACB->sense_dmat); + if (pACB->sg_dmat) { + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); + } if (pACB->srb_dmamap) { bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, @@ -3628,6 +3647,11 @@ if (pACB->iores) bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), pACB->iores); + if (pACB->sg_dmat) { + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); + } + if (pACB->srb_dmamap) { bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, @@ -3685,6 +3709,8 @@ PACB pACB = device_get_softc(dev); bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), pACB->iores); + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, pACB->srb_dmamap); ==== //depot/projects/hammer/sys/dev/trm/trm.h#3 (text+ko) ==== @@ -27,7 +27,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/dev/trm/trm.h,v 1.3 2003/02/20 03:21:34 cognet Exp $ + * $FreeBSD: src/sys/dev/trm/trm.h,v 1.4 2004/03/07 17:23:39 cognet Exp $ */ #ifndef trm_H @@ -155,8 +155,6 @@ * CAM ccb */ union ccb *pccb; - bus_dma_tag_t parent_dmat; - bus_dma_tag_t sg_dmat; bus_dmamap_t sg_dmamap; bus_dmamap_t dmamap; u_int16_t SRBState; @@ -235,6 +233,7 @@ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ bus_dma_tag_t srb_dmat; bus_dma_tag_t sense_dmat; /* dmat for sense buffer */ + bus_dma_tag_t sg_dmat; bus_dmamap_t sense_dmamap; bus_dmamap_t srb_dmamap; bus_addr_t sense_busaddr; ==== //depot/projects/hammer/sys/dev/usb/umass.c#19 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.104 2004/03/04 07:20:48 sanpei Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.105 2004/03/07 05:33:09 sanpei Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -351,12 +351,20 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS }, + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_DVR_UEH8, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_QUIRKS + }, { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, RID_WILDCARD, /* XXX This is not correct as there are Zip drives that use ATAPI. */ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_TEST_UNIT_READY }, + { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2, RID_WILDCARD, + UMASS_PROTO_SCSI, + NO_QUIRKS + }, { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443U2, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS ==== //depot/projects/hammer/sys/dev/usb/usbdevs#29 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -787,6 +787,7 @@ product IODATA USBETTXS 0x0913 USB ETTX product IODATA USBRSAQ 0x0a03 USB serial adapter USB-RSAQ1 product IODATA IU_CD2 0x0204 DVD Multi-plus unit iU-CD2 +product IODATA DVR_UEH8 0x0206 DVD Multi-plus unit DVR-UEH8 /* Iomega products */ product IOMEGA ZIP100 0x0001 Zip 100 @@ -888,6 +889,7 @@ product LOGITECH QUICKCAMPRO2 0xd001 QuickCam Pro /* Logitec Corp. products */ +product LOGITEC LDR_H443SU2 0x0033 DVD Multi-plus unit LDR-H443SU2 product LOGITEC LDR_H443U2 0x00b3 DVD Multi-plus unit LDR-H443U2 /* Lucent products */ ==== //depot/projects/hammer/sys/dev/usb/usbdevs.h#28 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.172 2004/03/04 07:22:30 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp */ /* @@ -794,6 +794,7 @@ #define USB_PRODUCT_IODATA_USBETTXS 0x0913 /* USB ETTX */ #define USB_PRODUCT_IODATA_USBRSAQ 0x0a03 /* USB serial adapter USB-RSAQ1 */ #define USB_PRODUCT_IODATA_IU_CD2 0x0204 /* DVD Multi-plus unit iU-CD2 */ +#define USB_PRODUCT_IODATA_DVR_UEH8 0x0206 /* DVD Multi-plus unit DVR-UEH8 */ /* Iomega products */ #define USB_PRODUCT_IOMEGA_ZIP100 0x0001 /* Zip 100 */ @@ -895,6 +896,7 @@ #define USB_PRODUCT_LOGITECH_QUICKCAMPRO2 0xd001 /* QuickCam Pro */ /* Logitec Corp. products */ +#define USB_PRODUCT_LOGITEC_LDR_H443SU2 0x0033 /* DVD Multi-plus unit LDR-H443SU2 */ #define USB_PRODUCT_LOGITEC_LDR_H443U2 0x00b3 /* DVD Multi-plus unit LDR-H443U2 */ /* Lucent products */ ==== //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#28 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.172 2004/03/04 07:22:30 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp */ /* @@ -1504,6 +1504,12 @@ "DVD Multi-plus unit iU-CD2", }, { + USB_VENDOR_IODATA, USB_PRODUCT_IODATA_DVR_UEH8, + 0, + "I/O Data", + "DVD Multi-plus unit DVR-UEH8", + }, + { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, 0, "Iomega", @@ -1882,6 +1888,12 @@ "QuickCam Pro", }, { + USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2, + 0, + "Logitec Corp", + "DVD Multi-plus unit LDR-H443SU2", + }, + { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443U2, 0, "Logitec Corp", ==== //depot/projects/hammer/sys/geom/geom_subr.c#24 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.71 2004/02/14 17:58:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.72 2004/03/07 17:33:15 phk Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -272,7 +272,8 @@ if (!(gp->flags & G_GEOM_WITHER)) { gp->flags |= G_GEOM_WITHER; LIST_FOREACH(pp, &gp->provider, provider) - g_orphan_provider(pp, error); + if (!(pp->flags & G_PF_ORPHAN)) + g_orphan_provider(pp, error); } for (pp = LIST_FIRST(&gp->provider); pp != NULL; pp = pp2) { pp2 = LIST_NEXT(pp, provider); ==== //depot/projects/hammer/sys/i386/include/pmap.h#10 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.103 2003/11/08 03:01:26 alc Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.104 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -326,8 +326,6 @@ extern pt_entry_t *CMAP1; extern vm_paddr_t avail_end; extern vm_paddr_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_paddr_t phys_avail[]; extern int pseflag; extern int pgeflag; ==== //depot/projects/hammer/sys/ia64/ia64/pmap.c#21 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.125 2003/10/08 19:55:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.126 2004/03/07 07:43:13 alc Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -728,7 +728,7 @@ pmap->pm_flags = 0; for (i = 0; i < 5; i++) - pmap->pm_rid[i] = 0; + pmap->pm_rid[i] = pmap_allocate_rid(); pmap->pm_ptphint = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); @@ -744,10 +744,6 @@ void pmap_pinit2(struct pmap *pmap) { - int i; - - for (i = 0; i < 5; i++) - pmap->pm_rid[i] = pmap_allocate_rid(); } /*************************************************** ==== //depot/projects/hammer/sys/ia64/include/pmap.h#8 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.15 2003/10/06 01:47:11 bms Exp $ + * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.16 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -109,8 +109,6 @@ extern vm_offset_t avail_end; extern vm_offset_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/hammer/sys/net/if_stf.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_stf.c,v 1.35 2003/12/28 03:55:59 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_stf.c,v 1.36 2004/03/07 05:15:42 rwatson Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* @@ -141,7 +141,7 @@ static LIST_HEAD(, stf_softc) stf_softc_list; static MALLOC_DEFINE(M_STF, STFNAME, "6to4 Tunnel Interface"); -static int ip_stf_ttl = 40; +static const int ip_stf_ttl = 40; extern struct domain inetdomain; struct protosw in_stf_protosw = ==== //depot/projects/hammer/sys/nfsserver/nfs.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.69 2003/05/25 06:17:33 truckman Exp $ + * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.70 2004/03/07 16:28:31 kan Exp $ */ #ifndef _NFSSERVER_NFS_H_ @@ -132,7 +132,7 @@ struct vattr; struct nameidata; -extern struct callout_handle nfsrv_timer_handle; +extern struct callout nfsrv_callout; extern struct nfsrvstats nfsrvstats; extern int nfsrv_ticks; ==== //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.86 2003/11/17 00:56:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.87 2004/03/07 16:28:31 kan Exp $"); /* * Socket operations for use by nfs @@ -96,7 +96,7 @@ */ #define NFS_CWNDSCALE 256 #define NFS_MAXCWND (NFS_CWNDSCALE * 32) -struct callout_handle nfsrv_timer_handle; +struct callout nfsrv_callout; static void nfs_realign(struct mbuf **pm, int hsiz); /* XXX SHARED */ static int nfsrv_getstream(struct nfssvc_sock *, int); @@ -779,5 +779,5 @@ nfsrv_wakenfsd(slp); } splx(s); - nfsrv_timer_handle = timeout(nfsrv_timer, NULL, nfsrv_ticks); + callout_reset(&nfsrv_callout, nfsrv_ticks, nfsrv_timer, NULL); } ==== //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.123 2003/12/17 16:12:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.124 2004/03/07 16:28:31 kan Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -545,6 +545,7 @@ nfsrv_init(0); /* Init server data structures */ nfsrv_initcache(); /* Init the server request cache */ + callout_init(&nfsrv_callout, 0); nfsrv_timer(0); nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg; @@ -555,7 +556,7 @@ case MOD_UNLOAD: - untimeout(nfsrv_timer, (void *)NULL, nfsrv_timer_handle); + callout_stop(&nfsrv_callout); sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg; sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call; break; ==== //depot/projects/hammer/sys/pc98/conf/GENERIC#15 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.242 2004/01/30 13:15:42 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.243 2004/03/07 04:07:57 nyan Exp $ machine pc98 #cpu I386_CPU # Do not enable with other cpu types @@ -128,6 +128,8 @@ # syscons is the default console driver, resembling an SCO console device sc +#device agp # support several AGP chipsets + # Floating point support - do not disable. device npx @@ -175,15 +177,18 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bfe # Broadcom BCM440x 10/100 ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device pcn # AMD Am79C97x PCI 10/100 NICs +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 +device sk # SysKonnect SK-984x and SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) +device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II @@ -223,8 +228,6 @@ # Be aware of the administrative consequences of enabling this! device bpf # Berkeley packet filter -#device compat_atdisk # IBM-PC HDD support - # USB support #device uhci # UHCI PCI->USB interface #device ohci # OHCI PCI->USB interface ==== //depot/projects/hammer/sys/pc98/conf/NOTES#19 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.25 2004/01/30 13:06:57 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.27 2004/03/07 05:38:20 nyan Exp $ # # @@ -341,7 +341,7 @@ # config as well, or you will not have the dependencies. The other option # is to load both as modules. -device tdfx # Enable 3Dfx Voodoo support +device tdfx # Enable 3Dfx Voodoo support options TDFX_LINUX # Enable Linuxulator support # DRM options: @@ -380,59 +380,36 @@ # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) -# el: 3Com 3C501 (slow!) # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; # Intel EtherExpress -# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100, -# DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133 -# (no hints needed). +# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, -# OC-3141, OC-3540, OC-3250 -# rdp: RealTek RTL 8002-based pocket ethernet adapters -# sbni: Granch SBNI12-xx ISA and PCI adapters +# OC-3141, OC-3540 and OC-3250. +# sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) -# wl: Lucent Wavelan (ISA card only). +# wl: Lucent Wavelan (ISA card only). # Order for ISA/EISA devices is important here device ar -hint.ar.0.at="isa" -hint.ar.0.port="0x300" -hint.ar.0.irq="10" -hint.ar.0.maddr="0xd0000" device ed #options ED_NO_MIIBUS # Disable ed miibus support hint.ed.0.at="isa" hint.ed.0.port="0x280" hint.ed.0.irq="5" hint.ed.0.maddr="0xd8000" -device el 1 -hint.el.0.at="isa" -hint.el.0.port="0x300" -hint.el.0.irq="9" device ie # Hints only required for Starlan hint.ie.2.at="isa" hint.ie.2.port="0x300" hint.ie.2.irq="5" hint.ie.2.maddr="0xd0000" -device le 1 -hint.le.0.at="isa" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" device lnc hint.lnc.0.at="isa" hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" -device rdp 1 -hint.rdp.0.at="isa" -hint.rdp.0.port="0x378" -hint.rdp.0.irq="7" -hint.rdp.0.flags="2" device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -444,12 +421,7 @@ hint.snc.0.irq="6" hint.snc.0.maddr="0xc0000" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403071947.i27Jlrfi072531>