CVS commit: src/sys/netinet
Module Name:src
Committed By: liamjfoy
Date: Wed Mar 19 08:27:21 UTC 2014
Modified Files:
src/sys/netinet: ip_flow.c ip_input.c ip_var.h
Log Message:
Remove ipflow_prune and replace with ipflow_reap. ok rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.309 -r1.310 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.97 -r1.98 src/sys/netinet/ip_var.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/netinet/ip_flow.c
diff -u src/sys/netinet/ip_flow.c:1.60 src/sys/netinet/ip_flow.c:1.61
--- src/sys/netinet/ip_flow.c:1.60 Thu Jan 19 13:13:48 2012
+++ src/sys/netinet/ip_flow.c Wed Mar 19 08:27:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_flow.c,v 1.60 2012/01/19 13:13:48 liamjfoy Exp $ */
+/* $NetBSD: ip_flow.c,v 1.61 2014/03/19 08:27:21 liamjfoy Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_flow.c,v 1.60 2012/01/19 13:13:48 liamjfoy Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_flow.c,v 1.61 2014/03/19 08:27:21 liamjfoy Exp $);
#include sys/param.h
#include sys/systm.h
@@ -396,13 +396,6 @@ ipflow_reap(bool just_one)
}
void
-ipflow_prune(void)
-{
-
- (void) ipflow_reap(false);
-}
-
-void
ipflow_slowtimo(void)
{
struct rtentry *rt;
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.309 src/sys/netinet/ip_input.c:1.310
--- src/sys/netinet/ip_input.c:1.309 Tue Feb 25 18:30:12 2014
+++ src/sys/netinet/ip_input.c Wed Mar 19 08:27:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.309 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: ip_input.c,v 1.310 2014/03/19 08:27:21 liamjfoy Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_input.c,v 1.309 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_input.c,v 1.310 2014/03/19 08:27:21 liamjfoy Exp $);
#include opt_inet.h
#include opt_compat_netbsd.h
@@ -1525,7 +1525,7 @@ sysctl_net_inet_ip_maxflows(SYSCTLFN_ARG
mutex_enter(softnet_lock);
KERNEL_LOCK(1, NULL);
- ipflow_prune();
+ ipflow_reap(false);
KERNEL_UNLOCK_ONE(NULL);
mutex_exit(softnet_lock);
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.97 src/sys/netinet/ip_var.h:1.98
--- src/sys/netinet/ip_var.h:1.97 Tue May 3 17:44:31 2011
+++ src/sys/netinet/ip_var.h Wed Mar 19 08:27:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.97 2011/05/03 17:44:31 dyoung Exp $ */
+/* $NetBSD: ip_var.h,v 1.98 2014/03/19 08:27:21 liamjfoy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -222,7 +222,7 @@ int rip_usrreq(struct socket *,
int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
int ipflow_init(int);
void ipflow_poolinit(void);
-void ipflow_prune(void);
+void ipflow_reap(bool);
void ipflow_create(const struct route *, struct mbuf *);
void ipflow_slowtimo(void);
int ipflow_invalidate_all(int);
CVS commit: src/sys/netinet
Module Name:src
Committed By: liamjfoy
Date: Wed Mar 19 10:54:20 UTC 2014
Modified Files:
src/sys/netinet: ip_flow.c ip_var.h
Log Message:
Move ipflow into ip_var.h and fix confliction
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.98 -r1.99 src/sys/netinet/ip_var.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/netinet/ip_flow.c
diff -u src/sys/netinet/ip_flow.c:1.61 src/sys/netinet/ip_flow.c:1.62
--- src/sys/netinet/ip_flow.c:1.61 Wed Mar 19 08:27:21 2014
+++ src/sys/netinet/ip_flow.c Wed Mar 19 10:54:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_flow.c,v 1.61 2014/03/19 08:27:21 liamjfoy Exp $ */
+/* $NetBSD: ip_flow.c,v 1.62 2014/03/19 10:54:20 liamjfoy Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_flow.c,v 1.61 2014/03/19 08:27:21 liamjfoy Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_flow.c,v 1.62 2014/03/19 10:54:20 liamjfoy Exp $);
#include sys/param.h
#include sys/systm.h
@@ -63,20 +63,6 @@ __KERNEL_RCSID(0, $NetBSD: ip_flow.c,v
* Similar code is very well commented in netinet6/ip6_flow.c
*/
-struct ipflow {
- LIST_ENTRY(ipflow) ipf_list; /* next in active list */
- LIST_ENTRY(ipflow) ipf_hash; /* next ipflow in bucket */
- struct in_addr ipf_dst; /* destination address */
- struct in_addr ipf_src; /* source address */
- uint8_t ipf_tos; /* type-of-service */
- struct route ipf_ro; /* associated route entry */
- u_long ipf_uses; /* number of uses in this period */
- u_long ipf_last_uses; /* number of uses in last period */
- u_long ipf_dropped; /* ENOBUFS retured by if_output */
- u_long ipf_errors; /* other errors returned by if_output */
- u_int ipf_timer; /* lifetime timer */
-};
-
#define IPFLOW_HASHBITS 6 /* should not be a multiple of 8 */
static struct pool ipflow_pool;
@@ -348,7 +334,7 @@ ipflow_free(struct ipflow *ipf)
splx(s);
}
-static struct ipflow *
+struct ipflow *
ipflow_reap(bool just_one)
{
while (just_one || ipflow_inuse ip_maxflows) {
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.98 src/sys/netinet/ip_var.h:1.99
--- src/sys/netinet/ip_var.h:1.98 Wed Mar 19 08:27:21 2014
+++ src/sys/netinet/ip_var.h Wed Mar 19 10:54:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.98 2014/03/19 08:27:21 liamjfoy Exp $ */
+/* $NetBSD: ip_var.h,v 1.99 2014/03/19 10:54:20 liamjfoy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -49,6 +49,23 @@ struct ipovly {
} __packed;
/*
+ * IP Flow structure
+ */
+struct ipflow {
+ LIST_ENTRY(ipflow) ipf_list; /* next in active list */
+ LIST_ENTRY(ipflow) ipf_hash; /* next ipflow in bucket */
+ struct in_addr ipf_dst; /* destination address */
+ struct in_addr ipf_src; /* source address */
+ uint8_t ipf_tos; /* type-of-service */
+ struct route ipf_ro; /* associated route entry */
+ u_long ipf_uses; /* number of uses in this period */
+ u_long ipf_last_uses; /* number of uses in last period */
+ u_long ipf_dropped; /* ENOBUFS retured by if_output */
+ u_long ipf_errors; /* other errors returned by if_output */
+ u_int ipf_timer; /* lifetime timer */
+};
+
+/*
* IP sequence queue structure.
*
* XXX -- The following explains why the ipqe_m field is here, for TCP's use:
@@ -222,7 +239,7 @@ int rip_usrreq(struct socket *,
int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
int ipflow_init(int);
void ipflow_poolinit(void);
-void ipflow_reap(bool);
+struct ipflow *ipflow_reap(bool);
void ipflow_create(const struct route *, struct mbuf *);
void ipflow_slowtimo(void);
int ipflow_invalidate_all(int);
CVS commit: src/external/cddl/osnet/dev/fbt
Module Name:src
Committed By: ozaki-r
Date: Wed Mar 19 11:14:12 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
Log Message:
Exclude mvsoctmr_* functions from FBT targets
Probing them doesn't work for DTrace/arm for some reason.
Anyway with this fix, DTrace/arm works on SHEEVAPLUG
as well as BEAGLEBONE.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/dev/fbt/fbt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.14 src/external/cddl/osnet/dev/fbt/fbt.c:1.15
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.14 Sat Mar 15 08:00:19 2014
+++ src/external/cddl/osnet/dev/fbt/fbt.c Wed Mar 19 11:14:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.14 2014/03/15 08:00:19 ozaki-r Exp $ */
+/* $NetBSD: fbt.c,v 1.15 2014/03/19 11:14:12 ozaki-r Exp $ */
/*
* CDDL HEADER START
@@ -756,12 +756,13 @@ fbt_provide_module_cb(const char *name,
|| strncmp(name, kauth_, 5) == 0 /* CRED XXX for now */
/* Sensitive functions on ARM */
|| strncmp(name, _spl, 4) == 0
- || strncmp(name, dmt_, 4) == 0
|| strcmp(name, binuptime) == 0
|| strcmp(name, dosoftints) == 0
|| strcmp(name, fbt_emulate) == 0
|| strcmp(name, nanouptime) == 0
|| strcmp(name, undefinedinstruction) == 0
+ || strncmp(name, dmt_, 4) == 0 /* omap */
+ || strncmp(name, mvsoctmr_, 9) == 0 /* marvell */
) {
return 0;
}
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Wed Mar 19 15:48:23 UTC 2014
Modified Files:
src/sys/dev/scsipi: cd.c
Log Message:
PR kern/48550: additional initialization and sanity checking on the reported
blocksize of the medium.
To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 src/sys/dev/scsipi/cd.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/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.317 src/sys/dev/scsipi/cd.c:1.318
--- src/sys/dev/scsipi/cd.c:1.317 Sun Mar 16 05:20:29 2014
+++ src/sys/dev/scsipi/cd.c Wed Mar 19 15:48:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.317 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: cd.c,v 1.318 2014/03/19 15:48:23 martin Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.317 2014/03/16 05:20:29 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.318 2014/03/19 15:48:23 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1823,6 +1823,7 @@ read_cd_capacity(struct scsipi_periph *p
/* issue the cd capacity request */
flags = XS_CTL_DATA_IN;
memset(cap_cmd, 0, sizeof(cap_cmd));
+ memset(cap, 0, sizeof(cap));
cap_cmd.opcode = READ_CD_CAPACITY;
error = scsipi_command(periph,
@@ -1837,8 +1838,14 @@ read_cd_capacity(struct scsipi_periph *p
*last_lba = _4btol(cap.addr);
/* blksize is 2048 for CD, but some drives give gibberish */
- if ((*blksize 512) || ((*blksize 511) != 0))
+ if ((*blksize 512) || ((*blksize 511) != 0)
+ || (*blksize 16*1024)) {
+ if (*blksize 16*1024)
+ aprint_error(read_cd_capacity: extra large block
+ size %u found - limiting to 2kByte\n,
+ *blksize);
*blksize = 2048; /* some drives lie ! */
+ }
/* recordables have READ_DISCINFO implemented */
flags = XS_CTL_DATA_IN | XS_CTL_SILENT;
@@ -1889,8 +1896,8 @@ read_cd_capacity(struct scsipi_periph *p
static u_long
cd_size(struct cd_softc *cd, int flags)
{
- u_int blksize;
- u_long last_lba, size;
+ u_int blksize = 2048;
+ u_long last_lba = 0, size;
int error;
error = read_cd_capacity(cd-sc_periph, blksize, last_lba);
@@ -2993,7 +3000,7 @@ mmc_getdiscinfo(struct scsipi_periph *pe
struct scsipi_read_discinfo_data di;
const uint32_t buffer_size = 1024;
uint32_t feat_tbl_len, pos;
- u_long last_lba;
+ u_long last_lba = 0;
uint8_t *buffer, *fpos;
int feature, last_feature, features_len, feature_cur, feature_len;
int lsb, msb, error, flags;
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Wed Mar 19 16:46:23 UTC 2014
Modified Files:
src/sys/lib/libunwind: Makefile.inc
Log Message:
Allow building with GCC 4.1 by providing cstdint
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libunwind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libunwind/Makefile.inc
diff -u src/sys/lib/libunwind/Makefile.inc:1.4 src/sys/lib/libunwind/Makefile.inc:1.5
--- src/sys/lib/libunwind/Makefile.inc:1.4 Thu Mar 13 01:50:50 2014
+++ src/sys/lib/libunwind/Makefile.inc Wed Mar 19 16:46:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2014/03/13 01:50:50 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/03/19 16:46:23 joerg Exp $
.PATH: ${NETBSDSRCDIR}/sys/lib/libunwind
@@ -7,5 +7,15 @@ SRCS+= libunwind.cxx \
INCS+= unwind.h
+.if ${HAVE_GCC:U48} == 4
+CLEANFILES+= cstdint
+DPSRCS+= cstdint
+
+cstdint:
+ echo '#include stdint.h' ${.TARGET}
+
+COPTS.libunwind.cxx+= -D__builtin_unreachable()=abort()
+.else
COPTS.libunwind.cxx+= ${${ACTIVE_CXX} == gcc:? -std=c++0x : -std=c++11 }
+.endif
COPTS.libunwind.cxx+= -funwind-tables -fno-rtti -fno-exceptions -fvisibility=hidden -Wno-old-style-cast
CVS commit: src/doc
Module Name:src Committed By: nonaka Date: Wed Mar 19 15:42:47 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Note Realtek RTS5209/RTS5229 Card Reader driver support. To generate a diff of this commit: cvs rdiff -u -r1.1904 -r1.1905 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1904 src/doc/CHANGES:1.1905 --- src/doc/CHANGES:1.1904 Fri Mar 14 11:32:34 2014 +++ src/doc/CHANGES Wed Mar 19 15:42:47 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1904 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1905 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -373,3 +373,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: elftoolchain: import FreeBSD-2014-03-08 [christos 20140309] amd64: Switched to GCC 4.8. [christos 20140311] dhcpcd(8): Import dhcpcd-6.3.2 [roy 20140314] + rtsx(4): Add a driver for Realtek RTS5209/RTS5229 Card Reader. + Ported from OpenBSD. [nonaka 20140319]
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed Mar 19 17:48:34 UTC 2014 Modified Files: src/share/man/man4: rtsx.4 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/rtsx.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/rtsx.4 diff -u src/share/man/man4/rtsx.4:1.1 src/share/man/man4/rtsx.4:1.2 --- src/share/man/man4/rtsx.4:1.1 Wed Mar 19 15:26:41 2014 +++ src/share/man/man4/rtsx.4 Wed Mar 19 17:48:34 2014 @@ -1,10 +1,10 @@ -.\ $NetBSD: rtsx.4,v 1.1 2014/03/19 15:26:41 nonaka Exp $ +.\ $NetBSD: rtsx.4,v 1.2 2014/03/19 17:48:34 wiz Exp $ .\ $OpenBSD: rtsx.4,v 1.4 2013/11/06 13:51:02 stsp Exp $ .\ .\ Theo de Raadt, 2006. Public Domain. .\ Stefan Sperling, 2012. Public Domain. .\ -.Dd March 19 2014 +.Dd March 19, 2014 .Dt RTSX 4 .Os .Sh NAME
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed Mar 19 17:48:27 UTC 2014 Modified Files: src/share/man/man4: sdmmc.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/sdmmc.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/sdmmc.4 diff -u src/share/man/man4/sdmmc.4:1.5 src/share/man/man4/sdmmc.4:1.6 --- src/share/man/man4/sdmmc.4:1.5 Wed Mar 19 15:26:41 2014 +++ src/share/man/man4/sdmmc.4 Wed Mar 19 17:48:27 2014 @@ -1,9 +1,9 @@ -.\ $NetBSD: sdmmc.4,v 1.5 2014/03/19 15:26:41 nonaka Exp $ +.\ $NetBSD: sdmmc.4,v 1.6 2014/03/19 17:48:27 wiz Exp $ .\ $OpenBSD: sdmmc.4,v 1.8 2009/03/25 19:33:06 mk Exp $ .\ .\ Theo de Raadt, 2006. Public Domain. .\ -.Dd October 1, 2009 +.Dd March 19, 2014 .Dt SDMMC 4 .Os .Sh NAME
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Wed Mar 19 18:04:32 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_ddi.c
Log Message:
Fix uninitialized variable wait in intel_ddi_prepare_link_retrain.
Move a line around, too, to avoid merge conflicts with upstream.
Noted by maxv@.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.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/external/bsd/drm2/dist/drm/i915/intel_ddi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Wed Mar 19 18:04:32 2014
@@ -1357,8 +1357,8 @@ void intel_ddi_prepare_link_retrain(stru
struct intel_dp *intel_dp = intel_dig_port-dp;
struct drm_i915_private *dev_priv = encoder-dev-dev_private;
enum port port = intel_dig_port-port;
- bool wait;
uint32_t val;
+ bool wait = false;
if (I915_READ(DP_TP_CTL(port)) DP_TP_CTL_ENABLE) {
val = I915_READ(DDI_BUF_CTL(port));
CVS commit: src/sys/fs/ptyfs
Module Name:src
Committed By: christos
Date: Wed Mar 19 18:09:00 UTC 2014
Modified Files:
src/sys/fs/ptyfs: ptyfs_vfsops.c
Log Message:
- return an error if we could not get the pts pathname
- correct getting pathname if the mount point inside a chroot
(Ilya Zykov)
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/ptyfs/ptyfs_vfsops.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/fs/ptyfs/ptyfs_vfsops.c
diff -u src/sys/fs/ptyfs/ptyfs_vfsops.c:1.45 src/sys/fs/ptyfs/ptyfs_vfsops.c:1.46
--- src/sys/fs/ptyfs/ptyfs_vfsops.c:1.45 Tue Feb 25 13:30:10 2014
+++ src/sys/fs/ptyfs/ptyfs_vfsops.c Wed Mar 19 14:09:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vfsops.c,v 1.45 2014/02/25 18:30:10 pooka Exp $ */
+/* $NetBSD: ptyfs_vfsops.c,v 1.46 2014/03/19 18:09:00 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ptyfs_vfsops.c,v 1.45 2014/02/25 18:30:10 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptyfs_vfsops.c,v 1.46 2014/03/19 18:09:00 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -109,14 +109,16 @@ ptyfs__getpath(struct lwp *l, const stru
buf = malloc(MAXBUF, M_TEMP, M_WAITOK);
bp = buf + MAXBUF;
*--bp = '\0';
- error = getcwd_common(cwdi-cwdi_rdir, rootvnode, bp,
+ error = getcwd_common(mp-mnt_vnodecovered, cwdi-cwdi_rdir, bp,
buf, MAXBUF / 2, 0, l);
- if (error) /* XXX */
+ if (error) { /* Mount point is out of rdir */
+ rv = NULL;
goto out;
+ }
len = strlen(bp);
if (len sizeof(mp-mnt_stat.f_mntonname)) /* XXX */
- rv += len;
+ rv += strlen(rv) - len;
out:
free(buf, M_TEMP);
return rv;
@@ -128,6 +130,7 @@ ptyfs__makename(struct ptm_pty *pt, stru
{
struct mount *mp = pt-arg;
size_t len;
+ const char *np;
switch (ms) {
case 'p':
@@ -135,8 +138,11 @@ ptyfs__makename(struct ptm_pty *pt, stru
len = snprintf(tbuf, bufsiz, /dev/null);
break;
case 't':
- len = snprintf(tbuf, bufsiz, %s/%llu, ptyfs__getpath(l, mp),
- (unsigned long long)minor(dev));
+ np = ptyfs__getpath(l, mp);
+ if (np == NULL)
+ return EOPNOTSUPP;
+ len = snprintf(tbuf, bufsiz, %s/%llu, np,
+ (unsigned long long)minor(dev));
break;
default:
return EINVAL;
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Wed Mar 19 18:11:17 UTC 2014
Modified Files:
src/sys/kern: tty_ptm.c
Log Message:
fix leak on error from pty_fill_ptmget (Ilya Zykov)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/tty_ptm.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/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.29 src/sys/kern/tty_ptm.c:1.30
--- src/sys/kern/tty_ptm.c:1.29 Sun Mar 16 01:20:30 2014
+++ src/sys/kern/tty_ptm.c Wed Mar 19 14:11:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.29 2014/03/16 05:20:30 dholland Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.30 2014/03/19 18:11:17 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty_ptm.c,v 1.29 2014/03/16 05:20:30 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty_ptm.c,v 1.30 2014/03/19 18:11:17 christos Exp $);
#include opt_compat_netbsd.h
#include opt_ptm.h
@@ -381,7 +381,9 @@ ptmioctl(dev_t dev, u_long cmd, void *da
goto bad;
/* now, put the indices and names into struct ptmget */
- return pty_fill_ptmget(l, newdev, cfd, sfd, data);
+ if ((error = pty_fill_ptmget(l, newdev, cfd, sfd, data)) != 0)
+ goto bad2;
+ return 0;
default:
#ifdef COMPAT_60
error = compat_60_ptmioctl(dev, cmd, data, flag, l);
@@ -391,6 +393,11 @@ ptmioctl(dev_t dev, u_long cmd, void *da
DPRINTF((ptmioctl EINVAL\n));
return EINVAL;
}
+bad2:
+ fp = fd_getfile(sfd);
+ if (fp != NULL) {
+ fd_close(sfd);
+ }
bad:
fp = fd_getfile(cfd);
if (fp != NULL) {
CVS commit: src/usr.bin/getaddrinfo
Module Name:src Committed By: riastradh Date: Wed Mar 19 18:21:39 UTC 2014 Modified Files: src/usr.bin/getaddrinfo: getaddrinfo.1 Log Message: Clarify some wording in getaddrinfo.1. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/getaddrinfo/getaddrinfo.1 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/getaddrinfo/getaddrinfo.1 diff -u src/usr.bin/getaddrinfo/getaddrinfo.1:1.2 src/usr.bin/getaddrinfo/getaddrinfo.1:1.3 --- src/usr.bin/getaddrinfo/getaddrinfo.1:1.2 Mon Sep 30 08:13:59 2013 +++ src/usr.bin/getaddrinfo/getaddrinfo.1 Wed Mar 19 18:21:39 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: getaddrinfo.1,v 1.2 2013/09/30 08:13:59 wiz Exp $ +.\ $NetBSD: getaddrinfo.1,v 1.3 2014/03/19 18:21:39 riastradh Exp $ .\ .\ Copyright (c) 2013 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 30, 2013 +.Dd March 19, 2014 .Dt GETADDRINFO 1 .Os .Sh NAME @@ -50,10 +50,15 @@ the routine and formats them to standard output. .Pp The output is a sequence of lines of space-separated fields: +.Pp .Dl socket-type address-family protocol [af-specific data ...] .Pp -For the internet family, the address-family-specific data are the -internet address and the port number. +For the +.Dq inet +and +.Dq inet6 +address families, the af-specific data are the IP/IPv6 address and port +number. .Pp Although the .Nm @@ -143,7 +148,8 @@ dgram inet udp 149.20.53.67 0 stream inet6 tcp 2001:4f8:3:7:2e0:81ff:fe52:9ab6 0 stream inet tcp 149.20.53.67 0 .Ed -The unspecified service manifested as a port number of zero. +.Pp +The port number here is zero because no service was specified. .Pp Look up .Dq morden.NetBSD.org
CVS commit: src/libexec/ld.elf_so/arch/vax
Module Name:src Committed By: matt Date: Wed Mar 19 15:34:30 UTC 2014 Modified Files: src/libexec/ld.elf_so/arch/vax: rtld_start.S Log Message: Fix two bugs. (jump past entry mask, fix insv) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/libexec/ld.elf_so/arch/vax/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/vax/rtld_start.S diff -u src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.18 src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.19 --- src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.18 Wed Mar 19 02:39:22 2014 +++ src/libexec/ld.elf_so/arch/vax/rtld_start.S Wed Mar 19 15:34:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.18 2014/03/19 02:39:22 matt Exp $ */ +/* $NetBSD: rtld_start.S,v 1.19 2014/03/19 15:34:30 matt Exp $ */ /* * Copyright 1996 Matt Thomas m...@3am-software.com @@ -71,7 +71,7 @@ ALTENTRY(_rtld_bind_start) pushl %r0 /* push address of obj entry */ calls $2,_rtld_bind - movl %r0,%r3 /* save routine address */ + addl3 $2,%r0,%r3 /* save routine address */ extzv $0,$12,(%r0),%r1 /* get entry mask */ extzv $0,$12,6(%fp),%r2 /* get saved mask */ cmpw %r1,%r2 /* compare them */ @@ -151,7 +151,7 @@ ALTENTRY(_rtld_bind_start) movq (%sp)+,-(%r0) /* move PSW/save-mask/etc + AP into place */ movq %r3,-(%r0) /* move routine address + cond handle slot */ addl3 $4,%r0,%fp /* get start of new callframe */ - insv $0,$12,%r1,6(%fp) /* insert new saved mask */ + insv %r1,$0,$12,6(%fp) /* insert new saved mask */ popr $0x3f /* restore R0-R5 (cond flags not modified) */ subl3 $4,%fp,%sp /* sp needs to be equal to fp */ rsb /* and jmp to the routine */
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: uwe
Date: Wed Mar 19 20:30:53 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
On sh3 __udivsi3 is gcc millicode with special calling convention
(less registers clobbered than usual). Each DSO that needs it gets
its own hidden copy from libgcc.a. Do not compile udivsi3.c for sh3
here since this C version doesn't conform to what gcc expects and
overrides the libgcc.a version.
This makes binaries compiled with gcc4.8 work. The issue was not
exposed with gcc4.5 since it uses different division strategy by
default.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.16 src/lib/libc/compiler_rt/Makefile.inc:1.17
--- src/lib/libc/compiler_rt/Makefile.inc:1.16 Sun Mar 2 03:04:52 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Wed Mar 19 20:30:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2014/03/02 03:04:52 matt Exp $
+# $NetBSD: Makefile.inc,v 1.17 2014/03/19 20:30:53 uwe Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -127,11 +127,18 @@ GENERIC_SRCS+= \
ucmpti2.c \
udivmodsi4.c \
udivmodti4.c \
- udivsi3.c \
udivti3.c \
umodsi3.c \
umodti3.c
+.if ${MACHINE_CPU} != sh3
+# On sh3 __udivsi3 is gcc millicode with special calling convention
+# (less registers clobbered than usual). Each DSO that needs it gets
+# its own hidden copy from libgcc.a.
+GENERIC_SRCS+= \
+ udivsi3.c
+.endif
+
GENERIC_SRCS+= \
absvdi2.c \
addvdi3.c \
CVS commit: src/sys/lib/libunwind
Module Name:src Committed By: joerg Date: Wed Mar 19 21:15:45 UTC 2014 Modified Files: src/sys/lib/libunwind: unwind_registers.S Log Message: Drop XXX, spell R14 as SP. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libunwind/unwind_registers.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libunwind/unwind_registers.S diff -u src/sys/lib/libunwind/unwind_registers.S:1.4 src/sys/lib/libunwind/unwind_registers.S:1.5 --- src/sys/lib/libunwind/unwind_registers.S:1.4 Tue Mar 18 13:08:15 2014 +++ src/sys/lib/libunwind/unwind_registers.S Wed Mar 19 21:15:45 2014 @@ -307,8 +307,7 @@ ENTRY(_ZN7_Unwind13Registers_vaxC1Ev, R0 movl %r11, 44(%r0) movl 8(%fp), 48(%r0) movl 12(%fp), 52(%r0) - /* XXX correct argument handling */ - addl3 $36, %r14, 56(%r0) + addl3 $36, %sp, 56(%r0) /* Return PC */ movl 16(%fp), 60(%r0) /* Load saved value of r0 as r1 */
CVS commit: src/libexec/ld.elf_so/arch/vax
Module Name:src Committed By: joerg Date: Wed Mar 19 21:52:00 UTC 2014 Modified Files: src/libexec/ld.elf_so/arch/vax: rtld_start.S Log Message: Save actual start of function, not address of entry mask on the stack. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/libexec/ld.elf_so/arch/vax/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/vax/rtld_start.S diff -u src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.19 src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.20 --- src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.19 Wed Mar 19 15:34:30 2014 +++ src/libexec/ld.elf_so/arch/vax/rtld_start.S Wed Mar 19 21:52:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.19 2014/03/19 15:34:30 matt Exp $ */ +/* $NetBSD: rtld_start.S,v 1.20 2014/03/19 21:52:00 joerg Exp $ */ /* * Copyright 1996 Matt Thomas m...@3am-software.com @@ -76,7 +76,7 @@ ALTENTRY(_rtld_bind_start) extzv $0,$12,6(%fp),%r2 /* get saved mask */ cmpw %r1,%r2 /* compare them */ bneq 12f /* if they are different, rebuild */ - movl %r0,-4(%fp) /* save routine address */ + movl %r3,-4(%fp) /* save routine address */ popr $0x3f /* pop registers */ movab 68(%sp),%sp /* restore sp */ rsb /* and jump to it */
CVS import: xsrc/external/mit/xkill/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:43:16 UTC 2014 Update of /cvsroot/xsrc/external/mit/xkill/dist In directory ivanova.netbsd.org:/tmp/cvs-serv828 Log Message: initial import of xkill-1.0.4 Status: Vendor Tag: xorg Release Tags: xkill-1-0-4 U xsrc/external/mit/xkill/dist/config.guess U xsrc/external/mit/xkill/dist/INSTALL U xsrc/external/mit/xkill/dist/missing U xsrc/external/mit/xkill/dist/ChangeLog U xsrc/external/mit/xkill/dist/config.h.in U xsrc/external/mit/xkill/dist/config.sub U xsrc/external/mit/xkill/dist/configure U xsrc/external/mit/xkill/dist/README U xsrc/external/mit/xkill/dist/xkill.c U xsrc/external/mit/xkill/dist/COPYING U xsrc/external/mit/xkill/dist/compile U xsrc/external/mit/xkill/dist/Makefile.am U xsrc/external/mit/xkill/dist/configure.ac U xsrc/external/mit/xkill/dist/depcomp U xsrc/external/mit/xkill/dist/Makefile.in U xsrc/external/mit/xkill/dist/install-sh U xsrc/external/mit/xkill/dist/aclocal.m4 N xsrc/external/mit/xkill/dist/man/Makefile.am N xsrc/external/mit/xkill/dist/man/Makefile.in N xsrc/external/mit/xkill/dist/man/xkill.man No conflicts created by this import
CVS import: xsrc/external/mit/util-macros/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:43:14 UTC 2014 Update of /cvsroot/xsrc/external/mit/util-macros/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21464 Log Message: initial import of util-macros-1.18.0 Status: Vendor Tag: xorg Release Tags: util-macros-1-18-0 U xsrc/external/mit/util-macros/dist/xorg-macros.pc.in U xsrc/external/mit/util-macros/dist/install-sh U xsrc/external/mit/util-macros/dist/README U xsrc/external/mit/util-macros/dist/aclocal.m4 U xsrc/external/mit/util-macros/dist/missing U xsrc/external/mit/util-macros/dist/configure U xsrc/external/mit/util-macros/dist/Makefile.in U xsrc/external/mit/util-macros/dist/INSTALL U xsrc/external/mit/util-macros/dist/xorgversion.m4 U xsrc/external/mit/util-macros/dist/Makefile.am U xsrc/external/mit/util-macros/dist/COPYING U xsrc/external/mit/util-macros/dist/configure.ac U xsrc/external/mit/util-macros/dist/xorg-macros.m4.in U xsrc/external/mit/util-macros/dist/ChangeLog No conflicts created by this import
CVS import: xsrc/external/mit/xkbutils/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:43:15 UTC 2014 Update of /cvsroot/xsrc/external/mit/xkbutils/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20511 Log Message: initial import of xkbutils-1.0.4 Status: Vendor Tag: xorg Release Tags: xkbutils-1-0-4 U xsrc/external/mit/xkbutils/dist/depcomp U xsrc/external/mit/xkbutils/dist/Makefile.am U xsrc/external/mit/xkbutils/dist/missing U xsrc/external/mit/xkbutils/dist/configure.ac U xsrc/external/mit/xkbutils/dist/utils.h U xsrc/external/mit/xkbutils/dist/compile U xsrc/external/mit/xkbutils/dist/xkbbell.c U xsrc/external/mit/xkbutils/dist/Makefile.in U xsrc/external/mit/xkbutils/dist/config.sub U xsrc/external/mit/xkbutils/dist/COPYING U xsrc/external/mit/xkbutils/dist/LED.c U xsrc/external/mit/xkbutils/dist/README U xsrc/external/mit/xkbutils/dist/ChangeLog U xsrc/external/mit/xkbutils/dist/LEDP.h U xsrc/external/mit/xkbutils/dist/utils.c U xsrc/external/mit/xkbutils/dist/configure U xsrc/external/mit/xkbutils/dist/aclocal.m4 U xsrc/external/mit/xkbutils/dist/LED.h U xsrc/external/mit/xkbutils/dist/xkbwatch.c U xsrc/external/mit/xkbutils/dist/INSTALL U xsrc/external/mit/xkbutils/dist/install-sh U xsrc/external/mit/xkbutils/dist/config.h.in U xsrc/external/mit/xkbutils/dist/config.guess U xsrc/external/mit/xkbutils/dist/xkbvleds.c N xsrc/external/mit/xkbutils/dist/man/Makefile.am N xsrc/external/mit/xkbutils/dist/man/Makefile.in N xsrc/external/mit/xkbutils/dist/man/xkbbell.man N xsrc/external/mit/xkbutils/dist/man/xkbwatch.man N xsrc/external/mit/xkbutils/dist/man/xkbvleds.man No conflicts created by this import
CVS import: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:43:18 UTC 2014 Update of /cvsroot/xsrc/external/mit/xorg-cf-files/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15013 Log Message: initial import of xorg-cf-files-1.0.5 Status: Vendor Tag: xorg Release Tags: xorg-cf-files-1-0-5 U xsrc/external/mit/xorg-cf-files/dist/darwinLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/fujitsu.cf U xsrc/external/mit/xorg-cf-files/dist/DGUX.cf U xsrc/external/mit/xorg-cf-files/dist/gnuLib.rules U xsrc/external/mit/xorg-cf-files/dist/nto.cf U xsrc/external/mit/xorg-cf-files/dist/OpenBSDLib.rules U xsrc/external/mit/xorg-cf-files/dist/pegasus.cf U xsrc/external/mit/xorg-cf-files/dist/sony.cf U xsrc/external/mit/xorg-cf-files/dist/os2.cf U xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf U xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl U xsrc/external/mit/xorg-cf-files/dist/sgi.cf U xsrc/external/mit/xorg-cf-files/dist/sequentLib.rules U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.rules U xsrc/external/mit/xorg-cf-files/dist/lnxdoc.tmpl U xsrc/external/mit/xorg-cf-files/dist/darwinLib.rules U xsrc/external/mit/xorg-cf-files/dist/sgiLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/README U xsrc/external/mit/xorg-cf-files/dist/COPYING U xsrc/external/mit/xorg-cf-files/dist/xorg.cf N xsrc/external/mit/xorg-cf-files/dist/compile U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.rules U xsrc/external/mit/xorg-cf-files/dist/xf86.tmpl U xsrc/external/mit/xorg-cf-files/dist/site.def.in U xsrc/external/mit/xorg-cf-files/dist/necLib.rules U xsrc/external/mit/xorg-cf-files/dist/svr4.cf U xsrc/external/mit/xorg-cf-files/dist/isc.cf U xsrc/external/mit/xorg-cf-files/dist/QNX4.cf U xsrc/external/mit/xorg-cf-files/dist/config.sub U xsrc/external/mit/xorg-cf-files/dist/sunLib.rules U xsrc/external/mit/xorg-cf-files/dist/Server.tmpl U xsrc/external/mit/xorg-cf-files/dist/os2.rules U xsrc/external/mit/xorg-cf-files/dist/xorgsite.def U xsrc/external/mit/xorg-cf-files/dist/mingw.cf U xsrc/external/mit/xorg-cf-files/dist/darwin.cf U xsrc/external/mit/xorg-cf-files/dist/sun.cf U xsrc/external/mit/xorg-cf-files/dist/sunLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/linux.cf U xsrc/external/mit/xorg-cf-files/dist/ServerLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.tmpl U xsrc/external/mit/xorg-cf-files/dist/cross.rules U xsrc/external/mit/xorg-cf-files/dist/macII.cf U xsrc/external/mit/xorg-cf-files/dist/Imake.rules U xsrc/external/mit/xorg-cf-files/dist/convex.cf U xsrc/external/mit/xorg-cf-files/dist/sco5.cf U xsrc/external/mit/xorg-cf-files/dist/dmx.cf U xsrc/external/mit/xorg-cf-files/dist/os2def.db U xsrc/external/mit/xorg-cf-files/dist/Win32.rules C xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf U xsrc/external/mit/xorg-cf-files/dist/minix.cf U xsrc/external/mit/xorg-cf-files/dist/ibmLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/OpenBSD.cf U xsrc/external/mit/xorg-cf-files/dist/Win32.cf U xsrc/external/mit/xorg-cf-files/dist/lynx.cf U xsrc/external/mit/xorg-cf-files/dist/ncr.cf U xsrc/external/mit/xorg-cf-files/dist/missing U xsrc/external/mit/xorg-cf-files/dist/config.guess U xsrc/external/mit/xorg-cf-files/dist/WinLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/bsdLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/nec.cf C xsrc/external/mit/xorg-cf-files/dist/Imake.cf U xsrc/external/mit/xorg-cf-files/dist/ibmLib.rules U xsrc/external/mit/xorg-cf-files/dist/Oki.cf U xsrc/external/mit/xorg-cf-files/dist/cygwin.rules U xsrc/external/mit/xorg-cf-files/dist/site.def U xsrc/external/mit/xorg-cf-files/dist/OpenBSDLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/xf86site.def U xsrc/external/mit/xorg-cf-files/dist/svr3.cf U xsrc/external/mit/xorg-cf-files/dist/cygwin.tmpl U xsrc/external/mit/xorg-cf-files/dist/ibm.cf U xsrc/external/mit/xorg-cf-files/dist/bsdi.cf U xsrc/external/mit/xorg-cf-files/dist/nto.rules U xsrc/external/mit/xorg-cf-files/dist/install-sh U xsrc/external/mit/xorg-cf-files/dist/necLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/bsdLib.rules U xsrc/external/mit/xorg-cf-files/dist/gnu.cf U xsrc/external/mit/xorg-cf-files/dist/cde.rules U xsrc/external/mit/xorg-cf-files/dist/generic.cf U xsrc/external/mit/xorg-cf-files/dist/site.sample U xsrc/external/mit/xorg-cf-files/dist/ultrix.cf U xsrc/external/mit/xorg-cf-files/dist/configure.ac U xsrc/external/mit/xorg-cf-files/dist/Makefile.am U xsrc/external/mit/xorg-cf-files/dist/aclocal.m4 U xsrc/external/mit/xorg-cf-files/dist/sgiLib.rules U xsrc/external/mit/xorg-cf-files/dist/xorg.tmpl U xsrc/external/mit/xorg-cf-files/dist/apollo.cf U xsrc/external/mit/xorg-cf-files/dist/moto.cf U xsrc/external/mit/xorg-cf-files/dist/bsdiLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/mach.cf U xsrc/external/mit/xorg-cf-files/dist/xfree86.cf U xsrc/external/mit/xorg-cf-files/dist/sco.cf U xsrc/external/mit/xorg-cf-files/dist/hpLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/noop.rules U xsrc/external/mit/xorg-cf-files/dist/mingw.rules U
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:45:22 UTC 2014 Modified Files: xsrc/external/mit/xorg-cf-files/dist: Imake.cf NetBSD.cf X11.tmpl Removed Files: xsrc/external/mit/xkbutils/dist: xkbbell.man xkbvleds.man xkbwatch.man xsrc/external/mit/xkill/dist: AUTHORS NEWS xkill.man xsrc/external/mit/xorg-cf-files/dist: xprint_host.def Log Message: merge util-macros 1.18.0, xkbutils 1.0.4, xkill 1.0.4, and xorg-cf-files 1.0.5. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbutils/dist/xkbbell.man \ xsrc/external/mit/xkbutils/dist/xkbvleds.man \ xsrc/external/mit/xkbutils/dist/xkbwatch.man cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkill/dist/AUTHORS \ xsrc/external/mit/xkill/dist/NEWS xsrc/external/mit/xkill/dist/xkill.man cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-cf-files/dist/Imake.cf \ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xorg-cf-files/dist/xprint_host.def 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/xorg-cf-files/dist/Imake.cf diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.4 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.5 --- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.4 Mon Feb 21 04:09:07 2011 +++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Wed Mar 19 23:45:21 2014 @@ -2,14 +2,14 @@ XCOMM $XdotOrg: xc/config/cf/Imake.cf,v XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ /* * To add support for another platform: - * - * 1. Identify a machine-specific cpp symbol. If your preprocessor + * + * 1. Identify a machine-specific cpp symbol. If your preprocessor * does not have any built in, you will need to add the symbol to the * cpp_argv table in config/imake/imakemdep.h and rebuild imake with * the BOOTSTRAPCFLAGS variable set (see the macII for an example). * * 2. Add all machine-specific cpp symbols (either defined by you or by - * the preprocessor or compiler) to the predefs table in + * the preprocessor or compiler) to the predefs table in * config/imake/imakemdep.h. * * 3. But a new #ifdef block below that defines MacroIncludeFile and @@ -174,7 +174,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define Mvme68kArchitecture # undef mvme68k # endif -# if defined(sun3) +# if defined(sun3) # define Sun3Architecture # undef sun3 # endif @@ -623,7 +623,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v #ifdef MOTOROLA # define MacroIncludeFile moto.cf # define MacroFile moto.cf -# undef MOTOROLA +# undef MOTOROLA # ifdef SYSV # define MotoR3Architecture # endif @@ -651,8 +651,8 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # ifdef i386 # undef i386 # ifdef ISC -# define i386Architecture -# define i386SVR3Architecture +# define i386Architecture +# define i386SVR3Architecture # define MacroIncludeFile isc.cf # define MacroFile isc.cf # define i386IscArchitecture @@ -694,8 +694,8 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # undef SVR4 # else /* ! SVR4 */ # ifdef ISC -# define i386Architecture -# define i386SVR3Architecture +# define i386Architecture +# define i386SVR3Architecture # define MacroIncludeFile isc.cf # define MacroFile isc.cf # define i386IscArchitecture @@ -950,9 +950,9 @@ XCOMM Keep cpp from replacing path eleme # endif # undef __sparc__ # endif -# ifdef ia64 +# ifdef ia64 # define ia64Architecture -# undef ia64 +# undef ia64 # endif # ifdef __ia64__ # ifndef ia64Architecture @@ -1027,6 +1027,10 @@ XCOMM Keep cpp from replacing path eleme # define AMD64Architecture # endif # endif +# if defined(__aarch64__) +# define AArch64Architecture +# undef __aarch64__ +# endif #endif /* linux || __GLIBC__ */ #if (defined(__Lynx__) || defined(Lynx)) (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) @@ -1098,7 +1102,7 @@ XCOMM Keep cpp from replacing path eleme # define NecArchitecture #endif -#ifdef minix +#ifdef minix #define MacroIncludeFile minix.cf #define MacroFile minix.cf #undef minix Index: xsrc/external/mit/xorg-cf-files/dist/X11.tmpl diff -u xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.4 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.5 --- xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.4 Mon Feb 21 04:09:07 2011 +++ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl Wed Mar 19 23:45:21 2014 @@ -65,7 +65,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v # define XOrgWebSupportAddress http://wiki.X.Org #endif -XORGRELSTRING = XorgManVersionString +XORGRELSTRING = XorgManVersionString XORGMANNAME = XOrgManNameString #ifndef XOrgManDefs @@
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Wed Mar 19 23:46:05 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-savage: Makefile
Log Message:
remove duplicated -DHAVE_XEXTPROTO_71.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-savage/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-r128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.7 Mon Jun 3 08:51:18 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Wed Mar 19 23:46:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/03 08:51:18 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/19 23:46:05 mrg Exp $
DRIVER= xf86-video-r128
DRIVER_NAME= r128_drv
@@ -22,8 +22,7 @@ CPPFLAGS+= -DWITH_VGAHW
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DHAVE_XEXTPROTO_71 \
- -DHAVE_XAA_H -DR128DRI
+CPPFLAGS+= -DHAVE_XAA_H -DR128DRI
CWARNFLAGS.clang+= -Wno-format -Wno-pointer-sign
Index: src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.12 Mon Jun 3 09:23:07 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile Wed Mar 19 23:46:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/06/03 09:23:07 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/19 23:46:05 mrg Exp $
DRIVER= xf86-video-savage
DRIVER_NAME= savage_drv
@@ -23,7 +23,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DHAVE_XAA_H -DHAVE_XEXTPROTO_71 -DSAVAGEDRI
+CPPFLAGS+= -DHAVE_XAA_H -DSAVAGEDRI
CPPFLAGS.savage_driver.c= -DPACKAGE_VERSION=\${PACKAGE_MAJOR}\
CPPFLAGS.savage_exa.c= -Wno-error # volatile - mempcy
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Wed Mar 19 23:46:22 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xkbutils: Makefile.xkbutils
src/external/mit/xorg/bin/xkill: Makefile
Log Message:
find moved man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xkill/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/xkbutils/Makefile.xkbutils
diff -u src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.2 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.3
--- src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.2 Mon Nov 9 00:36:12 2009
+++ src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils Wed Mar 19 23:46:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xkbutils,v 1.2 2009/11/09 00:36:12 mrg Exp $
+# $NetBSD: Makefile.xkbutils,v 1.3 2014/03/19 23:46:22 mrg Exp $
.include bsd.own.mk
@@ -8,7 +8,9 @@ LDADD+= -lxkbfile -lXaw -lXmu -lXt -lSM
DPADD+= ${LIBXKBFILE} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.xkbutils}
+CPPFLAGS+= -DHAVE_STRCASECMP
+
+.PATH: ${X11SRCDIR.xkbutils} ${X11SRCDIR.xkbutils}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.1.1.1 src/external/mit/xorg/bin/xkill/Makefile:1.2
--- src/external/mit/xorg/bin/xkill/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xkill/Makefile Wed Mar 19 23:46:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/19 23:46:22 mrg Exp $
.include bsd.own.mk
@@ -7,7 +7,9 @@ PROG= xkill
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+CPPFLAGS+= -DPACKAGE_STRING=\1.0.4\
+
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS import: xsrc/external/mit/xf86-video-mga/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:53:11 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-mga/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20419 Log Message: initial import of xf86-video-mga-1.6.3 Status: Vendor Tag: xorg Release Tags: xf86-video-mga-1-6-3 U xsrc/external/mit/xf86-video-mga/dist/depcomp U xsrc/external/mit/xf86-video-mga/dist/configure.ac U xsrc/external/mit/xf86-video-mga/dist/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/COPYING U xsrc/external/mit/xf86-video-mga/dist/README_HALLIB U xsrc/external/mit/xf86-video-mga/dist/config.h.in U xsrc/external/mit/xf86-video-mga/dist/aclocal.m4 U xsrc/external/mit/xf86-video-mga/dist/mga_PInS.txt U xsrc/external/mit/xf86-video-mga/dist/config.guess U xsrc/external/mit/xf86-video-mga/dist/config.sub U xsrc/external/mit/xf86-video-mga/dist/ChangeLog U xsrc/external/mit/xf86-video-mga/dist/ltmain.sh U xsrc/external/mit/xf86-video-mga/dist/missing U xsrc/external/mit/xf86-video-mga/dist/INSTALL U xsrc/external/mit/xf86-video-mga/dist/configure U xsrc/external/mit/xf86-video-mga/dist/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/install-sh U xsrc/external/mit/xf86-video-mga/dist/README U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/man/mga.man U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/util/README U xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c U xsrc/external/mit/xf86-video-mga/dist/src/compat-api.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_ucode.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_maven.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h U xsrc/external/mit/xf86-video-mga/dist/src/mga.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h U xsrc/external/mit/xf86-video-mga/dist/src/binding.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c U xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/src/client.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_halmod.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-savage/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:53:16 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-savage/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19302 Log Message: initial import of xf86-video-savage-2.3.7 Status: Vendor Tag: xorg Release Tags: xf86-video-savage-2-3-7 U xsrc/external/mit/xf86-video-savage/dist/configure.ac U xsrc/external/mit/xf86-video-savage/dist/README U xsrc/external/mit/xf86-video-savage/dist/aclocal.m4 U xsrc/external/mit/xf86-video-savage/dist/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/config.h.in U xsrc/external/mit/xf86-video-savage/dist/configure U xsrc/external/mit/xf86-video-savage/dist/COPYING U xsrc/external/mit/xf86-video-savage/dist/ChangeLog U xsrc/external/mit/xf86-video-savage/dist/INSTALL U xsrc/external/mit/xf86-video-savage/dist/config.guess U xsrc/external/mit/xf86-video-savage/dist/config.sub U xsrc/external/mit/xf86-video-savage/dist/depcomp U xsrc/external/mit/xf86-video-savage/dist/install-sh U xsrc/external/mit/xf86-video-savage/dist/ltmain.sh U xsrc/external/mit/xf86-video-savage/dist/missing U xsrc/external/mit/xf86-video-savage/dist/src/savage_accel.c U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_common.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_xaa.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_bci.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_cursor.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c C xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_drm.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_i2c.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_pciids.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_regs.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_sarea.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_shadow.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_video.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_hwmc.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dripriv.h U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/man/savage.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-savage/dist
CVS import: xsrc/external/mit/xf86-video-neomagic/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:53:13 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-neomagic/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28208 Log Message: initial import of xf86-video-neomagic-1.2.8 Status: Vendor Tag: xorg Release Tags: xf86-video-neomagic-1-2-8 U xsrc/external/mit/xf86-video-neomagic/dist/TODO U xsrc/external/mit/xf86-video-neomagic/dist/README U xsrc/external/mit/xf86-video-neomagic/dist/install-sh U xsrc/external/mit/xf86-video-neomagic/dist/configure U xsrc/external/mit/xf86-video-neomagic/dist/config.guess U xsrc/external/mit/xf86-video-neomagic/dist/missing U xsrc/external/mit/xf86-video-neomagic/dist/ChangeLog U xsrc/external/mit/xf86-video-neomagic/dist/COPYING U xsrc/external/mit/xf86-video-neomagic/dist/configure.ac U xsrc/external/mit/xf86-video-neomagic/dist/INSTALL U xsrc/external/mit/xf86-video-neomagic/dist/NM-reg.txt U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/depcomp U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/config.sub U xsrc/external/mit/xf86-video-neomagic/dist/aclocal.m4 U xsrc/external/mit/xf86-video-neomagic/dist/ltmain.sh U xsrc/external/mit/xf86-video-neomagic/dist/config.h.in U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_pcirename.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_dga.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_cursor.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_i2c.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo.h U xsrc/external/mit/xf86-video-neomagic/dist/src/compat-api.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_macros.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2200.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2070.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_reg.h U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2090.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_driver.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_shadow.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2097.c U xsrc/external/mit/xf86-video-neomagic/dist/man/neomagic.man U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-ast/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:53:09 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-ast/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16834 Log Message: initial import of xf86-video-ast-0.98.0 Status: Vendor Tag: xorg Release Tags: xf86-video-ast-0-98-0 U xsrc/external/mit/xf86-video-ast/dist/missing U xsrc/external/mit/xf86-video-ast/dist/ltmain.sh U xsrc/external/mit/xf86-video-ast/dist/configure U xsrc/external/mit/xf86-video-ast/dist/configure.ac U xsrc/external/mit/xf86-video-ast/dist/Makefile.in U xsrc/external/mit/xf86-video-ast/dist/Makefile.am U xsrc/external/mit/xf86-video-ast/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ast/dist/ChangeLog U xsrc/external/mit/xf86-video-ast/dist/config.h.in U xsrc/external/mit/xf86-video-ast/dist/config.guess U xsrc/external/mit/xf86-video-ast/dist/INSTALL U xsrc/external/mit/xf86-video-ast/dist/README U xsrc/external/mit/xf86-video-ast/dist/install-sh U xsrc/external/mit/xf86-video-ast/dist/COPYING U xsrc/external/mit/xf86-video-ast/dist/config.sub U xsrc/external/mit/xf86-video-ast/dist/depcomp C xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_tool.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_mode.h U xsrc/external/mit/xf86-video-ast/dist/src/ast.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_pcirename.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_mode.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_2dtool.h C xsrc/external/mit/xf86-video-ast/dist/src/ast_driver.c U xsrc/external/mit/xf86-video-ast/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ast/dist/src/ast_2dtool.c U xsrc/external/mit/xf86-video-ast/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ast/dist/src/ast_cursor.c U xsrc/external/mit/xf86-video-ast/dist/src/compat-api.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_cursor.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-ast/dist
CVS import: xsrc/external/mit/xf86-video-r128/dist
Module Name:xsrc Committed By: mrg Date: Wed Mar 19 23:53:14 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10159 Log Message: initial import of xf86-video-r128-6.9.2 Status: Vendor Tag: xorg Release Tags: xf86-video-r128-6-9-2 U xsrc/external/mit/xf86-video-r128/dist/configure.ac U xsrc/external/mit/xf86-video-r128/dist/README U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4 U xsrc/external/mit/xf86-video-r128/dist/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/config.h.in U xsrc/external/mit/xf86-video-r128/dist/configure U xsrc/external/mit/xf86-video-r128/dist/COPYING U xsrc/external/mit/xf86-video-r128/dist/ChangeLog U xsrc/external/mit/xf86-video-r128/dist/INSTALL U xsrc/external/mit/xf86-video-r128/dist/config.guess U xsrc/external/mit/xf86-video-r128/dist/config.sub U xsrc/external/mit/xf86-video-r128/dist/depcomp U xsrc/external/mit/xf86-video-r128/dist/install-sh U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh U xsrc/external/mit/xf86-video-r128/dist/missing U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_dga.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h C xsrc/external/mit/xf86-video-r128/dist/src/r128.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/man/r128.man 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-r128/dist
CVS commit: src/sys/sys
Module Name:src
Committed By: pooka
Date: Thu Mar 20 00:29:57 UTC 2014
Modified Files:
src/sys/sys: mbuf.h
Log Message:
Adjust comment indent.
no useful change
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/sys/mbuf.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/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.153 src/sys/sys/mbuf.h:1.154
--- src/sys/sys/mbuf.h:1.153 Thu Nov 14 00:50:36 2013
+++ src/sys/sys/mbuf.h Thu Mar 20 00:29:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.153 2013/11/14 00:50:36 christos Exp $ */
+/* $NetBSD: mbuf.h,v 1.154 2014/03/20 00:29:57 pooka Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -171,12 +171,12 @@ struct m_hdr {
* packets during reassembly.
*/
struct pkthdr {
- struct ifnet *rcvif; /* rcv interface */
- SLIST_HEAD(packet_tags, m_tag) tags; /* list of packet tags */
- int len; /* total packet length */
- int csum_flags; /* checksum flags */
- uint32_t csum_data; /* checksum data */
- u_int segsz; /* segment size */
+ struct ifnet *rcvif; /* rcv interface */
+ SLIST_HEAD(packet_tags, m_tag) tags; /* list of packet tags */
+ int len; /* total packet length */
+ int csum_flags; /* checksum flags */
+ uint32_t csum_data; /* checksum data */
+ u_int segsz; /* segment size */
};
/*
CVS commit: xsrc/external/mit/xf86-video-ast/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 00:47:21 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-ast/dist/src: ast_accel.c Log Message: move a extern decl into the scope it is used. To generate a diff of this commit: cvs rdiff -u -r1.1.1.7 -r1.2 \ xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.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-ast/dist/src/ast_accel.c diff -u xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.1.1.7 xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.2 --- xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.1.1.7 Wed Mar 19 23:53:08 2014 +++ xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c Thu Mar 20 00:47:21 2014 @@ -54,6 +54,8 @@ /* Driver specific headers */ #include ast.h +extern UCHAR *pjRequestCMDQ(ASTRecPtr pAST, ULONG ulDataLen); + #ifdef Accel_2D #ifdef HAVE_XAA_H @@ -100,7 +102,6 @@ int ASTXAAPatternROP[16]= /* extern function */ extern void vWaitEngIdle(ScrnInfoPtr pScrn, ASTRecPtr pAST); -extern UCHAR *pjRequestCMDQ(ASTRecPtr pAST, ULONG ulDataLen); extern Bool bGetLineTerm(_LINEInfo *LineInfo, LINEPARAM *dsLineParam); /* Prototype type declaration */
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 01:04:22 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-mga/dist/src: mga_exa.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_exa.c
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c
Log Message:
- avoid casting from int to a pointer.
- call miPointerSetPosition() correctly for this ABI.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_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-mga/dist/src/mga_exa.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.1.1.4 Wed Mar 19 23:53:10 2014
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c Thu Mar 20 01:04:22 2014
@@ -729,7 +729,7 @@ mgaDownloadFromScreen(PixmapPtr pSrc, in
{
PMGA(pSrc);
-char *src = (char *) exaGetPixmapFirstPixel(pSrc);
+char *src = (char *)(unsigned long) exaGetPixmapFirstPixel(pSrc);
int src_pitch = exaGetPixmapPitch(pSrc);
int cpp = (pSrc-drawable.bitsPerPixel + 7) / 8;
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.1.1.6 xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.2
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.1.1.6 Wed Mar 19 23:53:15 2014
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c Thu Mar 20 01:04:22 2014
@@ -567,7 +567,7 @@ SavageUploadToScreen(PixmapPtr pDst, int
Bool
SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch)
{
-unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc);
+unsigned char *src = (unsigned char *) (unsigned long) exaGetPixmapFirstPixel(pSrc);
int src_pitch = exaGetPixmapPitch(pSrc);
int bpp = pSrc-drawable.bitsPerPixel;
Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.3 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.4
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.3 Mon Jun 3 08:50:49 2013
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c Thu Mar 20 01:04:22 2014
@@ -9362,7 +9362,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 13
miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 5
- miPointerSetPosition(inputInfo.pointer, x, y);
+ miPointerSetPosition(inputInfo.pointer, x, y);
#else
UpdateCurrentTime();
miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
CVS commit: src/sys/arch/i386/stand/boot
Module Name:src
Committed By: christos
Date: Thu Mar 20 01:15:29 UTC 2014
Modified Files:
src/sys/arch/i386/stand/boot: boot2.c
Log Message:
allow LS to be commented out
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/i386/stand/boot/boot2.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/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.60 src/sys/arch/i386/stand/boot/boot2.c:1.61
--- src/sys/arch/i386/stand/boot/boot2.c:1.60 Fri Aug 30 12:42:17 2013
+++ src/sys/arch/i386/stand/boot/boot2.c Wed Mar 19 21:15:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.60 2013/08/30 16:42:17 jmcneill Exp $ */
+/* $NetBSD: boot2.c,v 1.61 2014/03/20 01:15:29 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -115,7 +115,9 @@ void print_banner(void);
void boot2(int, uint64_t);
void command_help(char *);
+#if LIBSA_ENABLE_LS_OP
void command_ls(char *);
+#endif
void command_quit(char *);
void command_boot(char *);
void command_dev(char *);
@@ -129,7 +131,9 @@ void command_multiboot(char *);
const struct bootblk_command commands[] = {
{ help, command_help },
{ ?, command_help },
+#if LIBSA_ENABLE_LS_OP
{ ls, command_ls },
+#endif
{ quit, command_quit },
{ boot, command_boot },
{ dev, command_dev },
@@ -397,7 +401,9 @@ command_help(char *arg)
printf(commands are:\n
boot [xdNx:][filename] [-12acdqsvxz]\n
(ex. \hd0a:netbsd.old -s\\n
+#if LIBSA_ENABLE_LS_OP
ls [path]\n
+#endif
dev xd[N[x]]:\n
consdev {pc|com[0123]|com[0123]kbd|auto}\n
vesa {modenum|on|off|enabled|disabled|list}\n
@@ -413,6 +419,7 @@ command_help(char *arg)
quit\n);
}
+#if LIBSA_ENABLE_LS_OP
void
command_ls(char *arg)
{
@@ -422,6 +429,7 @@ command_ls(char *arg)
ls(arg);
default_filename = save;
}
+#endif
/* ARGSUSED */
void
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Thu Mar 20 01:35:45 UTC 2014
Modified Files:
src/sys/lib/libunwind: UnwindCursor.hpp libunwind.cxx
Log Message:
Fix DW_CFA_GNU_args_size handling. The primary architecture using this
opcode is VAX. A function call pushes the number of arguments given onto
the stack and ret will pop it automatically. The FDE of the caller
contains the amount of stack space used for arguments (and possibly
extra padding), so unwinding has to compensate for this when returning
from a function. This is exactly the case when step() is done. The
existing handling in _Unwind_SetIP no longer makes sense.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libunwind/UnwindCursor.hpp
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libunwind/libunwind.cxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libunwind/UnwindCursor.hpp
diff -u src/sys/lib/libunwind/UnwindCursor.hpp:1.1 src/sys/lib/libunwind/UnwindCursor.hpp:1.2
--- src/sys/lib/libunwind/UnwindCursor.hpp:1.1 Mon Oct 14 01:14:57 2013
+++ src/sys/lib/libunwind/UnwindCursor.hpp Thu Mar 20 01:35:45 2014
@@ -61,6 +61,9 @@ public:
this-setInfoBasedOnIPRegister(true);
if (fUnwindInfoMissing)
return UNW_STEP_END;
+
+ if (fInfo.extra_args)
+setSP(getSP() + fInfo.extra_args);
return UNW_STEP_SUCCESS;
}
__builtin_unreachable();
Index: src/sys/lib/libunwind/libunwind.cxx
diff -u src/sys/lib/libunwind/libunwind.cxx:1.4 src/sys/lib/libunwind/libunwind.cxx:1.5
--- src/sys/lib/libunwind/libunwind.cxx:1.4 Tue Mar 18 13:08:15 2014
+++ src/sys/lib/libunwind/libunwind.cxx Thu Mar 20 01:35:45 2014
@@ -288,12 +288,7 @@ void _Unwind_SetIP(struct _Unwind_Contex
cursor-setIP(new_value);
unw_proc_info_t info;
cursor-getInfo(info);
- uint64_t orgArgSize = info.extra_args;
- uint64_t orgFuncStart = info.start_ip;
cursor-setInfoBasedOnIPRegister(false);
- // Adjust REG_SP if there was a DW_CFA_GNU_args_size.
- if (orgFuncStart == info.start_ip orgArgSize != 0)
-cursor-setSP(cursor-getSP() + orgArgSize);
}
uintptr_t _Unwind_GetRegionStart(struct _Unwind_Context *context) {
CVS commit: src/external/gpl3/gcc/dist/gcc/config
Module Name:src
Committed By: joerg
Date: Thu Mar 20 01:46:19 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config: netbsd.h
Log Message:
Always use --eh-frame-hdr, even when linking statically.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/config/netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.9 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.10
--- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.9 Sat Mar 1 09:04:12 2014
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Thu Mar 20 01:46:19 2014
@@ -188,9 +188,7 @@ along with GCC; see the file COPYING3.
#undef WINT_TYPE
#define WINT_TYPE int
-#if defined(HAVE_LD_EH_FRAME_HDR)
-#define LINK_EH_SPEC %{!static:--eh-frame-hdr}
-#endif
+#define LINK_EH_SPEC --eh-frame-hdr
/* Use --as-needed -lgcc_s for eh support. */
#ifdef HAVE_LD_AS_NEEDED
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: christos Date: Thu Mar 20 03:13:31 UTC 2014 Added Files: src/sys/lib/libsa: ls.h Log Message: new header. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/lib/libsa/ls.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/lib/libsa/ls.h diff -u /dev/null src/sys/lib/libsa/ls.h:1.1 --- /dev/null Wed Mar 19 23:13:31 2014 +++ src/sys/lib/libsa/ls.h Wed Mar 19 23:13:31 2014 @@ -0,0 +1,40 @@ +/* $NetBSD: ls.h,v 1.1 2014/03/20 03:13:31 christos Exp $ */ + +/*- + * Copyright (c) 2014 + * The NetBSD Foundation, Inc. All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#define NELEM(x) (sizeof (x) / sizeof(*x)) + +typedef struct lsentry lsentry_t; + +__compactcall void lsadd(lsentry_t **, const char *, const char *, size_t, +uint32_t, const char *); +__compactcall void lsprint(lsentry_t *); +__compactcall void lsfree(lsentry_t *); +__compactcall void lsunsup(const char *);
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: christos
Date: Thu Mar 20 03:13:18 UTC 2014
Modified Files:
src/sys/lib/libsa: cd9660.c dosfs.c ext2fs.c ls.c minixfs3.c nfs.c
nullfs.c tftp.c ufs.c ustarfs.c
Log Message:
reduce size by 1K by sharing the ls code.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/lib/libsa/cd9660.c
cvs rdiff -u -r1.19 -r1.20 src/sys/lib/libsa/dosfs.c \
src/sys/lib/libsa/ext2fs.c
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libsa/ls.c
cvs rdiff -u -r1.6 -r1.7 src/sys/lib/libsa/minixfs3.c
cvs rdiff -u -r1.47 -r1.48 src/sys/lib/libsa/nfs.c
cvs rdiff -u -r1.11 -r1.12 src/sys/lib/libsa/nullfs.c
cvs rdiff -u -r1.34 -r1.35 src/sys/lib/libsa/tftp.c \
src/sys/lib/libsa/ustarfs.c
cvs rdiff -u -r1.64 -r1.65 src/sys/lib/libsa/ufs.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/lib/libsa/cd9660.c
diff -u src/sys/lib/libsa/cd9660.c:1.29 src/sys/lib/libsa/cd9660.c:1.30
--- src/sys/lib/libsa/cd9660.c:1.29 Sun Jul 22 20:49:20 2012
+++ src/sys/lib/libsa/cd9660.c Wed Mar 19 23:13:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.29 2012/07/23 00:49:20 mhitch Exp $ */
+/* $NetBSD: cd9660.c,v 1.30 2014/03/20 03:13:18 christos Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -401,10 +401,10 @@ cd9660_stat(struct open_file *f, struct
}
#if defined(LIBSA_ENABLE_LS_OP)
+#include ls.h
__compactcall void
cd9660_ls(struct open_file *f, const char *pattern)
{
- printf(Currently ls command is unsupported by cd9660\n);
- return;
+ lsunsup(cd9660);
}
#endif
Index: src/sys/lib/libsa/dosfs.c
diff -u src/sys/lib/libsa/dosfs.c:1.19 src/sys/lib/libsa/dosfs.c:1.20
--- src/sys/lib/libsa/dosfs.c:1.19 Sun Oct 20 13:15:42 2013
+++ src/sys/lib/libsa/dosfs.c Wed Mar 19 23:13:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dosfs.c,v 1.19 2013/10/20 17:15:42 christos Exp $ */
+/* $NetBSD: dosfs.c,v 1.20 2014/03/20 03:13:18 christos Exp $ */
/*
* Copyright (c) 1996, 1998 Robert Nordier
@@ -406,11 +406,11 @@ dosfs_stat(struct open_file *fd, struct
}
#if defined(LIBSA_ENABLE_LS_OP)
+#include ls.h
__compactcall void
dosfs_ls(struct open_file *f, const char *pattern)
{
- printf(Currently ls command is unsupported by dosfs\n);
- return;
+ lsunsup(dosfs);
}
#endif
Index: src/sys/lib/libsa/ext2fs.c
diff -u src/sys/lib/libsa/ext2fs.c:1.19 src/sys/lib/libsa/ext2fs.c:1.20
--- src/sys/lib/libsa/ext2fs.c:1.19 Sun Oct 20 13:17:30 2013
+++ src/sys/lib/libsa/ext2fs.c Wed Mar 19 23:13:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.c,v 1.19 2013/10/20 17:17:30 christos Exp $ */
+/* $NetBSD: ext2fs.c,v 1.20 2014/03/20 03:13:18 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@@ -146,30 +146,6 @@ struct file {
daddr_t f_buf_blkno; /* block number of data block */
};
-#if defined(LIBSA_ENABLE_LS_OP)
-
-#define NELEM(x) (sizeof (x) / sizeof(*x))
-
-typedef struct entry_t entry_t;
-struct entry_t {
- entry_t *e_next;
- ino32_t e_ino;
- uint8_t e_type;
- char e_name[1];
-};
-
-static const char*const typestr[] = {
- unknown,
- REG,
- DIR,
- CHR,
- BLK,
- FIFO,
- SOCK,
- LNK
-};
-
-#endif /* LIBSA_ENABLE_LS_OP */
static int read_inode(ino32_t, struct open_file *);
static int block_map(struct open_file *, indp_t, indp_t *);
@@ -828,6 +804,20 @@ ext2fs_stat(struct open_file *f, struct
}
#if defined(LIBSA_ENABLE_LS_OP)
+
+#include ls.h
+
+static const char*const typestr[] = {
+ unknown,
+ REG,
+ DIR,
+ CHR,
+ BLK,
+ FIFO,
+ SOCK,
+ LNK
+};
+
__compactcall void
ext2fs_ls(struct open_file *f, const char *pattern)
{
@@ -835,7 +825,7 @@ ext2fs_ls(struct open_file *f, const cha
size_t block_size = fp-f_fs-e2fs_bsize;
char *buf;
size_t buf_size;
- entry_t *names = 0, *n, **np;
+ lsentry_t *names = NULL;
fp-f_seekp = 0;
while (fp-f_seekp (off_t)fp-f_di.e2di_size) {
@@ -874,47 +864,14 @@ ext2fs_ls(struct open_file *f, const cha
printf(bad dir entry\n);
goto out;
}
- if (pattern !fnmatch(dp-e2d_name, pattern))
-continue;
- n = alloc(sizeof *n + strlen(dp-e2d_name));
- if (!n) {
-printf(%d: %s (%s)\n,
- fs2h32(dp-e2d_ino), dp-e2d_name, t);
-continue;
- }
- n-e_ino = fs2h32(dp-e2d_ino);
- n-e_type = dp-e2d_type;
- strcpy(n-e_name, dp-e2d_name);
- for (np = names; *np; np = (*np)-e_next) {
-if (strcmp(n-e_name, (*np)-e_name) 0)
- break;
- }
- n-e_next = *np;
- *np = n;
+ lsadd(names, pattern, dp-e2d_name,
+ strlen(dp-e2d_name), fs2h32(dp-e2d_ino), t);
}
fp-f_seekp += buf_size;
}
- if (names) {
- entry_t *p_names = names;
- do {
- n = p_names;
- printf(%d: %s (%s)\n,
-n-e_ino, n-e_name, typestr[n-e_type]);
- p_names = n-e_next;
- } while (p_names);
- } else {
- printf(not found\n);
- }
-out:
- if (names) {
- do {
- n = names;
- names = n-e_next;
- dealloc(n, 0);
- } while (names);
- }
- return;
+ lsprint(names);
+out: lsfree(names);
}
#endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Thu Mar 20 05:32:31 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-ast: Makefile
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
Log Message:
turn on XAA explicitly for ast.
remove removed sources for mga, and fix the XAA list.
remove redundant defines for tdfx.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/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-ast/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.4 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile Thu Mar 20 05:32:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/20 05:32:31 mrg Exp $
DRIVER= xf86-video-ast
DRIVER_NAME= ast_drv
@@ -6,6 +6,8 @@ DRIVER_NAME= ast_drv
SRCS= ast_2dtool.c ast_accel.c ast_cursor.c ast_driver.c
SRCS+= ast_mode.c ast_tool.c ast_vgatool.c
+CPPFLAGS+= -DHAVE_XAA_H
+
CWARNFLAGS.clang+= -Wno-format
.include ../Makefile.xf86-driver
Index: src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.11 Sun Jun 2 08:57:17 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Thu Mar 20 05:32:31 2014
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2013/06/02 08:57:17 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/20 05:32:31 mrg Exp $
.include bsd.own.mk
DRIVER= xf86-video-mga
DRIVER_NAME= mga_drv
-SRCS= mga_arc.c mga_bios.c mga_dac3026.c mga_dacG.c
-SRCS+= mga_dga.c mga_dh.c mga_driver.c mga_esc.c mga_g450pll.c
+SRCS= mga_bios.c mga_dac3026.c mga_dacG.c
+SRCS+= mga_dga.c mga_dh.c mga_driver.c mga_g450pll.c
SRCS+= mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c
-SRCS+= mga_vga.c mga_video.c
+SRCS+= mga_vga.c mga_video.c mga_storm.c
MAN= mga.4
.if ${X11DRI} != no
@@ -21,7 +21,7 @@ CPPFLAGS+= -DUSE_EXA
#endif
#if USE_XAA
-SRCS+= mga_storm.c
+SRCS+= mga_arc.c
CPPFLAGS+= -DUSE_XAA -DHAVE_XAA_H
#endif
Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.11 Mon Jun 3 10:24:24 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Thu Mar 20 05:32:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/06/03 10:24:24 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/20 05:32:31 mrg Exp $
DRIVER= xf86-video-tdfx
DRIVER_NAME= tdfx_drv
@@ -11,7 +11,6 @@ MAN= tdfx.4
.if ${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == x86_64
CPPFLAGS+= -DUSE_INT10
-CPPFLAGS+= -DUSE_PCIVGAIO
.endif
CPPFLAGS+= -DHAVE_XAA_H
CPPFLAGS+= -DTDFXDRI
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: ozaki-r
Date: Thu Mar 20 05:39:11 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_bsc.c
Log Message:
Mark a variable __diagused
PR 48668 from David H. Gutteridge
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_bsc.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/arm/broadcom/bcm2835_bsc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_bsc.c:1.1 src/sys/arch/arm/broadcom/bcm2835_bsc.c:1.2
--- src/sys/arch/arm/broadcom/bcm2835_bsc.c:1.1 Sat Jan 5 20:15:17 2013
+++ src/sys/arch/arm/broadcom/bcm2835_bsc.c Thu Mar 20 05:39:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_bsc.c,v 1.1 2013/01/05 20:15:17 jakllsch Exp $ */
+/* $NetBSD: bcm2835_bsc.c,v 1.2 2014/03/20 05:39:11 ozaki-r Exp $ */
/*
* Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_bsc.c,v 1.1 2013/01/05 20:15:17 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_bsc.c,v 1.2 2014/03/20 05:39:11 ozaki-r Exp $);
#include sys/param.h
#include sys/device.h
@@ -169,7 +169,7 @@ static int
bsciic_acquire_bus(void *v, int flags)
{
struct bsciic_softc * const sc = v;
- uint32_t s;
+ uint32_t s __diagused;
mutex_enter(sc-sc_buslock);
