CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Tue Jun 4 07:44:45 UTC 2013
Modified Files:
src/external/mit/xorg/lib: Makefile
Log Message:
build libXdmGreet.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.25 src/external/mit/xorg/lib/Makefile:1.26
--- src/external/mit/xorg/lib/Makefile:1.25 Wed Feb 29 20:07:56 2012
+++ src/external/mit/xorg/lib/Makefile Tue Jun 4 07:44:45 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2012/02/29 20:07:56 tron Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/04 07:44:45 mrg Exp $
# build libraries for xorg
SUBDIR= libfontenc freetype libFS libICE libOSMesa \
- libXau libXdmcp libdrm libpciaccess .WAIT
+ libXau libXdmGreet libXdmcp libdrm libpciaccess .WAIT
.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
SUBDIR+=libdrm_intel
.endif
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Jun 4 07:47:55 UTC 2013 Modified Files: src/share/man/man4: drm.4 Log Message: Fix SYNOPSIS. Reported by Brad Harder in PR 47885. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/drm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/drm.4 diff -u src/share/man/man4/drm.4:1.14 src/share/man/man4/drm.4:1.15 --- src/share/man/man4/drm.4:1.14 Tue Jan 15 03:28:18 2013 +++ src/share/man/man4/drm.4 Tue Jun 4 07:47:54 2013 @@ -1,6 +1,6 @@ -.\ $NetBSD: drm.4,v 1.14 2013/01/15 03:28:18 jmcneill Exp $ +.\ $NetBSD: drm.4,v 1.15 2013/06/04 07:47:54 wiz Exp $ .\ -.\ Copyright (c) 2007 Thomas Klausner +.\ Copyright (c) 2007, 2013 Thomas Klausner .\ All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without @@ -23,22 +23,22 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 14, 2013 +.Dd June 4, 2013 .Dt DRM 4 .Os .Sh NAME .Nm drm .Nd Direct Rendering Manager (DRI kernel support) .Sh SYNOPSIS -.Cd i915drm* at vga? -.Cd mach64drm* at vga? -.Cd mgadrm*at vga? -.Cd r128drm* at vga? -.Cd radeondrm* at vga? -.Cd savagedrm* at vga? -.Cd sisdrm*at vga? -.Cd tdfxdrm* at vga? -.Cd viadrm*at vga? +.Cd i915drm* at drm? +.Cd mach64drm* at drm? +.Cd mgadrm*at drm? +.Cd r128drm* at drm? +.Cd radeondrm* at drm? +.Cd savagedrm* at drm? +.Cd sisdrm*at drm? +.Cd tdfxdrm* at drm? +.Cd viadrm*at drm? .Pp .Cd optionsDRM_DEBUG .Cd optionsDRM_NO_AGP
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Jun 4 09:37:22 UTC 2013 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7429 Log Message: Import openresolv-3.5.5 with the following changes from 3.5.3 * Fix setting IPv6 namservers over DBus to dnsmasq * Fix pdnsd config file generation * Man page fixes Status: Vendor Tag: roy Release Tags: openresolv-3-5-5 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Tue Jun 4 09:40:12 UTC 2013 Modified Files: src/external/bsd/openresolv/dist: resolvconf.conf.5.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.7 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.8 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.7 Thu Mar 21 04:57:38 2013 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Jun 4 09:40:12 2013 @@ -1,4 +1,4 @@ -.\ Copyright (c) 2009-2012 Roy Marples +.\ Copyright (c) 2009-2013 Roy Marples .\ All rights reserved .\ .\ Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 2, 2012 +.Dd April 27, 2013 .Dt RESOLVCONF.CONF 5 SMM .Os .Sh NAME @@ -108,11 +108,12 @@ without any alteration. A libc resolver sortlist, as specified in .Xr resolv.conf 5 . .It Sy resolv_conf_local_only -If a local nameserver is configured then the default is just to specify that +If a local name server is configured then the default is just to specify that and ignore all other entries as they will be configured for the local -nameserver. -Set this to YES to list them instead, if you need working DNS and the local -nameserver stops functioning at the expense of duplicated server queries. +name server. +Set this to NO to also list non-local nameservers. +This will give you working DNS even if the local nameserver stops functioning +at the expense of duplicated server queries. .El .Sh SUBSCRIBER OPTIONS openresolv ships with subscribers for the name servers @@ -125,28 +126,31 @@ Each subscriber can create configuration in the subscribers main configuration file. .Bl -tag -width indent .It Sy dnsmasq_conf -This file tells dnsmasq which nameservers to use for specific domains. +This file tells dnsmasq which name servers to use for specific domains. .It Sy dnsmasq_resolv -This file tells dnsmasq which nameservers to use for global lookups. +This file tells dnsmasq which name servers to use for global lookups. .Pp Example resolvconf.conf for dnsmasq: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 dnsmasq_conf=/etc/dnsmasq-conf.conf .D1 dnsmasq_resolv=/etc/dnsmasq-resolv.conf .Pp Example dnsmasq.conf: .D1 listen-address=127.0.0.1 +.D1 # If dnsmasq is compiled for DBus then we can take +.D1 # advantage of not having to restart dnsmasq. +.D1 enable-dbus .D1 conf-file=/etc/dnsmasq-conf.conf .D1 resolv-file=/etc/dnsmasq-resolv.conf .It Sy named_options Include this file in the named options block. -This file tells named which nameservers to use for global lookups. +This file tells named which name servers to use for global lookups. .It Sy named_zones Include this file in the named global scope, after the options block. -This file tells named which nameservers to use for specific domains. +This file tells named which name servers to use for specific domains. .Pp Example resolvconf.conf for named: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 named_options=/etc/named-options.conf .D1 named_zones=/etc/named-zones.conf .Pp @@ -164,12 +168,12 @@ setup to read .Pa pdnsd_resolv as documented below. .It Sy pdnsd_resolv -This file tells pdnsd about global nameservers. +This file tells pdnsd about global name servers. If this variable is not set then it's written to .Pa pdnsd_conf . .Pp Example resolvconf.conf for pdnsd: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 pdnsd_conf=/etc/pdnsd.conf .D1 # pdnsd_resolv=/etc/pdnsd-resolv.conf .Pp @@ -185,10 +189,10 @@ Example pdnsd.conf: .D1 # file=/etc/pdnsd-resolv.conf; .D1 } .It Sy unbound_conf -This file tells unbound about specific and global nameservers. +This file tells unbound about specific and global name servers. .Pp Example resolvconf.conf for unbound: -.D1 nameservers=127.0.0.1 +.D1 name_servers=127.0.0.1 .D1 unbound_conf=/etc/unbound-resolvconf.conf .Pp Example unbound.conf: @@ -208,8 +212,6 @@ To accomodate this, the subscribers have variables, documented below. .Pp .Bl -tag -width indent -.It Sy dbus_pid -Locaiton of the dbus pidfile. .It Sy dnsmasq_service Location of the dnsmasq service. .It Sy dnsmasq_restart @@ -241,7 +243,7 @@ and .An Roy Marples Aq r...@marples.name .Sh BUGS Each distribution is a special snowflake and likes to name the same thing -differently, namely the named service script and the dbus pidfile location. +differently, namely the named service script. .Pp Please report them to .Lk http://roy.marples.name/projects/openresolv
CVS commit: src/share/man/man4
Module Name:src Committed By: njoly Date: Tue Jun 4 12:11:12 UTC 2013 Modified Files: src/share/man/man4: gpiopwm.4 Log Message: Fix width in .Bl macro. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/gpiopwm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/gpiopwm.4 diff -u src/share/man/man4/gpiopwm.4:1.2 src/share/man/man4/gpiopwm.4:1.3 --- src/share/man/man4/gpiopwm.4:1.2 Sun Nov 13 19:31:05 2011 +++ src/share/man/man4/gpiopwm.4 Tue Jun 4 12:11:12 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpiopwm.4,v 1.2 2011/11/13 19:31:05 wiz Exp $ +.\ $NetBSD: gpiopwm.4,v 1.3 2013/06/04 12:11:12 njoly Exp $ .\ .\ Copyright (c) 2011 Marc Balmer m...@msys.ch .\ @@ -41,7 +41,7 @@ variables. The following .Xr sysctl 3 variables are used to define the pulsing: -.Bl -tag width +.Bl -tag -width hw.gpiopwmN.off .It hw.gpiopwmN.off Define the .Dq off
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: macallan
Date: Tue Jun 4 13:42:37 UTC 2013
Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c
Log Message:
actually map the whole SX IO space instead of just the first page over and
over again (doh)
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sparc/dev/cgfourteen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.73 src/sys/arch/sparc/dev/cgfourteen.c:1.74
--- src/sys/arch/sparc/dev/cgfourteen.c:1.73 Wed May 29 22:26:39 2013
+++ src/sys/arch/sparc/dev/cgfourteen.c Tue Jun 4 13:42:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.73 2013/05/29 22:26:39 macallan Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.74 2013/06/04 13:42:37 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -564,7 +564,8 @@ cgfourteenmmap(dev_t dev, off_t off, int
} else if (off = CG14_SXIO_VOFF
off (CG14_SXIO_VOFF + 0x03ff)) {
return (bus_space_mmap(sc-sc_sx-sc_tag, 0x8LL,
- sc-sc_fb_paddr, prot, BUS_SPACE_MAP_LINEAR));
+ sc-sc_fb_paddr + (off - CG14_SXIO_VOFF),
+ prot, BUS_SPACE_MAP_LINEAR));
#endif
} else
return -1;
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: msaitoh
Date: Tue Jun 4 13:59:17 UTC 2013
Modified Files:
src/sys/arch/x86/pci: ichlpcib.c
Log Message:
Add Intel 8 Series / C220 Series LPC devices.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/pci/ichlpcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.38 src/sys/arch/x86/pci/ichlpcib.c:1.39
--- src/sys/arch/x86/pci/ichlpcib.c:1.38 Sat Jan 12 20:33:59 2013
+++ src/sys/arch/x86/pci/ichlpcib.c Tue Jun 4 13:59:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.38 2013/01/12 20:33:59 riastradh Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.39 2013/06/04 13:59:16 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.38 2013/01/12 20:33:59 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.39 2013/06/04 13:59:16 msaitoh Exp $);
#include sys/types.h
#include sys/param.h
@@ -247,6 +247,19 @@ static struct lpcib_device {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Q77_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z75_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z87_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z85_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HM86_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H87_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HM87_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Q85_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Q87_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_QM87_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_B85_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C222_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C224_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C226_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H81_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_LPC, 1, 0 },
{ 0, 0, 0, 0 },
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jun 4 13:57:48 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel devices from document (Intel 8 Series / C220 Chipset Family Platform Controller Hub (PCH) Datasheet) To generate a diff of this commit: cvs rdiff -u -r1.1155 -r1.1156 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1155 src/sys/dev/pci/pcidevs:1.1156 --- src/sys/dev/pci/pcidevs:1.1155 Mon Jun 3 16:20:53 2013 +++ src/sys/dev/pci/pcidevs Tue Jun 4 13:57:48 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1155 2013/06/03 16:20:53 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1156 2013/06/04 13:57:48 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3458,7 +3458,52 @@ product INTEL EG20T_SPI 0x8816 EG20T PC product INTEL EG20T_I2C 0x8817 EG20T PCH I2C Interface product INTEL EG20T_CAN 0x8818 EG20T PCH CAN Controller product INTEL EG20T_IEEE1588 0x8819 EG20T PCH IEEE1588 +product INTEL 8SER_DT_SATA 0x8c00 8 Series (desktop) SATA Controller +product INTEL 8SER_MO_SATA 0x8c01 8 Series (mobile) SATA Controller +product INTEL 8SER_DT_SATA_AHCI 0x8c02 8 Series (desktop) SATA Controller (AHCI) +product INTEL 8SER_MO_SATA_AHCI 0x8c03 8 Series (mobile) SATA Controller (AHCI) +product INTEL 8SER_DT_SATA_RAID 0x8c04 8 Series (desktop) SATA Controller (RAID) +product INTEL 8SER_MO_SATA_RAID 0x8c05 8 Series (mobile) SATA Controller (RAID) +product INTEL 8SER_DT_SATA_RAID_SR 0x8c06 8 Series (desktop) SATA Controller (RAID) + Smart Response +product INTEL 8SER_MO_SATA_RAID_SR 0x8c07 8 Series (mobile) SATA Controller (RAID) + Smart Response +product INTEL 8SER_DT_SATA_2 0x8c08 8 Series (desktop) SATA Controller +product INTEL 8SER_MO_SATA_2 0x8c09 8 Series (mobile) SATA Controller +product INTEL 8SER_DT_SATA_RAID1 0x8c0e 8 Series (desktop) SATA Controller (RAID1) +product INTEL 8SER_MO_SATA_RAID1 0x8c0f 8 Series (mobile) SATA Controller (RAID1) +product INTEL 8SERIES_PCIE_1 0x8c10 8 Series PCIE +product INTEL 8SERIES_PCIE_2 0x8c12 8 Series PCIE +product INTEL 8SERIES_PCIE_3 0x8c14 8 Series PCIE +product INTEL 8SERIES_PCIE_4 0x8c16 8 Series PCIE +product INTEL 8SERIES_PCIE_5 0x8c18 8 Series PCIE +product INTEL 8SERIES_PCIE_6 0x8c1a 8 Series PCIE +product INTEL 8SERIES_PCIE_7 0x8c1c 8 Series PCIE +product INTEL 8SERIES_PCIE_8 0x8c1e 8 Series PCIE +product INTEL 8SERIES_HDA 0x8c20 8 Series HD Audio +product INTEL 8SERIES_SMB 0x8c22 8 Series SMBus Controller +product INTEL 8SERIES_THERM 0x8c24 8 Series Thermal +product INTEL 8SERIES_EHCI_1 0x8c26 8 Series USB EHCI +product INTEL 8SERIES_EHCI_2 0x8c2d 8 Series USB EHCI +product INTEL 8SERIES_XHCI 0x8c31 8 Series USB xHCI +product INTEL 8SERIES_LAN 0x8c33 8 Series LAN +product INTEL 8SERIES_MEI_1 0x8c3a 8 Series MEI Controller +product INTEL 8SERIES_MEI_2 0x8c3b 8 Series MEI Controller +product INTEL 8SERIES_IDE_R 0x8c3c 8 Series IDE-R product INTEL 8SERIES_KT 0x8c3d 8 Series KT +product INTEL 8SERIES_M_LPC 0x8c41 8 Series Mobile Full Featured ES LPC +product INTEL 8SERIES_D_LPC 0x8c42 8 Series Desktop Full Featured ES LPC +product INTEL Z87_LPC 0x8c44 Z87 LPC +product INTEL Z85_LPC 0x8c46 Z85 LPC +product INTEL HM86_LPC 0x8c49 HM86 LPC +product INTEL H87_LPC 0x8c4a H87 LPC +product INTEL HM87_LPC 0x8c4b HM87 LPC +product INTEL Q85_LPC 0x8c4c Q85 LPC +product INTEL Q87_LPC 0x8c4e Q87 LPC +product INTEL QM87_LPC 0x8c4f QM87 LPC +product INTEL B85_LPC 0x8c50 B85 LPC +product INTEL C222_LPC 0x8c52 C222 LPC +product INTEL C224_LPC 0x8c54 C224 LPC +product INTEL C226_LPC 0x8c56 C226 LPC +product INTEL H81_LPC 0x8c5c H81 LPC product INTEL PINEVIEW_HB 0xa000 Pineview Host Bridge product INTEL PINEVIEW_IGD 0xa001 Pineview Integrated Graphics Device product INTEL PINEVIEW_M_HB 0xa010 Pineview Host Bridge
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Tue Jun 4 14:39:31 UTC 2013 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: sync drm with i386 To generate a diff of this commit: cvs rdiff -u -r1.375 -r1.376 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.375 src/sys/arch/amd64/conf/GENERIC:1.376 --- src/sys/arch/amd64/conf/GENERIC:1.375 Tue May 28 08:13:55 2013 +++ src/sys/arch/amd64/conf/GENERIC Tue Jun 4 10:39:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.375 2013/05/28 12:13:55 kiyohara Exp $ +# $NetBSD: GENERIC,v 1.376 2013/06/04 14:39:31 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.375 $ +#ident GENERIC-$Revision: 1.376 $ maxusers 64 # estimated number of users @@ -393,6 +393,7 @@ radeondrm* at drm? # ATI Radeon DRM dri savagedrm* at drm? # S3 Savage DRM driver sisdrm* at drm? # SiS DRM driver tdfxdrm* at drm? # 3dfx (voodoo) DRM driver +viadrm* at drm? # VIA DRM driver # Cryptographic Devices
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src Committed By: pooka Date: Tue Jun 4 14:54:34 UTC 2013 Modified Files: src/sys/rump/net/lib/libshmif: rumpcomp_user.c Log Message: On Linux, pass the inotify descriptor up so that we can correctly read it in the wait() routine. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/lib/libshmif/rumpcomp_user.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/net/lib/libshmif/rumpcomp_user.c diff -u src/sys/rump/net/lib/libshmif/rumpcomp_user.c:1.11 src/sys/rump/net/lib/libshmif/rumpcomp_user.c:1.12 --- src/sys/rump/net/lib/libshmif/rumpcomp_user.c:1.11 Tue May 7 16:18:48 2013 +++ src/sys/rump/net/lib/libshmif/rumpcomp_user.c Tue Jun 4 14:54:34 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpcomp_user.c,v 1.11 2013/05/07 16:18:48 pooka Exp $ */ +/* $NetBSD: rumpcomp_user.c,v 1.12 2013/06/04 14:54:34 pooka Exp $ */ /*- * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. @@ -137,6 +137,7 @@ rumpcomp_shmif_watchsetup(int *inotifyp, goto out; } rv = 0; + *inotifyp = inotify; out: return rumpuser_component_errtrans(rv);
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Tue Jun 4 15:17:28 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser_dl.c
Log Message:
FreeBSD does the Solaris-like map-l_addr boogie.
from Ben Gras
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/librumpuser/rumpuser_dl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.18 src/lib/librumpuser/rumpuser_dl.c:1.19
--- src/lib/librumpuser/rumpuser_dl.c:1.18 Mon Apr 29 18:00:20 2013
+++ src/lib/librumpuser/rumpuser_dl.c Tue Jun 4 15:17:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_dl.c,v 1.18 2013/04/29 18:00:20 pooka Exp $ */
+/* $NetBSD: rumpuser_dl.c,v 1.19 2013/06/04 15:17:28 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -40,7 +40,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser_dl.c,v 1.18 2013/04/29 18:00:20 pooka Exp $);
+__RCSID($NetBSD: rumpuser_dl.c,v 1.19 2013/06/04 15:17:28 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -151,7 +151,7 @@ do { \
*/
#if defined(__linux__)
#define adjptr(_map_, _ptr_) ((void *)(_ptr_))
-#elif defined(__sun__) || defined(__DragonFly__)
+#elif defined(__sun__) || defined(__DragonFly__) || defined(__FreeBSD__)
#define adjptr(_map_, _ptr_) \
(ismainobj ? (void *)(_ptr_) : (void *)(_map_-l_addr + (_ptr_)))
#else
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Jun 4 16:55:07 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix a bug that the check of reset complete fails on Intel 8 series with
wm_lan_init_done: lan_init_done failed to complete message.
The broken code was used for ICH8, 9... and PCH2 but I've never seen the
problem.
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.252 src/sys/dev/pci/if_wm.c:1.253
--- src/sys/dev/pci/if_wm.c:1.252 Mon Jun 3 18:47:52 2013
+++ src/sys/dev/pci/if_wm.c Tue Jun 4 16:55:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.252 2013/06/03 18:47:52 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.253 2013/06/04 16:55:07 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.252 2013/06/03 18:47:52 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.253 2013/06/04 16:55:07 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -4288,16 +4288,15 @@ wm_reset(struct wm_softc *sc)
case WM_T_I210:
case WM_T_I211:
case WM_T_80003:
- case WM_T_ICH8:
- case WM_T_ICH9:
/* check EECD_EE_AUTORD */
wm_get_auto_rd_done(sc);
break;
+ case WM_T_ICH8:
+ case WM_T_ICH9:
case WM_T_ICH10:
case WM_T_PCH:
case WM_T_PCH2:
case WM_T_PCH_LPT:
- wm_lan_init_done(sc);
break;
default:
panic(%s: unknown type\n, __func__);
@@ -5037,13 +5036,15 @@ wm_get_cfg_done(struct wm_softc *sc)
case WM_T_PCH:
case WM_T_PCH2:
case WM_T_PCH_LPT:
- if (sc-sc_type = WM_T_PCH) {
- reg = CSR_READ(sc, WMREG_STATUS);
- if ((reg STATUS_PHYRA) != 0)
-CSR_WRITE(sc, WMREG_STATUS,
-reg ~STATUS_PHYRA);
- }
delay(10*1000);
+ if (sc-sc_type = WM_T_ICH10)
+ wm_lan_init_done(sc);
+ else
+ wm_get_auto_rd_done(sc);
+
+ reg = CSR_READ(sc, WMREG_STATUS);
+ if ((reg STATUS_PHYRA) != 0)
+ CSR_WRITE(sc, WMREG_STATUS, reg ~STATUS_PHYRA);
break;
default:
panic(%s: %s: unknown type\n, device_xname(sc-sc_dev),
CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src
Module Name:xsrc Committed By: wiz Date: Tue Jun 4 16:59:25 UTC 2013 Modified Files: xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.h Log Message: Remove some prototypes (reduce diff to upstream) where I can't find the corresponding functions. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.4 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.5 --- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.4 Sat Jun 1 21:21:16 2013 +++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h Tue Jun 4 16:59:25 2013 @@ -520,14 +520,7 @@ Bool VIADRIBufferInit(ScrnInfoPtr pScrn) #endif /* HAVE_DRI */ int viaOffScreenLinear(struct buffer_object *obj, ScrnInfoPtr pScrn, unsigned long size); -void viaShowCursor(ScrnInfoPtr pScrn); -void viaHideCursor(ScrnInfoPtr pScrn); -Bool viaHWCursorInit(ScreenPtr pScreen); -void ViaDisplaySetStreamOnCRT(ScrnInfoPtr pScrn, Bool primary); void ViaDisplaySetStreamOnDFP(ScrnInfoPtr pScrn, Bool primary); -void ViaDisplaySetStreamOnDVO(ScrnInfoPtr pScrn, int port, Bool primary); void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn); -void ViaDisplayEnableCRT(ScrnInfoPtr pScrn); -void ViaDisplayEnableDVO(ScrnInfoPtr pScrn, int port); #endif /* _VIA_DRIVER_H_ */
CVS import: xsrc/external/mit/xf86-video-suncg14/dist
Module Name:xsrc Committed By: mrg Date: Tue Jun 4 21:46:19 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-video-suncg14/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19726 Log Message: initial import of xf86-video-suncg14-1.1.2 Status: Vendor Tag: xorg Release Tags: xf86-video-suncg14-1-1-2 U xsrc/external/mit/xf86-video-suncg14/dist/README U xsrc/external/mit/xf86-video-suncg14/dist/install-sh U xsrc/external/mit/xf86-video-suncg14/dist/configure U xsrc/external/mit/xf86-video-suncg14/dist/config.guess U xsrc/external/mit/xf86-video-suncg14/dist/missing U xsrc/external/mit/xf86-video-suncg14/dist/ChangeLog U xsrc/external/mit/xf86-video-suncg14/dist/COPYING U xsrc/external/mit/xf86-video-suncg14/dist/configure.ac N xsrc/external/mit/xf86-video-suncg14/dist/INSTALL U xsrc/external/mit/xf86-video-suncg14/dist/Makefile.in U xsrc/external/mit/xf86-video-suncg14/dist/depcomp U xsrc/external/mit/xf86-video-suncg14/dist/Makefile.am U xsrc/external/mit/xf86-video-suncg14/dist/config.sub U xsrc/external/mit/xf86-video-suncg14/dist/aclocal.m4 U xsrc/external/mit/xf86-video-suncg14/dist/ltmain.sh U xsrc/external/mit/xf86-video-suncg14/dist/config.h.in C xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c C xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h N xsrc/external/mit/xf86-video-suncg14/dist/src/compat-api.h U xsrc/external/mit/xf86-video-suncg14/dist/src/Makefile.in U xsrc/external/mit/xf86-video-suncg14/dist/src/Makefile.am U xsrc/external/mit/xf86-video-suncg14/dist/man/suncg14.man U xsrc/external/mit/xf86-video-suncg14/dist/man/Makefile.in U xsrc/external/mit/xf86-video-suncg14/dist/man/Makefile.am 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-suncg14/dist
CVS import: xsrc/external/mit/xf86-video-suncg6/dist
Module Name:xsrc Committed By: mrg Date: Tue Jun 4 21:46:21 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-video-suncg6/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16419 Log Message: initial import of xf86-video-suncg6-1.1.2 Status: Vendor Tag: xorg Release Tags: xf86-video-suncg6-1-1-2 U xsrc/external/mit/xf86-video-suncg6/dist/README U xsrc/external/mit/xf86-video-suncg6/dist/install-sh U xsrc/external/mit/xf86-video-suncg6/dist/configure U xsrc/external/mit/xf86-video-suncg6/dist/config.guess U xsrc/external/mit/xf86-video-suncg6/dist/missing U xsrc/external/mit/xf86-video-suncg6/dist/ChangeLog U xsrc/external/mit/xf86-video-suncg6/dist/COPYING U xsrc/external/mit/xf86-video-suncg6/dist/configure.ac N xsrc/external/mit/xf86-video-suncg6/dist/INSTALL U xsrc/external/mit/xf86-video-suncg6/dist/Makefile.in U xsrc/external/mit/xf86-video-suncg6/dist/depcomp U xsrc/external/mit/xf86-video-suncg6/dist/Makefile.am U xsrc/external/mit/xf86-video-suncg6/dist/config.sub U xsrc/external/mit/xf86-video-suncg6/dist/aclocal.m4 U xsrc/external/mit/xf86-video-suncg6/dist/ltmain.sh U xsrc/external/mit/xf86-video-suncg6/dist/config.h.in C xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h C xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c N xsrc/external/mit/xf86-video-suncg6/dist/src/compat-api.h C xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h U xsrc/external/mit/xf86-video-suncg6/dist/src/Makefile.in U xsrc/external/mit/xf86-video-suncg6/dist/src/Makefile.am U xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_cursor.c U xsrc/external/mit/xf86-video-suncg6/dist/man/Makefile.in U xsrc/external/mit/xf86-video-suncg6/dist/man/suncg6.man U xsrc/external/mit/xf86-video-suncg6/dist/man/Makefile.am 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-suncg6/dist
CVS import: xsrc/external/mit/xf86-video-sunffb/dist
Module Name:xsrc Committed By: mrg Date: Tue Jun 4 21:46:23 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-video-sunffb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13545 Log Message: initial import of xf86-video-sunffb-1.2.2 Status: Vendor Tag: xorg Release Tags: xf86-video-sunffb-1-2-2 U xsrc/external/mit/xf86-video-sunffb/dist/README U xsrc/external/mit/xf86-video-sunffb/dist/install-sh U xsrc/external/mit/xf86-video-sunffb/dist/configure U xsrc/external/mit/xf86-video-sunffb/dist/config.guess U xsrc/external/mit/xf86-video-sunffb/dist/missing U xsrc/external/mit/xf86-video-sunffb/dist/ChangeLog U xsrc/external/mit/xf86-video-sunffb/dist/COPYING U xsrc/external/mit/xf86-video-sunffb/dist/configure.ac N xsrc/external/mit/xf86-video-sunffb/dist/INSTALL U xsrc/external/mit/xf86-video-sunffb/dist/Makefile.in U xsrc/external/mit/xf86-video-sunffb/dist/depcomp U xsrc/external/mit/xf86-video-sunffb/dist/Makefile.am U xsrc/external/mit/xf86-video-sunffb/dist/config.sub U xsrc/external/mit/xf86-video-sunffb/dist/aclocal.m4 U xsrc/external/mit/xf86-video-sunffb/dist/ltmain.sh U xsrc/external/mit/xf86-video-sunffb/dist/config.h.in C xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_fifo.h C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_attr.c C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dga.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_rcache.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_cursor.c N xsrc/external/mit/xf86-video-sunffb/dist/src/compat-api.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_loops.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_ddc.c C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.h U xsrc/external/mit/xf86-video-sunffb/dist/src/Makefile.in C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_asm.s U xsrc/external/mit/xf86-video-sunffb/dist/src/Makefile.am U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_wid.c C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_regs.h U xsrc/external/mit/xf86-video-sunffb/dist/man/sunffb.man U xsrc/external/mit/xf86-video-sunffb/dist/man/Makefile.in U xsrc/external/mit/xf86-video-sunffb/dist/man/Makefile.am 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-sunffb/dist
CVS import: xsrc/external/mit/xf86-video-sunleo/dist
Module Name:xsrc Committed By: mrg Date: Tue Jun 4 21:46:26 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-video-sunleo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17733 Log Message: initial import of xf86-video-sunleo-1.2.1 Status: Vendor Tag: xorg Release Tags: xf86-video-sunleo-1-2-1 N xsrc/external/mit/xf86-video-sunleo/dist/README U xsrc/external/mit/xf86-video-sunleo/dist/install-sh U xsrc/external/mit/xf86-video-sunleo/dist/configure U xsrc/external/mit/xf86-video-sunleo/dist/config.guess U xsrc/external/mit/xf86-video-sunleo/dist/missing U xsrc/external/mit/xf86-video-sunleo/dist/ChangeLog U xsrc/external/mit/xf86-video-sunleo/dist/COPYING U xsrc/external/mit/xf86-video-sunleo/dist/configure.ac N xsrc/external/mit/xf86-video-sunleo/dist/INSTALL U xsrc/external/mit/xf86-video-sunleo/dist/Makefile.in U xsrc/external/mit/xf86-video-sunleo/dist/depcomp U xsrc/external/mit/xf86-video-sunleo/dist/Makefile.am U xsrc/external/mit/xf86-video-sunleo/dist/config.sub U xsrc/external/mit/xf86-video-sunleo/dist/aclocal.m4 U xsrc/external/mit/xf86-video-sunleo/dist/ltmain.sh U xsrc/external/mit/xf86-video-sunleo/dist/config.h.in C xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c U xsrc/external/mit/xf86-video-sunleo/dist/src/leo_cursor.c C xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c U xsrc/external/mit/xf86-video-sunleo/dist/src/leo_regs.h N xsrc/external/mit/xf86-video-sunleo/dist/src/compat-api.h U xsrc/external/mit/xf86-video-sunleo/dist/src/Makefile.in U xsrc/external/mit/xf86-video-sunleo/dist/src/Makefile.am C xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h U xsrc/external/mit/xf86-video-sunleo/dist/man/sunleo.man U xsrc/external/mit/xf86-video-sunleo/dist/man/Makefile.in U xsrc/external/mit/xf86-video-sunleo/dist/man/Makefile.am 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-sunleo/dist
CVS import: xsrc/external/mit/xf86-video-suntcx/dist
Module Name:xsrc Committed By: mrg Date: Tue Jun 4 21:46:28 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-video-suntcx/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17250 Log Message: initial import of xf86-video-suntcx-1.1.2 Status: Vendor Tag: xorg Release Tags: xf86-video-suntcx-1-1-2 C xsrc/external/mit/xf86-video-suntcx/dist/README C xsrc/external/mit/xf86-video-suntcx/dist/install-sh C xsrc/external/mit/xf86-video-suntcx/dist/configure C xsrc/external/mit/xf86-video-suntcx/dist/config.guess C xsrc/external/mit/xf86-video-suntcx/dist/missing C xsrc/external/mit/xf86-video-suntcx/dist/ChangeLog C xsrc/external/mit/xf86-video-suntcx/dist/COPYING C xsrc/external/mit/xf86-video-suntcx/dist/configure.ac N xsrc/external/mit/xf86-video-suntcx/dist/INSTALL C xsrc/external/mit/xf86-video-suntcx/dist/Makefile.in C xsrc/external/mit/xf86-video-suntcx/dist/depcomp C xsrc/external/mit/xf86-video-suntcx/dist/Makefile.am C xsrc/external/mit/xf86-video-suntcx/dist/config.sub C xsrc/external/mit/xf86-video-suntcx/dist/aclocal.m4 C xsrc/external/mit/xf86-video-suntcx/dist/ltmain.sh C xsrc/external/mit/xf86-video-suntcx/dist/config.h.in C xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_regs.h N xsrc/external/mit/xf86-video-suntcx/dist/src/compat-api.h C xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h C xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_cursor.c C xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c C xsrc/external/mit/xf86-video-suntcx/dist/src/Makefile.in C xsrc/external/mit/xf86-video-suntcx/dist/src/Makefile.am C xsrc/external/mit/xf86-video-suntcx/dist/man/suntcx.man C xsrc/external/mit/xf86-video-suntcx/dist/man/Makefile.in C xsrc/external/mit/xf86-video-suntcx/dist/man/Makefile.am 24 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-suntcx/dist
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Tue Jun 4 22:20:42 UTC 2013 Modified Files: xsrc/external/mit/xf86-video-suncg14/dist/src: cg14.h cg14_driver.c xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h cg6_driver.c cg6_regs.h xsrc/external/mit/xf86-video-sunffb/dist/src: VISmoveImage.s ffb.h ffb_accel.c ffb_asm.s ffb_dac.c ffb_dga.c ffb_driver.c xsrc/external/mit/xf86-video-sunleo/dist/src: leo.h leo_accel.c leo_driver.c xsrc/external/mit/xf86-video-suntcx/dist: COPYING ChangeLog Makefile.am Makefile.in aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-suntcx/dist/man: Makefile.am Makefile.in suntcx.man xsrc/external/mit/xf86-video-suntcx/dist/src: Makefile.am Makefile.in tcx.h tcx_cursor.c tcx_driver.c tcx_regs.h Removed Files: xsrc/external/mit/xf86-video-sunleo/dist/src: leo_checks.c leo_frect.c leo_frectsp.c leo_fspans.c leo_fspanssp.c leo_glyph.c xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_accel.c Log Message: merge xf86-video-suncg14 1.1.2, xf86-video-suncg6 1.1.2, xf86-video-sunffb 1.2.2, xf86-video-suntcx 1.1.2 and xf86-video-sunleo 1.2.1 XXX: these might need more help To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s \ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c \ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_asm.s \ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dga.c cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_checks.c \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_frect.c \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_frectsp.c \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_glyph.c cvs rdiff -u -r1.2 -r0 \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspans.c \ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspanssp.c cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-suntcx/dist/COPYING \ xsrc/external/mit/xf86-video-suntcx/dist/ChangeLog \ xsrc/external/mit/xf86-video-suntcx/dist/Makefile.am \ xsrc/external/mit/xf86-video-suntcx/dist/Makefile.in \ xsrc/external/mit/xf86-video-suntcx/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-suntcx/dist/config.guess \ xsrc/external/mit/xf86-video-suntcx/dist/config.h.in \ xsrc/external/mit/xf86-video-suntcx/dist/config.sub \ xsrc/external/mit/xf86-video-suntcx/dist/configure \ xsrc/external/mit/xf86-video-suntcx/dist/configure.ac \ xsrc/external/mit/xf86-video-suntcx/dist/depcomp \ xsrc/external/mit/xf86-video-suntcx/dist/install-sh \ xsrc/external/mit/xf86-video-suntcx/dist/ltmain.sh \ xsrc/external/mit/xf86-video-suntcx/dist/missing cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/xf86-video-suntcx/dist/man/Makefile.am \ xsrc/external/mit/xf86-video-suntcx/dist/man/Makefile.in \ xsrc/external/mit/xf86-video-suntcx/dist/man/suntcx.man cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/xf86-video-suntcx/dist/src/Makefile.am \ xsrc/external/mit/xf86-video-suntcx/dist/src/Makefile.in \ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_cursor.c \ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_regs.h cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h cvs rdiff -u -r1.5 -r0 \ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Tue Jun 4 22:30:30 UTC 2013 Modified Files: src/sys/arch/sparc/dev: sxreg.h Log Message: add STore with (plane) Mask instruction To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/dev/sxreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/dev/sxreg.h diff -u src/sys/arch/sparc/dev/sxreg.h:1.5 src/sys/arch/sparc/dev/sxreg.h:1.6 --- src/sys/arch/sparc/dev/sxreg.h:1.5 Thu May 30 20:09:23 2013 +++ src/sys/arch/sparc/dev/sxreg.h Tue Jun 4 22:30:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: sxreg.h,v 1.5 2013/05/30 20:09:23 macallan Exp $ */ +/* $NetBSD: sxreg.h,v 1.6 2013/06/04 22:30:30 macallan Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -152,6 +152,8 @@ SX_PACKED | (dreg 7) | (o)) #define SX_ST(sreg, cnt, o) (0x8000 | ((cnt) 23) | SX_STORE | \ SX_LONG | (sreg 7) | (o)) +#define SX_STM(sreg, cnt, o) (0x8000 | ((cnt) 23) | SX_STORE_MASK | \ +SX_LONG | (sreg 7) | (o)) #define SX_STB(sreg, cnt, o) (0x8000 | ((cnt) 23) | SX_STORE | \ SX_UBYTE_0 | (sreg 7) | (o)) #define SX_STP(sreg, cnt, o) (0x8000 | ((cnt) 23) | SX_STORE | \
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: macallan
Date: Tue Jun 4 22:31:30 UTC 2013
Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c
Log Message:
report actual VRAM size in fb_type.fb_size
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/sparc/dev/cgfourteen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.74 src/sys/arch/sparc/dev/cgfourteen.c:1.75
--- src/sys/arch/sparc/dev/cgfourteen.c:1.74 Tue Jun 4 13:42:37 2013
+++ src/sys/arch/sparc/dev/cgfourteen.c Tue Jun 4 22:31:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.74 2013/06/04 13:42:37 macallan Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.75 2013/06/04 22:31:30 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -228,7 +228,7 @@ cgfourteenattach(device_t parent, device
struct cgfourteen_softc *sc = device_private(self);
struct fbdevice *fb = sc-sc_fb;
bus_space_handle_t bh;
- int node, ramsize;
+ int node;
volatile uint32_t *lut;
int i, isconsole, items;
uint32_t fbva[2] = {0, 0};
@@ -254,10 +254,8 @@ cgfourteenattach(device_t parent, device
fb-fb_type.fb_depth = 32;
fb_setsize_obp(fb, sc-sc_fb.fb_type.fb_depth, 1152, 900, node);
- ramsize = roundup(fb-fb_type.fb_height * fb-fb_linebytes, NBPG);
fb-fb_type.fb_cmsize = CG14_CLUT_SIZE;
- fb-fb_type.fb_size = ramsize + COLOUR_OFFSET;
if (sa-sa_nreg 2) {
printf(%s: only %d register sets\n,
@@ -268,6 +266,7 @@ cgfourteenattach(device_t parent, device
sa-sa_nreg * sizeof(struct sbus_reg));
sc-sc_vramsize = sc-sc_physadr[CG14_PXL_IDX].sbr_size;
+ fb-fb_type.fb_size = sc-sc_vramsize;
printf(: %d MB VRAM, (uint32_t)(sc-sc_vramsize 20));
/*
@@ -329,7 +328,7 @@ cgfourteenattach(device_t parent, device
if (sbus_bus_map( sc-sc_bustag,
sc-sc_physadr[CG14_PXL_IDX].sbr_slot,
sc-sc_physadr[CG14_PXL_IDX].sbr_offset,
- ramsize, BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE,
+ sc-sc_vramsize, BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE,
bh) != 0) {
printf(%s: cannot map pixels\n,
device_xname(sc-sc_dev));
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Jun 4 22:45:08 UTC 2013
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-suncg14: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunleo: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suntcx: Makefile
Log Message:
updates for merge xf86-video-suncg14 1.1.2, xf86-video-suncg6 1.1.2,
xf86-video-sunffb 1.2.2, xf86-video-suntcx 1.1.2 and xf86-video-sunleo 1.2.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.2 Thu Apr 14 16:50:05 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile Tue Jun 4 22:45:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/14 16:50:05 macallan Exp $
+# $NetBSD: Makefile,v 1.3 2013/06/04 22:45:07 mrg Exp $
DRIVER= xf86-video-suncg14
DRIVER_NAME= suncg14_drv
@@ -7,5 +7,6 @@ SRCS= cg14_driver.c cg14_cursor.c
MAN= suncg14.4
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include
+CPPFLAGS+= -DHAVE_XAA_H
.include ../Makefile.xf86-driver
Index: src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.2 Tue Jan 20 10:18:32 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Tue Jun 4 22:45:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/01/20 10:18:32 martin Exp $
+# $NetBSD: Makefile,v 1.3 2013/06/04 22:45:08 mrg Exp $
DRIVER= xf86-video-suncg6
DRIVER_NAME= suncg6_drv
@@ -6,6 +6,7 @@ DRIVER_NAME= suncg6_drv
SRCS= cg6_driver.c cg6_cursor.c cg6_accel.c
CPPFLAGS+= ${X11FLAGS.DRI}
+CPPFLAGS+= -DHAVE_XAA_H
MAN= suncg6.4
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.3 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Tue Jun 4 22:45:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/14 13:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.4 2013/06/04 22:45:08 mrg Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -17,6 +17,7 @@ COPTS= -mv8plus
.endif
CPPFLAGS+= ${X11FLAGS.DRI} -DUSE_VIS
+CPPFLAGS+= -DHAVE_XAA_H
MAN= sunffb.4
Index: src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.1 Sat Sep 5 22:35:53 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile Tue Jun 4 22:45:08 2013
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/09/05 22:35:53 macallan Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/04 22:45:08 mrg Exp $
DRIVER= xf86-video-sunleo
DRIVER_NAME= sunleo_drv
-SRCS= leo_accel.c leo_checks.c leo_cursor.c leo_driver.c \
- leo_frect.c leo_frectsp.c leo_fspans.c leo_fspanssp.c \
- leo_glyph.c
+SRCS= leo_accel.c leo_cursor.c leo_driver.c
CPPFLAGS+= ${X11FLAGS.DRI}
+CPPFLAGS+= -DHAVE_XAA_H
MAN= sunleo.4
Index: src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.1 Wed Aug 26 22:30:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile Tue Jun 4 22:45:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/08/26 22:30:46 macallan Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/04 22:45:08 mrg Exp $
DRIVER= xf86-video-suntcx
DRIVER_NAME= suntcx_drv
@@ -6,6 +6,7 @@
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Tue Jun 4 22:47:37 UTC 2013
Modified Files:
src/sys/netinet: ip_output.c udp_usrreq.c
src/sys/netipsec: files.netipsec ipsec.c ipsec.h ipsec_input.c
ipsec_output.c key.c key.h keydb.h xform_ah.c xform_esp.c
xform_ipcomp.c
Log Message:
PR/47886: Dr. Wolfgang Stukenbrock: IPSEC_NAT_T enabled kernels may access
outdated pointers and pass ESP data to UPD-sockets.
While here, simplify the code and remove the IPSEC_NAT_T option; always
compile nat-traversal in so that it does not bitrot.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.187 -r1.188 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netipsec/files.netipsec
cvs rdiff -u -r1.57 -r1.58 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.31 -r1.32 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.29 -r1.30 src/sys/netipsec/ipsec_input.c \
src/sys/netipsec/xform_ipcomp.c
cvs rdiff -u -r1.38 -r1.39 src/sys/netipsec/ipsec_output.c \
src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.79 -r1.80 src/sys/netipsec/key.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netipsec/key.h
cvs rdiff -u -r1.12 -r1.13 src/sys/netipsec/keydb.h
cvs rdiff -u -r1.41 -r1.42 src/sys/netipsec/xform_esp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.218 src/sys/netinet/ip_output.c:1.219
--- src/sys/netinet/ip_output.c:1.218 Sat Feb 2 02:00:40 2013
+++ src/sys/netinet/ip_output.c Tue Jun 4 18:47:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.218 2013/02/02 07:00:40 kefren Exp $ */
+/* $NetBSD: ip_output.c,v 1.219 2013/06/04 22:47:37 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.218 2013/02/02 07:00:40 kefren Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.219 2013/06/04 22:47:37 christos Exp $);
#include opt_pfil_hooks.h
#include opt_inet.h
@@ -126,6 +126,7 @@ __KERNEL_RCSID(0, $NetBSD: ip_output.c,
#include netinet/ip_private.h
#include netinet/in_offload.h
#include netinet/portalgo.h
+#include netinet/udp.h
#ifdef MROUTING
#include netinet/ip_mroute.h
@@ -137,9 +138,6 @@ __KERNEL_RCSID(0, $NetBSD: ip_output.c,
#include netipsec/xform.h
#endif /* FAST_IPSEC*/
-#ifdef IPSEC_NAT_T
-#include netinet/udp.h
-#endif
static struct mbuf *ip_insertoptions(struct mbuf *, struct mbuf *, int *);
static struct ifnet *ip_multicast_if(struct in_addr *, int *);
@@ -179,9 +177,7 @@ ip_output(struct mbuf *m0, ...)
struct ip_moptions *imo;
struct socket *so;
va_list ap;
-#ifdef IPSEC_NAT_T
int natt_frag = 0;
-#endif
#ifdef FAST_IPSEC
struct inpcb *inp;
struct secpolicy *sp = NULL;
@@ -518,22 +514,20 @@ sendit:
*sp == NULL, error != 0 discard packet, report error
*/
if (sp != NULL) {
-#ifdef IPSEC_NAT_T
/*
- * NAT-T ESP fragmentation: don't do IPSec processing now,
- * we'll do it on each fragmented packet.
+ * NAT-T ESP fragmentation: don't do IPSec processing
+ * now, we'll do it on each fragmented packet.
*/
- if (sp-req-sav
- ((sp-req-sav-natt_type UDP_ENCAP_ESPINUDP) ||
- (sp-req-sav-natt_type UDP_ENCAP_ESPINUDP_NON_IKE))) {
-if (ntohs(ip-ip_len) sp-req-sav-esp_frag) {
+ if (sp-req-sav (sp-req-sav-natt_type
+ (UDP_ENCAP_ESPINUDP|UDP_ENCAP_ESPINUDP_NON_IKE))) {
+if (ntohs(ip-ip_len) sp-req-sav-esp_frag)
+{
natt_frag = 1;
mtu = sp-req-sav-esp_frag;
splx(s);
goto spd_done;
}
}
-#endif /* IPSEC_NAT_T */
/*
* Do delayed checksums now because we send before
@@ -711,19 +705,17 @@ spd_done:
ia-ia_ifa.ifa_data.ifad_outbytes +=
ntohs(ip-ip_len);
#endif
-#ifdef IPSEC_NAT_T
/*
- * If we get there, the packet has not been handeld by
+ * If we get there, the packet has not been handled by
* IPSec whereas it should have. Now that it has been
* fragmented, re-inject it in ip_output so that IPsec
* processing can occur.
*/
if (natt_frag) {
-error = ip_output(m, opt,
-ro, flags | IP_RAWOUTPUT | IP_NOIPNEWID, imo, so, mtu_p);
- } else
-#endif /* IPSEC_NAT_T */
- {
+error = ip_output(m, opt, ro,
+flags | IP_RAWOUTPUT | IP_NOIPNEWID,
+imo, so, mtu_p);
+ } else {
KASSERT((m-m_pkthdr.csum_flags
(M_CSUM_UDPv4 | M_CSUM_TCPv4)) == 0);
KERNEL_LOCK(1, NULL);
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.187 src/sys/netinet/udp_usrreq.c:1.188
--- src/sys/netinet/udp_usrreq.c:1.187 Fri Jun 22 10:54:35 2012
+++ src/sys/netinet/udp_usrreq.c Tue Jun 4 18:47:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.187 2012/06/22 14:54:35 christos Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.188 2013/06/04
CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src
Module Name:xsrc
Committed By: mrg
Date: Tue Jun 4 22:56:31 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_driver.c
Log Message:
reduce a diff to upstream.
fix LeoFreeScreen() to use the right screen arg.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.3 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.4
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.3 Tue Jun 4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c Tue Jun 4 22:56:31 2013
@@ -1,3 +1,4 @@
+
/*
* Leo (ZX) framebuffer driver.
*
@@ -658,7 +659,7 @@ LeoCloseScreen(CLOSE_SCREEN_ARGS_DECL)
static void
LeoFreeScreen(FREE_SCREEN_ARGS_DECL)
{
-SCRN_INFO_PTR(pScrn);
+SCRN_INFO_PTR(arg);
LeoFreeRec(pScrn);
}
CVS commit: xsrc/external/mit/xf86-video-suntcx/dist/src
Module Name:xsrc
Committed By: mrg
Date: Tue Jun 4 22:58:31 UTC 2013
Added Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_accel.c
Log Message:
re-add tcx_accel.c
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.7 \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
diff -u /dev/null xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.7
--- /dev/null Tue Jun 4 22:58:31 2013
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c Tue Jun 4 22:58:31 2013
@@ -0,0 +1,384 @@
+/*
+ * TCX framebuffer - hardware acceleration.
+ *
+ * Copyright (C) 2009 Michael Lorenz
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the Software), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MICHAEL LORENZ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* $NetBSD: tcx_accel.c,v 1.7 2013/06/04 22:58:31 mrg Exp $ */
+
+#include sys/types.h
+
+#include tcx.h
+
+#ifdef DEBUG
+#define ENTER xf86Msg(X_ERROR, %s\n, __func__)
+#define LEAVE xf86Msg(X_ERROR, %s done\n, __func__)
+#else
+#define ENTER
+#define LEAVE
+#endif
+
+static void
+TcxWaitMarker(ScreenPtr pScreenInfo, int Marker)
+{
+ENTER;
+/* do nothing */
+}
+
+static int
+TcxMarkSync(ScreenPtr pScreenInfo)
+{
+ENTER;
+return 0;
+}
+
+static Bool
+TcxPrepareCopy
+(
+PixmapPtr pSrcPixmap,
+PixmapPtr pDstPixmap,
+int xdir,
+int ydir,
+int alu,
+Pixel planemask
+)
+{
+ScrnInfoPtr pScreenInfo = xf86Screens[pDstPixmap-drawable.pScreen-myNum];
+TcxPtr pTcx = GET_TCX_FROM_SCRN(pScreenInfo);
+
+ENTER;
+/* weed out the cases we can't accelerate */
+#ifdef DEBUG
+xf86Msg(X_ERROR, alu: %d mask %08x\n, alu, planemask);
+#endif
+if (alu != GXcopy)
+ return FALSE;
+if ((planemask != 0x) (planemask != 0x00ff))
+ return FALSE;
+
+pTcx-xdir = xdir;
+pTcx-ydir = ydir;
+pTcx-srcoff = exaGetPixmapOffset(pSrcPixmap) pTcx-pitchshift;
+pTcx-srcpitch = exaGetPixmapPitch(pSrcPixmap) pTcx-pitchshift;
+LEAVE;
+return TRUE;
+}
+
+static void
+TcxCopy
+(
+PixmapPtr pDstPixmap,
+int srcX,
+int srcY,
+int dstX,
+int dstY,
+int w,
+int h
+)
+{
+ScrnInfoPtr pScreenInfo = xf86Screens[pDstPixmap-drawable.pScreen-myNum];
+TcxPtr pTcx = GET_TCX_FROM_SCRN(pScreenInfo);
+uint64_t cmd, lcmd;
+int line, col, leftover, src, dst, xsteps, sstep, dstep, dpitch, x, xoff;
+int doff;
+
+ENTER;
+leftover = w 0x1f;
+if (leftover 0)
+ lcmd = 0x3000LL | (leftover - 1) 24;
+
+
+doff = exaGetPixmapOffset(pDstPixmap) pTcx-pitchshift;
+dpitch = exaGetPixmapPitch(pDstPixmap) pTcx-pitchshift;
+src = srcX + srcY * pTcx-srcpitch + pTcx-srcoff;
+dst = dstX + dstY * dpitch + doff;
+
+if (pTcx-ydir 0) {
+ src += (h - 1) * pTcx-srcpitch;
+ dst += (h - 1) * dpitch;
+ sstep = 0 - pTcx-srcpitch;
+ dstep = 0 - dpitch;
+} else {
+ sstep = pTcx-srcpitch;
+ dstep = dpitch;
+}
+
+xsteps = w 5;
+
+if ((pTcx-xdir 0) || (w 33)) {
+ for (line = 0; line h; line++) {
+ x = xsteps;
+ xoff = 0;
+ while (x 0) {
+ cmd = 0x30001f00LL | (uint64_t)(src + xoff);
+ pTcx-rblit[dst + xoff] = cmd;
+ xoff += 32;
+ x--;
+ }
+ if (leftover 0) {
+ cmd = lcmd | (uint64_t)(src + xoff);
+ pTcx-rblit[dst + xoff] = cmd;
+ }
+ src += sstep;
+ dst += dstep;
+ }
+} else {
+ /* same thing but right to left */
+ for (line = 0; line h; line++) {
+ x = xsteps;
+ xoff = xsteps 5;
+ if (leftover 0) {
+ cmd = lcmd | (uint64_t)(src + xoff);
+ pTcx-rblit[dst + xoff] = cmd;
+ }
+ xoff -= 32;
+ while (x 0) {
+ cmd = 0x30001f00LL | (uint64_t)(src + xoff);
+ pTcx-rblit[dst + xoff] = cmd;
+ xoff -= 32;
+ x--;
+ }
+ src += sstep;
+ dst += dstep;
+ }
+}
+
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Wed Jun 5 00:01:16 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
src/external/mit/xorg/lib/libXdmGreet: Makefile
Log Message:
update properly for xdm 1.1.11:
- link libXdmGreet against the same libs that modular does
- copy all the config.h defines we need (could do the copy config.h
thing here, but we use a bunch of non-standard paths)
- support ipv6 properly
- move freetype include to Makefile.xdm so the greeter can find it
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xdm/Makefile.xdm
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXdmGreet/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.9 src/external/mit/xorg/bin/xdm/Makefile:1.10
--- src/external/mit/xorg/bin/xdm/Makefile:1.9 Fri May 31 22:49:15 2013
+++ src/external/mit/xorg/bin/xdm/Makefile Wed Jun 5 00:01:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/05/31 22:49:15 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2013/06/05 00:01:16 mrg Exp $
.include bsd.own.mk
@@ -44,7 +44,6 @@ TARGETS+= configinstall
.include Makefile.xdm
CPPFLAGS.resource.c+= -DDEF_CHOOSER=\${XDMCHOOSERPATH}\
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
X11MANCPP= yes
X11EXTRAMANDEFS+= -DARC4_RANDOM \
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.7 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.8
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.7 Mon Jun 3 23:25:43 2013
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Wed Jun 5 00:01:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.7 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.8 2013/06/05 00:01:16 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -8,22 +8,31 @@ XDMLOGDIR= /var/log
XDMPIDDIR= /var/run
CPPFLAGS+= -DBINDIR=\${X11BINDIR}\ -DXDMDIR=\${XDMDIR}\ \
- -DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
- -DHAVE_ASPRINTF \
+ -DHASXDMAUTH ${X11FLAGS.CONNECTION} \
+ -DBSD44SOCKETS \
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
- -DXPM -DUSE_XFT -DUSE_XINERAMA \
- -UIPv6 \
- -DHAVE_SYS_PARAM_H \
- -DHAVE_DAEMON \
+ -DDEV_RANDOM=\dev/urandom\ \
+ -DXPM -DUSE_XFT \
-DHAVE_GETIFADDRS \
-DHAVE_MKSTEMP \
-DHAVE_SETPROCTITLE \
-DHAVE_SETUSERCONTEXT \
-DHAVE_ARC4RANDOM \
+ -DHAVE_DAEMON \
-DHAVE_SIGACTION \
-DHAVE_ASPRINTF \
+ -DHAVE_OPENLOG \
+ -DUNIXCONN \
+ -DTCPCONN \
+ -DHAVE_WORKING_VFORK \
+ -DHAVE_VFORK_H \
+ -DHAVE_VFORK \
+ -DHAVE_INTTYPES_H \
+ -DHAVE_SYS_PARAM_H \
+ -DHAVE_GRP_H \
-I${X11SRCDIR.xdm} \
-I${X11SRCDIR.xdm}/include \
+ -I${DESTDIR}${X11INCDIR}/freetype2 \
${X11FLAGS.VERSION}
LDFLAGS+= -Wl,--export-dynamic
@@ -32,6 +41,10 @@ LDFLAGS+= -Wl,--export-dynamic
CPPFLAGS+= -DUSE_PAM
.endif
+.if (${USE_INET6} != no)
+CPPFLAGS+= -DIPv6
+.endif
+
.PATH: ${X11SRCDIR.xdm}
.PATH: ${X11SRCDIR.xdm}/xdm
.PATH: ${X11SRCDIR.xdm}/man
Index: src/external/mit/xorg/lib/libXdmGreet/Makefile
diff -u src/external/mit/xorg/lib/libXdmGreet/Makefile:1.1 src/external/mit/xorg/lib/libXdmGreet/Makefile:1.2
--- src/external/mit/xorg/lib/libXdmGreet/Makefile:1.1 Mon Jun 3 23:25:43 2013
+++ src/external/mit/xorg/lib/libXdmGreet/Makefile Wed Jun 5 00:01:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/05 00:01:16 mrg Exp $
.include bsd.own.mk
@@ -11,14 +11,21 @@ SRCS= \
verify.c
CPPFLAGS+= -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
+CPPFLAGS+= -DGREET_LIB
-.if 0
-CPPFLAGS+= ${X11FLAGS.THREADLIB} \
- -DHAVE_XEXTPROTO_71 \
- -DXSERVER_LIBPCIACCESS \
- -DTRUE=1 -DFALSE=0 \
- -I${DESTDIR}${X11INCDIR}/xorg
-.endif
+LIBDPLIBS=\
+ Xext ${.CURDIR}/../libXext \
+ Xt ${.CURDIR}/../libXt \
+ Xdmcp ${.CURDIR}/../libXdmcp \
+ Xinerama ${.CURDIR}/../libXinerama \
+ Xft ${.CURDIR}/../libXft \
+ Xpm ${.CURDIR}/../libXpm \
+ X11 ${.CURDIR}/../libX11/dynamic \
+ pam ${.CURDIR}/../../../../../lib/libpam/libpam \
+ crypt ${.CURDIR}/../../../../../lib/libcrypt \
+ util ${.CURDIR}/../../../../../lib/libutil
+
+.include ../../bin/xdm/Makefile.xdm
.include bsd.x11.mk
.include bsd.lib.mk
CVS commit: src/sys/netinet
Module Name:src
Committed By: christos
Date: Wed Jun 5 00:48:32 UTC 2013
Modified Files:
src/sys/netinet: udp_usrreq.c
Log Message:
conditionalize the net traversal code on FAST_IPSEC to make rump build.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/netinet/udp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.188 src/sys/netinet/udp_usrreq.c:1.189
--- src/sys/netinet/udp_usrreq.c:1.188 Tue Jun 4 18:47:37 2013
+++ src/sys/netinet/udp_usrreq.c Tue Jun 4 20:48:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.188 2013/06/04 22:47:37 christos Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.189 2013/06/05 00:48:32 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: udp_usrreq.c,v 1.188 2013/06/04 22:47:37 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: udp_usrreq.c,v 1.189 2013/06/05 00:48:32 christos Exp $);
#include opt_inet.h
#include opt_compat_netbsd.h
@@ -148,8 +148,10 @@ struct inpcbtable udbtable;
percpu_t *udpstat_percpu;
#ifdef INET
+#ifdef FAST_IPSEC
static int udp4_espinudp (struct mbuf **, int, struct sockaddr *,
struct socket *);
+#endif
static void udp4_sendup (struct mbuf *, int, struct sockaddr *,
struct socket *);
static int udp4_realinput (struct sockaddr_in *, struct sockaddr_in *,
@@ -810,6 +812,7 @@ udp4_realinput(struct sockaddr_in *src,
return rcvcnt;
}
+#ifdef FAST_IPSEC
/* Handle ESP over UDP */
if (inp-inp_flags INP_ESPINUDP_ALL) {
struct sockaddr *sa = (struct sockaddr *)src;
@@ -835,6 +838,7 @@ udp4_realinput(struct sockaddr_in *src,
break;
}
}
+#endif
/*
* Check the minimum TTL for socket.
@@ -1439,7 +1443,7 @@ udp_statinc(u_int stat)
UDP_STATINC(stat);
}
-#if defined(INET)
+#if defined(INET) defined(FAST_IPSEC)
/*
* Returns:
* 1 if the packet was processed
CVS import: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 00:51:24 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26869 Log Message: initial import of libXi-1.7.1 Status: Vendor Tag: xorg Release Tags: libXi-1-7-1 U xsrc/external/mit/libXi/dist/Makefile.in U xsrc/external/mit/libXi/dist/COPYING U xsrc/external/mit/libXi/dist/missing U xsrc/external/mit/libXi/dist/ChangeLog U xsrc/external/mit/libXi/dist/README U xsrc/external/mit/libXi/dist/install-sh U xsrc/external/mit/libXi/dist/xi.pc.in N xsrc/external/mit/libXi/dist/docbook.am U xsrc/external/mit/libXi/dist/Makefile.am U xsrc/external/mit/libXi/dist/config.sub U xsrc/external/mit/libXi/dist/configure U xsrc/external/mit/libXi/dist/config.guess U xsrc/external/mit/libXi/dist/aclocal.m4 U xsrc/external/mit/libXi/dist/configure.ac U xsrc/external/mit/libXi/dist/depcomp U xsrc/external/mit/libXi/dist/ltmain.sh U xsrc/external/mit/libXi/dist/INSTALL U xsrc/external/mit/libXi/dist/specs/encoding.xml U xsrc/external/mit/libXi/dist/specs/Makefile.in U xsrc/external/mit/libXi/dist/specs/library.xml U xsrc/external/mit/libXi/dist/specs/inputlib.xml U xsrc/external/mit/libXi/dist/specs/Makefile.am U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h U xsrc/external/mit/libXi/dist/man/XGetExtensionVersion.man U xsrc/external/mit/libXi/dist/man/XGetDeviceFocus.man U xsrc/external/mit/libXi/dist/man/XGetSelectedExtensionEvents.man U xsrc/external/mit/libXi/dist/man/XGetDeviceMotionEvents.man U xsrc/external/mit/libXi/dist/man/XSetDeviceButtonMapping.man U xsrc/external/mit/libXi/dist/man/XDeviceTimeCoord.man U xsrc/external/mit/libXi/dist/man/XCloseDevice.man U xsrc/external/mit/libXi/dist/man/XListInputDevices.txt U xsrc/external/mit/libXi/dist/man/XIChangeHierarchy.man U xsrc/external/mit/libXi/dist/man/XISelectEvents.man U xsrc/external/mit/libXi/dist/man/XDeviceBell.man U xsrc/external/mit/libXi/dist/man/XGetFeedbackControl.man U xsrc/external/mit/libXi/dist/man/XIQueryVersion.txt U xsrc/external/mit/libXi/dist/man/XDeviceBell.txt U xsrc/external/mit/libXi/dist/man/XIGrabFocusIn.man U xsrc/external/mit/libXi/dist/man/Makefile.in U xsrc/external/mit/libXi/dist/man/XChangeDeviceProperty.man U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.man U xsrc/external/mit/libXi/dist/man/XIChangeProperty.man U xsrc/external/mit/libXi/dist/man/XSetDeviceModifierMapping.man U xsrc/external/mit/libXi/dist/man/XUngrabDeviceButton.man U xsrc/external/mit/libXi/dist/man/XSetDeviceFocus.man U xsrc/external/mit/libXi/dist/man/XGetDeviceControl.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceKey.txt U xsrc/external/mit/libXi/dist/man/XIGetFocus.man U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man U xsrc/external/mit/libXi/dist/man/XSetDeviceValuators.txt U xsrc/external/mit/libXi/dist/man/XGetFeedbackControl.txt U xsrc/external/mit/libXi/dist/man/XChangeKeyboardDevice.txt N xsrc/external/mit/libXi/dist/man/XIBarrierReleasePointer.txt U xsrc/external/mit/libXi/dist/man/XIListProperties.txt U xsrc/external/mit/libXi/dist/man/XIWarpPointer.man U xsrc/external/mit/libXi/dist/man/XGetDeviceProperty.txt U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.txt U xsrc/external/mit/libXi/dist/man/XISetFocus.man U xsrc/external/mit/libXi/dist/man/XISetClientPointer.txt U xsrc/external/mit/libXi/dist/man/XGetDeviceProperty.man U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man U xsrc/external/mit/libXi/dist/man/XSetDeviceMode.txt U xsrc/external/mit/libXi/dist/man/XSetDeviceButtonMapping.txt U xsrc/external/mit/libXi/dist/man/XIGrabDevice.txt U xsrc/external/mit/libXi/dist/man/XISetFocus.txt U xsrc/external/mit/libXi/dist/man/XChangeDeviceControl.man U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.txt N xsrc/external/mit/libXi/dist/man/XIBarrierReleasePointers.man U xsrc/external/mit/libXi/dist/man/XIWarpPointer.txt U xsrc/external/mit/libXi/dist/man/XIUngrabKeycode.man N xsrc/external/mit/libXi/dist/man/XIGrabTouchBegin.man U xsrc/external/mit/libXi/dist/man/XSendExtensionEvent.txt U xsrc/external/mit/libXi/dist/man/XChangeFeedbackControl.man U xsrc/external/mit/libXi/dist/man/XIQueryDevice.man U xsrc/external/mit/libXi/dist/man/XIQueryVersion.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.txt U xsrc/external/mit/libXi/dist/man/XIUngrabFocusIn.man U xsrc/external/mit/libXi/dist/man/XIChangeProperty.txt U xsrc/external/mit/libXi/dist/man/XChangePointerDevice.txt U xsrc/external/mit/libXi/dist/man/XOpenDevice.txt U xsrc/external/mit/libXi/dist/man/XSetDeviceMode.man U xsrc/external/mit/libXi/dist/man/XIQueryDevice.txt U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.man N xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man U xsrc/external/mit/libXi/dist/man/XChangeDeviceKeyMapping.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.man U
CVS commit: src
Module Name:src
Committed By: mrg
Date: Wed Jun 5 00:52:23 UTC 2013
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libXi: Makefile shlib_version
Log Message:
adapt for libXi 1.7.1.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXi/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXi/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.50 src/distrib/sets/lists/xbase/shl.mi:1.51
--- src/distrib/sets/lists/xbase/shl.mi:1.50 Mon Jun 3 23:25:43 2013
+++ src/distrib/sets/lists/xbase/shl.mi Wed Jun 5 00:52:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.50 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: shl.mi,v 1.51 2013/06/05 00:52:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -245,7 +245,7 @@
./usr/X11R7/lib/libXft.so.3.0 -unknown- xorg
./usr/X11R7/lib/libXi.so -unknown- xorg
./usr/X11R7/lib/libXi.so.7 -unknown- xorg
-./usr/X11R7/lib/libXi.so.7.0 -unknown- xorg
+./usr/X11R7/lib/libXi.so.7.1 -unknown- xorg
./usr/X11R7/lib/libXinerama.so -unknown- xorg
./usr/X11R7/lib/libXinerama.so.2 -unknown- xorg
./usr/X11R7/lib/libXinerama.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.9 src/distrib/sets/lists/xdebug/shl.mi:1.10
--- src/distrib/sets/lists/xdebug/shl.mi:1.9 Mon Jun 3 23:25:43 2013
+++ src/distrib/sets/lists/xdebug/shl.mi Wed Jun 5 00:52:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.9 2013/06/03 23:25:43 mrg Exp $
+# $NetBSD: shl.mi,v 1.10 2013/06/05 00:52:23 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -83,7 +83,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/libXi/Makefile
diff -u src/external/mit/xorg/lib/libXi/Makefile:1.8 src/external/mit/xorg/lib/libXi/Makefile:1.9
--- src/external/mit/xorg/lib/libXi/Makefile:1.8 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libXi/Makefile Wed Jun 5 00:52:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/05 00:52:22 mrg Exp $
.include bsd.own.mk
@@ -7,6 +7,7 @@ LIB= Xi
.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
SRCS= XIAllowEvents.c \
+ XIBarrier.c \
XIGrabDevice.c \
XIQueryVersion.c \
XIQueryDevice.c \
@@ -81,5 +82,7 @@ COPTS.XSndExEv.c+= -Wno-error # XXX
CWARNFLAGS.clang+= -Wno-pointer-sign
+# XXX manuals
+
.include bsd.x11.mk
.include bsd.lib.mk
Index: src/external/mit/xorg/lib/libXi/shlib_version
diff -u src/external/mit/xorg/lib/libXi/shlib_version:1.2 src/external/mit/xorg/lib/libXi/shlib_version:1.3
--- src/external/mit/xorg/lib/libXi/shlib_version:1.2 Sun Jan 11 03:10:11 2009
+++ src/external/mit/xorg/lib/libXi/shlib_version Wed Jun 5 00:52:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
+# $NetBSD: shlib_version,v 1.3 2013/06/05 00:52:22 mrg Exp $
#
major=7
-minor=0
+minor=1
CVS commit: xsrc/external/mit/libXi/dist/doc
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 00:52:36 UTC 2013 Removed Files: xsrc/external/mit/libXi/dist/doc: Makefile.am Makefile.in porting.xml Log Message: merge libXi 1.7.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXi/dist/doc/Makefile.am \ xsrc/external/mit/libXi/dist/doc/porting.xml cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libXi/dist/doc/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xf86-input-synaptics/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 01:02:26 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-input-synaptics/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11937 Log Message: initial import of xf86-input-synaptics-1.7.1 Status: Vendor Tag: xorg Release Tags: xf86-input-synaptics-1-7-1 U xsrc/external/mit/xf86-input-synaptics/dist/Makefile.in U xsrc/external/mit/xf86-input-synaptics/dist/COPYING U xsrc/external/mit/xf86-input-synaptics/dist/missing U xsrc/external/mit/xf86-input-synaptics/dist/Makefile.am U xsrc/external/mit/xf86-input-synaptics/dist/xorg-synaptics.pc.in U xsrc/external/mit/xf86-input-synaptics/dist/ChangeLog U xsrc/external/mit/xf86-input-synaptics/dist/README U xsrc/external/mit/xf86-input-synaptics/dist/install-sh U xsrc/external/mit/xf86-input-synaptics/dist/config.h.in U xsrc/external/mit/xf86-input-synaptics/dist/config.sub U xsrc/external/mit/xf86-input-synaptics/dist/configure U xsrc/external/mit/xf86-input-synaptics/dist/config.guess U xsrc/external/mit/xf86-input-synaptics/dist/aclocal.m4 U xsrc/external/mit/xf86-input-synaptics/dist/configure.ac U xsrc/external/mit/xf86-input-synaptics/dist/ltmain.sh U xsrc/external/mit/xf86-input-synaptics/dist/depcomp U xsrc/external/mit/xf86-input-synaptics/dist/INSTALL U xsrc/external/mit/xf86-input-synaptics/dist/include/Makefile.in U xsrc/external/mit/xf86-input-synaptics/dist/include/Makefile.am U xsrc/external/mit/xf86-input-synaptics/dist/include/synaptics-properties.h U xsrc/external/mit/xf86-input-synaptics/dist/man/synclient.man U xsrc/external/mit/xf86-input-synaptics/dist/man/Makefile.in U xsrc/external/mit/xf86-input-synaptics/dist/man/syndaemon.man U xsrc/external/mit/xf86-input-synaptics/dist/man/Makefile.am U xsrc/external/mit/xf86-input-synaptics/dist/man/synaptics.man U xsrc/external/mit/xf86-input-synaptics/dist/src/synapticsstr.h U xsrc/external/mit/xf86-input-synaptics/dist/src/ps2comm.c U xsrc/external/mit/xf86-input-synaptics/dist/src/Makefile.in U xsrc/external/mit/xf86-input-synaptics/dist/src/synaptics.c U xsrc/external/mit/xf86-input-synaptics/dist/src/properties.c U xsrc/external/mit/xf86-input-synaptics/dist/src/alpscomm.c U xsrc/external/mit/xf86-input-synaptics/dist/src/eventcomm.h U xsrc/external/mit/xf86-input-synaptics/dist/src/ps2comm.h U xsrc/external/mit/xf86-input-synaptics/dist/src/Makefile.am U xsrc/external/mit/xf86-input-synaptics/dist/src/psmcomm.c U xsrc/external/mit/xf86-input-synaptics/dist/src/eventcomm.c U xsrc/external/mit/xf86-input-synaptics/dist/src/synproto.h N xsrc/external/mit/xf86-input-synaptics/dist/src/synproto.c U xsrc/external/mit/xf86-input-synaptics/dist/conf/50-synaptics.conf U xsrc/external/mit/xf86-input-synaptics/dist/conf/Makefile.in U xsrc/external/mit/xf86-input-synaptics/dist/conf/11-x11-synaptics.fdi U xsrc/external/mit/xf86-input-synaptics/dist/conf/Makefile.am U xsrc/external/mit/xf86-input-synaptics/dist/tools/Makefile.in U xsrc/external/mit/xf86-input-synaptics/dist/tools/synclient.c U xsrc/external/mit/xf86-input-synaptics/dist/tools/Makefile.am U xsrc/external/mit/xf86-input-synaptics/dist/tools/syndaemon.c N xsrc/external/mit/xf86-input-synaptics/dist/test/fake-symbols.h N xsrc/external/mit/xf86-input-synaptics/dist/test/Makefile.in N xsrc/external/mit/xf86-input-synaptics/dist/test/fake-symbols.c N xsrc/external/mit/xf86-input-synaptics/dist/test/Makefile.am N xsrc/external/mit/xf86-input-synaptics/dist/test/eventcomm-test.c No conflicts created by this import
CVS import: xsrc/external/mit/xf86-input-elographics/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 01:02:24 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-input-elographics/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4826 Log Message: initial import of xf86-input-elographics-1.4.1 Status: Vendor Tag: xorg Release Tags: xf86-input-elographics-1-4-1 U xsrc/external/mit/xf86-input-elographics/dist/Makefile.in U xsrc/external/mit/xf86-input-elographics/dist/COPYING U xsrc/external/mit/xf86-input-elographics/dist/missing U xsrc/external/mit/xf86-input-elographics/dist/ChangeLog U xsrc/external/mit/xf86-input-elographics/dist/README U xsrc/external/mit/xf86-input-elographics/dist/install-sh U xsrc/external/mit/xf86-input-elographics/dist/config.h.in U xsrc/external/mit/xf86-input-elographics/dist/Makefile.am U xsrc/external/mit/xf86-input-elographics/dist/config.sub U xsrc/external/mit/xf86-input-elographics/dist/configure U xsrc/external/mit/xf86-input-elographics/dist/config.guess U xsrc/external/mit/xf86-input-elographics/dist/aclocal.m4 U xsrc/external/mit/xf86-input-elographics/dist/configure.ac U xsrc/external/mit/xf86-input-elographics/dist/depcomp U xsrc/external/mit/xf86-input-elographics/dist/ltmain.sh U xsrc/external/mit/xf86-input-elographics/dist/man/elographics.man U xsrc/external/mit/xf86-input-elographics/dist/man/Makefile.in U xsrc/external/mit/xf86-input-elographics/dist/man/Makefile.am U xsrc/external/mit/xf86-input-elographics/dist/src/Makefile.in C xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c U xsrc/external/mit/xf86-input-elographics/dist/src/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-input-elographics/dist
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Wed Jun 5 01:01:57 UTC 2013 Modified Files: src/share/man/man4: options.4 Log Message: depcrecate IPSEC_NAT_T To generate a diff of this commit: cvs rdiff -u -r1.421 -r1.422 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.421 src/share/man/man4/options.4:1.422 --- src/share/man/man4/options.4:1.421 Wed May 15 01:47:10 2013 +++ src/share/man/man4/options.4 Tue Jun 4 21:01:57 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.421 2013/05/15 05:47:10 msaitoh Exp $ +.\ $NetBSD: options.4,v 1.422 2013/06/05 01:01:57 christos Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd May 15, 2013 +.Dd June 4, 2013 .Dt OPTIONS 4 .Os .Sh NAME @@ -1699,8 +1699,9 @@ to carry out cryptographic operations. See .Xr fast_ipsec 4 for details. -.It Cd options IPSEC_NAT_T -Includes support for +The +.Cd FAST_IPSEC +option includes support for .Tn IPsec Network Address Translator traversal (NAT-T), as described in RFCs 3947 and 3948.
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Wed Jun 5 01:03:12 UTC 2013
Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
Removed Files:
xsrc/external/mit/xf86-input-synaptics/dist/include: synaptics.h
xsrc/external/mit/xf86-input-synaptics/dist/src: alpscomm.h
Log Message:
merge xf86-input-elographics 1.4.1 and xf86-input-synaptics 1.7.1.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-input-synaptics/dist/include/synaptics.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-input-synaptics/dist/src/alpscomm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.2 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.3
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.2 Sat Jul 23 21:56:54 2011
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Wed Jun 5 01:03:12 2013
@@ -66,7 +66,7 @@
typedef struct {
int type;
-char*name;
+const char *name;
} Model;
static Model SupportedModels[] =
@@ -248,7 +248,7 @@ xf86EloGetPacket(unsigned char *buffer,
* Okay, give up.
*/
if (num_bytes 0) {
-Error(System error while reading from Elographics touchscreen.);
+ErrorF(System error while reading from Elographics touchscreen.);
return !Success;
}
DBG(4, ErrorF(Read %d bytes\n, num_bytes));
@@ -722,7 +722,7 @@ xf86EloControl(DeviceIntPtr dev,
/* I will map coordinates myself */
InitValuatorAxisStruct(dev, 0,
axis_labels[0],
- -1, -1,
+ priv-min_x, priv-max_x,
9500,
0 /* min_res */,
9500 /* max_res */
@@ -732,7 +732,7 @@ xf86EloControl(DeviceIntPtr dev,
);
InitValuatorAxisStruct(dev, 1,
axis_labels[1],
- -1, -1,
+ priv-min_y, priv-max_y,
10500,
0 /* min_res */,
10500 /* max_res */
@@ -764,7 +764,7 @@ xf86EloControl(DeviceIntPtr dev,
DBG(2, ErrorF(Elographics touchscreen opening : %s\n, priv-input_dev));
pInfo-fd = xf86OpenSerial(pInfo-options);
if (pInfo-fd 0) {
- Error(Unable to open Elographics touchscreen device);
+ ErrorF(Unable to open Elographics touchscreen device);
return !Success;
}
@@ -856,7 +856,7 @@ xf86EloControl(DeviceIntPtr dev,
default:
ErrorF(unsupported mode=%d\n, mode);
- return !Success;
+ return BadValue;
}
}
@@ -892,13 +892,12 @@ xf86EloAllocate(InputDriverPtr drv, Inpu
priv-packet_buf_p = 0;
priv-swap_axes = 0;
- pInfo-flags = 0 /* XI86_NO_OPEN_ON_INIT */;
pInfo-device_control = xf86EloControl;
pInfo-read_input = xf86EloReadInput;
pInfo-control_proc = NULL;
pInfo-switch_mode = NULL;
pInfo-private = priv;
- pInfo-type_name= Elographics TouchScreen;
+ pInfo-type_name= XI_TOUCHSCREEN;
return Success;
}
@@ -917,7 +916,11 @@ xf86EloUninit(InputDriverPtr drv,
xf86DeleteInput(pInfo, 0);
}
-static char *default_options[] = {
+static
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 18
+const
+#endif
+char *default_options[] = {
BaudRate, 9600,
StopBits, 1,
DataBits, 8,
@@ -932,7 +935,7 @@ xf86EloInit(InputDriverPtr drv,
int flags)
{
EloPrivatePtr priv=NULL;
- char *str;
+ const char *str;
int portrait = 0;
int height, width;
char *opt_model;
@@ -946,18 +949,21 @@ xf86EloInit(InputDriverPtr drv,
priv = pInfo-private;
- str = xf86FindOptionValue(pInfo-options, Device);
+ str = xf86SetStrOption(pInfo-options, Device, NULL);
if (!str) {
xf86Msg(X_ERROR, %s: No Device specified in Elographics module config.\n,
pInfo-name);
-if (priv) {
- if (priv-input_dev) {
- free(priv-input_dev);
- }
- free(priv);
-}
return BadValue;
+ } else {
+ pInfo-fd = xf86OpenSerial(pInfo-options);
+ if (pInfo-fd 0) {
+ xf86Msg(X_ERROR, %s: Unable to open Elographics touchscreen device %s, pInfo-name, str);
+ return BadValue;
+ }
+ xf86CloseSerial(pInfo-fd);
+ pInfo-fd = -1;
}
+
priv-input_dev = strdup(str);
opt_model = xf86SetStrOption(pInfo-options, Model, NULL);
@@ -973,8 +979,6 @@ xf86EloInit(InputDriverPtr drv,
model++;
}
- pInfo-name = xf86SetStrOption(pInfo-options, DeviceName, XI_TOUCHSCREEN);
- xf86Msg(X_CONFIG, Elographics X device name: %s\n, pInfo-name);
priv-screen_no = xf86SetIntOption(pInfo-options, ScreenNo, 0);
xf86Msg(X_CONFIG, Elographics associated screen: %d\n, priv-screen_no);
priv-untouch_delay = xf86SetIntOption(pInfo-options, UntouchDelay, ELO_UNTOUCH_DELAY);
CVS import: xsrc/external/mit/xf86-input-vmmouse/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 01:02:28 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-input-vmmouse/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12198 Log Message: initial import of xf86-input-vmmouse-13.0.0 Status: Vendor Tag: xorg Release Tags: xf86-input-vmmouse-13-0-0 U xsrc/external/mit/xf86-input-vmmouse/dist/README U xsrc/external/mit/xf86-input-vmmouse/dist/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/ltmain.sh U xsrc/external/mit/xf86-input-vmmouse/dist/aclocal.m4 U xsrc/external/mit/xf86-input-vmmouse/dist/configure U xsrc/external/mit/xf86-input-vmmouse/dist/install-sh U xsrc/external/mit/xf86-input-vmmouse/dist/config.h.in U xsrc/external/mit/xf86-input-vmmouse/dist/missing U xsrc/external/mit/xf86-input-vmmouse/dist/config.guess U xsrc/external/mit/xf86-input-vmmouse/dist/INSTALL U xsrc/external/mit/xf86-input-vmmouse/dist/configure.ac U xsrc/external/mit/xf86-input-vmmouse/dist/ChangeLog U xsrc/external/mit/xf86-input-vmmouse/dist/config.sub U xsrc/external/mit/xf86-input-vmmouse/dist/depcomp U xsrc/external/mit/xf86-input-vmmouse/dist/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/COPYING U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/11-x11-vmmouse.fdi U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/man/vmmouse_detect.man U xsrc/external/mit/xf86-input-vmmouse/dist/man/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/man/vmmouse.man U xsrc/external/mit/xf86-input-vmmouse/dist/man/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/src/xf86OSmouse.h U xsrc/external/mit/xf86-input-vmmouse/dist/src/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/src/vmmouse.c U xsrc/external/mit/xf86-input-vmmouse/dist/src/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_client.c U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_proto.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_proto.c U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_client.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_defs.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/tools/50-vmmouse.conf U xsrc/external/mit/xf86-input-vmmouse/dist/tools/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/tools/69-xorg-vmmouse.rules.in U xsrc/external/mit/xf86-input-vmmouse/dist/tools/hal-probe-vmmouse.in U xsrc/external/mit/xf86-input-vmmouse/dist/tools/vmmouse_detect.c U xsrc/external/mit/xf86-input-vmmouse/dist/tools/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 01:06:27 UTC 2013 Modified Files: xsrc/external/mit/xf86-input-elographics/include: config.h xsrc/external/mit/xf86-input-synaptics/include: config.h Log Message: new config.h for xf86-input-elographics 1.4.1 and xf86-input-synaptics 1.7.1 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-input-elographics/include/config.h cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/xf86-input-synaptics/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-input-elographics/include/config.h diff -u xsrc/external/mit/xf86-input-elographics/include/config.h:1.3 xsrc/external/mit/xf86-input-elographics/include/config.h:1.4 --- xsrc/external/mit/xf86-input-elographics/include/config.h:1.3 Sat Jul 23 21:58:29 2011 +++ xsrc/external/mit/xf86-input-elographics/include/config.h Wed Jun 5 01:06:27 2013 @@ -43,25 +43,25 @@ #define PACKAGE_NAME xf86-input-elographics /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-input-elographics 1.3.0 +#define PACKAGE_STRING xf86-input-elographics 1.4.1 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-input-elographics /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.3.0 +#define PACKAGE_VERSION 1.4.1 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 3 +#define PACKAGE_VERSION_MINOR 4 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 +#define PACKAGE_VERSION_PATCHLEVEL 1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 1.3.0 +#define VERSION 1.4.1 Index: xsrc/external/mit/xf86-input-synaptics/include/config.h diff -u xsrc/external/mit/xf86-input-synaptics/include/config.h:1.1 xsrc/external/mit/xf86-input-synaptics/include/config.h:1.2 --- xsrc/external/mit/xf86-input-synaptics/include/config.h:1.1 Sat Jan 29 02:32:19 2011 +++ xsrc/external/mit/xf86-input-synaptics/include/config.h Wed Jun 5 01:06:27 2013 @@ -4,6 +4,9 @@ /* Optional backend eventcomm enabled */ /* #undef BUILD_EVENTCOMM */ +/* Optional backend ps2comm and alpscomm enabled */ +#define BUILD_PS2COMM 1 + /* Optional backend psmcomm enabled */ #define BUILD_PSMCOMM 1 @@ -60,7 +63,7 @@ #define PACKAGE_NAME xf86-input-synaptics /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-input-synaptics 1.3.0 +#define PACKAGE_STRING xf86-input-synaptics 1.7.1 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-input-synaptics @@ -69,19 +72,19 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.3.0 +#define PACKAGE_VERSION 1.7.1 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 3 +#define PACKAGE_VERSION_MINOR 7 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 +#define PACKAGE_VERSION_PATCHLEVEL 1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 1.3.0 +#define VERSION 1.7.1
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Wed Jun 5 01:18:35 UTC 2013 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 md.i386 src/distrib/sets/lists/xserver: md.amd64 md.i386 Log Message: bump vmmouse_drv.so To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.amd64 \ src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/xserver/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.3 src/distrib/sets/lists/xdebug/md.amd64:1.4 --- src/distrib/sets/lists/xdebug/md.amd64:1.3 Fri Feb 8 15:13:04 2013 +++ src/distrib/sets/lists/xdebug/md.amd64 Wed Jun 5 01:18:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.3 2013/02/08 15:13:04 christos Exp $ +# $NetBSD: md.amd64,v 1.4 2013/06/05 01:18:35 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg @@ -159,7 +159,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.12.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.11.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmwlegacy_drv.so.11.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug -unknown- obsolete Index: src/distrib/sets/lists/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.3 src/distrib/sets/lists/xdebug/md.i386:1.4 --- src/distrib/sets/lists/xdebug/md.i386:1.3 Fri Feb 8 15:13:04 2013 +++ src/distrib/sets/lists/xdebug/md.i386 Wed Jun 5 01:18:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.3 2013/02/08 15:13:04 christos Exp $ +# $NetBSD: md.i386,v 1.4 2013/06/05 01:18:35 mrg Exp $ ./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11 @@ -209,7 +209,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.12.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.11.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmwlegacy_drv.so.11.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug -unknown- obsolete Index: src/distrib/sets/lists/xserver/md.amd64 diff -u src/distrib/sets/lists/xserver/md.amd64:1.67 src/distrib/sets/lists/xserver/md.amd64:1.68 --- src/distrib/sets/lists/xserver/md.amd64:1.67 Wed Jan 16 16:01:09 2013 +++ src/distrib/sets/lists/xserver/md.amd64 Wed Jun 5 01:18:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.67 2013/01/16 16:01:09 christos Exp $ +# $NetBSD: md.amd64,v 1.68 2013/06/05 01:18:35 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/gtf -unknown- x11 @@ -476,7 +476,7 @@ ./usr/X11R7/lib/modules/drivers/via_drv.so -unknown- obsolete ./usr/X11R7/lib/modules/drivers/via_drv.so.0 -unknown- obsolete ./usr/X11R7/lib/modules/drivers/vmmouse_drv.so -unknown- xorg -./usr/X11R7/lib/modules/drivers/vmmouse_drv.so.12 -unknown- xorg +./usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13 -unknown- xorg ./usr/X11R7/lib/modules/drivers/vmware_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/vmware_drv.so.11 -unknown- xorg ./usr/X11R7/lib/modules/drivers/vmwlegacy_drv.so -unknown- xorg Index: src/distrib/sets/lists/xserver/md.i386 diff -u src/distrib/sets/lists/xserver/md.i386:1.86 src/distrib/sets/lists/xserver/md.i386:1.87 --- src/distrib/sets/lists/xserver/md.i386:1.86 Wed Jan 16 16:01:09 2013 +++ src/distrib/sets/lists/xserver/md.i386 Wed Jun 5 01:18:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.86 2013/01/16 16:01:09 christos Exp $ +# $NetBSD: md.i386,v 1.87 2013/06/05 01:18:35 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11
CVS import: xsrc/external/mit/xf86-video-wsfb/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 01:36:03 UTC 2013 Update of /cvsroot/xsrc/external/mit/xf86-video-wsfb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7045 Log Message: initial import of xf86-video-wsfb-0.4.0 Status: Vendor Tag: xorg Release Tags: xf86-video-wsfb-0-4-0 U xsrc/external/mit/xf86-video-wsfb/dist/Makefile.am U xsrc/external/mit/xf86-video-wsfb/dist/README U xsrc/external/mit/xf86-video-wsfb/dist/COPYING U xsrc/external/mit/xf86-video-wsfb/dist/configure U xsrc/external/mit/xf86-video-wsfb/dist/depcomp N xsrc/external/mit/xf86-video-wsfb/dist/INSTALL U xsrc/external/mit/xf86-video-wsfb/dist/ChangeLog U xsrc/external/mit/xf86-video-wsfb/dist/aclocal.m4 U xsrc/external/mit/xf86-video-wsfb/dist/ltmain.sh U xsrc/external/mit/xf86-video-wsfb/dist/Makefile.in U xsrc/external/mit/xf86-video-wsfb/dist/configure.ac U xsrc/external/mit/xf86-video-wsfb/dist/config.guess U xsrc/external/mit/xf86-video-wsfb/dist/missing U xsrc/external/mit/xf86-video-wsfb/dist/install-sh U xsrc/external/mit/xf86-video-wsfb/dist/config.sub U xsrc/external/mit/xf86-video-wsfb/dist/config.h.in U xsrc/external/mit/xf86-video-wsfb/dist/man/Makefile.am U xsrc/external/mit/xf86-video-wsfb/dist/man/wsfb.man U xsrc/external/mit/xf86-video-wsfb/dist/man/Makefile.in C xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c U xsrc/external/mit/xf86-video-wsfb/dist/src/Makefile.am U xsrc/external/mit/xf86-video-wsfb/dist/src/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-wsfb/dist
CVS commit: xsrc/external/mit/xf86-video-wsfb/dist/src
Module Name:xsrc
Committed By: mrg
Date: Wed Jun 5 01:45:34 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
merge xf86-video-wsfb 0.4.0
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.17 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.18
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.17 Thu Mar 28 16:30:47 2013
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Wed Jun 5 01:45:34 2013
@@ -1,6 +1,5 @@
-/* $OpenBSD: wsfb_driver.c,v 1.16 2009/09/13 19:33:49 matthieu Exp $ */
/*
- * Copyright (c) 2001 Matthieu Herrb
+ * Copyright © 2001-2012 Matthieu Herrb
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -42,6 +41,8 @@
#include errno.h
#include fcntl.h
+#include unistd.h
+#include sys/ioctl.h
#include sys/types.h
#include sys/mman.h
#include sys/time.h
@@ -110,9 +111,7 @@ extern int priv_open_device(const char *
#endif
/* Prototypes */
-#ifdef XFree86LOADER
static pointer WsfbSetup(pointer, pointer, int *, int *);
-#endif
static Bool WsfbGetRec(ScrnInfoPtr);
static void WsfbFreeRec(ScrnInfoPtr);
static const OptionInfoRec * WsfbAvailableOptions(int, int);
@@ -145,7 +144,7 @@ static Bool WsfbDriverFunc(ScrnInfoPtr p
pointer ptr);
/* Helper functions */
-static int wsfb_open(char *);
+static int wsfb_open(const char *);
static pointer wsfb_mmap(size_t, off_t, int);
enum { WSFB_ROTATE_NONE = 0,
@@ -155,7 +154,7 @@ enum { WSFB_ROTATE_NONE = 0,
};
/*
- * This is intentionally screen-independent.
+ * This is intentionally screen-independent.
* It indicates the binding choice made in the first PreInit.
*/
static int pix24bpp = 0;
@@ -195,6 +194,7 @@ static const OptionInfoRec WsfbOptions[]
{ -1, NULL, OPTV_NONE, {0}, FALSE}
};
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) = 6
/* Symbols needed from other modules */
static const char *fbSymbols[] = {
fbPictureInit,
@@ -217,6 +217,7 @@ static const char *ramdacSymbols[] = {
xf86InitCursor,
NULL
};
+#endif
#ifdef XFree86LOADER
static XF86ModuleVersionInfo WsfbVersRec = {
@@ -225,8 +226,8 @@ static XF86ModuleVersionInfo WsfbVersRec
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- PACKAGE_VERSION_MAJOR,
- PACKAGE_VERSION_MINOR,
+ PACKAGE_VERSION_MAJOR,
+ PACKAGE_VERSION_MINOR,
PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -264,7 +265,6 @@ WsfbSetup(pointer module, pointer opts,
return NULL;
}
}
-#endif /* XFree86LOADER */
static Bool
WsfbGetRec(ScrnInfoPtr pScrn)
@@ -283,7 +283,7 @@ WsfbFreeRec(ScrnInfoPtr pScrn)
if (pScrn-driverPrivate == NULL)
return;
- xfree(pScrn-driverPrivate);
+ free(pScrn-driverPrivate);
pScrn-driverPrivate = NULL;
}
@@ -302,11 +302,11 @@ WsfbIdentify(int flags)
/* Open the framebuffer device. */
static int
-wsfb_open(char *dev)
+wsfb_open(const char *dev)
{
int fd = -1;
- /* Try argument from XF86Config first. */
+ /* Try argument from xorg.conf first. */
if (dev == NULL || ((fd = priv_open_device(dev)) == -1)) {
/* Second: environment variable. */
dev = getenv(XDEVICE);
@@ -356,7 +356,7 @@ WsfbProbe(DriverPtr drv, int flags)
int i, fd, entity;
GDevPtr *devSections;
int numDevSections;
- char *dev;
+ const char *dev;
Bool foundScreen = FALSE;
TRACE(probe start);
@@ -397,7 +397,7 @@ WsfbProbe(DriverPtr drv, int flags)
}
}
}
- xfree(devSections);
+ free(devSections);
TRACE(probe done);
return foundScreen;
}
@@ -407,8 +407,8 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
{
WsfbPtr fPtr;
int default_depth, wstype;
- char *dev, *s;
- char *mod = NULL;
+ const char *dev;
+ char *mod = NULL, *s;
const char *reqSym = NULL;
Gamma zeros = {0.0, 0.0, 0.0};
DisplayModePtr mode;
@@ -506,7 +506,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
*/
if (fPtr-fbi.fbi_pixeltype == WSFB_CI) {
fPtr-saved_cmap.red =
- (unsigned char *)xalloc(fPtr-fbi.fbi_subtype.fbi_cmapinfo.cmap_entries);
+ (unsigned char *)malloc(fPtr-fbi.fbi_subtype.fbi_cmapinfo.cmap_entries);
if (fPtr-saved_cmap.red == NULL) {
xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
Cannot malloc %d bytes\n,
@@ -514,22 +514,22 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
return FALSE;
}
fPtr-saved_cmap.green =
- (unsigned char *)xalloc(fPtr-fbi.fbi_subtype.fbi_cmapinfo.cmap_entries);
+ (unsigned char *)malloc(fPtr-fbi.fbi_subtype.fbi_cmapinfo.cmap_entries);
if (fPtr-saved_cmap.green == NULL) {
xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
Cannot malloc %d bytes\n,
CVS commit: xsrc/external/mit/xf86-video-wsfb/include
Module Name:xsrc Committed By: mrg Date: Wed Jun 5 01:47:45 UTC 2013 Modified Files: xsrc/external/mit/xf86-video-wsfb/include: config.h Log Message: update for xf86-video-wsfb 0.4.0 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-wsfb/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-wsfb/include/config.h diff -u xsrc/external/mit/xf86-video-wsfb/include/config.h:1.3 xsrc/external/mit/xf86-video-wsfb/include/config.h:1.4 --- xsrc/external/mit/xf86-video-wsfb/include/config.h:1.3 Sun Jan 10 09:59:46 2010 +++ xsrc/external/mit/xf86-video-wsfb/include/config.h Wed Jun 5 01:47:45 2013 @@ -49,19 +49,19 @@ #define PACKAGE_NAME xf86-video-wsfb /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-wsfb 0.3.0 +#define PACKAGE_STRING xf86-video-wsfb 0.4.0 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-wsfb /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.3.0 +#define PACKAGE_VERSION 0.4.0 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 0 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 3 +#define PACKAGE_VERSION_MINOR 4 /* Patch version of this package */ #define PACKAGE_VERSION_PATCHLEVEL 0 @@ -70,4 +70,4 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 0.3.0 +#define VERSION 0.4.0
CVS commit: xsrc/external/mit/xf86-video-wsfb/dist/src
Module Name:xsrc
Committed By: mrg
Date: Wed Jun 5 02:11:44 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
fix a merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.18 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.19
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.18 Wed Jun 5 01:45:34 2013
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Wed Jun 5 02:11:44 2013
@@ -219,7 +219,6 @@ static const char *ramdacSymbols[] = {
};
#endif
-#ifdef XFree86LOADER
static XF86ModuleVersionInfo WsfbVersRec = {
wsfb,
MODULEVENDORSTRING,
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Wed Jun 5 02:51:49 UTC 2013
Modified Files:
src/external/mit/xorg/lib: Makefile
Log Message:
libXdmGreet depends upon a bunch of libs; move it.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.26 src/external/mit/xorg/lib/Makefile:1.27
--- src/external/mit/xorg/lib/Makefile:1.26 Tue Jun 4 07:44:45 2013
+++ src/external/mit/xorg/lib/Makefile Wed Jun 5 02:51:49 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/06/04 07:44:45 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2013/06/05 02:51:49 mrg Exp $
# build libraries for xorg
SUBDIR= libfontenc freetype libFS libICE libOSMesa \
- libXau libXdmGreet libXdmcp libdrm libpciaccess .WAIT
+ libXau libXdmcp libdrm libpciaccess .WAIT
.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
SUBDIR+=libdrm_intel
.endif
@@ -31,6 +31,8 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
libXrandr \
.WAIT \
libXft libglut \
+ .WAIT \
+ libXdmGreet \
xcb-util
.include bsd.subdir.mk
CVS commit: othersrc/external/historical/eawk
Module Name:othersrc
Committed By: agc
Date: Wed Jun 5 02:59:48 UTC 2013
Modified Files:
othersrc/external/historical/eawk/dist: b.c eawk.h lib.c run.c tran.c
othersrc/external/historical/eawk/extend/bzlib: bzlib.c
othersrc/external/historical/eawk/extend/c: c.c
othersrc/external/historical/eawk/extend/dirent: dirent.c
othersrc/external/historical/eawk/extend/zlib: zlib.c
Log Message:
modify the name eawk_lookup to be eawk_array_lookup
change the function's signature so that the array comes first, followed
by the name of the entry.
fix up all uses of eawk_array_lookup()
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/external/historical/eawk/dist/b.c
cvs rdiff -u -r1.3 -r1.4 othersrc/external/historical/eawk/dist/eawk.h \
othersrc/external/historical/eawk/dist/lib.c
cvs rdiff -u -r1.5 -r1.6 othersrc/external/historical/eawk/dist/run.c
cvs rdiff -u -r1.4 -r1.5 othersrc/external/historical/eawk/dist/tran.c
cvs rdiff -u -r1.1 -r1.2 \
othersrc/external/historical/eawk/extend/bzlib/bzlib.c
cvs rdiff -u -r1.1 -r1.2 othersrc/external/historical/eawk/extend/c/c.c
cvs rdiff -u -r1.1 -r1.2 \
othersrc/external/historical/eawk/extend/dirent/dirent.c
cvs rdiff -u -r1.1 -r1.2 othersrc/external/historical/eawk/extend/zlib/zlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/historical/eawk/dist/b.c
diff -u othersrc/external/historical/eawk/dist/b.c:1.2 othersrc/external/historical/eawk/dist/b.c:1.3
--- othersrc/external/historical/eawk/dist/b.c:1.2 Fri May 31 05:56:36 2013
+++ othersrc/external/historical/eawk/dist/b.c Wed Jun 5 02:59:47 2013
@@ -946,7 +946,7 @@ eawk_regcomp(eawk_t *eawk, const char *s
}
}
- if (strcmp(eawk_getsval(eawk, eawk_lookup(stage, eawk-control)), compiling) == 0) {
+ if (strcmp(eawk_getsval(eawk, eawk_array_lookup(eawk-control, stage)), compiling) == 0) {
/* a constant for sure */
return mkdfa(eawk, s, anchor);
}
Index: othersrc/external/historical/eawk/dist/eawk.h
diff -u othersrc/external/historical/eawk/dist/eawk.h:1.3 othersrc/external/historical/eawk/dist/eawk.h:1.4
--- othersrc/external/historical/eawk/dist/eawk.h:1.3 Wed Jun 5 00:55:25 2013
+++ othersrc/external/historical/eawk/dist/eawk.h Wed Jun 5 02:59:47 2013
@@ -289,7 +289,7 @@ char *eawk_setsvalN(eawk_t */*eawk*/, aw
awkarray_t *eawk_asort(eawk_t */*eawk*/, awkarray_t */*array*/, int /*asorti*/, int */*sortc*/);
awkcell_t *eawk_new_array(eawk_t */*eawk*/, awkcell_t */*arrayname*/);
-awkcell_t *eawk_lookup(const char */*name*/, awkarray_t */*array*/);
+awkcell_t *eawk_array_lookup(awkarray_t */*array*/, const char */*name*/);
int eawk_define_constant(eawk_t */*eawk*/, const char */*name*/, int64_t /*valnum*/);
__END_DECLS
Index: othersrc/external/historical/eawk/dist/lib.c
diff -u othersrc/external/historical/eawk/dist/lib.c:1.3 othersrc/external/historical/eawk/dist/lib.c:1.4
--- othersrc/external/historical/eawk/dist/lib.c:1.3 Wed Jun 5 00:55:25 2013
+++ othersrc/external/historical/eawk/dist/lib.c Wed Jun 5 02:59:47 2013
@@ -59,7 +59,7 @@ initgetrec(eawk_t *eawk)
for (i = 1; i *eawk-ARGC; i++) {
if (!eawk_isclvar(p = getargv(eawk, i))) { /* find 1st real filename */
- eawk_setsval(eawk, eawk_lookup(FILENAME, eawk-symtab), getargv(eawk, i));
+ eawk_setsval(eawk, eawk_array_lookup(eawk-symtab, FILENAME), getargv(eawk, i));
return;
}
eawk_setclvar(eawk, p); /* a commandline assignment before filename */
@@ -181,7 +181,7 @@ eprint(eawk_t *eawk)
char *stage;
char *p, *q;
- stage = eawk_getsval(eawk, eawk_lookup(stage, eawk-control));
+ stage = eawk_getsval(eawk, eawk_array_lookup(eawk-control, stage));
if (strcmp(stage, error display) == 0 || strcmp(stage, running) == 0 || eawk-eprintc++ 0) {
return;
}
@@ -252,7 +252,7 @@ error(eawk_t *eawk)
{
char *stage;
- stage = eawk_getsval(eawk, eawk_lookup(stage, eawk-control));
+ stage = eawk_getsval(eawk, eawk_array_lookup(eawk-control, stage));
(void) fprintf(stderr, \n);
if (strcmp(stage, error display) == 0 eawk-NR *eawk-NR 0) {
(void) fprintf(stderr, input record number %d, (int) (*eawk-FNR));
@@ -688,14 +688,14 @@ eawk_syntax(eawk_t *eawk, const char *fm
if (eawk-syntaxc++ 2)
return;
- (void) fprintf(stderr, %s: , eawk_getsval(eawk, eawk_lookup(cmdname, eawk-control)));
+ (void) fprintf(stderr, %s: , eawk_getsval(eawk, eawk_array_lookup(eawk-control, cmdname)));
va_start(varg, fmt);
vfprintf(stderr, fmt, varg);
va_end(varg);
(void) fprintf(stderr, at source line %d, eawk-lineno);
if (eawk-curfname != NULL)
(void) fprintf(stderr, in function %s, eawk-curfname);
- stage = eawk_getsval(eawk, eawk_lookup(stage, eawk-control));
+ stage = eawk_getsval(eawk, eawk_array_lookup(eawk-control, stage));
if (strcmp(stage, compiling) == 0 cursource(eawk) != NULL)
(void) fprintf(stderr,
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Jun 5 03:59:44 UTC 2013
Modified Files:
src/usr.bin/make: job.c
Log Message:
JobCreatePipe: do fcntl() *after* any fiddling of fd's
to avoid leaking descriptors.
Job_ServerStart: set closed on exec for jp_0 and jp_1.
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/make/job.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.172 src/usr.bin/make/job.c:1.173
--- src/usr.bin/make/job.c:1.172 Tue Mar 5 22:01:43 2013
+++ src/usr.bin/make/job.c Wed Jun 5 03:59:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $ */
+/* $NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $;
+static char rcsid[] = $NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)job.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $);
+__RCSID($NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -401,6 +401,15 @@ JobCreatePipe(Job *job, int minfd)
if (pipe(job-jobPipe) == -1)
Punt(Cannot create pipe: %s, strerror(errno));
+for (i = 0; i 2; i++) {
+ /* Avoid using low numbered fds */
+ fd = fcntl(job-jobPipe[i], F_DUPFD, minfd);
+ if (fd != -1) {
+ close(job-jobPipe[i]);
+ job-jobPipe[i] = fd;
+ }
+}
+
/* Set close-on-exec flag for both */
(void)fcntl(job-jobPipe[0], F_SETFD, 1);
(void)fcntl(job-jobPipe[1], F_SETFD, 1);
@@ -413,15 +422,6 @@ JobCreatePipe(Job *job, int minfd)
*/
fcntl(job-jobPipe[0], F_SETFL,
fcntl(job-jobPipe[0], F_GETFL, 0) | O_NONBLOCK);
-
-for (i = 0; i 2; i++) {
- /* Avoid using low numbered fds */
- fd = fcntl(job-jobPipe[i], F_DUPFD, minfd);
- if (fd != -1) {
- close(job-jobPipe[i]);
- job-jobPipe[i] = fd;
- }
-}
}
/*-
@@ -2812,6 +2812,8 @@ Job_ServerStart(int max_tokens, int jp_0
/* Pipe passed in from parent */
tokenWaitJob.inPipe = jp_0;
tokenWaitJob.outPipe = jp_1;
+ (void)fcntl(jp_0, F_SETFD, 1);
+ (void)fcntl(jp_1, F_SETFD, 1);
return;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Jun 5 05:18:44 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel devices from the following datasheets: - Desktop 4th Generation Intel Core Processort Family Datasheet Volume 2 of 2 - Mobile 4th Generation Intel Core Processort Family Datasheet Volume 2 of 2 - Intel Xeon Processor E3-1200 v3 Product Family Datasheet Volume 2 of 2 To generate a diff of this commit: cvs rdiff -u -r1.1156 -r1.1157 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1156 src/sys/dev/pci/pcidevs:1.1157 --- src/sys/dev/pci/pcidevs:1.1156 Tue Jun 4 13:57:48 2013 +++ src/sys/dev/pci/pcidevs Wed Jun 5 05:18:44 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1156 2013/06/04 13:57:48 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1157 2013/06/05 05:18:44 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2532,6 +2532,7 @@ product INTEL IOP333_B 0x0372 IOP333 PC product INTEL SRCZCRX 0x0407 RAID Controller product INTEL SRCU42E 0x0408 SCSI RAID Controller product INTEL SRCS28X 0x0409 SATA RAID Controller +product INTEL HASWELL_IGD 0x0402 Haswell Integrated Graphics Device product INTEL PCEB 0x0482 82375EB/SB PCI-EISA Bridge product INTEL CDC 0x0483 82424ZX Cache and DRAM Controller product INTEL SIO 0x0484 82378ZB System I/O @@ -2543,6 +2544,11 @@ product INTEL WIFI_LINK_2230_1 0x0887 Ce product INTEL WIFI_LINK_2230_2 0x0888 Centrino Wireless-N 2230 product INTEL 80960RM 0x0962 i960 RM PCI-PCI product INTEL 80960RN 0x0964 i960 RN PCI-PCI +product INTEL HASWELL_HOST_DRAM 0x0c00 Haswell Host Bridge, DRAM +product INTEL HASWELL_PCIE16 0x0c01 Haswell PCI-E x16 Controller +product INTEL HASWELL_PCIE8 0x0c05 Haswell PCI-E x8 Controller +product INTEL HASWELL_PCIE4 0x0c09 Haswell PCI-E x4 Controller +product INTEL HASWELL_MINI_HDA 0x0c0c Haswell Mini HD Audio Controller product INTEL 82542 0x1000 i82542 Gigabit Ethernet product INTEL 82543GC_FIBER 0x1001 i82453GC 1000baseX Ethernet product INTEL MODEM56 0x1002 56k Modem
