Date: Fri, 2 Jul 2004 20:05:50 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 56330 for review Message-ID: <200407022005.i62K5oFH040763@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=56330 Change 56330 by peter@peter_work on 2004/07/02 20:04:58 IFC @56327 Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#13 integrate .. //depot/projects/hammer/sys/alpha/alpha/sgmap.c#4 integrate .. //depot/projects/hammer/sys/alpha/isa/isa.c#10 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#10 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs.c#8 integrate .. //depot/projects/hammer/sys/alpha/pci/cia.c#7 integrate .. //depot/projects/hammer/sys/alpha/pci/pcibus.c#4 integrate .. //depot/projects/hammer/sys/alpha/pci/t2.c#8 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunami.c#7 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunami_pci.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#8 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#51 integrate .. //depot/projects/hammer/sys/conf/files#69 integrate .. //depot/projects/hammer/sys/conf/options#44 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#41 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#24 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#27 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#34 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#17 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#23 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#11 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#40 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#11 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#1 branch .. //depot/projects/hammer/sys/geom/label/g_label.h#1 branch .. //depot/projects/hammer/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/hammer/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/hammer/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/hammer/sys/i386/conf/NOTES#45 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#12 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#19 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#34 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#22 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#15 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#30 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#31 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#42 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/geom/geom_label/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/hammer/sys/net/if_tun.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#33 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#11 integrate .. //depot/projects/hammer/sys/pci/if_de.c#16 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#36 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#29 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#39 integrate .. //depot/projects/hammer/sys/sys/param.h#38 integrate .. //depot/projects/hammer/sys/sys/proc.h#55 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#9 integrate .. //depot/projects/hammer/sys/sys/rman.h#5 integrate .. //depot/projects/hammer/sys/sys/sched.h#10 integrate .. //depot/projects/hammer/sys/sys/syscall.h#30 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#30 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#30 integrate .. //depot/projects/hammer/sys/sys/thr.h#3 integrate .. //depot/projects/hammer/sys/sys/umtx.h#4 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#30 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#11 integrate Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.45 2004/07/02 03:47:28 scottl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -66,6 +66,7 @@ int map_count; bus_dma_lock_t *lockfunc; void *lockfuncarg; + bus_dma_segment_t *segments; }; struct bounce_page { @@ -221,7 +222,9 @@ newtag->lockfunc = dflt_lock; newtag->lockfuncarg = NULL; } - + + newtag->segments = NULL; + /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr); @@ -290,6 +293,8 @@ parent = dmat->parent; atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); free(dmat, M_DEVBUF); /* * Last reference count, so @@ -332,6 +337,14 @@ return (0); } + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if (dmat->lowaddr < ptoa(Maxmem)) { /* Must bounce */ int maxpages; @@ -425,6 +438,14 @@ /* If we succeed, no mapping/bouncing will be required */ *mapp = &nobounce_dmamap; + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -477,11 +498,6 @@ { vm_offset_t vaddr; vm_offset_t paddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif bus_dma_segment_t *sg; int seg; int error; @@ -496,16 +512,16 @@ * of the bus address space. */ vaddr = trunc_page((vm_offset_t) buf); - dm_segments[0].ds_addr = + dmat->segments[0].ds_addr = map->busaddress + (vm_offset_t) buf - vaddr; - dm_segments[0].ds_len = buflen; + dmat->segments[0].ds_len = buflen; buflen = round_page((vm_offset_t) buf + buflen) - vaddr; sgmap_load_region(chipset.sgmap, map->busaddress, vaddr, buflen); map->buflen = buflen; - (*callback)(callback_arg, dm_segments, 1, error); + (*callback)(callback_arg, dmat->segments, 1, error); return (0); } @@ -560,7 +576,7 @@ } vaddr = (vm_offset_t)buf; - sg = &dm_segments[0]; + sg = &dmat->segments[0]; seg = 1; sg->ds_len = 0; @@ -604,7 +620,7 @@ error = EFBIG; } - (*callback)(callback_arg, dm_segments, seg, error); + (*callback)(callback_arg, dmat->segments, seg, error); return (0); } @@ -617,7 +633,6 @@ */ static int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, - bus_dma_segment_t segs[], void *buf, bus_size_t buflen, struct thread *td, int flags, @@ -625,12 +640,15 @@ int *segp, int first) { + bus_dma_segment_t *segs; bus_size_t sgsize; bus_addr_t curaddr, lastaddr, baddr, bmask; vm_offset_t vaddr = (vm_offset_t)buf; int seg; pmap_t pmap; + segs = dmat->segments; + if (td != NULL) pmap = vmspace_pmap(td->td_proc->p_vmspace); else @@ -709,11 +727,6 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error; KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, @@ -730,7 +743,6 @@ for (m = m0; m != NULL && error == 0; m = m->m_next) { if (m->m_len > 0) { error = _bus_dmamap_load_buffer(dmat, - dm_segments, m->m_data, m->m_len, NULL, flags, &lastaddr, &nsegs, first); @@ -743,9 +755,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } return (error); @@ -761,11 +773,6 @@ int flags) { bus_addr_t lastaddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; @@ -796,9 +803,7 @@ caddr_t addr = (caddr_t) iov[i].iov_base; if (minlen > 0) { - error = _bus_dmamap_load_buffer(dmat, - dm_segments, - addr, minlen, + error = _bus_dmamap_load_buffer(dmat, addr, minlen, td, flags, &lastaddr, &nsegs, first); first = 0; @@ -808,9 +813,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, uio->uio_resid, error); } return (error); ==== //depot/projects/hammer/sys/alpha/alpha/sgmap.c#4 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/isa/isa.c#10 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#10 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.29 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/pci/apecs.c#8 (text+ko) ==== @@ -55,8 +55,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.25 2003/12/23 02:36:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.26 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/pci/cia.c#7 (text+ko) ==== @@ -87,10 +87,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.43 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/pci/pcibus.c#4 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.33 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.34 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_isa.h" +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/pci/t2.c#8 (text+ko) ==== @@ -51,8 +51,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.21 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/pci/tsunami.c#7 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.24 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/pci/tsunami_pci.c#4 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.16 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.17 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#8 (text+ko) ==== @@ -56,8 +56,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.26 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.27 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#17 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.16 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.17 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.26 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.27 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#19 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -595,10 +595,10 @@ 428 UNIMPL __acl_aclcheck_link ; XXX implement 429 UNIMPL sigwait -430 MNOPROTO { int thr_create(ucontext_t *ctx, thr_id_t *id, int flag s); } +430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } 431 MNOPROTO { void thr_exit(void); } -432 MNOPROTO { int thr_self(thr_id_t *id); } -433 MNOPROTO { int thr_kill(thr_id_t id, int sig); } +432 MNOPROTO { int thr_self(long *id); } +433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO { int jail_attach(int jid); } @@ -608,4 +608,4 @@ 440 UNIMPL kse_switchin 441 UNIMPL ksem_timedwait 442 MNOPROTO { int thr_suspend(const struct timespec *timeout); } -443 MNOPROTO { int thr_wake(thr_id_t id); } +443 MNOPROTO { int thr_wake(long id); } ==== //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.119 2004/06/18 14:36:24 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.120 2004/07/02 15:31:44 netchild Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1799,6 +1799,10 @@ args->cmd = SNDCTL_DSP_GETOPTR; return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SNDCTL_DSP_SETDUPLEX: + args->cmd = SNDCTL_DSP_SETDUPLEX; + return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SNDCTL_DSP_GETODELAY: args->cmd = SNDCTL_DSP_GETODELAY; return (ioctl(td, (struct ioctl_args *)args)); ==== //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#8 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_ioctl.h,v 1.20 2004/06/18 14:36:24 bms Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.21 2004/07/02 15:31:44 netchild Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -254,6 +254,7 @@ #define LINUX_SNDCTL_DSP_SETTRIGGER LINUX_SNDCTL_DSP_GETTRIGGER #define LINUX_SNDCTL_DSP_GETIPTR 0x5011 #define LINUX_SNDCTL_DSP_GETOPTR 0x5012 +#define LINUX_SNDCTL_DSP_SETDUPLEX 0x5016 #define LINUX_SNDCTL_DSP_GETODELAY 0x5017 #define LINUX_SNDCTL_SEQ_RESET 0x5100 #define LINUX_SNDCTL_SEQ_SYNC 0x5101 ==== //depot/projects/hammer/sys/conf/NOTES#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1238 2004/06/30 01:00:59 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1239 2004/07/02 19:40:35 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -125,6 +125,7 @@ options GEOM_FOX # Redundant path mitigation options GEOM_GATE # Userland services. options GEOM_GPT # GPT partitioning +options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning options GEOM_NOP # Test class. options GEOM_PC98 # NEC PC9800 partitioning ==== //depot/projects/hammer/sys/conf/files#69 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.921 2004/06/30 14:52:49 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.922 2004/07/02 19:40:36 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -940,6 +940,10 @@ crypto/sha2/sha2.c optional geom_bde geom/concat/g_concat.c optional geom_concat geom/gate/g_gate.c optional geom_gate +geom/label/g_label.c optional geom_label +geom/label/g_label_iso9660.c optional geom_label +geom/label/g_label_msdosfs.c optional geom_label +geom/label/g_label_ufs.c optional geom_label geom/nop/g_nop.c optional geom_nop geom/stripe/g_stripe.c optional geom_stripe geom/geom_aes.c optional geom_aes ==== //depot/projects/hammer/sys/conf/options#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.457 2004/06/29 02:30:12 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.458 2004/07/02 19:40:36 pjd Exp $ # # On the handling of kernel options # @@ -71,6 +71,7 @@ GEOM_FOX opt_geom.h GEOM_GATE opt_geom.h GEOM_GPT opt_geom.h +GEOM_LABEL opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h GEOM_NOP opt_geom.h ==== //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#10 (text+ko) ==== @@ -1,4 +1,51 @@ ---------------------------------------- +27 May 2004. Summary of changes for version 20040527: + +1) ACPI CA Core Subsystem: + +Completed a new design and implementation for EBDA (Extended BIOS +Data Area) support in the RSDP scan code. The original code +improperly scanned for the EBDA by simply scanning from memory +location 0 to 0x400. The correct method is to first obtain the +EBDA pointer from within the BIOS data area, then scan 1K of +memory starting at the EBDA pointer. There appear to be few if +any machines that place the RSDP in the EBDA, however. + +Integrated a fix for a possible fault during evaluation of +BufferField arguments. Obsolete code that was causing the +problem was removed. + +Found and fixed a problem in the Field Support Code where data +could be corrupted on a bit field read that starts on an aligned +boundary but does not end on an aligned boundary. Merged the +read/write "datum length" calculation code into a common +procedure. + +Rolled in a couple of changes to the FreeBSD-specific header. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release: + Non-Debug Version: 77.6K Code, 11.5K Data, 89.1K Total + Debug Version: 163.2K Code, 67.2K Data, 230.4K Total + Current Release: + Non-Debug Version: 77.7K Code, 11.5K Data, 89.2K Total + Debug Version: 163.3K Code, 67.2K Data, 230.5K Total + + +2) iASL Compiler/Disassembler: + +Fixed a generation warning produced by some overly-verbose +compilers for a 64-bit constant. + +---------------------------------------- 14 May 2004. Summary of changes for version 20040514: 1) ACPI CA Core Subsystem: ==== //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#12 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 156 $ + * $Revision: 158 $ * *****************************************************************************/ @@ -137,7 +137,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20040514 +#define ACPI_CA_VERSION 0x20040527 /* * OS name, used for the _OS object. The _OS object is essentially obsolete, @@ -151,7 +151,7 @@ /* Maximum objects in the various object caches */ -#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ +#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects */ #define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ #define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ #define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ @@ -235,10 +235,11 @@ /* Constants used in searching for the RSDP in low memory */ -#define ACPI_LO_RSDP_WINDOW_BASE 0 /* Physical Address */ -#define ACPI_HI_RSDP_WINDOW_BASE 0xE0000 /* Physical Address */ -#define ACPI_LO_RSDP_WINDOW_SIZE 0x400 -#define ACPI_HI_RSDP_WINDOW_SIZE 0x20000 +#define ACPI_EBDA_PTR_LOCATION 0x0000040E /* Physical Address */ +#define ACPI_EBDA_PTR_LENGTH 2 +#define ACPI_EBDA_WINDOW_SIZE 1024 +#define ACPI_HI_RSDP_WINDOW_BASE 0x000E0000 /* Physical Address */ +#define ACPI_HI_RSDP_WINDOW_SIZE 0x00020000 #define ACPI_RSDP_SCAN_STEP 16 /* Operation regions */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#13 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acfreebsd.h - OS specific defines, etc. - * $Revision: 15 $ + * $Revision: 17 $ * *****************************************************************************/ @@ -156,6 +156,7 @@ /* Not building kernel code, so use libc */ #define ACPI_USE_STANDARD_HEADERS #define ACPI_FLUSH_CPU_CACHE() + #if __STDC_HOSTED__ #include <ctype.h> #endif ==== //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acinterp.h - Interpreter subcomponent prototypes and defines - * $Revision: 148 $ + * $Revision: 149 $ * *****************************************************************************/ @@ -191,6 +191,12 @@ */ ACPI_STATUS +AcpiExCommonBufferSetup ( + ACPI_OPERAND_OBJECT *ObjDesc, + UINT32 BufferLength, + UINT32 *DatumCount); + +ACPI_STATUS AcpiExExtractFromField ( ACPI_OPERAND_OBJECT *ObjDesc, void *Buffer, ==== //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#10 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acmacros.h - C macros for the entire subsystem. - * $Revision: 150 $ + * $Revision: 151 $ * *****************************************************************************/ @@ -126,6 +126,9 @@ #define ACPI_LOBYTE(l) ((UINT8)(UINT16)(l)) #define ACPI_HIBYTE(l) ((UINT8)((((UINT16)(l)) >> 8) & 0xFF)) +#define ACPI_SET_BIT(target,bit) ((target) |= (bit)) +#define ACPI_CLEAR_BIT(target,bit) ((target) &= ~(bit)) + #if ACPI_MACHINE_WIDTH == 16 ==== //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 (text+ko) ==== @@ -2252,7 +2252,7 @@ ConstExprTerm : PARSEOP_ZERO {$$ = TrCreateValuedLeafNode (PARSEOP_ZERO, 0);} | PARSEOP_ONE {$$ = TrCreateValuedLeafNode (PARSEOP_ONE, 1);} - | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, 0xFFFFFFFFFFFFFFFFull);} + | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, ACPI_INTEGER_MAX);} ; /* OptionalCount must appear before ByteList or an incorrect reduction will result */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#12 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbcmds - debug commands and output routines - * $Revision: 112 $ + * $Revision: 113 $ * ******************************************************************************/ @@ -161,6 +161,9 @@ AcpiDbSleep ( char *ObjectArg) { +#if ACPI_MACHINE_WIDTH == 16 + return (AE_OK); +#else ACPI_STATUS Status; UINT8 SleepState; @@ -185,6 +188,7 @@ Status = AcpiLeaveSleepState (SleepState); return (Status); +#endif } ==== //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#10 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisply - debug display commands - * $Revision: 105 $ + * $Revision: 106 $ * ******************************************************************************/ @@ -824,8 +824,8 @@ (GpeBlock->RegisterCount * 8) -1); AcpiOsPrintf (" RegisterInfo: %p Status %8.8X%8.8X Enable %8.8X%8.8X\n", GpeBlock->RegisterInfo, - ACPI_FORMAT_UINT64 (GpeBlock->RegisterInfo->StatusAddress.Address), - ACPI_FORMAT_UINT64 (GpeBlock->RegisterInfo->EnableAddress.Address)); + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeBlock->RegisterInfo->StatusAddress.Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeBlock->RegisterInfo->EnableAddress.Address))); AcpiOsPrintf (" EventInfo: %p\n", GpeBlock->EventInfo); /* Examine each GPE Register within the block */ @@ -838,8 +838,8 @@ " Reg %u: WakeEnable %2.2X, RunEnable %2.2X Status %8.8X%8.8X Enable %8.8X%8.8X\n", i, GpeRegisterInfo->EnableForWake, GpeRegisterInfo->EnableForRun, - ACPI_FORMAT_UINT64 (GpeRegisterInfo->StatusAddress.Address), - ACPI_FORMAT_UINT64 (GpeRegisterInfo->EnableAddress.Address)); + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeRegisterInfo->StatusAddress.Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeRegisterInfo->EnableAddress.Address))); /* Now look at the individual GPEs in this byte register */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#10 (text+ko) ==== @@ -2,7 +2,7 @@ * * Module Name: dsopcode - Dispatcher Op Region support and handling of * "control" opcodes - * $Revision: 94 $ + * $Revision: 95 $ * *****************************************************************************/ @@ -153,7 +153,6 @@ ACPI_STATUS Status; ACPI_PARSE_OBJECT *Op; ACPI_WALK_STATE *WalkState; - ACPI_PARSE_OBJECT *Arg; ACPI_FUNCTION_TRACE ("DsExecuteArguments"); @@ -204,9 +203,7 @@ /* Get and init the Op created above */ - Arg = Op->Common.Value.Arg; Op->Common.Node = Node; - Arg->Common.Node = Node; AcpiPsDeleteParseTree (Op); /* Evaluate the deferred arguments */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evgpe - General Purpose Event handling and dispatch - * $Revision: 40 $ + * $Revision: 42 $ * *****************************************************************************/ @@ -206,28 +206,28 @@ if (Type == ACPI_GPE_DISABLE) { - GpeRegisterInfo->EnableForWake &= ~RegisterBit; - GpeRegisterInfo->EnableForRun &= ~RegisterBit; + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); return_ACPI_STATUS (AE_OK); } - /* 2) Enable case. Set the appropriate enable bits */ + /* 2) Enable case. Set/Clear the appropriate enable bits */ switch (GpeEventInfo->Flags & ACPI_GPE_TYPE_MASK) { case ACPI_GPE_TYPE_WAKE: - GpeRegisterInfo->EnableForWake |= RegisterBit; - GpeRegisterInfo->EnableForRun &= ~RegisterBit; + ACPI_SET_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; case ACPI_GPE_TYPE_RUNTIME: - GpeRegisterInfo->EnableForWake &= ~RegisterBit; - GpeRegisterInfo->EnableForRun |= RegisterBit; + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_SET_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; case ACPI_GPE_TYPE_WAKE_RUN: - GpeRegisterInfo->EnableForWake |= RegisterBit; - GpeRegisterInfo->EnableForRun |= RegisterBit; + ACPI_SET_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_SET_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; default: @@ -274,17 +274,19 @@ switch (GpeEventInfo->Flags & ACPI_GPE_TYPE_MASK) { case ACPI_GPE_TYPE_WAKE: - GpeEventInfo->Flags |= ACPI_GPE_WAKE_ENABLED; + + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); break; case ACPI_GPE_TYPE_WAKE_RUN: - GpeEventInfo->Flags |= ACPI_GPE_WAKE_ENABLED; + + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); /*lint -fallthrough */ case ACPI_GPE_TYPE_RUNTIME: - GpeEventInfo->Flags |= ACPI_GPE_RUN_ENABLED; + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_RUN_ENABLED); if (WriteToHardware) { @@ -350,11 +352,11 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407022005.i62K5oFH040763>