CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Sun Dec 22 07:24:33 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Added some Realtek devices. To generate a diff of this commit: cvs rdiff -u -r1.1170 -r1.1171 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1170 src/sys/dev/pci/pcidevs:1.1171 --- src/sys/dev/pci/pcidevs:1.1170 Sat Dec 21 09:23:36 2013 +++ src/sys/dev/pci/pcidevs Sun Dec 22 07:24:33 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1170 2013/12/21 09:23:36 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1171 2013/12/22 07:24:33 nonaka Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -4734,6 +4734,12 @@ product RDC PCIB 0x6036 RDC PCI-ISA bri product RDC R6040 0x6040 RDC R6040 10/100 Ethernet /* Realtek products */ +product REALTEK RTS5209 0x5209 RTS5209 PCI-E Card Reader +product REALTEK RTS5227 0x5227 RTS5227 PCI-E Card Reader +product REALTEK RTS5229 0x5229 RTS5229 PCI-E Card Reader +product REALTEK RTS5249 0x5249 RTS5249 PCI-E Card Reader +product REALTEK RTL8411B 0x5287 RTL8411B PCI-E Card Reader +product REALTEK RTL8411 0x5289 RTL8411 PCI-E Card Reader product REALTEK RT8029 0x8029 8029 Ethernet product REALTEK RT8139D 0x8039 8139D 10/100 Ethernet product REALTEK RT8100 0x8100 8100 10/100 Ethernet
CVS commit: src/lib/libc/net
Module Name:src
Committed By: christos
Date: Sun Dec 22 02:45:16 UTC 2013
Modified Files:
src/lib/libc/net: gethnamaddr.c
Log Message:
- don't clobber hp in the RES_USE_INET6 case
- increment naddrs in the yp case
- don't use __hostalias(), it is not thread-safe.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/lib/libc/net/gethnamaddr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/gethnamaddr.c
diff -u src/lib/libc/net/gethnamaddr.c:1.84 src/lib/libc/net/gethnamaddr.c:1.85
--- src/lib/libc/net/gethnamaddr.c:1.84 Tue Aug 27 05:56:12 2013
+++ src/lib/libc/net/gethnamaddr.c Sat Dec 21 21:45:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gethnamaddr.c,v 1.84 2013/08/27 09:56:12 christos Exp $ */
+/* $NetBSD: gethnamaddr.c,v 1.85 2013/12/22 02:45:16 christos Exp $ */
/*
* ++Copyright++ 1985, 1988, 1993
@@ -57,7 +57,7 @@
static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.84 2013/08/27 09:56:12 christos Exp $");
+__RCSID("$NetBSD: gethnamaddr.c,v 1.85 2013/12/22 02:45:16 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -514,11 +514,11 @@ gethostbyname_r(const char *name, struct
_DIAGASSERT(name != NULL);
if (res->options & RES_USE_INET6) {
- hp = gethostbyname_internal(name, AF_INET6, res, hp, buf,
- buflen, he);
- if (hp) {
+ struct hostent *nhp = gethostbyname_internal(name, AF_INET6,
+ res, hp, buf, buflen, he);
+ if (nhp) {
__res_put_state(res);
- return hp;
+ return nhp;
}
}
hp = gethostbyname_internal(name, AF_INET, res, hp, buf, buflen, he);
@@ -547,6 +547,7 @@ gethostbyname_internal(const char *name,
{
const char *cp;
struct getnamaddr info;
+ char hbuf[MAXHOSTNAMELEN];
size_t size;
static const ns_dtab dtab[] = {
NS_FILES_CB(_hf_gethtbyname, NULL)
@@ -580,7 +581,8 @@ gethostbyname_internal(const char *name,
* this is also done in res_nquery() since we are not the only
* function that looks up host names.
*/
- if (!strchr(name, '.') && (cp = __hostalias(name)))
+ if (!strchr(name, '.') && (cp = res_hostalias(res, name,
+ hbuf, sizeof(hbuf
name = cp;
/*
@@ -1128,6 +1130,7 @@ nextline:
}
goto done;
}
+ naddrs++;
while (*cp == ' ' || *cp == '\t')
cp++;
CVS commit: src/lib/libc/net
Module Name:src
Committed By: christos
Date: Sun Dec 22 02:40:48 UTC 2013
Modified Files:
src/lib/libc/net: getaddrinfo.c
Log Message:
this is supposed to be re-entrant, call don't call __hostalias that uses
a static buffer.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.105 src/lib/libc/net/getaddrinfo.c:1.106
--- src/lib/libc/net/getaddrinfo.c:1.105 Mon May 13 13:54:55 2013
+++ src/lib/libc/net/getaddrinfo.c Sat Dec 21 21:40:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.105 2013/05/13 17:54:55 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.105 2013/05/13 17:54:55 christos Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -2121,6 +2121,7 @@ res_searchN(const char *name, struct res
const char *cp, * const *domain;
HEADER *hp;
u_int dots;
+ char buf[MAXHOSTNAMELEN];
int trailing_dot, ret, saved_herrno;
int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
@@ -2141,7 +2142,7 @@ res_searchN(const char *name, struct res
/*
* if there aren't any dots, it could be a user-level alias
*/
- if (!dots && (cp = __hostalias(name)) != NULL) {
+ if (!dots && (cp = res_hostalias(res, name, buf, sizeof(buf))) != NULL) {
ret = res_queryN(cp, target, res);
return ret;
}
CVS commit: src/sys/arch/amiga
Module Name:src
Committed By: rkujawa
Date: Sun Dec 22 02:21:51 UTC 2013
Modified Files:
src/sys/arch/amiga/amiga: autoconf.c
src/sys/arch/amiga/conf: GENERIC.in files.amiga
src/sys/arch/amiga/include: bus.h
Added Files:
src/sys/arch/amiga/amiga: amiga_bus_simple_0x4000.c
src/sys/arch/amiga/dev: acafh.c acafhreg.h acafhvar.h wdc_acafh.c
Log Message:
Add preliminary support for the Individual Computers ACA500 in the form of acahf
driver. If ACA500 is equipped with supported accelerator with MMU, it allows
running NetBSD on an Amiga 500.
Since ACA is not autoconf-aware, and the probe procedure does not exist yet, the
driver is activated with the ACA500_SUPPORT kernel option. The acahf driver
is commented out in the GENERIC kernel for now (at least until it stops being
very experimental and hackish).
When it comes to ACA-specific hardware, for now the boot CF slot works. Support
for everything else is incoming...
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/amiga/amiga_bus_simple_0x4000.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/amiga/amiga/autoconf.c
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/dev/acafh.c \
src/sys/arch/amiga/dev/acafhreg.h src/sys/arch/amiga/dev/acafhvar.h \
src/sys/arch/amiga/dev/wdc_acafh.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/include/bus.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/amiga/autoconf.c
diff -u src/sys/arch/amiga/amiga/autoconf.c:1.114 src/sys/arch/amiga/amiga/autoconf.c:1.115
--- src/sys/arch/amiga/amiga/autoconf.c:1.114 Sat Oct 27 17:17:26 2012
+++ src/sys/arch/amiga/amiga/autoconf.c Sun Dec 22 02:21:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.114 2012/10/27 17:17:26 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.115 2013/12/22 02:21:51 rkujawa Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.114 2012/10/27 17:17:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.115 2013/12/22 02:21:51 rkujawa Exp $");
#include
#include
@@ -53,6 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include
#endif /* P5PB_CONSOLE */
+#include "opt_acafh.h"
+
static void findroot(void);
void mbattach(device_t, device_t, void *);
int mbprint(void *, const char *);
@@ -300,6 +302,10 @@ mbattach(device_t parent, device_t self,
#endif
config_found(self, __UNCONST("aucc"), simple_devprint);
+#ifdef ACA500_SUPPORT
+ config_found(self, __UNCONST("acafh"), simple_devprint);
+#endif
+
config_found(self, __UNCONST("zbus"), simple_devprint);
}
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.120 src/sys/arch/amiga/conf/GENERIC.in:1.121
--- src/sys/arch/amiga/conf/GENERIC.in:1.120 Fri Oct 4 15:13:51 2013
+++ src/sys/arch/amiga/conf/GENERIC.in Sun Dec 22 02:21:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.120 2013/10/04 15:13:51 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.121 2013/12/22 02:21:51 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.120 $"
+#ident "GENERIC-$Revision: 1.121 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -515,6 +515,10 @@ scsibus* at cbiiisc0
empsc0 at zbus0 # Emplant scsi
scsibus* at empsc0
+#acafh0 at mainbus0 # Individual Computers ACA500
+#options ACA500_SUPPORT
+#wdc* at acafhbus?
+
wdc0 at mainbus0 # A4000 & A1200 IDE bus
wdc* at zbus0 # Buddha / Catweasel
#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.171 src/sys/arch/amiga/conf/files.amiga:1.172
--- src/sys/arch/amiga/conf/files.amiga:1.171 Thu Aug 8 21:23:51 2013
+++ src/sys/arch/amiga/conf/files.amiga Sun Dec 22 02:21:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.171 2013/08/08 21:23:51 rkujawa Exp $
+# $NetBSD: files.amiga,v 1.172 2013/12/22 02:21:51 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -34,6 +34,8 @@ defflagDEVRELOAD
defflag opt_p5pb.h P5PB_DEBUG P5PB_CONSOLE
+defflag opt_acafh.h ACA500_SUPPORT
+
defparam IOBZCLOCK
device mainbus {}
@@ -58,6 +60,9 @@ file arch/amiga/amiga/amiga_bus_simple_1
define amibus_b800
file arch/amiga/amiga/amiga_bus_simple_0x800.c amibus_b800
+define amibus_b4000
+file arch/amiga/amiga/amiga_bus_simple_0x4000.c amibus_b4000
+
define amibus_empb
file arch/amiga/pci/empb_bsm.c amibus_empb
@@ -579,6 +584,15 @@ file arch/amiga/dev/z3rambd.c z3rambd ne
attach slh
CVS commit: src/etc
Module Name:src Committed By: dholland Date: Sun Dec 22 01:18:28 UTC 2013 Modified Files: src/etc: man.conf Log Message: Fix _crunch entries, which accidentally got changed from compression operations to decompression operations nearly two years ago. They are used only by catman(8), which we don't run any more, but they ought to be correct anyway. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/etc/man.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/man.conf diff -u src/etc/man.conf:1.34 src/etc/man.conf:1.35 --- src/etc/man.conf:1.34 Fri Oct 25 08:19:46 2013 +++ src/etc/man.conf Sun Dec 22 01:18:28 2013 @@ -1,4 +1,4 @@ -# $NetBSD: man.conf,v 1.34 2013/10/25 08:19:46 mbalmer Exp $ +# $NetBSD: man.conf,v 1.35 2013/12/22 01:18:28 dholland Exp $ # Sheer, raging paranoia... _version BSD.2 @@ -30,10 +30,10 @@ _build .tbl.xz /usr/bin/xzcat %s | /us _build .me /usr/bin/nroff -msafer -me %s 2>/dev/null | cat -s -_crunch .Z /usr/bin/zcat > %s -_crunch .bz2 /usr/bin/bzcat > %s -_crunch .gz /usr/bin/zcat > %s -_crunch .xz /usr/bin/xzcat > %s +_crunch .Z /usr/bin/compress -c > %s +_crunch .bz2 /usr/bin/bzip2 -c > %s +_crunch .gz /usr/bin/gzip -c > %s +_crunch .xz /usr/bin/xz -c > %s # Sections and their directories. # All paths ending in '/' are the equivalent of entries specifying that
CVS commit: src/distrib/utils/libhack
Module Name:src Committed By: christos Date: Sat Dec 21 20:10:02 UTC 2013 Modified Files: src/distrib/utils/libhack: gethost.c Log Message: refer to our own h_errno so we don't fetch the libc one To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/libhack/gethost.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/libhack/gethost.c diff -u src/distrib/utils/libhack/gethost.c:1.11 src/distrib/utils/libhack/gethost.c:1.12 --- src/distrib/utils/libhack/gethost.c:1.11 Tue Aug 27 05:53:33 2013 +++ src/distrib/utils/libhack/gethost.c Sat Dec 21 15:10:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: gethost.c,v 1.11 2013/08/27 09:53:33 christos Exp $ */ +/* $NetBSD: gethost.c,v 1.12 2013/12/21 20:10:02 christos Exp $ */ /*- * Copyright (c) 1985, 1988, 1993 @@ -73,7 +73,7 @@ __weak_alias(gethostbyaddr,_gethostbyadd __weak_alias(gethostbyname,_gethostbyname); #endif -extern int h_errno; +int h_errno; FILE *_h_file; static struct hostent h_ent; static char h_buf[4096];
CVS commit: src/sys/kern
Module Name:src
Committed By: skrll
Date: Sat Dec 21 17:44:33 UTC 2013
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
Check interp after reading it. Checking newly allocated memory doesn't
work.
Hi Christos.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/kern/exec_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.52 src/sys/kern/exec_elf.c:1.53
--- src/sys/kern/exec_elf.c:1.52 Sat Dec 21 14:41:02 2013
+++ src/sys/kern/exec_elf.c Sat Dec 21 17:44:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.52 2013/12/21 14:41:02 christos Exp $ */
+/* $NetBSD: exec_elf.c,v 1.53 2013/12/21 17:44:33 skrll Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.52 2013/12/21 14:41:02 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.53 2013/12/21 17:44:33 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -709,14 +709,14 @@ exec_elf_makecmds(struct lwp *l, struct
goto bad;
}
interp = PNBUF_GET();
+ if ((error = exec_read_from(l, epp->ep_vp,
+ pp->p_offset, interp, pp->p_filesz)) != 0)
+goto bad;
/* Ensure interp is NUL-terminated and of the expected length */
if (strnlen(interp, pp->p_filesz) != pp->p_filesz - 1) {
error = ENOEXEC;
goto bad;
}
- if ((error = exec_read_from(l, epp->ep_vp,
- pp->p_offset, interp, pp->p_filesz)) != 0)
-goto bad;
break;
}
}
CVS commit: src/sys/arch/luna68k/conf
Module Name:src Committed By: tsutsui Date: Sat Dec 21 17:12:36 UTC 2013 Modified Files: src/sys/arch/luna68k/conf: GENERIC Log Message: Add and enable wsmux(4) in GENERIC (for mlterm-fb demonstration). To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/arch/luna68k/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/luna68k/conf/GENERIC diff -u src/sys/arch/luna68k/conf/GENERIC:1.108 src/sys/arch/luna68k/conf/GENERIC:1.109 --- src/sys/arch/luna68k/conf/GENERIC:1.108 Sun Jun 30 21:38:57 2013 +++ src/sys/arch/luna68k/conf/GENERIC Sat Dec 21 17:12:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.108 2013/06/30 21:38:57 rmind Exp $ +# $NetBSD: GENERIC,v 1.109 2013/12/21 17:12:36 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.108 $" +#ident "GENERIC-$Revision: 1.109 $" maxusers 8 @@ -156,8 +156,8 @@ fb0 at mainbus0 # 16 or 256 pseudo colo # Workstation Console attachments wsdisplay* at fb? -wskbd* at ws? console ? -wsmouse* at ws? +wskbd* at ws? console ? mux 1 +wsmouse* at ws? mux 0 # SCSI bus support scsibus* at spc? @@ -202,6 +202,8 @@ pseudo-device ksyms # /dev/ksyms #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if +pseudo-device wsmux # mouse & keyboard multiplexsor + # Veriexec # # a pseudo device needed for veriexec
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: kiyohara
Date: Sat Dec 21 15:20:39 UTC 2013
Modified Files:
src/sys/dev/mii: makphy.c
Log Message:
Add Marvell 88E1543. Tested on OPENBLOCKS_AX3.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/makphy.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/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.37 src/sys/dev/mii/makphy.c:1.38
--- src/sys/dev/mii/makphy.c:1.37 Sat Jan 21 16:48:08 2012
+++ src/sys/dev/mii/makphy.c Sat Dec 21 15:20:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.37 2012/01/21 16:48:08 chs Exp $ */
+/* $NetBSD: makphy.c,v 1.38 2013/12/21 15:20:39 kiyohara Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.37 2012/01/21 16:48:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.38 2013/12/21 15:20:39 kiyohara Exp $");
#include
#include
@@ -122,6 +122,9 @@ static const struct mii_phydesc makphys[
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R_29,
MII_STR_xxMARVELL_E1116R_29 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1543,
+ MII_STR_xxMARVELL_E1543 },
+
{ 0,0,
NULL },
};
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: kiyohara
Date: Sat Dec 21 15:18:21 UTC 2013
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/mii/miidevs_data.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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.119 src/sys/dev/mii/miidevs.h:1.120
--- src/sys/dev/mii/miidevs.h:1.119 Wed Jun 12 02:51:43 2013
+++ src/sys/dev/mii/miidevs.h Sat Dec 21 15:18:21 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.119 2013/06/12 02:51:43 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.120 2013/12/21 15:18:21 kiyohara Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.116 2013/06/12 02:51:16 msaitoh Exp
+ * NetBSD: miidevs,v 1.117 2013/12/21 15:16:23 kiyohara Exp
*/
/*-
@@ -378,6 +378,8 @@
#define MII_STR_xxMARVELL_E1116R "Marvell 88E1116R Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1116R_29 0x0029
#define MII_STR_xxMARVELL_E1116R_29 "Marvell 88E1116R Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E1543 0x002a
+#define MII_STR_xxMARVELL_E1543 "Marvell 88E1543 Alaska Quad Port Gb PHY"
/* Myson Technology PHYs */
#define MII_MODEL_xxMYSON_MTD972 0x
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.107 src/sys/dev/mii/miidevs_data.h:1.108
--- src/sys/dev/mii/miidevs_data.h:1.107 Wed Jun 12 02:51:43 2013
+++ src/sys/dev/mii/miidevs_data.h Sat Dec 21 15:18:21 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.107 2013/06/12 02:51:43 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.108 2013/12/21 15:18:21 kiyohara Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.116 2013/06/12 02:51:16 msaitoh Exp
+ * NetBSD: miidevs,v 1.117 2013/12/21 15:16:23 kiyohara Exp
*/
/*-
@@ -150,6 +150,7 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R_29, MII_STR_xxMARVELL_E1116R_29 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1543, MII_STR_xxMARVELL_E1543 },
{ MII_OUI_xxMYSON, MII_MODEL_xxMYSON_MTD972, MII_STR_xxMYSON_MTD972 },
{ MII_OUI_MYSON, MII_MODEL_MYSON_MTD803, MII_STR_MYSON_MTD803 },
{ MII_OUI_xxNATSEMI, MII_MODEL_xxNATSEMI_DP83840, MII_STR_xxNATSEMI_DP83840 },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: kiyohara Date: Sat Dec 21 15:16:23 UTC 2013 Modified Files: src/sys/dev/mii: miidevs Log Message: Add Marvell 88E1543 Quad Port Gb PHY To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.116 src/sys/dev/mii/miidevs:1.117 --- src/sys/dev/mii/miidevs:1.116 Wed Jun 12 02:51:16 2013 +++ src/sys/dev/mii/miidevs Sat Dec 21 15:16:23 2013 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.116 2013/06/12 02:51:16 msaitoh Exp $ +$NetBSD: miidevs,v 1.117 2013/12/21 15:16:23 kiyohara Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -258,6 +258,7 @@ model xxMARVELL E1145 0x000d Marvell 88 model xxMARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model xxMARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY model xxMARVELL E1116R_29 0x0029 Marvell 88E1116R Gigabit PHY +model xxMARVELL E1543 0x002a Marvell 88E1543 Alaska Quad Port Gb PHY /* Myson Technology PHYs */ model xxMYSON MTD972 0x MTD972 10/100 media interface
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Sat Dec 21 14:41:02 UTC 2013
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
Consistency checks for the length of the interpreter (the length includes
the trailing NUL): make sure it is not empty and has the proper length.
>From Maxime Villard
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/kern/exec_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.51 src/sys/kern/exec_elf.c:1.52
--- src/sys/kern/exec_elf.c:1.51 Thu Nov 14 07:07:11 2013
+++ src/sys/kern/exec_elf.c Sat Dec 21 09:41:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.51 2013/11/14 12:07:11 martin Exp $ */
+/* $NetBSD: exec_elf.c,v 1.52 2013/12/21 14:41:02 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.51 2013/11/14 12:07:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.52 2013/12/21 14:41:02 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -704,12 +704,16 @@ exec_elf_makecmds(struct lwp *l, struct
for (i = 0; i < eh->e_phnum; i++) {
pp = &ph[i];
if (pp->p_type == PT_INTERP) {
- if (pp->p_filesz >= MAXPATHLEN) {
+ if (pp->p_filesz < 2 || pp->p_filesz > MAXPATHLEN) {
error = ENOEXEC;
goto bad;
}
interp = PNBUF_GET();
- interp[0] = '\0';
+ /* Ensure interp is NUL-terminated and of the expected length */
+ if (strnlen(interp, pp->p_filesz) != pp->p_filesz - 1) {
+error = ENOEXEC;
+goto bad;
+ }
if ((error = exec_read_from(l, epp->ep_vp,
pp->p_offset, interp, pp->p_filesz)) != 0)
goto bad;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sat Dec 21 09:23:36 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel E600 and EG20T devices. To generate a diff of this commit: cvs rdiff -u -r1.1169 -r1.1170 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1169 src/sys/dev/pci/pcidevs:1.1170 --- src/sys/dev/pci/pcidevs:1.1169 Sun Dec 15 04:21:52 2013 +++ src/sys/dev/pci/pcidevs Sat Dec 21 09:23:36 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1169 2013/12/15 04:21:52 pgoyette Exp $ +$NetBSD: pcidevs,v 1.1170 2013/12/21 09:23:36 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3442,6 +3442,7 @@ product INTEL 5400_CE 0x4031 5400 Coher product INTEL 5400_IOAPIC 0x4032 5400 IOAPIC product INTEL 5400_RAS_0 0x4035 5400 RAS product INTEL 5400_RAS_1 0x4036 5400 RAS +product INTEL E600_VGA 0x4108 E600 Integrated VGA product INTEL E600_HB 0x4114 E600 Host product INTEL PRO_WL_2200BG 0x4220 PRO/Wireless LAN 2200BG Mini-PCI Adapter product INTEL PRO_WL_2225BG 0x4221 PRO/Wireless LAN 2225BG Mini-PCI Adapter @@ -3497,6 +3498,12 @@ product INTEL 82443GX_AGP 0x71a1 82443GX product INTEL 82443GX_NOAGP 0x71a2 82443GX Host Bridge/Controller (AGP disabled) product INTEL I740 0x7800 i740 Graphics Accelerator product INTEL SCH_IDE 0x811a SCH IDE Controller +product INTEL E600_HDA 0x811b E600 HD Audio +product INTEL E600_PCIB_0 0x8180 E600 Virtual PCI-PCI Bridge +product INTEL E600_PCIB_1 0x8181 E600 Virtual PCI-PCI Bridge +product INTEL E600_GVD 0x8182 E600 Integrated Graphic Video Display +product INTEL E600_PCIB_2 0x8184 E600 Virtual PCI-PCI Bridge +product INTEL E600_PCIB_3 0x8185 E600 Virtual PCI-PCI Bridge product INTEL E600_LPC 0x8186 Atom Processor E6xx LPC Bridge product INTEL PCI450_PB 0x84c4 82454KX/GX PCI Bridge (PB) product INTEL PCI450_MC 0x84c5 82451KX/GX Memory Controller (MC)
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: skrll
Date: Sat Dec 21 08:58:07 UTC 2013
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
Re-enable arm-simd now that SPRSR restoration has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.25 src/external/mit/xorg/lib/pixman/Makefile:1.26
--- src/external/mit/xorg/lib/pixman/Makefile:1.25 Sat Sep 7 09:22:37 2013
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Dec 21 08:58:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2013/09/07 09:22:37 skrll Exp $
+# $NetBSD: Makefile,v 1.26 2013/12/21 08:58:07 skrll Exp $
NOLINT= 1 # defined
@@ -65,12 +65,13 @@ CPPFLAGS+= -DUSE_VMX
MKDEPFLAGS+= -maltivec
.endif
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmhf"
+
+.if !empty(MACHINE_ARCH:Mearm*)
# ARM SIMD
-#SRCS+= pixman-arm-simd.c \
-# pixman-arm-simd-asm.S \
-# pixman-arm-simd-asm-scaled.S
-#CPPFLAGS+= -DUSE_ARM_SIMD
+SRCS+= pixman-arm-simd.c \
+ pixman-arm-simd-asm.S \
+ pixman-arm-simd-asm-scaled.S
+CPPFLAGS+= -DUSE_ARM_SIMD
# ARM NEON
SRCS+= pixman-arm-neon.c \
pixman-arm-neon-asm.S \
