Re: CVS commit: src/sys/arch/sparc64
On Mon, 04 Feb 2013, Michael Lorenz wrote: Modified Files: src/sys/arch/sparc64/include: cpu.h src/sys/arch/sparc64/sparc64: machdep.c Log Message: add a sysctl.vis node that indicated which version of the VIS instruction set is supported. Currently this will be 1 for UltraSPARC I and II, 2 for UltraSPARC-III and up Does this need to use #define CPU_VIS, or could it use a new-style dynamic MIB entry, passing CTL_CREATE to sysctl_createv(9)? --apb (Alan Barrett)
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Mon Feb 4 09:52:43 UTC 2013
Modified Files:
src/usr.sbin/ldpd: ldp_peer.c
Log Message:
correct the sockaddr compare
modify a couple of debug messages
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ldpd/ldp_peer.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.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.8 src/usr.sbin/ldpd/ldp_peer.c:1.9
--- src/usr.sbin/ldpd/ldp_peer.c:1.8 Mon Jan 28 21:35:34 2013
+++ src/usr.sbin/ldpd/ldp_peer.c Mon Feb 4 09:52:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.8 2013/01/28 21:35:34 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.9 2013/02/04 09:52:43 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,9 +66,9 @@ ldp_peer_init(void)
static int
sockaddr_cmp(const struct sockaddr *a, const struct sockaddr *b)
{
- if (a-sa_len != b-sa_len || a-sa_family == b-sa_family)
+ if (a-sa_len != b-sa_len || a-sa_family != b-sa_family)
return -1;
- return memcmp(a-sa_data, b-sa_data, a-sa_len);
+ return memcmp(a, b, a-sa_len);
}
/*
* soc should be 1 if there is already a TCP socket for this else we'll
@@ -521,13 +521,14 @@ ldp_test_mapping(struct sockaddr * a, in
return NULL;
}
if (lpeer-state != LDP_PEER_ESTABLISHED) {
- warnp(ldp_test_mapping: peer is down ?!\n);
+ fatalp(ldp_test_mapping: peer is down ?!\n);
return NULL;
}
lm = ldp_peer_get_lm(lpeer, a, prefix);
if (!lm) {
- debugp(Cannot match that prefix to the specified peer\n);
+ debugp(Cannot match prefix %s/%d to the specified peer\n,
+ satos(a), prefix);
return NULL;
}
rv = malloc(sizeof(*rv));
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: kefren Date: Mon Feb 4 10:53:15 UTC 2013 Modified Files: src/usr.sbin/ldpd: ldpd.8 Log Message: Mention IPv6, operation mode and re-section a bit To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/ldpd/ldpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/ldpd/ldpd.8 diff -u src/usr.sbin/ldpd/ldpd.8:1.7 src/usr.sbin/ldpd/ldpd.8:1.8 --- src/usr.sbin/ldpd/ldpd.8:1.7 Mon Nov 12 22:46:59 2012 +++ src/usr.sbin/ldpd/ldpd.8 Mon Feb 4 10:53:14 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: ldpd.8,v 1.7 2012/11/12 22:46:59 wiz Exp $ +.\ $NetBSD: ldpd.8,v 1.8 2013/02/04 10:53:14 kefren Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 12, 2012 +.Dd February 4, 2013 .Dt LDPD 8 .Os .Sh NAME @@ -38,16 +38,13 @@ .Sh DESCRIPTION .Nm is a utility used to automatically distribute labels between two MPLS LSRs -almost conforming to RFC5036. -Right now some features requested by RFC5036 are not fully implemented. -For more information please consult the +conforming to RFC5036. +Currently some features described by RFC5036 are not fully implemented (see .Sx BUGS -section. -As a security measure you SHOULD filter the LDP well-known (646) -TCP and UDP ports using your favourite packet filter before starting -.Nm . -This is the current way used to filter neighbours and to protect the -system of external attacks like route injections. +section). +.Nm +supports peering with IPv6 LDP speakers and IPv6 labels exchange, conforming +to specifications in RFC5036 and draft-ietf-mpls-ldp-ipv6. .Pp .Nm logs information using the @@ -74,6 +71,9 @@ routes will be changed into tagged route will be populated. Any change in MPLS topology will also be announced to LDP neighbors. .Nm +uses currently Independent Control Mapping and Downstream Unsolicited mode +for Label Advertisment. +.Nm will listen on a route socket and compute the necessary changes in order to change untagged routes into tagged routes. This means that one may use one's favourite dynamic routing protocol @@ -104,6 +104,12 @@ Changes the TCP control port (default: 2 .It Fl W Enable output of warning messages. .El +.Sh SECURITY CONSIDERATIONS +As a security measure you SHOULD filter the LDP well-known (646) +TCP and UDP ports using your favourite packet filter before starting +.Nm . +This is the current way used to filter neighbours and to protect the +system of possible external attacks like route injections. .Sh SEE ALSO .Rs .%R RFC @@ -117,6 +123,12 @@ Enable output of warning messages. .%D January 2001 .%T LDP Applicability .Re +.Rs +.%R DRAFT +.%N draft-ietf-mpls-ldp-ipv6-07 +.%D June 2012 +.%T Updates to LDP for IPv6 +.Re .Sh HISTORY The .Nm @@ -124,4 +136,4 @@ command appeared in .Nx 6.0 . .Sh BUGS .Nm -supports only IPv4 and doesn't implement Path Vector and Hop Count TLVs. +doesn't implement Path Vector and Hop Count TLVs.
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: wiz Date: Mon Feb 4 11:02:32 UTC 2013 Modified Files: src/usr.sbin/ldpd: ldpd.8 Log Message: Grammar. Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ldpd/ldpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/ldpd/ldpd.8 diff -u src/usr.sbin/ldpd/ldpd.8:1.8 src/usr.sbin/ldpd/ldpd.8:1.9 --- src/usr.sbin/ldpd/ldpd.8:1.8 Mon Feb 4 10:53:14 2013 +++ src/usr.sbin/ldpd/ldpd.8 Mon Feb 4 11:02:32 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: ldpd.8,v 1.8 2013/02/04 10:53:14 kefren Exp $ +.\ $NetBSD: ldpd.8,v 1.9 2013/02/04 11:02:32 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -104,12 +104,6 @@ Changes the TCP control port (default: 2 .It Fl W Enable output of warning messages. .El -.Sh SECURITY CONSIDERATIONS -As a security measure you SHOULD filter the LDP well-known (646) -TCP and UDP ports using your favourite packet filter before starting -.Nm . -This is the current way used to filter neighbours and to protect the -system of possible external attacks like route injections. .Sh SEE ALSO .Rs .%R RFC @@ -137,3 +131,9 @@ command appeared in .Sh BUGS .Nm doesn't implement Path Vector and Hop Count TLVs. +.Sh SECURITY CONSIDERATIONS +As a security measure you SHOULD filter the LDP well-known (646) +TCP and UDP ports using your favourite packet filter before starting +.Nm . +This is the current way used to filter neighbours and to protect the +system from possible external attacks like route injections.
CVS commit: src/sys/sys
Module Name:src Committed By: macallan Date: Mon Feb 4 13:18:36 UTC 2013 Modified Files: src/sys/sys: bus_proto.h Log Message: add BUS_DMA_PREFETCHABLE flag for bus_dmamem_map(), analog to BUS_SPACE_MAP_PREFETCHABLE To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/sys/bus_proto.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/bus_proto.h diff -u src/sys/sys/bus_proto.h:1.6 src/sys/sys/bus_proto.h:1.7 --- src/sys/sys/bus_proto.h:1.6 Wed Aug 17 10:46:38 2011 +++ src/sys/sys/bus_proto.h Mon Feb 4 13:18:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_proto.h,v 1.6 2011/08/17 10:46:38 martin Exp $ */ +/* $NetBSD: bus_proto.h,v 1.7 2013/02/04 13:18:35 macallan Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2001, 2007 The NetBSD Foundation, Inc. @@ -319,6 +319,8 @@ bool bus_space_handle_is_equal(bus_space #define BUS_DMA_READ 0x100 /* mapping is device - memory only */ #define BUS_DMA_WRITE 0x200 /* mapping is memory - device only */ #define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */ +#define BUS_DMA_PREFETCHABLE 0x800 /* hint: map non-cached but allow + * things like write combining */ /* Operations performed by bus_dmamap_sync(). */ #define BUS_DMASYNC_PREREAD 0x01 /* pre-read synchronization */
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: macallan
Date: Mon Feb 4 13:26:20 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
support BUS_DMA_PREFETCHABLE in bus_dmamem_mmap()
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/arm/arm32/bus_dma.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/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.72 src/sys/arch/arm/arm32/bus_dma.c:1.73
--- src/sys/arch/arm/arm32/bus_dma.c:1.72 Mon Jan 28 08:03:13 2013
+++ src/sys/arch/arm/arm32/bus_dma.c Mon Feb 4 13:26:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.72 2013/01/28 08:03:13 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.73 2013/02/04 13:26:19 macallan Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.72 2013/01/28 08:03:13 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.73 2013/02/04 13:26:19 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1354,6 +1354,7 @@ paddr_t
_bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
off_t off, int prot, int flags)
{
+ paddr_t map_flags;
int i;
for (i = 0; i nsegs; i++) {
@@ -1371,7 +1372,12 @@ _bus_dmamem_mmap(bus_dma_tag_t t, bus_dm
continue;
}
- return (arm_btop((u_long)segs[i].ds_addr + off));
+ map_flags = 0;
+ if (flags BUS_DMA_PREFETCHABLE)
+ map_flags |= ARM32_MMAP_WRITECOMBINE;
+
+ return (arm_btop((u_long)segs[i].ds_addr + off) | map_flags);
+
}
/* Page not found. */
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: macallan
Date: Mon Feb 4 13:37:30 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
support ARM32_MMAP_WRITECOMBINE for managed pages as well
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/sys/arch/arm/arm32/pmap.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/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.251 src/sys/arch/arm/arm32/pmap.c:1.252
--- src/sys/arch/arm/arm32/pmap.c:1.251 Fri Feb 1 15:02:31 2013
+++ src/sys/arch/arm/arm32/pmap.c Mon Feb 4 13:37:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.251 2013/02/01 15:02:31 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.252 2013/02/04 13:37:30 macallan Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -212,7 +212,7 @@
#include arm/cpuconf.h
#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.251 2013/02/01 15:02:31 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.252 2013/02/04 13:37:30 macallan Exp $);
#ifdef PMAP_DEBUG
@@ -2862,7 +2862,10 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
npte |= L2_TYPE_INV;
}
- npte |= pte_l2_s_cache_mode;
+ if (flags ARM32_MMAP_WRITECOMBINE) {
+ npte |= pte_l2_s_wc_mode;
+ } else
+ npte |= pte_l2_s_cache_mode;
if (pg == opg) {
/*
CVS commit: src
Module Name:src Committed By: joerg Date: Mon Feb 4 15:00:37 UTC 2013 Modified Files: src/external/bsd/llvm: Makefile.inc src/external/bsd/llvm/bin/bugpoint: Makefile src/external/bsd/llvm/bin/clang: Makefile src/external/bsd/llvm/bin/clang-tblgen: Makefile src/external/bsd/llvm/bin/llc: Makefile src/external/bsd/llvm/bin/llvm-bcanalyzer: Makefile src/external/bsd/llvm/bin/llvm-mc: Makefile src/external/bsd/llvm/bin/llvm-objdump: Makefile src/external/bsd/llvm/bin/llvm-symbolizer: Makefile src/external/bsd/llvm/bin/opt: Makefile src/external/bsd/llvm/config/llvm/Config: AsmParsers.def AsmPrinters.def Disassemblers.def Targets.def config.h.in src/external/bsd/llvm/include: Makefile src/external/bsd/llvm/lib: Makefile src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile src/external/bsd/llvm/lib/libLLVMBitReader: Makefile src/external/bsd/llvm/lib/libLLVMLinker: Makefile src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc: Makefile src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile src/external/bsd/llvm/lib/libLLVMSupport: Makefile src/external/bsd/llvm/lib/libLLVMipa: Makefile src/external/bsd/llvm/lib/libclangAST: Makefile src/external/bsd/llvm/lib/libclangBasic: Makefile src/external/bsd/llvm/lib/libclangFormat: Makefile src/external/bsd/llvm/lib/libclangSerialization: Makefile Added Files: src/external/bsd/llvm/lib/libLLVMAArch64AsmParser: Makefile src/external/bsd/llvm/lib/libLLVMAArch64AsmPrinter: Makefile src/external/bsd/llvm/lib/libLLVMAArch64CodeGen: Makefile src/external/bsd/llvm/lib/libLLVMAArch64Disassembler: Makefile src/external/bsd/llvm/lib/libLLVMAArch64MCTargetDesc: Makefile src/external/bsd/llvm/lib/libLLVMAArch64TargetInfo: Makefile src/external/bsd/llvm/lib/libLLVMObjCARC: Makefile src/tools/llvm-lib/libLLVMAArch64AsmParser: Makefile src/tools/llvm-lib/libLLVMAArch64AsmPrinter: Makefile src/tools/llvm-lib/libLLVMAArch64CodeGen: Makefile src/tools/llvm-lib/libLLVMAArch64Disassembler: Makefile src/tools/llvm-lib/libLLVMAArch64MCTargetDesc: Makefile src/tools/llvm-lib/libLLVMAArch64TargetInfo: Makefile src/tools/llvm-lib/libLLVMObjCARC: Makefile Log Message: Update to LLVM/Clang snapshot r174288. This brings in the new AArch64 backend as well as an import bug fix for pointer compare optimisations. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/external/bsd/llvm/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/llvm/bin/bugpoint/Makefile cvs rdiff -u -r1.22 -r1.23 src/external/bsd/llvm/bin/clang/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/bin/clang-tblgen/Makefile cvs rdiff -u -r1.12 -r1.13 src/external/bsd/llvm/bin/llc/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/llvm-bcanalyzer/Makefile cvs rdiff -u -r1.13 -r1.14 src/external/bsd/llvm/bin/llvm-mc/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/llvm-objdump/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/llvm-symbolizer/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/bin/opt/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/llvm/config/llvm/Config/AsmParsers.def cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/llvm/config/llvm/Config/Disassemblers.def \ src/external/bsd/llvm/config/llvm/Config/Targets.def cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/config/llvm/Config/config.h.in cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/include/Makefile cvs rdiff -u -r1.26 -r1.27 src/external/bsd/llvm/lib/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libLLVMAArch64AsmParser/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libLLVMAArch64AsmPrinter/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libLLVMAArch64Disassembler/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libLLVMAArch64MCTargetDesc/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libLLVMAArch64TargetInfo/Makefile cvs rdiff -u -r1.11 -r1.12 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libLLVMBitReader/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMLinker/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMObjCARC/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile cvs rdiff -u -r1.8 -r1.9
CVS commit: src/sys/net80211
Module Name:src
Committed By: christos
Date: Mon Feb 4 15:44:45 UTC 2013
Modified Files:
src/sys/net80211: ieee80211_netbsd.c
Log Message:
don't print the interface name 2ice.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/net80211/ieee80211_netbsd.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/net80211/ieee80211_netbsd.c
diff -u src/sys/net80211/ieee80211_netbsd.c:1.22 src/sys/net80211/ieee80211_netbsd.c:1.23
--- src/sys/net80211/ieee80211_netbsd.c:1.22 Wed Nov 14 13:34:05 2012
+++ src/sys/net80211/ieee80211_netbsd.c Mon Feb 4 10:44:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.22 2012/11/14 18:34:05 matt Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.23 2013/02/04 15:44:45 christos Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -30,7 +30,7 @@
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.8 2005/08/08 18:46:35 sam Exp $);
#else
-__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.22 2012/11/14 18:34:05 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.23 2013/02/04 15:44:45 christos Exp $);
#endif
/*
@@ -655,8 +655,8 @@ ieee80211_notify_node_join(struct ieee80
struct ifnet *ifp = ic-ic_ifp;
struct ieee80211_join_event iev;
- IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, %s: %snode %s join\n,
- ifp-if_xname, (ni == ic-ic_bss) ? bss : ,
+ IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, %snode %s join\n,
+ (ni == ic-ic_bss) ? bss : ,
ether_sprintf(ni-ni_macaddr));
memset(iev, 0, sizeof(iev));
@@ -680,8 +680,8 @@ ieee80211_notify_node_leave(struct ieee8
struct ifnet *ifp = ic-ic_ifp;
struct ieee80211_leave_event iev;
- IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, %s: %snode %s leave\n,
- ifp-if_xname, (ni == ic-ic_bss) ? bss : ,
+ IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, %snode %s leave\n,
+ (ni == ic-ic_bss) ? bss : ,
ether_sprintf(ni-ni_macaddr));
if (ni == ic-ic_bss) {
@@ -701,7 +701,7 @@ ieee80211_notify_scan_done(struct ieee80
struct ifnet *ifp = ic-ic_ifp;
IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN,
- %s: notify scan done\n, ic-ic_ifp-if_xname);
+ %s, notify scan done\n);
/* dispatch wireless event indicating scan completed */
rt_ieee80211msg(ifp, RTM_IEEE80211_SCAN, NULL, 0);
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Mon Feb 4 17:14:32 UTC 2013
Modified Files:
src/usr.sbin/ldpd: ldp_peer.c ldp_peer.h pdu.c socketops.c
Log Message:
* Don't assume INET in connection path
* Lookup in hello list in order to get the correct LDP ID, instead of
transport address
* Improve an error message
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/ldpd/ldp_peer.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/ldpd/ldp_peer.h src/usr.sbin/ldpd/pdu.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/ldpd/socketops.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.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.9 src/usr.sbin/ldpd/ldp_peer.c:1.10
--- src/usr.sbin/ldpd/ldp_peer.c:1.9 Mon Feb 4 09:52:43 2013
+++ src/usr.sbin/ldpd/ldp_peer.c Mon Feb 4 17:14:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.9 2013/02/04 09:52:43 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.10 2013/02/04 17:14:31 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@ ldp_peer_init(void)
myaddresses = NULL;
}
-static int
+int
sockaddr_cmp(const struct sockaddr *a, const struct sockaddr *b)
{
if (a-sa_len != b-sa_len || a-sa_family != b-sa_family)
Index: src/usr.sbin/ldpd/ldp_peer.h
diff -u src/usr.sbin/ldpd/ldp_peer.h:1.3 src/usr.sbin/ldpd/ldp_peer.h:1.4
--- src/usr.sbin/ldpd/ldp_peer.h:1.3 Sat Jan 26 17:29:55 2013
+++ src/usr.sbin/ldpd/ldp_peer.h Mon Feb 4 17:14:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.h,v 1.3 2013/01/26 17:29:55 kefren Exp $ */
+/* $NetBSD: ldp_peer.h,v 1.4 2013/02/04 17:14:31 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -86,6 +86,7 @@ struct peer_map {
#define LDP_PEER_ESTABLISHED 2
#define LDP_PEER_HOLDDOWN 3
+int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *);
voidldp_peer_init(void);
struct ldp_peer * ldp_peer_new(const struct in_addr *, struct sockaddr *,
struct sockaddr *, uint16_t, int);
Index: src/usr.sbin/ldpd/pdu.c
diff -u src/usr.sbin/ldpd/pdu.c:1.3 src/usr.sbin/ldpd/pdu.c:1.4
--- src/usr.sbin/ldpd/pdu.c:1.3 Mon Jan 28 21:35:35 2013
+++ src/usr.sbin/ldpd/pdu.c Mon Feb 4 17:14:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pdu.c,v 1.3 2013/01/28 21:35:35 kefren Exp $ */
+/* $NetBSD: pdu.c,v 1.4 2013/02/04 17:14:31 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -67,8 +67,9 @@ check_recv_pdu(struct ldp_peer * p, stru
return LDP_E_BAD_LENGTH;
if (p-ldp_id.s_addr != rpdu-ldp_id.s_addr) {
- fatalp(Invalid LDP ID received from %s\n,
- inet_ntoa(p-ldp_id));
+ fatalp(Invalid LDP ID %s received from ,
+ inet_ntoa(rpdu-ldp_id));
+ fatalp(%s\n, inet_ntoa(p-ldp_id));
notiftlv = build_notification(0,
NOTIF_FATAL | NOTIF_BAD_LDP_ID);
send_tlv(p, (struct tlv *) notiftlv);
Index: src/usr.sbin/ldpd/socketops.c
diff -u src/usr.sbin/ldpd/socketops.c:1.24 src/usr.sbin/ldpd/socketops.c:1.25
--- src/usr.sbin/ldpd/socketops.c:1.24 Sun Feb 3 19:41:59 2013
+++ src/usr.sbin/ldpd/socketops.c Mon Feb 4 17:14:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: socketops.c,v 1.24 2013/02/03 19:41:59 kefren Exp $ */
+/* $NetBSD: socketops.c,v 1.25 2013/02/04 17:14:31 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -941,38 +941,67 @@ the_big_loop(void)
void
new_peer_connection()
{
- struct sockaddr_in sa, sin_me;
+ union sockunion peer_address, my_address;
+ struct in_addr *peer_ldp_id = NULL;
+ struct hello_info *hi;
int s;
- s = accept(ls, (struct sockaddr *) sa,
- (socklen_t) { sizeof(struct sockaddr_in) } );
+ s = accept(ls, peer_address.sa,
+ (socklen_t) { sizeof(union sockunion) } );
if (s 0) {
fatalp(accept: %s, strerror(errno));
return;
}
- if (get_ldp_peer((const struct sockaddr *)sa) != NULL) {
+ if (get_ldp_peer(peer_address.sa) != NULL) {
close(s);
return;
}
- warnp(Accepted a connection from %s\n, inet_ntoa(sa.sin_addr));
+ warnp(Accepted a connection from %s\n, satos(peer_address.sa));
- if (getsockname(s, (struct sockaddr *)sin_me,
- (socklen_t) { sizeof(struct sockaddr_in) } )) {
+ if (getsockname(s, my_address.sa,
+ (socklen_t) { sizeof(union sockunion) } )) {
fatalp(new_peer_connection(): cannot getsockname\n);
close(s);
return;
}
+ if (peer_address.sa.sa_family == AF_INET)
+ peer_address.sin.sin_port = 0;
+ else if (peer_address.sa.sa_family == AF_INET6)
+ peer_address.sin6.sin6_port = 0;
+ else {
+ fatalp(Unknown peer address family\n);
+ close(s);
+ return;
+ }
- if (ntohl(sa.sin_addr.s_addr) ntohl(sin_me.sin_addr.s_addr)) {
+ /* Verify if it should connect - XXX: no check for INET6 */
+ if (peer_address.sa.sa_family == AF_INET
+ ntohl(peer_address.sin.sin_addr.s_addr)
+ ntohl(my_address.sin.sin_addr.s_addr)) {
fatalp(Peer %s: connect from lower ID\n,
-
CVS commit: src/sys/dev/ic
Module Name:src Committed By: phx Date: Mon Feb 4 17:19:18 UTC 2013 Modified Files: src/sys/dev/ic: msm6242breg.h Log Message: 24h-mode is indicated by bit 2 of control register F. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/msm6242breg.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/dev/ic/msm6242breg.h diff -u src/sys/dev/ic/msm6242breg.h:1.1 src/sys/dev/ic/msm6242breg.h:1.2 --- src/sys/dev/ic/msm6242breg.h:1.1 Wed Nov 14 01:52:48 2012 +++ src/sys/dev/ic/msm6242breg.h Mon Feb 4 17:19:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: msm6242breg.h,v 1.1 2012/11/14 01:52:48 rkujawa Exp $ */ +/* $NetBSD: msm6242breg.h,v 1.2 2013/02/04 17:19:17 phx Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #define MSM6242B_CONTROL_E 0xE #define MSM6242B_CONTROL_F 0xF -#define MSM6242B_CONTROL_F_24H __BIT(3) +#define MSM6242B_CONTROL_F_24H __BIT(2) #define MSM6242B_MASK 0xF /* 4 significant bits only */ #define MSM6242B_SIZE 0x10 @@ -67,4 +67,3 @@ #define MSM6242B_BASE_YEAR 1900 #endif /* _MSM6242BREG_H_ */ -
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jdc Date: Mon Feb 4 18:29:56 UTC 2013 Modified Files: src/sys/dev/ic: gem.c Log Message: Halt the RX watchdog callout when stopping. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ic/gem.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/ic/gem.c diff -u src/sys/dev/ic/gem.c:1.100 src/sys/dev/ic/gem.c:1.101 --- src/sys/dev/ic/gem.c:1.100 Sun Jul 22 14:32:57 2012 +++ src/sys/dev/ic/gem.c Mon Feb 4 18:29:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: gem.c,v 1.100 2012/07/22 14:32:57 matt Exp $ */ +/* $NetBSD: gem.c,v 1.101 2013/02/04 18:29:55 jdc Exp $ */ /* * @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gem.c,v 1.100 2012/07/22 14:32:57 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: gem.c,v 1.101 2013/02/04 18:29:55 jdc Exp $); #include opt_inet.h @@ -713,6 +713,7 @@ gem_stop(struct ifnet *ifp, int disable) DPRINTF(sc, (%s: gem_stop\n, device_xname(sc-sc_dev))); callout_halt(sc-sc_tick_ch, NULL); + callout_halt(sc-sc_rx_watchdog, NULL); if ((sc-sc_flags (GEM_SERDES | GEM_SERIAL)) != 0) gem_pcs_stop(sc, disable); else
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src
Committed By: matt
Date: Mon Feb 4 18:41:18 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h netbsd-elf.h
t-netbsd-eabi
Removed Files:
src/external/gpl3/gcc/dist/gcc/config/arm: unwind-netbsd.h
Log Message:
Default to EABI5. Don't supply -meabi= to as. switch back unwind-arm.h
nuke unwind-netbsd.h
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h \
src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
cvs rdiff -u -r1.1 -r0 \
src/external/gpl3/gcc/dist/gcc/config/arm/unwind-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/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.3 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.4
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.3 Thu Jan 31 06:52:16 2013
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h Mon Feb 4 18:41:18 2013
@@ -68,7 +68,7 @@
#undef SUBTARGET_EXTRA_ASM_SPEC
#define SUBTARGET_EXTRA_ASM_SPEC \
- -matpcs %{!mabi=*|mabi=aapcs*:-meabi=4} %{fpic|fpie:-k} %{fPIC|fPIE:-k}
+ -matpcs %{fpic|fpie:-k} %{fPIC|fPIE:-k}
/* Default to full VFP if -mhard-float is specified. */
#undef SUBTARGET_ASM_FLOAT_SPEC
Index: src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.3 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.4
--- src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.3 Thu Jan 31 07:11:08 2013
+++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi Mon Feb 4 18:41:18 2013
@@ -24,8 +24,8 @@
# _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
# _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
# _fixsfsi _fixunssfsi
-LIB1ASMFUNCS += \
- _floatundisf
+#LIB1ASMFUNCS += \
+# _floatundisf
# Add the BPABI C functions.
LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi-netbsd.c \
@@ -35,4 +35,4 @@ LIB2FUNCS_EXTRA = $(srcdir)/config/arm/b
LIB2FUNCS_STATIC_EXTRA =
# to make compat easier.
-UNWIND_H = $(srcdir)/config/arm/unwind-netbsd.h
+UNWIND_H = $(srcdir)/config/arm/unwind-arm.h
Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.4 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.5
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.4 Sat Feb 2 05:04:25 2013
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h Mon Feb 4 18:41:18 2013
@@ -61,7 +61,7 @@
#undef SUBTARGET_EXTRA_ASM_SPEC
#define SUBTARGET_EXTRA_ASM_SPEC \
- -matpcs %{mabi=aapcs*:-meabi=4} %{fpic|fpie:-k} %{fPIC|fPIE:-k}
+ -matpcs %{mabi=aapcs*:-meabi=5} %{fpic|fpie:-k} %{fPIC|fPIE:-k}
/* Default to full VFP if -mhard-float is specified. */
#undef SUBTARGET_ASM_FLOAT_SPEC
CVS commit: src/external/gpl3/binutils/dist/gas
Module Name:src
Committed By: matt
Date: Mon Feb 4 18:42:31 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist/gas: configure.tgt
Added Files:
src/external/gpl3/binutils/dist/gas/config: te-armnetbsdeabi.h
Log Message:
Add a match for arm*--netbsdelf-eabi* and default that EABI with a VFP FPU
and ARCH_ARM_V5TEJ cpu.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/gpl3/binutils/dist/gas/configure.tgt
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/binutils/dist/gas/config/te-armnetbsdeabi.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/binutils/dist/gas/configure.tgt
diff -u src/external/gpl3/binutils/dist/gas/configure.tgt:1.1.1.2 src/external/gpl3/binutils/dist/gas/configure.tgt:1.2
--- src/external/gpl3/binutils/dist/gas/configure.tgt:1.1.1.2 Sat Sep 24 22:23:35 2011
+++ src/external/gpl3/binutils/dist/gas/configure.tgt Mon Feb 4 18:42:30 2013
@@ -118,6 +118,7 @@ case ${generic_target} in
arm-*-linux-*) fmt=elf em=linux ;;
arm-*-uclinux*eabi*) fmt=elf em=armlinuxeabi ;;
arm-*-uclinux*) fmt=elf em=linux ;;
+ arm-*-netbsdelf-*eabi*) fmt=elf em=armnetbsdeabi ;;
arm-*-netbsdelf*) fmt=elf em=nbsd ;;
arm-*-*n*bsd*) fmt=aout em=nbsd ;;
arm-*-nto*)fmt=elf ;;
Added files:
Index: src/external/gpl3/binutils/dist/gas/config/te-armnetbsdeabi.h
diff -u /dev/null src/external/gpl3/binutils/dist/gas/config/te-armnetbsdeabi.h:1.1
--- /dev/null Mon Feb 4 18:42:31 2013
+++ src/external/gpl3/binutils/dist/gas/config/te-armnetbsdeabi.h Mon Feb 4 18:42:31 2013
@@ -0,0 +1,25 @@
+/* Copyright 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+
+ This file is part of GAS, the GNU Assembler.
+
+ GAS is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3,
+ or (at your option) any later version.
+
+ GAS is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+ the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GAS; see the file COPYING. If not, write to the Free
+ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
+
+#include te-netbsd.h
+
+/* The EABI requires the use of VFP. */
+#define CPU_DEFAULT ARM_ARCH_V5TEJ
+#define FPU_DEFAULT FPU_ARCH_VFP
+#define EABI_DEFAULT EF_ARM_EABI_VER5
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Feb 4 19:29:39 UTC 2013 Modified Files: src/lib/libc/sys: posix_fadvise.2 Log Message: According to the opengroup document [1], we should include fcntl.h (not sys/fcntl.h) for posix_fadvise(). [1] http://pubs.opengroup.org/onlinepubs/009695399/functions/posix_fadvise.html To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/sys/posix_fadvise.2 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/sys/posix_fadvise.2 diff -u src/lib/libc/sys/posix_fadvise.2:1.3 src/lib/libc/sys/posix_fadvise.2:1.4 --- src/lib/libc/sys/posix_fadvise.2:1.3 Tue Jun 9 11:21:33 2009 +++ src/lib/libc/sys/posix_fadvise.2 Mon Feb 4 19:29:38 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: posix_fadvise.2,v 1.3 2009/06/09 11:21:33 yamt Exp $ +.\ $NetBSD: posix_fadvise.2,v 1.4 2013/02/04 19:29:38 njoly Exp $ .\ .\ Copyright (c)2006,2009 YAMAMOTO Takashi, .\ All rights reserved. @@ -36,7 +36,7 @@ .Lb libc .\ .Sh SYNOPSIS -.In sys/fcntl.h +.In fcntl.h .Ft int .Fn posix_fadvise int fd off_t offset off_t size int hint .\
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Feb 4 20:03:11 UTC 2013 Modified Files: src/lib/libc/sys: posix_fadvise.2 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/sys/posix_fadvise.2 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/sys/posix_fadvise.2 diff -u src/lib/libc/sys/posix_fadvise.2:1.4 src/lib/libc/sys/posix_fadvise.2:1.5 --- src/lib/libc/sys/posix_fadvise.2:1.4 Mon Feb 4 19:29:38 2013 +++ src/lib/libc/sys/posix_fadvise.2 Mon Feb 4 20:03:11 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: posix_fadvise.2,v 1.4 2013/02/04 19:29:38 njoly Exp $ +.\ $NetBSD: posix_fadvise.2,v 1.5 2013/02/04 20:03:11 wiz Exp $ .\ .\ Copyright (c)2006,2009 YAMAMOTO Takashi, .\ All rights reserved. @@ -25,7 +25,7 @@ .\ SUCH DAMAGE. .\ .\ -.Dd June 9, 2009 +.Dd February 4, 2013 .Dt POSIX_FADVISE 2 .Os .Sh NAME
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Mon Feb 4 20:28:24 UTC 2013
Modified Files:
src/usr.sbin/ldpd: ldp_peer.c socketops.c
Log Message:
move code around a little bit in order to call get_ldp_peer correctly
check also for transport_address in get_ldp_peer
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/ldpd/ldp_peer.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/ldpd/socketops.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.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.10 src/usr.sbin/ldpd/ldp_peer.c:1.11
--- src/usr.sbin/ldpd/ldp_peer.c:1.10 Mon Feb 4 17:14:31 2013
+++ src/usr.sbin/ldpd/ldp_peer.c Mon Feb 4 20:28:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.10 2013/02/04 17:14:31 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.11 2013/02/04 20:28:24 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,7 +66,8 @@ ldp_peer_init(void)
int
sockaddr_cmp(const struct sockaddr *a, const struct sockaddr *b)
{
- if (a-sa_len != b-sa_len || a-sa_family != b-sa_family)
+ if (a == NULL || b == NULL || a-sa_len != b-sa_len ||
+ a-sa_family != b-sa_family)
return -1;
return memcmp(a, b, a-sa_len);
}
@@ -226,9 +227,9 @@ get_ldp_peer(const struct sockaddr * a)
(const void *) p-ldp_id,
sizeof(struct in_addr)) == 0)
return p;
- if (sockaddr_cmp(a, p-address) == 0)
- return p;
- if (a-sa_family == AF_INET check_ifaddr(p,a))
+ if (sockaddr_cmp(a, p-address) == 0 ||
+ sockaddr_cmp(a, p-transport_address) == 0 ||
+ check_ifaddr(p, a))
return p;
}
return NULL;
Index: src/usr.sbin/ldpd/socketops.c
diff -u src/usr.sbin/ldpd/socketops.c:1.25 src/usr.sbin/ldpd/socketops.c:1.26
--- src/usr.sbin/ldpd/socketops.c:1.25 Mon Feb 4 17:14:31 2013
+++ src/usr.sbin/ldpd/socketops.c Mon Feb 4 20:28:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: socketops.c,v 1.25 2013/02/04 17:14:31 kefren Exp $ */
+/* $NetBSD: socketops.c,v 1.26 2013/02/04 20:28:24 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -953,19 +953,13 @@ new_peer_connection()
return;
}
- if (get_ldp_peer(peer_address.sa) != NULL) {
- close(s);
- return;
- }
-
- warnp(Accepted a connection from %s\n, satos(peer_address.sa));
-
if (getsockname(s, my_address.sa,
(socklen_t) { sizeof(union sockunion) } )) {
fatalp(new_peer_connection(): cannot getsockname\n);
close(s);
return;
}
+
if (peer_address.sa.sa_family == AF_INET)
peer_address.sin.sin_port = 0;
else if (peer_address.sa.sa_family == AF_INET6)
@@ -976,6 +970,14 @@ new_peer_connection()
return;
}
+ /* Already peered or in holddown ? */
+ if (get_ldp_peer(peer_address.sa) != NULL) {
+ close(s);
+ return;
+ }
+
+ warnp(Accepted a connection from %s\n, satos(peer_address.sa));
+
/* Verify if it should connect - XXX: no check for INET6 */
if (peer_address.sa.sa_family == AF_INET
ntohl(peer_address.sin.sin_addr.s_addr)
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Feb 4 21:24:07 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c dwc_otgvar.h
Log Message:
Fix transfer aborts and bump the workqueue to IPL_BIO.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/dwc_otg.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/dwc_otgvar.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/dev/usb/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.42 src/sys/dev/usb/dwc_otg.c:1.43
--- src/sys/dev/usb/dwc_otg.c:1.42 Sun Feb 3 22:25:39 2013
+++ src/sys/dev/usb/dwc_otg.c Mon Feb 4 21:24:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.42 2013/02/03 22:25:39 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.43 2013/02/04 21:24:07 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.42 2013/02/03 22:25:39 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.43 2013/02/04 21:24:07 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -190,9 +190,7 @@ Static void dwc_otg_device_isoc_abort(u
Static void dwc_otg_device_isoc_close(usbd_pipe_handle);
Static void dwc_otg_device_isoc_done(usbd_xfer_handle);
-#if 0
-Static void dwc_otg_close_pipe(usbd_pipe_handle, dwc_otg_soft_ed_t *);
-#endif
+Static void dwc_otg_close_pipe(usbd_pipe_handle);
Static void dwc_otg_abort_xfer(usbd_xfer_handle, usbd_status);
Static void dwc_otg_device_clear_toggle(usbd_pipe_handle pipe);
@@ -247,6 +245,7 @@ Static void dwc_otg_vbus_interrupt(stru
Static void dwc_otg_standard_done(usbd_xfer_handle);
Static void dwc_otg_setup_standard_chain(usbd_xfer_handle);
Static void dwc_otg_start_standard_chain(usbd_xfer_handle);
+Static void dwc_otg_host_channel_free(struct dwc_otg_td *);
Static void dwc_otg_core_reset(struct dwc_otg_softc *sc);
@@ -425,6 +424,12 @@ dwc_otg_softintr(void *v)
mutex_spin_enter(sc-sc_intr_lock);
while ((dxfer = TAILQ_FIRST(sc-sc_complete)) != NULL) {
TAILQ_REMOVE(sc-sc_complete, dxfer, xnext);
+
+ if (dxfer-xfer.hcflags UXFER_ABORTING) {
+ cv_broadcast(dxfer-xfer.hccv);
+ continue;
+ }
+
mutex_spin_exit(sc-sc_intr_lock);
usb_transfer_complete(dxfer-xfer);
mutex_spin_enter(sc-sc_intr_lock);
@@ -577,21 +582,20 @@ dwc_otg_poll(struct usbd_bus *bus)
mutex_spin_exit(sc-sc_intr_lock);
}
-#if 0
/*
* Close a reqular pipe.
* Assumes that there are no pending transactions.
*/
Static void
-dwc_otg_close_pipe(usbd_pipe_handle pipe, dwc_otg_soft_ed_t *head)
+dwc_otg_close_pipe(usbd_pipe_handle pipe)
{
struct dwc_otg_pipe *dpipe = (struct dwc_otg_pipe *)pipe;
struct dwc_otg_softc *sc = pipe-device-bus-hci_private;
dpipe = dpipe;
- usb_delay_ms(sc-sc_bus, 1);
+
+ KASSERT(mutex_owned(sc-sc_lock));
}
-#endif
/*
* Abort a device request.
@@ -616,6 +620,10 @@ dwc_otg_abort_xfer(usbd_xfer_handle xfer
return;
}
+ /*
+ * If an abort is already in progress then just wait for it to
+ * complete and return.
+ */
if (xfer-hcflags UXFER_ABORTING) {
xfer-status = status;
xfer-hcflags |= UXFER_ABORTWAIT;
@@ -623,39 +631,32 @@ dwc_otg_abort_xfer(usbd_xfer_handle xfer
cv_wait(xfer-hccv, sc-sc_lock);
return;
}
- xfer-hcflags |= UXFER_ABORTING;
/*
* Step 1: Make interrupt routine and hardware ignore xfer.
*/
+ mutex_spin_enter(sc-sc_intr_lock);
+ xfer-hcflags |= UXFER_ABORTING;
+
xfer-status = status; /* make software ignore it */
callout_stop(xfer-timeout_handle);
- if (dxfer-td_transfer_cache) {
- int ch = dxfer-td_transfer_cache-channel;
- if (ch DWC_OTG_MAX_CHANNELS) {
-
- DPRINTF(Disabling channel %d\n, ch);
- DWC_OTG_WRITE_4(sc, DOTG_HCINTMSK(ch),
- HCINTMSK_CHHLTDMSK);
- DWC_OTG_WRITE_4(sc, DOTG_HCINT(ch),
- ~HCINTMSK_CHHLTDMSK);
-
- if ((DWC_OTG_READ_4(sc, DOTG_HCCHAR(ch))
- HCCHAR_CHENA) != 0) {
-DWC_OTG_MODIFY_4(sc, DOTG_HCCHAR(ch),
-HCCHAR_CHENA, HCCHAR_CHDIS);
- }
- }
+ if (dxfer-active) {
+ TAILQ_REMOVE(sc-sc_active, dxfer, xnext);
+ dxfer-active = false;
}
-
- mutex_spin_enter(sc-sc_intr_lock);
- dxfer-queued = false;
- TAILQ_REMOVE(sc-sc_active, dxfer, xnext);
mutex_spin_exit(sc-sc_intr_lock);
+ if (dxfer-td_transfer_cache != NULL) {
+ dwc_otg_host_channel_free(dxfer-td_transfer_cache);
+ }
+
+ while (dxfer-queued) {
+ cv_wait(xfer-hccv, sc-sc_lock);
+ }
+
/*
- * Step 4: Execute callback.
+ * Step 2: Execute callback.
*/
wake = xfer-hcflags UXFER_ABORTWAIT;
xfer-hcflags = ~(UXFER_ABORTING | UXFER_ABORTWAIT);
@@ -1136,9 +1137,8 @@ dwc_otg_root_ctrl_start(usbd_xfer_handle
err = USBD_NORMAL_COMPLETION;
fail:
-xfer-status = err;
-
mutex_enter(sc-sc_lock);
+ xfer-status = err;
usb_transfer_complete(xfer);
mutex_exit(sc-sc_lock);
@@ -1307,7 +1307,10 @@
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Feb 4 21:29:14 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c dwc_otgvar.h
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/dwc_otg.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/dwc_otgvar.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/dev/usb/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.43 src/sys/dev/usb/dwc_otg.c:1.44
--- src/sys/dev/usb/dwc_otg.c:1.43 Mon Feb 4 21:24:07 2013
+++ src/sys/dev/usb/dwc_otg.c Mon Feb 4 21:29:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.43 2013/02/04 21:24:07 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.44 2013/02/04 21:29:14 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.43 2013/02/04 21:24:07 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.44 2013/02/04 21:29:14 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -351,15 +351,15 @@ dwc_otg_allocm(struct usbd_bus *bus, usb
Static void
dwc_otg_freem(struct usbd_bus *bus, usb_dma_t *dma)
{
-struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = bus-hci_private;
DPRINTF(\n);
-if (dma-block-flags USB_DMA_RESERVE) {
-usb_reserve_freem(sc-sc_dma_reserve, dma);
-return;
-}
-usb_freemem(sc-sc_bus, dma);
+ if (dma-block-flags USB_DMA_RESERVE) {
+ usb_reserve_freem(sc-sc_dma_reserve, dma);
+ return;
+ }
+ usb_freemem(sc-sc_bus, dma);
}
usbd_xfer_handle
@@ -678,7 +678,7 @@ dwc_otg_noop(usbd_pipe_handle pipe)
Static void
dwc_otg_device_clear_toggle(usbd_pipe_handle pipe)
{
-
+
DPRINTF(toggle %d - 0, pipe-endpoint-datatoggle);
pipe-endpoint-datatoggle = 0;
@@ -853,7 +853,7 @@ dwc_otg_root_ctrl_start(usbd_xfer_handle
*buf = 0;
totlen = 1;
}
-break;
+ break;
case C(UR_GET_STATUS, UT_READ_DEVICE):
if (len 1) {
USETW(((usb_status_t *)buf)-wStatus,UDS_SELF_POWERED);
@@ -871,13 +871,13 @@ dwc_otg_root_ctrl_start(usbd_xfer_handle
DPRINTF(UR_SET_ADDRESS, UT_WRITE_DEVICE: addr %d\n,
value);
if (value = USB_MAX_DEVICES)
-goto fail;
+ goto fail;
sc-sc_addr = value;
break;
case C(UR_SET_CONFIG, UT_WRITE_DEVICE):
if (value != 0 value != 1)
-goto fail;
+ goto fail;
sc-sc_conf = value;
break;
@@ -913,7 +913,7 @@ dwc_otg_root_ctrl_start(usbd_xfer_handle
DPRINTFN(9, UR_CLEAR_FEATURE port=%d feature=%d\n,
index, value);
if (index 1 || index sc-sc_noport)
-goto fail;
+ goto fail;
switch (value) {
case UHF_PORT_ENABLE:
@@ -1137,12 +1137,12 @@ dwc_otg_root_ctrl_start(usbd_xfer_handle
err = USBD_NORMAL_COMPLETION;
fail:
-mutex_enter(sc-sc_lock);
+ mutex_enter(sc-sc_lock);
xfer-status = err;
-usb_transfer_complete(xfer);
-mutex_exit(sc-sc_lock);
+ usb_transfer_complete(xfer);
+ mutex_exit(sc-sc_lock);
-return USBD_IN_PROGRESS;
+ return USBD_IN_PROGRESS;
}
Static void
@@ -3854,7 +3854,7 @@ dwc_otg_setup_standard_chain(usbd_xfer_h
// DPRINTF((%s: xfer-length %d\n, __func__, xfer-length));
dxfer-queued = false;
-
+
/* get first again */
td = dxfer-td_transfer_first;
td-toggle = dpipe-pipe.endpoint-datatoggle;
@@ -3872,7 +3872,7 @@ dwc_otg_setup_standard_chain(usbd_xfer_h
hcchar |= HCCHAR_EPDIR_IN;
}
break;
-
+
case UE_INTERRUPT:
case UE_BULK:
case UE_ISOCHRONOUS:
@@ -4097,6 +4097,7 @@ dwc_otg_init(struct dwc_otg_softc *sc)
sc-sc_bus.pipe_size = sizeof(struct dwc_otg_pipe);
sc-sc_noport = 1;
+ dotg_sc = sc;
callout_init(sc-sc_timer, CALLOUT_MPSAFE);
@@ -4119,7 +4120,7 @@ dwc_otg_init(struct dwc_otg_softc *sc)
usb_setup_reserve(sc-sc_dev, sc-sc_dma_reserve, sc-sc_bus.dmatag,
USB_MEM_RESERVE);
-
+
#ifdef DOTG_COUNTERS
evcnt_attach_dynamic(sc-sc_ev_intr, EVCNT_TYPE_INTR,
NULL, xname, intr);
@@ -4141,7 +4142,7 @@ dwc_otg_init(struct dwc_otg_softc *sc)
for (size_t i = DWC_OTG_INTRBITF; i DWC_OTG_NINTRBITS; i++) {
evcnt_attach_dynamic(sc-sc_ev_intr_bit[i], EVCNT_TYPE_INTR,
NULL, xname, intnames[i]);
- }
+ }
#endif
Index: src/sys/dev/usb/dwc_otgvar.h
diff -u src/sys/dev/usb/dwc_otgvar.h:1.10 src/sys/dev/usb/dwc_otgvar.h:1.11
--- src/sys/dev/usb/dwc_otgvar.h:1.10 Mon Feb 4 21:24:07 2013
+++ src/sys/dev/usb/dwc_otgvar.h Mon Feb 4 21:29:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otgvar.h,v 1.10 2013/02/04 21:24:07 skrll Exp $ */
+/* $NetBSD: dwc_otgvar.h,v 1.11 2013/02/04 21:29:14 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/controller/dwc_otg.h,v 1.12 2012/09/27 15:23:38 hselasky Exp $ */
/*-
@@ -209,7 +209,7 @@ typedef struct dwc_otg_softc {
pool_cache_t sc_tdpool;
pool_cache_t
CVS commit: src/sys/arch/arm/omap
Module Name:src
Committed By: macallan
Date: Mon Feb 4 21:35:45 UTC 2013
Modified Files:
src/sys/arch/arm/omap: omapfb.c
Log Message:
put BUS_DMA_PREFETCHABLE back now that the missing pieces are in place
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/omap/omapfb.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/omap/omapfb.c
diff -u src/sys/arch/arm/omap/omapfb.c:1.19 src/sys/arch/arm/omap/omapfb.c:1.20
--- src/sys/arch/arm/omap/omapfb.c:1.19 Sat Feb 2 21:02:06 2013
+++ src/sys/arch/arm/omap/omapfb.c Mon Feb 4 21:35:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omapfb.c,v 1.19 2013/02/02 21:02:06 christos Exp $ */
+/* $NetBSD: omapfb.c,v 1.20 2013/02/04 21:35:44 macallan Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.19 2013/02/02 21:02:06 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.20 2013/02/04 21:35:44 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -557,7 +557,7 @@ omapfb_mmap(void *v, void *vs, off_t off
/* 'regular' framebuffer mmap()ing */
if (offset sc-sc_vramsize) {
pa = bus_dmamem_mmap(sc-sc_dmat, sc-sc_dmamem, 1,
- offset + 0x1000, prot, BUS_DMA_COHERENT);
+ offset + 0x1000, prot, BUS_DMA_PREFETCHABLE);
return pa;
}
return pa;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Feb 4 21:37:05 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: Remove something that shouldn't have been committed. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c diff -u src/sys/dev/usb/dwc_otg.c:1.44 src/sys/dev/usb/dwc_otg.c:1.45 --- src/sys/dev/usb/dwc_otg.c:1.44 Mon Feb 4 21:29:14 2013 +++ src/sys/dev/usb/dwc_otg.c Mon Feb 4 21:37:05 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.44 2013/02/04 21:29:14 skrll Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.45 2013/02/04 21:37:05 skrll Exp $ */ /*- * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.44 2013/02/04 21:29:14 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.45 2013/02/04 21:37:05 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -4097,7 +4097,6 @@ dwc_otg_init(struct dwc_otg_softc *sc) sc-sc_bus.pipe_size = sizeof(struct dwc_otg_pipe); sc-sc_noport = 1; - dotg_sc = sc; callout_init(sc-sc_timer, CALLOUT_MPSAFE);
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: skrll
Date: Mon Feb 4 21:43:17 UTC 2013
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Fix some VERBOSE_INIT_ARM output
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/rpi/rpi_machdep.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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.32 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.33
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.32 Mon Jan 28 19:47:02 2013
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Mon Feb 4 21:43:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.32 2013/01/28 19:47:02 jmcneill Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.33 2013/02/04 21:43:17 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.32 2013/01/28 19:47:02 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.33 2013/02/04 21:43:17 skrll Exp $);
#include opt_evbarm_boardtype.h
@@ -409,11 +409,6 @@ rpi_bootparams(void)
if (vcprop_tag_success_p(vb.vbt_armclockrate.tag))
curcpu()-ci_data.cpu_cc_freq = vb.vbt_armclockrate.rate;
- if (vcprop_tag_success_p(vb.vbt_macaddr.tag))
- printf(%s: mac-address %llx\n, __func__,
- vb.vbt_macaddr.addr);
-
-
#ifdef VERBOSE_INIT_ARM
if (vcprop_tag_success_p(vb.vbt_fwrev.tag))
printf(%s: firmware rev %x\n, __func__,
@@ -506,13 +501,13 @@ initarm(void *arg)
rpi_bootparams();
+#ifdef VERBOSE_INIT_ARM
if (vcprop_tag_success_p(vb.vbt_armclockrate.tag)) {
curcpu()-ci_data.cpu_cc_freq = vb.vbt_armclockrate.rate;
printf(%s: arm clock %d\n, __func__,
vb.vbt_armclockrate.rate);
}
-#ifdef VERBOSE_INIT_ARM
printf(initarm: Configuring system ...\n);
#endif
arm32_bootmem_init(bootconfig.dram[0].address,
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: skrll
Date: Mon Feb 4 21:46:14 UTC 2013
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Oops, put back the initialisation of cpu_cc_freq
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/rpi/rpi_machdep.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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.33 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.34
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.33 Mon Feb 4 21:43:17 2013
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Mon Feb 4 21:46:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.33 2013/02/04 21:43:17 skrll Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.34 2013/02/04 21:46:14 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.33 2013/02/04 21:43:17 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.34 2013/02/04 21:46:14 skrll Exp $);
#include opt_evbarm_boardtype.h
@@ -501,13 +501,15 @@ initarm(void *arg)
rpi_bootparams();
-#ifdef VERBOSE_INIT_ARM
if (vcprop_tag_success_p(vb.vbt_armclockrate.tag)) {
curcpu()-ci_data.cpu_cc_freq = vb.vbt_armclockrate.rate;
+#ifdef VERBOSE_INIT_ARM
printf(%s: arm clock %d\n, __func__,
vb.vbt_armclockrate.rate);
+#endif
}
+#ifdef VERBOSE_INIT_ARM
printf(initarm: Configuring system ...\n);
#endif
arm32_bootmem_init(bootconfig.dram[0].address,
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: macallan
Date: Mon Feb 4 22:19:43 UTC 2013
Modified Files:
src/sys/arch/sparc64/include: cpu.h
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
add a sysctl.vis node that indicated which version of the VIS instruction set
is supported. Currently this will be 1 for UltraSPARC I and II, 2 for
UltraSPARC-III and up
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.271 -r1.272 src/sys/arch/sparc64/sparc64/machdep.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/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.100 src/sys/arch/sparc64/include/cpu.h:1.101
--- src/sys/arch/sparc64/include/cpu.h:1.100 Fri Nov 9 10:05:59 2012
+++ src/sys/arch/sparc64/include/cpu.h Mon Feb 4 22:19:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.100 2012/11/09 10:05:59 nakayama Exp $ */
+/* $NetBSD: cpu.h,v 1.101 2013/02/04 22:19:43 macallan Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -50,7 +50,8 @@
#define CPU_BOOTED_DEVICE 2 /* string: device booted from */
#define CPU_BOOT_ARGS 3 /* string: args booted with */
#define CPU_ARCH 4 /* integer: cpu architecture version */
-#define CPU_MAXID 5 /* number of valid machdep ids */
+#define CPU_VIS 5 /* 0 - no VIS, 1 - VIS 1.0, etc. */
+#define CPU_MAXID 6 /* number of valid machdep ids */
#if defined(_KERNEL) || defined(_KMEMUSER)
/*
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.271 src/sys/arch/sparc64/sparc64/machdep.c:1.272
--- src/sys/arch/sparc64/sparc64/machdep.c:1.271 Sat Dec 8 11:43:27 2012
+++ src/sys/arch/sparc64/sparc64/machdep.c Mon Feb 4 22:19:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.271 2012/12/08 11:43:27 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.272 2013/02/04 22:19:43 macallan Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.271 2012/12/08 11:43:27 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.272 2013/02/04 22:19:43 macallan Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -395,6 +395,32 @@ sysctl_machdep_boot(SYSCTLFN_ARGS)
return (sysctl_lookup(SYSCTLFN_CALL(node)));
}
+/*
+ * figure out which VIS version the CPU supports
+ * this assumes all CPUs in the system are the same
+ */
+static int
+get_vis(void)
+{
+ int vis = 0;
+
+ if (GETVER_CPU_MANUF() == MANUF_FUJITSU) {
+ /* as far as I can tell SPARC64-III and up have VIS 1.0 */
+ if (GETVER_CPU_IMPL() = IMPL_SPARC64_III) {
+ vis = 1;
+ }
+ /* XXX - which, if any, SPARC64 support VIS 2.0? */
+ } else {
+ /* this better be Sun */
+ vis = 1; /* all UltraSPARCs support at least VIS 1.0 */
+ if (CPU_IS_USIII_UP()) {
+ vis = 2;
+ }
+ /* UltraSPARC T4 supports VIS 3.0 */
+ }
+ return vis;
+}
+
SYSCTL_SETUP(sysctl_machdep_setup, sysctl machdep subtree setup)
{
@@ -424,6 +450,11 @@ SYSCTL_SETUP(sysctl_machdep_setup, sysc
CTLTYPE_INT, cpu_arch, NULL,
NULL, 9, NULL, 0,
CTL_MACHDEP, CPU_ARCH, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
+ CTLTYPE_INT, vis, NULL,
+ NULL, get_vis(), NULL, 0,
+ CTL_MACHDEP, CPU_VIS, CTL_EOL);
}
void *
CVS commit: src/external/gpl3/binutils/dist/gas
Module Name:src
Committed By: matt
Date: Mon Feb 4 22:38:07 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist/gas: configure.tgt
Added Files:
src/external/gpl3/binutils/dist/gas/config: te-armnbsdeabi.h
te-armnbsdeabihf.h
Removed Files:
src/external/gpl3/binutils/dist/gas/config: te-armnetbsdeabi.h
Log Message:
Move arm-*-netbsdelf-*eabi* to before arm-*-eabi* so it matches properly.
Add arm-*-netbsdelf-*eabihf* which has a VFP V2 by default.
Rename armnetbsdeabi*.h to armnbsdeabi*.h to be consistent with other nbsd
files.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/gas/configure.tgt
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabi.h \
src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabihf.h
cvs rdiff -u -r1.1 -r0 \
src/external/gpl3/binutils/dist/gas/config/te-armnetbsdeabi.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/binutils/dist/gas/configure.tgt
diff -u src/external/gpl3/binutils/dist/gas/configure.tgt:1.2 src/external/gpl3/binutils/dist/gas/configure.tgt:1.3
--- src/external/gpl3/binutils/dist/gas/configure.tgt:1.2 Mon Feb 4 18:42:30 2013
+++ src/external/gpl3/binutils/dist/gas/configure.tgt Mon Feb 4 22:38:07 2013
@@ -109,6 +109,8 @@ case ${generic_target} in
arm-*-coff | thumb-*-coff) fmt=coff ;;
arm-*-rtems* | thumb-*-rtems*) fmt=elf ;;
arm-*-elf | thumb-*-elf) fmt=elf ;;
+ arm-*-netbsdelf*-*eabihf*) fmt=elf em=armnbsdeabihf ;;
+ arm-*-netbsdelf*-*eabi*) fmt=elf em=armnbsdeabi ;;
arm-*-eabi*)fmt=elf em=armeabi ;;
arm-*-symbianelf*) fmt=elf em=symbian ;;
arm-*-kaos*)fmt=elf ;;
@@ -118,7 +120,6 @@ case ${generic_target} in
arm-*-linux-*) fmt=elf em=linux ;;
arm-*-uclinux*eabi*) fmt=elf em=armlinuxeabi ;;
arm-*-uclinux*) fmt=elf em=linux ;;
- arm-*-netbsdelf-*eabi*) fmt=elf em=armnetbsdeabi ;;
arm-*-netbsdelf*) fmt=elf em=nbsd ;;
arm-*-*n*bsd*) fmt=aout em=nbsd ;;
arm-*-nto*)fmt=elf ;;
Added files:
Index: src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabi.h
diff -u /dev/null src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabi.h:1.1
--- /dev/null Mon Feb 4 22:38:07 2013
+++ src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabi.h Mon Feb 4 22:38:07 2013
@@ -0,0 +1,25 @@
+/* Copyright 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+
+ This file is part of GAS, the GNU Assembler.
+
+ GAS is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3,
+ or (at your option) any later version.
+
+ GAS is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+ the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GAS; see the file COPYING. If not, write to the Free
+ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
+
+#include te-nbsd.h
+
+/* The EABI requires the use of VFP. */
+#define CPU_DEFAULT ARM_ARCH_V5TEJ
+#define FPU_DEFAULT FPU_ARCH_VFP
+#define EABI_DEFAULT EF_ARM_EABI_VER5
Index: src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabihf.h
diff -u /dev/null src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabihf.h:1.1
--- /dev/null Mon Feb 4 22:38:07 2013
+++ src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabihf.h Mon Feb 4 22:38:07 2013
@@ -0,0 +1,25 @@
+/* Copyright 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+
+ This file is part of GAS, the GNU Assembler.
+
+ GAS is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3,
+ or (at your option) any later version.
+
+ GAS is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+ the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GAS; see the file COPYING. If not, write to the Free
+ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
+
+#include te-nbsd.h
+
+/* The EABI requires the use of VFP. */
+#define CPU_DEFAULT ARM_ARCH_V5TEJ
+#define FPU_DEFAULT FPU_ARCH_VFP_V2
+#define EABI_DEFAULT EF_ARM_EABI_VER5
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: matt Date: Mon Feb 4 22:50:13 UTC 2013 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/earm: config.h src/external/gpl3/binutils/lib/libbfd/arch/earmhf: config.h src/external/gpl3/binutils/usr.bin/common/arch/earm: config.h src/external/gpl3/binutils/usr.bin/common/arch/earmhf: config.h src/external/gpl3/binutils/usr.bin/gas/arch/earm: config.h targ-env.h src/external/gpl3/binutils/usr.bin/gas/arch/earmhf: config.h targ-env.h src/external/gpl3/binutils/usr.bin/ld/arch/earm: config.h src/external/gpl3/binutils/usr.bin/ld/arch/earmhf: config.h Log Message: Rerun mknative for earm and earmhf for gas changes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/earm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/common/arch/earm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gas/arch/earm/config.h \ src/external/gpl3/binutils/usr.bin/gas/arch/earm/targ-env.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhf/config.h \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhf/targ-env.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/ld/arch/earm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/ld/arch/earmhf/config.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/binutils/lib/libbfd/arch/earm/config.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/earm/config.h:1.1 src/external/gpl3/binutils/lib/libbfd/arch/earm/config.h:1.2 --- src/external/gpl3/binutils/lib/libbfd/arch/earm/config.h:1.1 Sun Aug 5 16:34:05 2012 +++ src/external/gpl3/binutils/lib/libbfd/arch/earm/config.h Mon Feb 4 22:50:12 2013 @@ -251,7 +251,7 @@ /* #undef HAVE_WIN32_PSTATUS_T */ /* Define to 1 if you have the zlib.h header file. */ -/* #undef HAVE_ZLIB_H */ +#define HAVE_ZLIB_H 1 /* Define to the sub-directory in which libtool stores uninstalled libraries. */ Index: src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h:1.1 src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h:1.2 --- src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h:1.1 Sun Feb 3 01:58:13 2013 +++ src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h Mon Feb 4 22:50:12 2013 @@ -251,7 +251,7 @@ /* #undef HAVE_WIN32_PSTATUS_T */ /* Define to 1 if you have the zlib.h header file. */ -/* #undef HAVE_ZLIB_H */ +#define HAVE_ZLIB_H 1 /* Define to the sub-directory in which libtool stores uninstalled libraries. */ Index: src/external/gpl3/binutils/usr.bin/common/arch/earm/config.h diff -u src/external/gpl3/binutils/usr.bin/common/arch/earm/config.h:1.1 src/external/gpl3/binutils/usr.bin/common/arch/earm/config.h:1.2 --- src/external/gpl3/binutils/usr.bin/common/arch/earm/config.h:1.1 Sun Aug 5 16:34:06 2012 +++ src/external/gpl3/binutils/usr.bin/common/arch/earm/config.h Mon Feb 4 22:50:12 2013 @@ -148,7 +148,7 @@ #define HAVE_UTIMES 1 /* Define to 1 if you have the zlib.h header file. */ -/* #undef HAVE_ZLIB_H */ +#define HAVE_ZLIB_H 1 /* Define as const if the declaration of iconv() needs const. */ #define ICONV_CONST const @@ -225,7 +225,7 @@ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ -/* #undef YYTEXT_POINTER */ +#define YYTEXT_POINTER 1 /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ Index: src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h diff -u src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h:1.1 src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h:1.2 --- src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h:1.1 Sun Feb 3 01:58:14 2013 +++ src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h Mon Feb 4 22:50:12 2013 @@ -148,7 +148,7 @@ #define HAVE_UTIMES 1 /* Define to 1 if you have the zlib.h header file. */ -/* #undef HAVE_ZLIB_H */ +#define HAVE_ZLIB_H 1 /* Define as const if the declaration of iconv() needs const. */ #define ICONV_CONST const @@ -225,7 +225,7 @@ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ -/* #undef YYTEXT_POINTER */ +#define YYTEXT_POINTER 1 /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ Index: src/external/gpl3/binutils/usr.bin/gas/arch/earm/config.h diff -u src/external/gpl3/binutils/usr.bin/gas/arch/earm/config.h:1.1
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Tue Feb 5 00:39:59 UTC 2013
Modified Files:
src/sys/dev/usb: usb_mem.c
Log Message:
segs is now used.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/usb_mem.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/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.59 src/sys/dev/usb/usb_mem.c:1.60
--- src/sys/dev/usb/usb_mem.c:1.59 Wed Jan 23 18:44:30 2013
+++ src/sys/dev/usb/usb_mem.c Mon Feb 4 19:39:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.59 2013/01/23 23:44:30 jmcneill Exp $ */
+/* $NetBSD: usb_mem.c,v 1.60 2013/02/05 00:39:58 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.59 2013/01/23 23:44:30 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.60 2013/02/05 00:39:58 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -442,6 +442,13 @@ usb_reserve_allocm(struct usb_dma_reserv
if (dma-block == NULL)
return USBD_NOMEM;
+ dma-block-segs = kmem_alloc(dma-block-nsegs *
+ sizeof(*dma-block-segs), KM_SLEEP);
+ if (dma-block-segs == NULL) {
+ kmem_free(dma-block, sizeof *dma-block);
+ return USBD_NOMEM;
+ }
+
error = extent_alloc(rs-extent, size, PAGE_SIZE, 0,
EX_NOWAIT, start);
@@ -458,7 +465,6 @@ usb_reserve_allocm(struct usb_dma_reserv
dma-block-align = PAGE_SIZE;
dma-block-size = size;
dma-block-nsegs = 1;
- /* XXX segs appears to be unused */
dma-block-segs[0] = rs-map-dm_segs[0];
dma-block-map = rs-map;
dma-block-kaddr = rs-vaddr;
@@ -470,11 +476,12 @@ usb_reserve_allocm(struct usb_dma_reserv
void
usb_reserve_freem(struct usb_dma_reserve *rs, usb_dma_t *dma)
{
- int error;
+ int error; /* XXX: why? */
error = extent_free(rs-extent,
(u_long)(rs-paddr + dma-offs), dma-block-size, 0);
- /* XXXPW correct that segs[0] is not used? */
+ kmem_free(dma-block-segs, dma-block-nsegs *
+ sizeof(*dma-block-segs));
kmem_free(dma-block, sizeof *dma-block);
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Tue Feb 5 00:41:51 UTC 2013
Modified Files:
src/sys/dev/usb: usb_mem.c
Log Message:
assign nsegs before allocation
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/usb/usb_mem.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/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.60 src/sys/dev/usb/usb_mem.c:1.61
--- src/sys/dev/usb/usb_mem.c:1.60 Mon Feb 4 19:39:58 2013
+++ src/sys/dev/usb/usb_mem.c Mon Feb 4 19:41:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.60 2013/02/05 00:39:58 christos Exp $ */
+/* $NetBSD: usb_mem.c,v 1.61 2013/02/05 00:41:51 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.60 2013/02/05 00:39:58 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.61 2013/02/05 00:41:51 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -442,6 +442,7 @@ usb_reserve_allocm(struct usb_dma_reserv
if (dma-block == NULL)
return USBD_NOMEM;
+ dma-block-nsegs = 1;
dma-block-segs = kmem_alloc(dma-block-nsegs *
sizeof(*dma-block-segs), KM_SLEEP);
if (dma-block-segs == NULL) {
@@ -464,7 +465,6 @@ usb_reserve_allocm(struct usb_dma_reserv
dma-block-flags = USB_DMA_RESERVE;
dma-block-align = PAGE_SIZE;
dma-block-size = size;
- dma-block-nsegs = 1;
dma-block-segs[0] = rs-map-dm_segs[0];
dma-block-map = rs-map;
dma-block-kaddr = rs-vaddr;
CVS commit: src/usr.sbin/mtree
Module Name:src
Committed By: christos
Date: Tue Feb 5 00:59:04 UTC 2013
Modified Files:
src/usr.sbin/mtree: only.c
Log Message:
fill up the directory hierarchy so that leaf files are not ignored if
specified by themselves.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mtree/only.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.sbin/mtree/only.c
diff -u src/usr.sbin/mtree/only.c:1.1 src/usr.sbin/mtree/only.c:1.2
--- src/usr.sbin/mtree/only.c:1.1 Sun Feb 3 14:15:17 2013
+++ src/usr.sbin/mtree/only.c Mon Feb 4 19:59:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: only.c,v 1.1 2013/02/03 19:15:17 christos Exp $ */
+/* $NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: only.c,v 1.1 2013/02/03 19:15:17 christos Exp $);
+__RCSID($NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $);
#endif
#include sys/param.h
@@ -86,14 +86,10 @@ hash_find(const char *str, uint32_t *h)
}
static void
-hash_insert(char *str)
+hash_insert(char *str, uint32_t h)
{
- uint32_t h;
struct hentry *e;
- if (hash_find(str, h))
- err(1, Duplicate entry %s, str);
-
if ((e = malloc(sizeof(*e))) == NULL)
mtree_err(memory allocation error);
@@ -103,6 +99,26 @@ hash_insert(char *str)
table[h] = e;
}
+static void
+fill(char *str)
+{
+ uint32_t h;
+ char *ptr = strrchr(str, '/');
+
+ if (ptr == NULL)
+ return;
+
+ *ptr = '\0';
+ if (!hash_find(str, h)) {
+ char *x = strdup(str);
+ if (x == NULL)
+ mtree_err(memory allocation error);
+ hash_insert(x, h);
+ fill(str);
+ }
+ *ptr = '/';
+}
+
void
load_only(const char *fname)
{
@@ -113,8 +129,13 @@ load_only(const char *fname)
if ((fp = fopen(fname, r)) == NULL)
err(1, Cannot open `%s', fname);
- while ((line = fparseln(fp, len, lineno, NULL, FPARSELN_UNESCALL)))
- hash_insert(line);
+ while ((line = fparseln(fp, len, lineno, NULL, FPARSELN_UNESCALL))) {
+ uint32_t h;
+ if (hash_find(line, h))
+ err(1, Duplicate entry %s, line);
+ hash_insert(line, h);
+ fill(line);
+ }
fclose(fp);
loaded = true;
CVS commit: src/external/lgpl3/gmp
Module Name:src
Committed By: matt
Date: Tue Feb 5 02:54:02 UTC 2013
Modified Files:
src/external/lgpl3/gmp: Makefile.netbsd-gmp
Log Message:
Use NETBSDSRCDIR. Use ?= when setting target so you can override from cmdline.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/gmp/Makefile.netbsd-gmp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/Makefile.netbsd-gmp
diff -u src/external/lgpl3/gmp/Makefile.netbsd-gmp:1.1 src/external/lgpl3/gmp/Makefile.netbsd-gmp:1.2
--- src/external/lgpl3/gmp/Makefile.netbsd-gmp:1.1 Sun Oct 30 01:50:32 2011
+++ src/external/lgpl3/gmp/Makefile.netbsd-gmp Tue Feb 5 02:54:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.netbsd-gmp,v 1.1 2011/10/30 01:50:32 mrg Exp $
+# $NetBSD: Makefile.netbsd-gmp,v 1.2 2013/02/05 02:54:01 matt Exp $
# hack makefile to help build gmp ./configure
@@ -6,7 +6,7 @@
CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
-TARGET=hppa-netbsd
+TARGET?=hppa-netbsd
#TARGET=mips64el-netbsd
ENV_ARGS=\
CC=${CC:Q}' '${CCADDFLAGS:Q} \
@@ -16,4 +16,4 @@ ENV_ARGS=\
LIBS=-lintl
all:
- env ${ENV_ARGS} /usr/src3/external/lgpl3/gmp/dist/configure --host=${TARGET} --target=${TARGET}
+ env ${ENV_ARGS} ${NETBSDSRCDIR}/external/lgpl3/gmp/dist/configure --host=${TARGET} --target=${TARGET}
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: matt
Date: Tue Feb 5 02:57:54 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/crtstuff/arch: earmhf.mk
src/external/gpl3/gcc/lib/libgcc/arch: earmhf.mk
src/external/gpl3/gcc/lib/libobjc/arch/earmhf: defs.mk
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: c++config.h
config.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf: auto-host.h configargs.h
defs.mk
Log Message:
updated mknative gcc bits for earmhf
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/crtstuff/arch/earmhf.mk
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/earmhf.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libobjc/arch/earmhf/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/config.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk
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/lib/crtstuff/arch/earmhf.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/earmhf.mk:1.1 src/external/gpl3/gcc/lib/crtstuff/arch/earmhf.mk:1.2
--- src/external/gpl3/gcc/lib/crtstuff/arch/earmhf.mk:1.1 Mon Feb 4 01:22:14 2013
+++ src/external/gpl3/gcc/lib/crtstuff/arch/earmhf.mk Tue Feb 5 02:57:54 2013
@@ -2,8 +2,8 @@
# Generated from: NetBSD: mknative-gcc,v 1.68 2012/09/25 06:55:10 skrll Exp
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
-G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber
-G_CRTSTUFF_CFLAGS=-O2 -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -g0 -finhibit-size-directive -fno-inline -fno-exceptions -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize
+G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
+G_CRTSTUFF_CFLAGS=-O2 -DIN_GCC -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf -g0 -finhibit-size-directive -fno-inline -fno-exceptions -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize
G_CRTSTUFF_T_CFLAGS=
G_CRTSTUFF_T_CFLAGS_S= -fPIC
G_tm_defines=NETBSD_ENABLE_PTHREADS TARGET_DEFAULT_FLOAT_ABI=ARM_FLOAT_ABI_HARD
Index: src/external/gpl3/gcc/lib/libgcc/arch/earmhf.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/earmhf.mk:1.2 src/external/gpl3/gcc/lib/libgcc/arch/earmhf.mk:1.3
--- src/external/gpl3/gcc/lib/libgcc/arch/earmhf.mk:1.2 Mon Feb 4 01:22:14 2013
+++ src/external/gpl3/gcc/lib/libgcc/arch/earmhf.mk Tue Feb 5 02:57:54 2013
@@ -2,7 +2,7 @@
# Generated from: NetBSD: mknative-gcc,v 1.68 2012/09/25 06:55:10 skrll Exp
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
-G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber
+G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I/usr/include/libelf
G_LIB2ADD=${GNUHOSTDIST}/gcc/config/arm/bpabi-netbsd.c ${GNUHOSTDIST}/gcc/config/arm/unaligned-funcs.c
G_LIB2ADDEH=${GNUHOSTDIST}/gcc/config/arm/unwind-arm.c ${GNUHOSTDIST}/gcc/config/arm/libunwind.S ${GNUHOSTDIST}/gcc/config/arm/pr-support.c ${GNUHOSTDIST}/gcc/unwind-c.c
G_LIB2ADD_ST=
@@ -20,5 +20,5 @@ G_EXTRA_HEADERS=${GNUHOSTDIST}/gcc/confi
G_xm_defines=
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: matt
Date: Tue Feb 5 03:02:10 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
Don't include t-arm-elf since it just provides stuff which netbsd already has.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/gcc/config.gcc
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.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.15 src/external/gpl3/gcc/dist/gcc/config.gcc:1.16
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.15 Thu Jan 31 06:53:21 2013
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Tue Feb 5 03:02:10 2013
@@ -730,7 +730,8 @@ arm*-*-netbsdelf*)
case ${target} in
arm*-*-netbsdelf-*eabi*)
tm_file=$tm_file arm/bpabi.h arm/netbsd-elf.h arm/netbsd-eabi.h
- tmake_file=$tmake_file arm/t-arm-elf arm/t-bpabi
+ #tmake_file=$tmake_file arm/t-arm-elf
+ tmake_file=$tmake_file arm/t-bpabi
tmake_file=$tmake_file arm/t-netbsd-eabi
# The BPABI long long divmod functions return a 128-bit value in
# registers r0-r3. Correctly modeling that requires the use of
CVS commit: src/sys/arch/evbarm/stand
Module Name:src
Committed By: matt
Date: Tue Feb 5 03:17:51 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/boot2440: Makefile
src/sys/arch/evbarm/stand/bootimx23: Makefile
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Make sure these are always compiled with -mabi=atpcs -mfloat-abi=soft
-Wa,-meabi=gnu so they use the old compilation methods.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/stand/boot2440/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/stand/bootimx23/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
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/evbarm/stand/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.5 src/sys/arch/evbarm/stand/boot2440/Makefile:1.6
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.5 Wed Dec 12 15:00:06 2012
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Tue Feb 5 03:17:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/12/12 15:00:06 matt Exp $
+# $NetBSD: Makefile,v 1.6 2013/02/05 03:17:50 matt Exp $
S= ${.CURDIR}/../../../..
@@ -14,7 +14,8 @@ CPPFLAGS+= -D_STANDALONE -DSUPPORT_DHCP
CPPFLAGS+= -DDM9000MAC=0x08,0x08,0x11,0x18,0x12,0x27
CPPFLAGS+= -DDEFAULT_BOOTFILE=ld0a:netbsd;net:
CPPFLAGS+= -nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
-CPUFLAGS= -march=armv4
+CPPFLAGS+= -march=armv4 -mabi=atpcs -mfloat-abi=soft
+CPUFLAGS+= -Wa,-meabi=gnu
DBG=
LIBCRT0= # nothing
Index: src/sys/arch/evbarm/stand/bootimx23/Makefile
diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.1 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.2
--- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.1 Tue Nov 20 19:08:46 2012
+++ src/sys/arch/evbarm/stand/bootimx23/Makefile Tue Feb 5 03:17:51 2013
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2012/11/20 19:08:46 jkunz Exp $
+# $Id: Makefile,v 1.2 2013/02/05 03:17:51 matt Exp $
S= ${.CURDIR}/../../../../
PROG= bootimx23
@@ -11,6 +11,7 @@ CLEANFILES+= ${PROG}
CFLAGS+= -Wall -Wno-main -ffreestanding -march=armv5te -mtune=arm926ej-s
CPPFLAGS+= -D_STANDALONE
CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
+CPPFLAGS+= -mabi=atpcs -mfloat-abi=soft -Wa,-meabi=gnu
#CPPFLAGS+= -DDEBUG
#DBG= -g
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.20 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.21
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.20 Mon Aug 13 10:25:02 2012
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Tue Feb 5 03:17:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.20 2012/08/13 10:25:02 khorben Exp $
+# $NetBSD: Makefile.gzboot,v 1.21 2013/02/05 03:17:51 matt Exp $
NOMAN= # defined
@@ -35,6 +35,7 @@ STARTFILE= srtbegin.o
CPPFLAGS+= -nostdinc -I. -I${EVBARM_STAND}/gzboot -I${EVBARM_STAND}/board
CPPFLAGS+= -I${S} -I${S}/arch -I${S}/lib/libsa
CPPFLAGS+= -I${S}/../common/dist/zlib
+CPPFLAGS+= -mabi=atpcs -mfloat-abi=soft -Wa,-meabi=gnu
CPPFLAGS+= -D_STANDALONE
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Feb 5 06:22:29 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: isakmp_xauth.c
Log Message:
From Ian West i...@niw.com.au: Fix double free of the radius info on
config reload.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.24 src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.25
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.24 Tue Nov 15 13:51:23 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Tue Feb 5 06:22:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_xauth.c,v 1.24 2011/11/15 13:51:23 tteras Exp $ */
+/* $NetBSD: isakmp_xauth.c,v 1.25 2013/02/05 06:22:29 tteras Exp $ */
/* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */
@@ -458,10 +458,14 @@ xauth_radius_init_conf(int free)
vfree(xauth_rad_config.acct_server_list[i].host);
vfree(xauth_rad_config.acct_server_list[i].secret);
}
- if (radius_auth_state != NULL)
+ if (radius_auth_state != NULL) {
rad_close(radius_auth_state);
- if (radius_acct_state != NULL)
+ radius_auth_state = NULL;
+ }
+ if (radius_acct_state != NULL) {
rad_close(radius_acct_state);
+ radius_acct_state = NULL;
+ }
}
/* initialize radius config */
CVS commit: [ipsec-tools-0_8-branch] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Feb 5 06:23:43 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_8-branch]:
isakmp_xauth.c
Log Message:
From Ian West i...@niw.com.au: Fix double free of the radius info on
config reload.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.2.1 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.22 src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.22.2.1
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.22 Mon Mar 14 15:50:36 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Tue Feb 5 06:23:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_xauth.c,v 1.22 2011/03/14 15:50:36 vanhu Exp $ */
+/* $NetBSD: isakmp_xauth.c,v 1.22.2.1 2013/02/05 06:23:42 tteras Exp $ */
/* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */
@@ -461,10 +461,14 @@ xauth_radius_init_conf(int free)
vfree(xauth_rad_config.acct_server_list[i].host);
vfree(xauth_rad_config.acct_server_list[i].secret);
}
- if (radius_auth_state != NULL)
+ if (radius_auth_state != NULL) {
rad_close(radius_auth_state);
- if (radius_acct_state != NULL)
+ radius_auth_state = NULL;
+ }
+ if (radius_acct_state != NULL) {
rad_close(radius_acct_state);
+ radius_acct_state = NULL;
+ }
}
/* initialize radius config */
CVS commit: src
Module Name:src
Committed By: matt
Date: Tue Feb 5 07:23:00 UTC 2013
Modified Files:
src/libexec/ld.aout_so: Makefile
src/sbin/ldconfig: Makefile
Log Message:
There are other little endian arm machine_arches other than arm
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/libexec/ld.aout_so/Makefile
cvs rdiff -u -r1.25 -r1.26 src/sbin/ldconfig/Makefile
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.aout_so/Makefile
diff -u src/libexec/ld.aout_so/Makefile:1.47 src/libexec/ld.aout_so/Makefile:1.48
--- src/libexec/ld.aout_so/Makefile:1.47 Tue Jul 6 05:59:53 2010
+++ src/libexec/ld.aout_so/Makefile Tue Feb 5 07:22:59 2013
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.47 2010/07/06 05:59:53 mrg Exp $
+# $NetBSD: Makefile,v 1.48 2013/02/05 07:22:59 matt Exp $
.include bsd.own.mk # for MKPIC definition
+.include bsd.endian.mk # for TARGET_ENDIANNESS
-.if ${MKPIC} != no exists(ld.so.${MACHINE_ARCH}.uue)
+.if ${MKPIC} != no
+.if ${TARGET_ENDIANNESS} == 1234 ${MACHINE_CPU} == arm
+UUDECODE_FILES= ld.so.${MACHINE_CPU}
+.else
+UUDECODE_FILES= ld.so.${MACHINE_ARCH}
+.endif
+.if exists(${UUDECODE_FILES}.uue)
FILES= ld.so
FILESDIR= /usr/libexec
FILESMODE= ${BINMODE}
-UUDECODE_FILES= ld.so.${MACHINE_ARCH}
UUDECODE_FILES_RENAME_${UUDECODE_FILES}= ld.so
all dependall: ${FILES}
-ld.so: ld.so.${MACHINE_ARCH}
+ld.so: ${UUDECODE_FILES}
.endif
+.endif
MAN= ld.aout_so.1
Index: src/sbin/ldconfig/Makefile
diff -u src/sbin/ldconfig/Makefile:1.25 src/sbin/ldconfig/Makefile:1.26
--- src/sbin/ldconfig/Makefile:1.25 Thu Aug 23 21:21:16 2012
+++ src/sbin/ldconfig/Makefile Tue Feb 5 07:23:00 2013
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2012/08/23 21:21:16 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2013/02/05 07:23:00 matt Exp $
.include bsd.own.mk # For MKPIC
.include bsd.shlib.mk
+.include bsd.endian.mk
.if ${MKPIC} != no \
-(${MACHINE_ARCH} == arm || \
+((${MACHINE_CPU} == arm ${TARGET_ENDIANNESS} == 1234) || \
${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == m68k || \
${MACHINE_ARCH} == sparc || \
CVS commit: src
Module Name:src
Committed By: matt
Date: Tue Feb 5 07:27:03 UTC 2013
Modified Files:
src/external/bsd/elftosb/lib: Makefile
src/external/bsd/elftosb/usr.sbin/elftosb: Makefile
src/external/bsd/elftosb/usr.sbin/sbkeygen: Makefile
src/external/bsd/elftosb/usr.sbin/sbtool: Makefile
src/tools: Makefile
Log Message:
There are other little endian arm machine_arches other than arm
Use MACHINE_CPU and TARGET_ENDIANNESS instead of MACHINE_ARCH
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/elftosb/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
cvs rdiff -u -r1.166 -r1.167 src/tools/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/bsd/elftosb/lib/Makefile
diff -u src/external/bsd/elftosb/lib/Makefile:1.4 src/external/bsd/elftosb/lib/Makefile:1.5
--- src/external/bsd/elftosb/lib/Makefile:1.4 Tue Nov 27 20:00:38 2012
+++ src/external/bsd/elftosb/lib/Makefile Tue Feb 5 07:27:02 2013
@@ -1,6 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2012/11/27 20:00:38 jkunz Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/05 07:27:02 matt Exp $
+
+.include bsd.endian.mk
+
+.if ${MACHINE} == evbarm \
+ ${MACHINE_CPU} == arm \
+ ${TARGET_ENDIANNESS} == 1234
-.if (${MACHINE} == evbarm) (${MACHINE_ARCH} == arm)
LIBISPRIVATE= yes
LIB= elftosb
SRCS= AESKey.cpp \
Index: src/external/bsd/elftosb/usr.sbin/elftosb/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.3
--- src/external/bsd/elftosb/usr.sbin/elftosb/Makefile:1.2 Tue Nov 27 20:00:38 2012
+++ src/external/bsd/elftosb/usr.sbin/elftosb/Makefile Tue Feb 5 07:27:03 2013
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:38 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
.include bsd.init.mk
+.include bsd.endian.mk
.PATH: ${DIST}/elftosb2
-.if (${MACHINE} == evbarm) (${MACHINE_ARCH} == arm)
+.if ${MACHINE} == evbarm \
+ ${MACHINE_CPU} == arm \
+ ${TARGET_ENDIANNESS} == 1234
+
PROG_CXX= elftosb
SRCS= BootImageGenerator.cpp \
ConversionController.cpp \
Index: src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.3
--- src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile:1.2 Tue Nov 27 20:00:39 2012
+++ src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile Tue Feb 5 07:27:03 2013
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
.include bsd.init.mk
+.include bsd.endian.mk
.PATH: ${DIST}/keygen
-.if (${MACHINE} == evbarm) (${MACHINE_ARCH} == arm)
+.if ${MACHINE} == evbarm \
+ ${MACHINE_CPU} == arm \
+ ${TARGET_ENDIANNESS} == 1234
+
PROG_CXX= sbkeygen
SRCS= keygen.cpp
+
.endif
MAN= sbkeygen.8
Index: src/external/bsd/elftosb/usr.sbin/sbtool/Makefile
diff -u src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.3
--- src/external/bsd/elftosb/usr.sbin/sbtool/Makefile:1.2 Tue Nov 27 20:00:39 2012
+++ src/external/bsd/elftosb/usr.sbin/sbtool/Makefile Tue Feb 5 07:27:03 2013
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2012/11/27 20:00:39 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
.include bsd.init.mk
+.include bsd.endian.mk
.PATH: ${DIST}/sbtool
-.if (${MACHINE} == evbarm) (${MACHINE_ARCH} == arm)
+.if ${MACHINE} == evbarm \
+ ${MACHINE_CPU} == arm \
+ ${TARGET_ENDIANNESS} == 1234
+
PROG_CXX= sbtool
SRCS= EncoreBootImageReader.cpp sbtool.cpp
+
.endif
MAN= sbtool.8
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.166 src/tools/Makefile:1.167
--- src/tools/Makefile:1.166 Thu Jan 31 15:22:50 2013
+++ src/tools/Makefile Tue Feb 5 07:27:02 2013
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.166 2013/01/31 15:22:50 pooka Exp $
+# $NetBSD: Makefile,v 1.167 2013/02/05 07:27:02 matt Exp $
.include bsd.own.mk
+.include bsd.endian.mk
# Make sure that the ordered build/install processing applies when using
# plain make.
@@ -196,7 +197,9 @@ SUBDIR+= amiga-txlt
SUBDIR+= hp300-mkboot
.endif
-.if ${MACHINE} == evbarm ${MACHINE_ARCH} == arm
+.if ${MACHINE} == evbarm \
+ ${MACHINE_CPU} == arm \
+ ${TARGET_ENDIANNESS} == 1234
SUBDIR+= elftosb
.endif
CVS commit: src/sys/arch/evbarm/stand
Module Name:src
Committed By: matt
Date: Tue Feb 5 07:28:19 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand: Makefile
src/sys/arch/evbarm/stand/gzboot: Makefile
Log Message:
There are other little endian arm machine_arches other than arm
Use MACHINE_CPU and TARGET_ENDIANNESS instead of MACHINE_ARCH
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/stand/gzboot/Makefile
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/evbarm/stand/Makefile
diff -u src/sys/arch/evbarm/stand/Makefile:1.4 src/sys/arch/evbarm/stand/Makefile:1.5
--- src/sys/arch/evbarm/stand/Makefile:1.4 Tue Nov 27 20:00:39 2012
+++ src/sys/arch/evbarm/stand/Makefile Tue Feb 5 07:28:19 2013
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2012/11/27 20:00:39 jkunz Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/05 07:28:19 matt Exp $
+
+.include bsd.endian.mk
SUBDIR+= gzboot
SUBDIR+= boot2440
-.if ${MACHINE_ARCH} == arm
+.if ${MACHINE_CPU} == arm ${TARGET_ENDIANNESS} == 1234
# According to the i.MX23 Reference Manual section 3.1, Page 3-3:
# The i.MX23 always operates in litle-endian mode.
SUBDIR+= bootimx23
Index: src/sys/arch/evbarm/stand/gzboot/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile:1.10 src/sys/arch/evbarm/stand/gzboot/Makefile:1.11
--- src/sys/arch/evbarm/stand/gzboot/Makefile:1.10 Sat Jun 2 20:50:41 2012
+++ src/sys/arch/evbarm/stand/gzboot/Makefile Tue Feb 5 07:28:19 2013
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/06/02 20:50:41 skrll Exp $
+# $NetBSD: Makefile,v 1.11 2013/02/05 07:28:19 matt Exp $
-.if ${MACHINE_ARCH} == arm
+.include bsd.endian.mk
+
+.if ${MACHINE_CPU} == arm ${TARGET_ENDIANNESS} == 1234
# Little endian platforms
SUBDIR= ADI_BRH_flash_0x0014
SUBDIR+= GEMINI_dram_0x0160
CVS commit: src/sys/arch/evbarm/stand/bootimx23
Module Name:src
Committed By: matt
Date: Tue Feb 5 07:28:48 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/bootimx23: Makefile
Log Message:
Add a ${MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/bootimx23/Makefile
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/evbarm/stand/bootimx23/Makefile
diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.2 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.3
--- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.2 Tue Feb 5 03:17:51 2013
+++ src/sys/arch/evbarm/stand/bootimx23/Makefile Tue Feb 5 07:28:48 2013
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2013/02/05 03:17:51 matt Exp $
+# $Id: Makefile,v 1.3 2013/02/05 07:28:48 matt Exp $
S= ${.CURDIR}/../../../../
PROG= bootimx23
@@ -39,6 +39,7 @@ SA_AS= library
LIBSA= ${SALIB}
${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
+ ${MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${.TARGET} \
${OBJS} ${LIBSA} ${LIBKERN}
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: matt Date: Tue Feb 5 07:31:51 UTC 2013 Modified Files: src/distrib/sets/lists/base: ad.arm.shl src/distrib/sets/lists/comp: ad.arm ad.arm.shl src/distrib/sets/lists/debug: ad.arm Log Message: Mark libc_vfp as depending on softfloat. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/ad.arm.shl cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/comp/ad.arm.shl cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/ad.arm 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/base/ad.arm.shl diff -u src/distrib/sets/lists/base/ad.arm.shl:1.3 src/distrib/sets/lists/base/ad.arm.shl:1.4 --- src/distrib/sets/lists/base/ad.arm.shl:1.3 Mon Jan 28 18:57:10 2013 +++ src/distrib/sets/lists/base/ad.arm.shl Tue Feb 5 07:31:50 2013 @@ -1,7 +1,7 @@ -# $NetBSD: ad.arm.shl,v 1.3 2013/01/28 18:57:10 matt Exp $ -./lib/libc_vfp.sobase-sys-shlib dynamicroot -./lib/libc_vfp.so.0base-sys-shlib dynamicroot -./lib/libc_vfp.so.0.0base-sys-shlib dynamicroot -./usr/lib/libc_vfp.sobase-sys-shlib -./usr/lib/libc_vfp.so.0base-sys-shlib -./usr/lib/libc_vfp.so.0.0 base-sys-shlib +# $NetBSD: ad.arm.shl,v 1.4 2013/02/05 07:31:50 matt Exp $ +./lib/libc_vfp.sobase-sys-shlib dynamicroot,softfloat +./lib/libc_vfp.so.0base-sys-shlib dynamicroot,softfloat +./lib/libc_vfp.so.0.0base-sys-shlib dynamicroot,softfloat +./usr/lib/libc_vfp.sobase-sys-shlib softfloat +./usr/lib/libc_vfp.so.0base-sys-shlib softfloat +./usr/lib/libc_vfp.so.0.0 base-sys-shlib softfloat Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.44 src/distrib/sets/lists/comp/ad.arm:1.45 --- src/distrib/sets/lists/comp/ad.arm:1.44 Mon Jan 28 18:57:10 2013 +++ src/distrib/sets/lists/comp/ad.arm Tue Feb 5 07:31:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.44 2013/01/28 18:57:10 matt Exp $ +# $NetBSD: ad.arm,v 1.45 2013/02/05 07:31:50 matt Exp $ ./usr/include/gcc-4.5/arm_neon.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 @@ -89,8 +89,8 @@ ./usr/lib/libarm32.acomp-obsolete obsolete ./usr/lib/libarm32_p.acomp-obsolete obsolete ./usr/lib/libarm_p.acomp-c-lib profile -./usr/lib/libc_vfp.acomp-c-lib -./usr/lib/libc_vfp_p.acomp-c-lib profile +./usr/lib/libc_vfp.acomp-c-lib softfloat +./usr/lib/libc_vfp_p.acomp-c-lib profile,softfloat ./usr/lib/libpmc.acomp-c-lib ./usr/lib/libpmc_p.acomp-c-proflib profile ./usr/libdata/lint/llib-larm.ln comp-c-lintlib lint Index: src/distrib/sets/lists/comp/ad.arm.shl diff -u src/distrib/sets/lists/comp/ad.arm.shl:1.3 src/distrib/sets/lists/comp/ad.arm.shl:1.4 --- src/distrib/sets/lists/comp/ad.arm.shl:1.3 Mon Jan 28 18:57:10 2013 +++ src/distrib/sets/lists/comp/ad.arm.shl Tue Feb 5 07:31:50 2013 @@ -1,5 +1,5 @@ -# $NetBSD: ad.arm.shl,v 1.3 2013/01/28 18:57:10 matt Exp $ +# $NetBSD: ad.arm.shl,v 1.4 2013/02/05 07:31:50 matt Exp $ ./usr/lib/libarm32_pic.a comp-obsolete obsolete ./usr/lib/libarm_pic.acomp-c-piclib -./usr/lib/libc_vfp_pic.a comp-c-piclib +./usr/lib/libc_vfp_pic.a comp-c-piclib softfloat ./usr/lib/libpmc_pic.acomp-c-piclib Index: src/distrib/sets/lists/debug/ad.arm diff -u src/distrib/sets/lists/debug/ad.arm:1.3 src/distrib/sets/lists/debug/ad.arm:1.4 --- src/distrib/sets/lists/debug/ad.arm:1.3 Sat Feb 2 18:19:38 2013 +++ src/distrib/sets/lists/debug/ad.arm Tue Feb 5 07:31:51 2013 @@ -1,9 +1,9 @@ -# $NetBSD: ad.arm,v 1.3 2013/02/02 18:19:38 christos Exp $ +# $NetBSD: ad.arm,v 1.4 2013/02/05 07:31:51 matt Exp $ ./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/lib/libarm.so.0.0.debug comp-sys-debug debug,pic -./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic +./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic,softfloat ./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug comp-sys-debug debug,pic ./usr/lib/libarm_g.a-unknown- debuglib -./usr/lib/libc_vfp_g.a-unknown- debuglib +./usr/lib/libc_vfp_g.a-unknown- debuglib,softfloat ./usr/lib/libpmc_g.a-unknown- debuglib
CVS commit: src/etc
Module Name:src
Committed By: matt
Date: Tue Feb 5 07:32:44 UTC 2013
Modified Files:
src/etc: Makefile
Log Message:
Add debug to the list of OBSOLETE_FILES
To generate a diff of this commit:
cvs rdiff -u -r1.403 -r1.404 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.403 src/etc/Makefile:1.404
--- src/etc/Makefile:1.403 Tue Jan 29 20:21:02 2013
+++ src/etc/Makefile Tue Feb 5 07:32:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.403 2013/01/29 20:21:02 christos Exp $
+# $NetBSD: Makefile,v 1.404 2013/02/05 07:32:44 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -341,7 +341,7 @@ install-etc-files: .PHONY .MAKE check_DE
# Install var/db/obsolete set lists; this is performed by make build
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp etc games man misc text
+OBSOLETE.files= base comp debug etc games man misc text
.if ${MKKMOD} != no
OBSOLETE.files+= modules
.endif
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: matt
Date: Tue Feb 5 07:34:07 UTC 2013
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Add earmhf support
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.32 src/etc/etc.evbarm/Makefile.inc:1.33
--- src/etc/etc.evbarm/Makefile.inc:1.32 Mon Sep 17 15:37:33 2012
+++ src/etc/etc.evbarm/Makefile.inc Tue Feb 5 07:34:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.32 2012/09/17 15:37:33 msaitoh Exp $
+# $NetBSD: Makefile.inc,v 1.33 2013/02/05 07:34:07 matt Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -14,7 +14,8 @@ EVBARM_BOARDS+= ADI_BRH BCM5301X CP3100
SMDK2800 TEAMASA_NPWR TS7200 TWINTAIL
.endif
-.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm
+.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm \
+|| ${MACHINE_ARCH} == earmhf
# Little endian platforms (armv5t+)
EVBARM_BOARDS+= BEAGLEBOARD OPENRD SHEEVAPLUG TISDP2420
.endif
@@ -34,7 +35,8 @@ BUILD_KERNELS+= ${board}_INSTALL
KERNEL_SETS+= IXM1200 HDL_G
.endif
-.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm
+.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm \
+|| ${MACHINE_ARCH} == earmhf
KERNEL_SETS+= RPI
.endif
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: kefren Date: Mon Feb 4 10:53:15 UTC 2013 Modified Files: src/usr.sbin/ldpd: ldpd.8 Log Message: Mention IPv6, operation mode and re-section a bit To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/ldpd/ldpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: wiz Date: Mon Feb 4 11:02:32 UTC 2013 Modified Files: src/usr.sbin/ldpd: ldpd.8 Log Message: Grammar. Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ldpd/ldpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: macallan Date: Mon Feb 4 13:18:36 UTC 2013 Modified Files: src/sys/sys: bus_proto.h Log Message: add BUS_DMA_PREFETCHABLE flag for bus_dmamem_map(), analog to BUS_SPACE_MAP_PREFETCHABLE To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/sys/bus_proto.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net80211
Module Name:src Committed By: christos Date: Mon Feb 4 15:44:45 UTC 2013 Modified Files: src/sys/net80211: ieee80211_netbsd.c Log Message: don't print the interface name 2ice. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/net80211/ieee80211_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: kefren Date: Mon Feb 4 17:14:32 UTC 2013 Modified Files: src/usr.sbin/ldpd: ldp_peer.c ldp_peer.h pdu.c socketops.c Log Message: * Don't assume INET in connection path * Lookup in hello list in order to get the correct LDP ID, instead of transport address * Improve an error message To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/ldpd/ldp_peer.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/ldpd/ldp_peer.h src/usr.sbin/ldpd/pdu.c cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/ldpd/socketops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: phx Date: Mon Feb 4 17:19:18 UTC 2013 Modified Files: src/sys/dev/ic: msm6242breg.h Log Message: 24h-mode is indicated by bit 2 of control register F. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/msm6242breg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jdc Date: Mon Feb 4 18:29:56 UTC 2013 Modified Files: src/sys/dev/ic: gem.c Log Message: Halt the RX watchdog callout when stopping. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ic/gem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: matt Date: Mon Feb 4 18:41:18 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h netbsd-elf.h t-netbsd-eabi Removed Files: src/external/gpl3/gcc/dist/gcc/config/arm: unwind-netbsd.h Log Message: Default to EABI5. Don't supply -meabi= to as. switch back unwind-arm.h nuke unwind-netbsd.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h \ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h cvs rdiff -u -r1.1 -r0 \ src/external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/gas
Module Name:src Committed By: matt Date: Mon Feb 4 18:42:31 UTC 2013 Modified Files: src/external/gpl3/binutils/dist/gas: configure.tgt Added Files: src/external/gpl3/binutils/dist/gas/config: te-armnetbsdeabi.h Log Message: Add a match for arm*--netbsdelf-eabi* and default that EABI with a VFP FPU and ARCH_ARM_V5TEJ cpu. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/binutils/dist/gas/configure.tgt cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/dist/gas/config/te-armnetbsdeabi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: njoly Date: Mon Feb 4 19:29:39 UTC 2013 Modified Files: src/lib/libc/sys: posix_fadvise.2 Log Message: According to the opengroup document [1], we should include fcntl.h (not sys/fcntl.h) for posix_fadvise(). [1] http://pubs.opengroup.org/onlinepubs/009695399/functions/posix_fadvise.html To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/sys/posix_fadvise.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Feb 4 20:03:11 UTC 2013 Modified Files: src/lib/libc/sys: posix_fadvise.2 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/sys/posix_fadvise.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: kefren Date: Mon Feb 4 20:28:24 UTC 2013 Modified Files: src/usr.sbin/ldpd: ldp_peer.c socketops.c Log Message: move code around a little bit in order to call get_ldp_peer correctly check also for transport_address in get_ldp_peer To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/ldpd/ldp_peer.c cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/ldpd/socketops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Feb 4 21:24:07 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c dwc_otgvar.h Log Message: Fix transfer aborts and bump the workqueue to IPL_BIO. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/dwc_otg.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/dwc_otgvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Feb 4 21:29:14 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c dwc_otgvar.h Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/dwc_otg.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/dwc_otgvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: macallan Date: Mon Feb 4 21:35:45 UTC 2013 Modified Files: src/sys/arch/arm/omap: omapfb.c Log Message: put BUS_DMA_PREFETCHABLE back now that the missing pieces are in place To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/omap/omapfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Feb 4 21:37:05 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: Remove something that shouldn't have been committed. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/dwc_otg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Mon Feb 4 21:43:17 UTC 2013 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Fix some VERBOSE_INIT_ARM output To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Mon Feb 4 21:46:14 UTC 2013 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Oops, put back the initialisation of cpu_cc_freq To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: macallan Date: Mon Feb 4 22:19:43 UTC 2013 Modified Files: src/sys/arch/sparc64/include: cpu.h src/sys/arch/sparc64/sparc64: machdep.c Log Message: add a sysctl.vis node that indicated which version of the VIS instruction set is supported. Currently this will be 1 for UltraSPARC I and II, 2 for UltraSPARC-III and up To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sparc64/include/cpu.h cvs rdiff -u -r1.271 -r1.272 src/sys/arch/sparc64/sparc64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/gas
Module Name:src Committed By: matt Date: Mon Feb 4 22:38:07 UTC 2013 Modified Files: src/external/gpl3/binutils/dist/gas: configure.tgt Added Files: src/external/gpl3/binutils/dist/gas/config: te-armnbsdeabi.h te-armnbsdeabihf.h Removed Files: src/external/gpl3/binutils/dist/gas/config: te-armnetbsdeabi.h Log Message: Move arm-*-netbsdelf-*eabi* to before arm-*-eabi* so it matches properly. Add arm-*-netbsdelf-*eabihf* which has a VFP V2 by default. Rename armnetbsdeabi*.h to armnbsdeabi*.h to be consistent with other nbsd files. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/gas/configure.tgt cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabi.h \ src/external/gpl3/binutils/dist/gas/config/te-armnbsdeabihf.h cvs rdiff -u -r1.1 -r0 \ src/external/gpl3/binutils/dist/gas/config/te-armnetbsdeabi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: matt Date: Mon Feb 4 22:50:13 UTC 2013 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/earm: config.h src/external/gpl3/binutils/lib/libbfd/arch/earmhf: config.h src/external/gpl3/binutils/usr.bin/common/arch/earm: config.h src/external/gpl3/binutils/usr.bin/common/arch/earmhf: config.h src/external/gpl3/binutils/usr.bin/gas/arch/earm: config.h targ-env.h src/external/gpl3/binutils/usr.bin/gas/arch/earmhf: config.h targ-env.h src/external/gpl3/binutils/usr.bin/ld/arch/earm: config.h src/external/gpl3/binutils/usr.bin/ld/arch/earmhf: config.h Log Message: Rerun mknative for earm and earmhf for gas changes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/earm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/common/arch/earm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gas/arch/earm/config.h \ src/external/gpl3/binutils/usr.bin/gas/arch/earm/targ-env.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhf/config.h \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhf/targ-env.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/ld/arch/earm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/ld/arch/earmhf/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Tue Feb 5 00:39:59 UTC 2013 Modified Files: src/sys/dev/usb: usb_mem.c Log Message: segs is now used. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/usb_mem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Tue Feb 5 00:41:51 UTC 2013 Modified Files: src/sys/dev/usb: usb_mem.c Log Message: assign nsegs before allocation To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/dev/usb/usb_mem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: christos Date: Tue Feb 5 00:59:04 UTC 2013 Modified Files: src/usr.sbin/mtree: only.c Log Message: fill up the directory hierarchy so that leaf files are not ignored if specified by themselves. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mtree/only.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/earmhf
Module Name:src Committed By: matt Date: Tue Feb 5 02:51:15 UTC 2013 Added Files: src/external/lgpl3/gmp/lib/libgmp/arch/earmhf: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h mp.h Log Message: mknative for earmhf To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/Makefile.inc \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/gmp-mparam.h \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/gmp.h \ src/external/lgpl3/gmp/lib/libgmp/arch/earmhf/mp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp
Module Name:src Committed By: matt Date: Tue Feb 5 02:54:02 UTC 2013 Modified Files: src/external/lgpl3/gmp: Makefile.netbsd-gmp Log Message: Use NETBSDSRCDIR. Use ?= when setting target so you can override from cmdline. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/gmp/Makefile.netbsd-gmp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: matt Date: Tue Feb 5 02:57:54 UTC 2013 Modified Files: src/external/gpl3/gcc/lib/crtstuff/arch: earmhf.mk src/external/gpl3/gcc/lib/libgcc/arch: earmhf.mk src/external/gpl3/gcc/lib/libobjc/arch/earmhf: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: c++config.h config.h defs.mk src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf: auto-host.h configargs.h defs.mk Log Message: updated mknative gcc bits for earmhf To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/crtstuff/arch/earmhf.mk cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/earmhf.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libobjc/arch/earmhf/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: matt Date: Tue Feb 5 03:02:10 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/gcc: config.gcc Log Message: Don't include t-arm-elf since it just provides stuff which netbsd already has. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/dist/gcc/config.gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/stand
Module Name:src Committed By: matt Date: Tue Feb 5 03:17:51 UTC 2013 Modified Files: src/sys/arch/evbarm/stand/boot2440: Makefile src/sys/arch/evbarm/stand/bootimx23: Makefile src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot Log Message: Make sure these are always compiled with -mabi=atpcs -mfloat-abi=soft -Wa,-meabi=gnu so they use the old compilation methods. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/stand/boot2440/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/stand/bootimx23/Makefile cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [ipsec-tools-0_8-branch] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tteras Date: Tue Feb 5 06:23:43 UTC 2013 Modified Files: src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_8-branch]: isakmp_xauth.c Log Message: From Ian West i...@niw.com.au: Fix double free of the radius info on config reload. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.2.1 \ src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: matt Date: Tue Feb 5 07:23:00 UTC 2013 Modified Files: src/libexec/ld.aout_so: Makefile src/sbin/ldconfig: Makefile Log Message: There are other little endian arm machine_arches other than arm To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/libexec/ld.aout_so/Makefile cvs rdiff -u -r1.25 -r1.26 src/sbin/ldconfig/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: matt Date: Tue Feb 5 07:27:03 UTC 2013 Modified Files: src/external/bsd/elftosb/lib: Makefile src/external/bsd/elftosb/usr.sbin/elftosb: Makefile src/external/bsd/elftosb/usr.sbin/sbkeygen: Makefile src/external/bsd/elftosb/usr.sbin/sbtool: Makefile src/tools: Makefile Log Message: There are other little endian arm machine_arches other than arm Use MACHINE_CPU and TARGET_ENDIANNESS instead of MACHINE_ARCH To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/elftosb/lib/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/elftosb/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbtool/Makefile cvs rdiff -u -r1.166 -r1.167 src/tools/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/stand
Module Name:src Committed By: matt Date: Tue Feb 5 07:28:19 UTC 2013 Modified Files: src/sys/arch/evbarm/stand: Makefile src/sys/arch/evbarm/stand/gzboot: Makefile Log Message: There are other little endian arm machine_arches other than arm Use MACHINE_CPU and TARGET_ENDIANNESS instead of MACHINE_ARCH To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/Makefile cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/stand/gzboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/stand/bootimx23
Module Name:src
Committed By: matt
Date: Tue Feb 5 07:28:48 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/bootimx23: Makefile
Log Message:
Add a ${MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/bootimx23/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: matt Date: Tue Feb 5 07:34:07 UTC 2013 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Add earmhf support To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/etc/etc.evbarm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
