CVS commit: src/sbin/gpt
Module Name:src Committed By: wiz Date: Sat Oct 4 07:15:54 UTC 2014 Modified Files: src/sbin/gpt: gpt.8 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.33 src/sbin/gpt/gpt.8:1.34 --- src/sbin/gpt/gpt.8:1.33 Sat Oct 4 01:00:42 2014 +++ src/sbin/gpt/gpt.8 Sat Oct 4 07:15:54 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpt.8,v 1.33 2014/10/04 01:00:42 christos Exp $ +.\ $NetBSD: gpt.8,v 1.34 2014/10/04 07:15:54 wiz Exp $ .\ .\ Copyright (c) 2002 Marcel Moolenaar .\ All rights reserved. @@ -92,7 +92,7 @@ Currently this option is primarily usefu command, but the intent is to use it to implement dry-run behaviour. .Pp -The +The .Fl s Ar sectorsize option overrides the default sector size for the device (obtained from the kernel if possible) or
CVS commit: [netbsd-7] src/sys/dev/sdmmc
Module Name:src
Committed By: martin
Date: Sat Oct 4 08:20:11 UTC 2014
Modified Files:
src/sys/dev/sdmmc [netbsd-7]: sdhc.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #127):
sys/dev/sdmmc/sdhc.c: revision 1.50
Fix divisor calculation for SDHC 3.0.
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.3 -r1.44.2.4 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.44.2.3 src/sys/dev/sdmmc/sdhc.c:1.44.2.4
--- src/sys/dev/sdmmc/sdhc.c:1.44.2.3 Fri Oct 3 18:53:56 2014
+++ src/sys/dev/sdmmc/sdhc.c Sat Oct 4 08:20:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.44.2.3 2014/10/03 18:53:56 martin Exp $ */
+/* $NetBSD: sdhc.c,v 1.44.2.4 2014/10/04 08:20:11 martin Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.44.2.3 2014/10/03 18:53:56 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.44.2.4 2014/10/04 08:20:11 martin Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -814,8 +814,7 @@ sdhc_clock_divisor(struct sdhc_host *hp,
}
if (hp-specver == SDHC_SPEC_VERS_300) {
div = howmany(hp-clkbase, freq);
- if (div 0)
- --div;
+ div = div 1 ? howmany(div, 2) : 0;
if (div 0x3ff)
return false;
*divp = (((div 8) SDHC_SDCLK_XDIV_MASK)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Oct 4 08:21:23 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #127 To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.43 src/doc/CHANGES-7.0:1.1.2.44 --- src/doc/CHANGES-7.0:1.1.2.43 Fri Oct 3 18:55:37 2014 +++ src/doc/CHANGES-7.0 Sat Oct 4 08:21:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.43 2014/10/03 18:55:37 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.44 2014/10/04 08:21:23 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -1036,3 +1036,8 @@ sys/dev/sdmmc/sdhcvar.h1.14 Various RPI DMAC and sdhc improvements. [skrll, ticket #126] +sys/dev/sdmmc/sdhc.c1.50 + + Fix divisor calculation for SDHC 3.0. + [skrll, ticket #127] +
CVS commit: src/sbin/gpt
Module Name:src
Committed By: riastradh
Date: Sat Oct 4 10:30:13 UTC 2014
Modified Files:
src/sbin/gpt: gpt_uuid.c
Log Message:
Make gpt(8) generate v4 (random) uuids.
Don't needlessly leak your date/time and MAC address when you edit
the disk.
Read from /dev/urandom rather than calling arc4random or anything,
since this is a tool. (Cygwin seems to have /dev/urandom, but yell
if this breaks the build on your exotic platform because it lacks
/dev/urandom.)
ok apb
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/gpt_uuid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.7 src/sbin/gpt/gpt_uuid.c:1.8
--- src/sbin/gpt/gpt_uuid.c:1.7 Fri Oct 3 20:30:06 2014
+++ src/sbin/gpt/gpt_uuid.c Sat Oct 4 10:30:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.7 2014/10/03 20:30:06 christos Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.8 2014/10/04 10:30:13 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,10 +32,13 @@
#include sys/cdefs.h
#ifdef __RCSID
-__RCSID($NetBSD: gpt_uuid.c,v 1.7 2014/10/03 20:30:06 christos Exp $);
+__RCSID($NetBSD: gpt_uuid.c,v 1.8 2014/10/04 10:30:13 riastradh Exp $);
#endif
+#include err.h
+#include fcntl.h
#include stdio.h
+#include unistd.h
#include map.h
#include gpt.h
@@ -56,12 +59,6 @@ struct dce_uuid {
uint8_t node[6];
};
-struct kern_uuid {
- uint64_t ll;
- uint16_t seq;
- uint8_t node[6];
-};
-
static const struct {
struct dce_uuid u;
const char *n;
@@ -238,96 +235,35 @@ gpt_uuid_create(gpt_type_t t, gpt_uuid_t
utf8_to_utf16((const uint8_t *)gpt_nv[t].d, b, s / sizeof(*b));
}
-#if !defined(HAVE_NBTOOL_CONFIG_H)
-#include sys/types.h
-#include sys/uuid.h
-#else
-#include time.h
-/*
- * Get the current time as a 5x bit count of 10-microsecond intervals
- * since 00:00:00.00, October 15,1582. We apply a magic offset to convert
- * the Unix time since 00:00:00.00, January 1, 1970 to the date of the
- * Gregorian reform to the Christian calendar.
- */
-static uint64_t
-uuid_time(void)
-{
- struct timeval tv;
- uint64_t xtime = 0x01B21DD213814000LL;
-
- (void)gettimeofday(tv, NULL);
- xtime += (uint64_t)tv.tv_sec * 1000LL;
- xtime += (uint64_t)(tv.tv_usec / 10);
- return (xtime ((1LL 60) - 1LL));
-}
-
-/*
- * No portable way to get ethernet, use hostid instead
- */
-static void
-uuid_node(uint8_t node[6])
-{
- long hid = gethostid();
- node[0] = 'N';
- node[1] = 'B';
- node[2] = (hid 24) 0xff;
- node[3] = (hid 16) 0xff;
- node[4] = (hid 8) 0xff;
- node[5] = (hid 0) 0xff;
-}
-
-static void
-uuid_generate(void *u, uint64_t *timep, int count)
-{
- static struct kern_uuid uuid_last;
- uint64_t xtime, ltime;
- uint16_t lseq;
- struct kern_uuid *uuid = u;
-
- uuid_node(uuid-node);
- xtime = uuid_time();
- *timep = xtime;
-
- if (uuid_last.ll == 0LL || uuid_last.node[0] != uuid-node[0] ||
- uuid_last.node[1] != uuid-node[1] ||
- uuid_last.node[2] != uuid-node[2]) {
- srandom((unsigned int) xtime);
- uuid-seq = (uint16_t)random() 0x3fff;
- } else if (uuid_last.ll = xtime)
- uuid-seq = (uuid_last.seq + 1) 0x3fff;
-
- uuid_last = *uuid;
- uuid_last.ll = (xtime + count - 1) ((1LL 60) - 1LL);
-}
-
-static void
-uuidgen(struct dce_uuid *store, int count)
-{
- uint64_t xtime;
- struct kern_uuid uuid;
- int i;
-
- /* Generate the base UUID. */
- uuid_generate(uuid, xtime, count);
-
- for (i = 0; i count; xtime++, i++) {
- /* Set time and version (=1) and deal with byte order. */
- store[i].time_low = (uint32_t)xtime;
- store[i].time_mid = (uint16_t)(xtime 32);
- store[i].time_hi_and_version =
- ((uint16_t)(xtime 48) 0xfff) | (1 12);
- store[i].clock_seq_hi_and_reserved = (uuid.seq 16) | 0x80;
- store[i].clock_seq_low = uuid.seq 0xff;
- memcpy(store[i].node, uuid.node, sizeof(uuid.node));
- }
-}
-#endif
-
void
gpt_uuid_generate(gpt_uuid_t t)
{
struct dce_uuid u;
+ int fd;
+ uint8_t *p;
+ size_t n;
+ ssize_t nread;
+
+ /* Randomly generate the content. */
+ fd = open(/dev/urandom, O_RDONLY | O_CLOEXEC);
+ if (fd == -1)
+ err(1, open(/dev/urandom));
+ for (p = (void *)u, n = sizeof u; 0 n; p += nread, n -= nread) {
+ nread = read(fd, p, n);
+ if (nread 0)
+ err(1, read(/dev/urandom));
+ if ((size_t)nread n)
+ errx(1, read too much: %zd %zu, nread, n);
+ }
+ (void)close(fd);
+
+ /* Set the version number to 4. */
+ u.time_hi_and_version = ~(uint32_t)0xf000;
+ u.time_hi_and_version |= 0x4000;
+
+ /* Fix the reserved bits. */
+ u.clock_seq_hi_and_reserved = ~(uint8_t)0x40;
+ u.clock_seq_hi_and_reserved |= 0x80;
- uuidgen((void *)u, 1);
gpt_dce_to_uuid(u, t);
}
CVS commit: src/sys
Module Name:src
Committed By: riastradh
Date: Sat Oct 4 11:15:44 UTC 2014
Modified Files:
src/sys/kern: init_main.c kern_uuid.c
src/sys/sys: uuid.h
Log Message:
Make uuidgen(2) generate v4 (random) uuids.
Rip out all the needless MAC address and date/time leakage. No more
uuid_init necessary, nor contention over a global uuid state.
While here, simplify uuid_snprintf and fix a strict aliasing
violation.
To generate a diff of this commit:
cvs rdiff -u -r1.459 -r1.460 src/sys/kern/init_main.c
cvs rdiff -u -r1.18 -r1.19 src/sys/kern/kern_uuid.c
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/uuid.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/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.459 src/sys/kern/init_main.c:1.460
--- src/sys/kern/init_main.c:1.459 Thu Aug 14 16:27:55 2014
+++ src/sys/kern/init_main.c Sat Oct 4 11:15:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.459 2014/08/14 16:27:55 riastradh Exp $ */
+/* $NetBSD: init_main.c,v 1.460 2014/10/04 11:15:44 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.459 2014/08/14 16:27:55 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.460 2014/10/04 11:15:44 riastradh Exp $);
#include opt_ddb.h
#include opt_ipsec.h
@@ -605,9 +605,6 @@ main(void)
ptrace_init();
#endif /* PTRACE */
- /* Initialize the UUID system calls. */
- uuid_init();
-
machdep_init();
procinit_sysctl();
Index: src/sys/kern/kern_uuid.c
diff -u src/sys/kern/kern_uuid.c:1.18 src/sys/kern/kern_uuid.c:1.19
--- src/sys/kern/kern_uuid.c:1.18 Sat Nov 19 22:51:25 2011
+++ src/sys/kern/kern_uuid.c Sat Oct 4 11:15:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_uuid.c,v 1.18 2011/11/19 22:51:25 tls Exp $ */
+/* $NetBSD: kern_uuid.c,v 1.19 2014/10/04 11:15:44 riastradh Exp $ */
/*
* Copyright (c) 2002 Marcel Moolenaar
@@ -29,190 +29,46 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_uuid.c,v 1.18 2011/11/19 22:51:25 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_uuid.c,v 1.19 2014/10/04 11:15:44 riastradh Exp $);
#include sys/param.h
+#include sys/cprng.h
#include sys/endian.h
-#include sys/kernel.h
-#include sys/mutex.h
-#include sys/socket.h
+#include sys/syscallargs.h
#include sys/systm.h
#include sys/uuid.h
-/* NetBSD */
-#include sys/proc.h
-#include sys/mount.h
-#include sys/syscallargs.h
-#include sys/uio.h
-#include sys/cprng.h
-
-#include net/if.h
-#include net/if_dl.h
-#include net/if_types.h
-
/*
* See also:
* http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
* http://www.opengroup.org/onlinepubs/009629399/apdxa.htm
- *
- * Note that the generator state is itself an UUID, but the time and clock
- * sequence fields are written in the native byte order.
*/
CTASSERT(sizeof(struct uuid) == 16);
-/* We use an alternative, more convenient representation in the generator. */
-struct uuid_private {
- union {
- uint64_t ll; /* internal. */
- struct {
- uint32_t low;
- uint16_t mid;
- uint16_t hi;
- } x;
- } time;
- uint16_t seq; /* Big-endian. */
- uint16_t node[UUID_NODE_LEN1];
-};
-
-CTASSERT(sizeof(struct uuid_private) == 16);
-
-static struct uuid_private uuid_last;
-
-/* UUID generator mutex lock */
-static kmutex_t uuid_mutex;
-
-void
-uuid_init(void)
-{
-
- mutex_init(uuid_mutex, MUTEX_DEFAULT, IPL_NONE);
-}
-
-/*
- * Return the first MAC address we encounter or, if none was found,
- * construct a sufficiently random multicast address. We don't try
- * to return the same MAC address as previously returned. We always
- * generate a new multicast address if no MAC address exists in the
- * system.
- * It would be nice to know if 'ifnet' or any of its sub-structures
- * has been changed in any way. If not, we could simply skip the
- * scan and safely return the MAC address we returned before.
- */
-static void
-uuid_node(uint16_t *node)
-{
- struct ifnet *ifp;
- struct ifaddr *ifa;
- struct sockaddr_dl *sdl;
- int i, s;
-
- s = splnet();
- KERNEL_LOCK(1, NULL);
- IFNET_FOREACH(ifp) {
- /* Walk the address list */
- IFADDR_FOREACH(ifa, ifp) {
- sdl = (struct sockaddr_dl*)ifa-ifa_addr;
- if (sdl != NULL sdl-sdl_family == AF_LINK
- sdl-sdl_type == IFT_ETHER) {
-/* Got a MAC address. */
-memcpy(node, CLLADDR(sdl), UUID_NODE_LEN);
-KERNEL_UNLOCK_ONE(NULL);
-splx(s);
-return;
- }
- }
- }
- KERNEL_UNLOCK_ONE(NULL);
- splx(s);
-
- for (i = 0; i (UUID_NODE_LEN1); i++)
- node[i] = (uint16_t)cprng_fast32();
- *((uint8_t*)node) |= 0x01;
-}
-
-/*
- * Get the current time as a 60 bit count of 100-nanosecond intervals
- * since 00:00:00.00, October 15,1582. We apply a magic offset to convert
- * the Unix time since 00:00:00.00, January 1, 1970 to the date of the
- * Gregorian reform to the Christian calendar.
- */
CVS commit: src/sbin/gpt
Module Name:src Committed By: riastradh Date: Sat Oct 4 11:23:35 UTC 2014 Modified Files: src/sbin/gpt: gpt_uuid.c Log Message: Paranoia: choke noisily on EOF from /dev/urandom. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/gpt_uuid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt_uuid.c diff -u src/sbin/gpt/gpt_uuid.c:1.8 src/sbin/gpt/gpt_uuid.c:1.9 --- src/sbin/gpt/gpt_uuid.c:1.8 Sat Oct 4 10:30:13 2014 +++ src/sbin/gpt/gpt_uuid.c Sat Oct 4 11:23:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: gpt_uuid.c,v 1.8 2014/10/04 10:30:13 riastradh Exp $ */ +/* $NetBSD: gpt_uuid.c,v 1.9 2014/10/04 11:23:35 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h #ifdef __RCSID -__RCSID($NetBSD: gpt_uuid.c,v 1.8 2014/10/04 10:30:13 riastradh Exp $); +__RCSID($NetBSD: gpt_uuid.c,v 1.9 2014/10/04 11:23:35 riastradh Exp $); #endif #include err.h @@ -252,6 +252,8 @@ gpt_uuid_generate(gpt_uuid_t t) nread = read(fd, p, n); if (nread 0) err(1, read(/dev/urandom)); + if (nread == 0) + errx(1, EOF from /dev/urandom); if ((size_t)nread n) errx(1, read too much: %zd %zu, nread, n); }
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sat Oct 4 11:42:13 UTC 2014 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16230 Log Message: Import tzdata2014h from ftp://ftp.iana.org/tz/releases/tzdata2014h.tar.gz Summary of changes in tzdata2014h (2014-09-25 18:59:03 -0700): * America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28. * Shanks says Asia/Novokuznetsk switched from LMT (not NMT) on 1924-05-01, not 1920-01-06. * Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Blantyre, Africa/Bujumbura, Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, Africa/Lusaka, Africa/Maseru, and Africa/Mbabane. * Changes affecting documentation and commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2014H U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/external/bsd/elftosb
Module Name:src
Committed By: uebayasi
Date: Sat Oct 4 11:45:19 UTC 2014
Modified Files:
src/external/bsd/elftosb/dist/elftosb2: elftosb_lexer.cpp
elftosb_parser.tab.cpp elftosb_parser.tab.hpp
Added Files:
src/external/bsd/elftosb: elftosb2netbsd
Log Message:
Remove '#line ...' lines to not confuse mkdep(1).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/elftosb/elftosb2netbsd
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/elftosb/dist/elftosb2/elftosb_lexer.cpp \
src/external/bsd/elftosb/dist/elftosb2/elftosb_parser.tab.cpp \
src/external/bsd/elftosb/dist/elftosb2/elftosb_parser.tab.hpp
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/dist/elftosb2/elftosb_lexer.cpp
diff -u src/external/bsd/elftosb/dist/elftosb2/elftosb_lexer.cpp:1.1 src/external/bsd/elftosb/dist/elftosb2/elftosb_lexer.cpp:1.2
--- src/external/bsd/elftosb/dist/elftosb2/elftosb_lexer.cpp:1.1 Thu Nov 15 19:49:14 2012
+++ src/external/bsd/elftosb/dist/elftosb2/elftosb_lexer.cpp Sat Oct 4 11:45:19 2014
@@ -1,6 +1,4 @@
-#line 2 /Users/creed/projects/fsl/fromsvr/elftosb/build/elftosb.build/Debug/elftosb.build/DerivedSources/elftosb_lexer.cpp
-#line 4 /Users/creed/projects/fsl/fromsvr/elftosb/build/elftosb.build/Debug/elftosb.build/DerivedSources/elftosb_lexer.cpp
#define YY_INT_ALIGNED short int
@@ -602,9 +600,7 @@ static yyconst flex_int32_t yy_rule_can_
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
/* %option prefix=Elftosb */
-#line 10 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
#include ElftosbLexer.h
#include stdlib.h
#include limits.h
@@ -624,7 +620,6 @@ using namespace elftosb;
/* start conditions */
-#line 628 /Users/creed/projects/fsl/fromsvr/elftosb/build/elftosb.build/Debug/elftosb.build/DerivedSources/elftosb_lexer.cpp
#define INITIAL 0
#define blob 1
@@ -726,10 +721,8 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 38 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
-#line 733 /Users/creed/projects/fsl/fromsvr/elftosb/build/elftosb.build/Debug/elftosb.build/DerivedSources/elftosb_lexer.cpp
if ( !(yy_init) )
{
@@ -820,112 +813,90 @@ do_action: /* This label is used only to
case 1:
YY_RULE_SETUP
-#line 40 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_OPTIONS; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 41 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_CONSTANTS; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 42 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_SOURCES; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 43 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_FILTERS; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 44 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_SECTION; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 45 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_EXTERN; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 46 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_FROM; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 47 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_RAW; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 48 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_LOAD; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 49 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_JUMP; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 50 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_CALL; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 51 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_MODE; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 52 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_IF; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 53 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_ELSE; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 54 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_DEFINED; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 55 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_INFO; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 56 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_WARNING; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 57 /Users/creed/projects/fsl/fromsvr/elftosb/elftosb2/elftosb_lexer.l
{ return TOK_ERROR; }
YY_BREAK
case 19:
YY_RULE_SETUP
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Oct 4 11:49:02 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: tzdata2014h/tzcode2014h have been released. we have updated tzdata. To generate a diff of this commit: cvs rdiff -u -r1.1153 -r1.1154 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1153 src/doc/3RDPARTY:1.1154 --- src/doc/3RDPARTY:1.1153 Sat Sep 27 11:23:11 2014 +++ src/doc/3RDPARTY Sat Oct 4 11:49:02 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1153 2014/09/27 11:23:11 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1154 2014/10/04 11:49:02 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1312,8 +1312,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2014f / tzdata2014g -Current Vers: tzcode2014g / tzdata2014g +Version: tzcode2014f / tzdata2014h +Current Vers: tzcode2014h / tzdata2014h Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Oct 4 11:49:58 UTC 2014 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2014h. [apb 20141004] Also delete a stray blank line. To generate a diff of this commit: cvs rdiff -u -r1.1987 -r1.1988 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1987 src/doc/CHANGES:1.1988 --- src/doc/CHANGES:1.1987 Mon Sep 29 05:58:48 2014 +++ src/doc/CHANGES Sat Oct 4 11:49:57 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1987 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1988 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -35,7 +35,6 @@ Changes from NetBSD 7.0 to NetBSD 8.0: The related changes to src/sys/conf require a rebuild of config(1). [joerg 20140824] zoneinfo: Import tzdata2014g. [apb 20140831] - wm(4): Add internal SERDES support for 82575 and newer controllers. [msaitoh 20140903] or1k: Add new port. [matt 20140903] @@ -57,3 +56,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: mpt(4): added bio(4) support. [jmcneill 20140927] gpt(8): added type subcommand to modify partition type. [jnemeth 20140927] + zoneinfo: Import tzdata2014h. [apb 20141004]
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: macallan
Date: Sat Oct 4 13:05:57 UTC 2014
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
pay attention to copyin()'s return values
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 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.53 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.54
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.53 Fri Oct 3 11:40:55 2014
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sat Oct 4 13:05:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.53 2014/10/03 11:40:55 skrll Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.54 2014/10/04 13:05:57 macallan 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.53 2014/10/03 11:40:55 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.54 2014/10/04 13:05:57 macallan Exp $);
#include opt_evbarm_boardtype.h
#include opt_ddb.h
@@ -911,9 +911,12 @@ rpi_fb_do_cursor(struct wsdisplay_cursor
shape = 1;
}
if (cur-which WSDISPLAY_CURSOR_DOSHAPE) {
+ int err;
- copyin(cur-mask, cursor_mask, CURSOR_BITMAP_SIZE);
- copyin(cur-image, cursor_bitmap, CURSOR_BITMAP_SIZE);
+ err = copyin(cur-mask, cursor_mask, CURSOR_BITMAP_SIZE);
+ err += copyin(cur-image, cursor_bitmap, CURSOR_BITMAP_SIZE);
+ if (err != 0)
+ return EFAULT;
shape = 1;
}
if (shape) {
CVS commit: src/games/primes
Module Name:src
Committed By: wiz
Date: Sat Oct 4 13:15:50 UTC 2014
Modified Files:
src/games/primes: primes.6 primes.c
Log Message:
usage police
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/games/primes/primes.6
cvs rdiff -u -r1.20 -r1.21 src/games/primes/primes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/primes/primes.6
diff -u src/games/primes/primes.6:1.4 src/games/primes/primes.6:1.5
--- src/games/primes/primes.6:1.4 Thu Oct 2 21:36:37 2014
+++ src/games/primes/primes.6 Sat Oct 4 13:15:50 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: primes.6,v 1.4 2014/10/02 21:36:37 ast Exp $
+.\ $NetBSD: primes.6,v 1.5 2014/10/04 13:15:50 wiz Exp $
.\
.\ Copyright (c) 1989, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -43,8 +43,7 @@
.Nd generate primes
.Sh SYNOPSIS
.Nm primes
-.Op Fl d
-.Op Fl h
+.Op Fl dh
.Op Ar start Op Ar stop
.Sh DESCRIPTION
The
@@ -96,6 +95,7 @@ prints the prime numbers in hexadecimal.
Out of range or invalid input results in
an appropriate error message to standard error.
.Sh AUTHORS
+.An -nosplit
Originally by
.An Landon Curt Noll ,
extended to some 64-bit primes by
Index: src/games/primes/primes.c
diff -u src/games/primes/primes.c:1.20 src/games/primes/primes.c:1.21
--- src/games/primes/primes.c:1.20 Thu Oct 2 21:36:37 2014
+++ src/games/primes/primes.c Sat Oct 4 13:15:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: primes.c,v 1.20 2014/10/02 21:36:37 ast Exp $ */
+/* $NetBSD: primes.c,v 1.21 2014/10/04 13:15:50 wiz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = @(#)primes.c 8.5 (Berkeley) 5/10/95;
#else
-__RCSID($NetBSD: primes.c,v 1.20 2014/10/02 21:36:37 ast Exp $);
+__RCSID($NetBSD: primes.c,v 1.21 2014/10/04 13:15:50 wiz Exp $);
#endif
#endif /* not lint */
@@ -52,13 +52,13 @@ __RCSID($NetBSD: primes.c,v 1.20 2014/1
* By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\
*
* usage:
- * primes [-d] [-h] [start [stop]]
+ * primes [-dh] [start [stop]]
*
* Print primes = start and stop. If stop is omitted,
* the value SPSPMAX is assumed. If start is
* omitted, start is read from standard input.
- * -h: print primes in hexadecimal
* -d: print difference to previous prime, e.g. 3 (1)
+ * -h: print primes in hexadecimal
*
* validation check: there are 664579 primes between 0 and 10^7
*/
@@ -338,6 +338,6 @@ primes(uint64_t start, uint64_t stop)
static void
usage(void)
{
- (void)fprintf(stderr, usage: primes [-d] [-h] [start [stop]]\n);
+ (void)fprintf(stderr, usage: primes [-dh] [start [stop]]\n);
exit(1);
}
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: mlelstv Date: Sat Oct 4 13:18:34 UTC 2014 Modified Files: src/sys/arch/evbarm/rpi: rpi_vcmbox.c Log Message: be verbose about sysmon error. enable monitoring. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/rpi/rpi_vcmbox.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_vcmbox.c diff -u src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.3 src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.4 --- src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.3 Tue Apr 1 06:55:29 2014 +++ src/sys/arch/evbarm/rpi/rpi_vcmbox.c Sat Oct 4 13:18:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_vcmbox.c,v 1.3 2014/04/01 06:55:29 skrll Exp $ */ +/* $NetBSD: rpi_vcmbox.c,v 1.4 2014/10/04 13:18:34 mlelstv Exp $ */ /*- * Copyright (c) 2013 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rpi_vcmbox.c,v 1.3 2014/04/01 06:55:29 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: rpi_vcmbox.c,v 1.4 2014/10/04 13:18:34 mlelstv Exp $); #include sys/param.h #include sys/types.h @@ -152,7 +152,11 @@ vcmbox_attach(device_t parent, device_t sc-sc_sme-sme_refresh = vcmbox_sensor_refresh; sc-sc_sme-sme_get_limits = vcmbox_sensor_get_limits; vcmbox_create_sensors(sc); - sysmon_envsys_register(sc-sc_sme); + if (sysmon_envsys_register(sc-sc_sme) == 0) + return; + + aprint_error_dev(self, unable to register with sysmon\n); + sysmon_envsys_destroy(sc-sc_sme); } static int @@ -355,7 +359,8 @@ vcmbox_create_sensors(struct vcmbox_soft sc-sc_sensor[VCMBOX_SENSOR_TEMP].sensor = VCMBOX_SENSOR_TEMP; sc-sc_sensor[VCMBOX_SENSOR_TEMP].units = ENVSYS_STEMP; sc-sc_sensor[VCMBOX_SENSOR_TEMP].state = ENVSYS_SINVALID; - sc-sc_sensor[VCMBOX_SENSOR_TEMP].flags = ENVSYS_FHAS_ENTROPY; + sc-sc_sensor[VCMBOX_SENSOR_TEMP].flags = ENVSYS_FMONLIMITS | + ENVSYS_FHAS_ENTROPY; strlcpy(sc-sc_sensor[VCMBOX_SENSOR_TEMP].desc, vcmbox_sensor_name[VCMBOX_SENSOR_TEMP], sizeof(sc-sc_sensor[VCMBOX_SENSOR_TEMP].desc));
CVS commit: src/sys/fs/filecorefs
Module Name:src
Committed By: hannken
Date: Sat Oct 4 13:27:24 UTC 2014
Modified Files:
src/sys/fs/filecorefs: filecore_lookup.c filecore_node.c
filecore_node.h filecore_vfsops.c
Log Message:
Change filecore to vcache.
Compile-tested only, was not able to get my hands on a readable fs image.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/fs/filecorefs/filecore_lookup.c
cvs rdiff -u -r1.26 -r1.27 src/sys/fs/filecorefs/filecore_node.c
cvs rdiff -u -r1.5 -r1.6 src/sys/fs/filecorefs/filecore_node.h
cvs rdiff -u -r1.76 -r1.77 src/sys/fs/filecorefs/filecore_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/filecorefs/filecore_lookup.c
diff -u src/sys/fs/filecorefs/filecore_lookup.c:1.20 src/sys/fs/filecorefs/filecore_lookup.c:1.21
--- src/sys/fs/filecorefs/filecore_lookup.c:1.20 Tue Jun 3 19:30:30 2014
+++ src/sys/fs/filecorefs/filecore_lookup.c Sat Oct 4 13:27:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_lookup.c,v 1.20 2014/06/03 19:30:30 joerg Exp $ */
+/* $NetBSD: filecore_lookup.c,v 1.21 2014/10/04 13:27:24 hannken Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: filecore_lookup.c,v 1.20 2014/06/03 19:30:30 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: filecore_lookup.c,v 1.21 2014/10/04 13:27:24 hannken Exp $);
#include sys/param.h
#include sys/namei.h
@@ -128,8 +128,6 @@ filecore_lookup(void *v)
struct buf *bp; /* a buffer of directory entries */
struct filecore_direntry *de;
int numdirpasses; /* strategy for directory search */
- struct vnode *pdp; /* saved dp during symlink work */
- struct vnode *tdp; /* returned by filecore_vget_internal */
int error;
u_short namelen;
int res;
@@ -259,54 +257,24 @@ found:
if ((flags ISLASTCN) nameiop == LOOKUP)
dp-i_diroff = i;
- /*
- * Step through the translation in the name. We do not `iput' the
- * directory because we may need it again if a symbolic link
- * is relative to the current directory. Instead we save it
- * unlocked as pdp. We must get the target inode before unlocking
- * the directory to insure that the inode will not be removed
- * before we get it. We prevent deadlock by always fetching
- * inodes from the root, moving down the directory tree. Thus
- * when following backward pointers .. we must unlock the
- * parent directory before getting the requested directory.
- * There is a potential race condition here if both the current
- * and parent directories are removed before the `iget' for the
- * inode associated with .. returns. We hope that this occurs
- * infrequently since we cannot avoid this race condition without
- * implementing a sophisticated deadlock detection algorithm.
- * Note also that this simple deadlock detection scheme will not
- * work if the file system has any hard links other than ..
- * that point backwards in the directory structure.
- */
- pdp = vdp;
-
- /*
- * If ino is different from dp-i_ino,
- * it's a relocated directory.
- */
- if (flags ISDOTDOT) {
- ino_t pin = filecore_getparent(dp);
-
- VOP_UNLOCK(pdp); /* race to get the inode */
- error = VFS_VGET(vdp-v_mount, pin, tdp);
- vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY);
- if (error) {
- return error;
- }
- *vpp = tdp;
- } else if (name[0] == '.' namelen == 1) {
+ if (name[0] == '.' namelen == 1) {
vref(vdp); /* we want ourself, ie . */
*vpp = vdp;
} else {
+ ino_t ino;
+
+ if (flags ISDOTDOT) {
+ ino = filecore_getparent(dp);
+ } else {
+ ino = dp-i_dirent.addr | (i FILECORE_INO_INDEX);
#ifdef FILECORE_DEBUG_BR
printf(brelse(%p) lo4\n, bp);
#endif
- brelse(bp, 0);
- error = VFS_VGET(vdp-v_mount, dp-i_dirent.addr |
- (i FILECORE_INO_INDEX), tdp);
+ brelse(bp, 0);
+ }
+ error = vcache_get(vdp-v_mount, ino, sizeof(ino), vpp);
if (error)
- return (error);
- *vpp = tdp;
+ return error;
}
/*
@@ -314,7 +282,5 @@ found:
*/
cache_enter(vdp, *vpp, cnp-cn_nameptr, cnp-cn_namelen,
cnp-cn_flags);
- if (*vpp != vdp)
- VOP_UNLOCK(*vpp);
return 0;
}
Index: src/sys/fs/filecorefs/filecore_node.c
diff -u src/sys/fs/filecorefs/filecore_node.c:1.26 src/sys/fs/filecorefs/filecore_node.c:1.27
--- src/sys/fs/filecorefs/filecore_node.c:1.26 Thu Feb 27 16:51:38 2014
+++ src/sys/fs/filecorefs/filecore_node.c Sat Oct 4 13:27:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_node.c,v 1.26 2014/02/27 16:51:38 hannken Exp $ */
+/* $NetBSD: filecore_node.c,v 1.27 2014/10/04 13:27:24 hannken Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: filecore_node.c,v 1.26 2014/02/27 16:51:38 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: filecore_node.c,v 1.27 2014/10/04 13:27:24 hannken Exp $);
#include
CVS commit: src/sys/arch/luna68k/dev
Module Name:src Committed By: tsutsui Date: Sat Oct 4 14:42:41 UTC 2014 Modified Files: src/sys/arch/luna68k/dev: omkbdmap.c Log Message: Fix unintended RCS Id substitution. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/dev/omkbdmap.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/luna68k/dev/omkbdmap.c diff -u src/sys/arch/luna68k/dev/omkbdmap.c:1.1 src/sys/arch/luna68k/dev/omkbdmap.c:1.2 --- src/sys/arch/luna68k/dev/omkbdmap.c:1.1 Sun Jul 20 11:14:56 2014 +++ src/sys/arch/luna68k/dev/omkbdmap.c Sat Oct 4 14:42:41 2014 @@ -1,8 +1,8 @@ -/* $NetBSD: omkbdmap.c,v 1.1 2014/07/20 11:14:56 tsutsui Exp $ */ +/* $NetBSD: omkbdmap.c,v 1.2 2014/10/04 14:42:41 tsutsui Exp $ */ /* $OpenBSD: omkbdmap.c,v 1.2 2013/11/16 18:31:44 miod Exp $ */ /* Partially from: - * $NetBSD: omkbdmap.c,v 1.1 2014/07/20 11:14:56 tsutsui Exp $ + * NetBSD: lunaws.c,v 1.6 2002/03/17 19:40:42 atatat Exp * * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved.
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: martin Date: Sat Oct 4 15:25:15 UTC 2014 Modified Files: src/sys/arch/arm/allwinner: awin_gige.c Log Message: Initialize all bits of the GMAC clock register, add comments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/allwinner/awin_gige.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/allwinner/awin_gige.c diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.7 src/sys/arch/arm/allwinner/awin_gige.c:1.8 --- src/sys/arch/arm/allwinner/awin_gige.c:1.7 Thu Sep 11 06:56:05 2014 +++ src/sys/arch/arm/allwinner/awin_gige.c Sat Oct 4 15:25:15 2014 @@ -31,7 +31,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.7 2014/09/11 06:56:05 martin Exp $); +__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.8 2014/10/04 15:25:15 martin Exp $); #include sys/param.h #include sys/bus.h @@ -126,10 +126,10 @@ awin_gige_attach(device_t parent, device /* * We use RGMII phy mode, set up clock accordingly */ + bus_space_write_4(aio-aio_core_bst, aio-aio_ccm_bsh, + AWIN_GMAC_CLK_REG, 4); /* GPIT = RMII */ awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh, - AWIN_GMAC_CLK_REG, 4, 3); - awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh, - AWIN_GMAC_CLK_REG, 2, 0); + AWIN_GMAC_CLK_REG, 2, 0); /* GTCS = internal transmit clock */ dwc_gmac_attach(sc-sc_core, 2); }
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: christos Date: Sat Oct 4 15:29:13 UTC 2014 Modified Files: src/gnu/dist/groff/tmac: ascii.tmac Log Message: and a few more. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/gnu/dist/groff/tmac/ascii.tmac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/groff/tmac/ascii.tmac diff -u src/gnu/dist/groff/tmac/ascii.tmac:1.5 src/gnu/dist/groff/tmac/ascii.tmac:1.6 --- src/gnu/dist/groff/tmac/ascii.tmac:1.5 Thu Oct 2 02:56:36 2014 +++ src/gnu/dist/groff/tmac/ascii.tmac Sat Oct 4 11:29:13 2014 @@ -1,16 +1,43 @@ .\ Transliterate non-ASCII characters for use in man pages etc. +.\ ligatures .fchar \(:a ae .fchar \(:o oe .fchar \(:u ue .fchar \(:A Ae .fchar \(:O Oe .fchar \(:U Ue +.\ germandbls .fchar \(ss ss .\ dagger and double dagger. .fchar \(dg [+] .fchar \(dd [++] .\ up arrow .fchar \(ua \(ha +.\ cedilla +.fchar \(ac , +.\ questiondown +.fchar \(r? ? +.\ exclamdown +.fchar \(r! ! +.\ dieresis +.fchar \(ad +.\ caron +.fchar \(ah v +.\ macron +.fchar \(a- -- +.\ ring +.fchar \(ao o +.\ thorn +.fchar \(Tp p +.\ Thorn +.fchar \(TP P +.\ Eth +.fchar \(-D D +.\ eth +.fchar \(Sd d +.\ ogonek +.fchar \(ho o +.\ Fonts .\ We have no fonts, should be turn things to bold for italic? .ft C ..
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src Committed By: riastradh Date: Sat Oct 4 15:51:23 UTC 2014 Modified Files: src/sys/external/bsd/drm/dist/bsd-core: drm_atomic.h Log Message: Canonicalize boolean result from test_and_set_bit. Not actually semantically significant for any callers, but Linux documentation insists it is important, so we'll follow suit. Fixes last part of PR kern/48999. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.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/external/bsd/drm/dist/bsd-core/drm_atomic.h diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.h:1.4 src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.h:1.5 --- src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.h:1.4 Fri Jun 19 03:50:03 2009 +++ src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.h Sat Oct 4 15:51:23 2014 @@ -49,7 +49,7 @@ test_and_set_bit(int b, volatile void *p unsigned int r = *(volatile int *)p m; *(volatile int *)p |= m; splx(s); - return r; + return !!r; } static __inline void @@ -115,7 +115,7 @@ test_and_set_bit(int b, volatile void *p break; } while (atomic_cas_uint(val, old, old | mask) != old); - return old mask; + return !!(old mask); } #endif
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: christos Date: Sat Oct 4 15:54:54 UTC 2014 Modified Files: src/gnu/dist/groff/tmac: ascii.tmac Log Message: few more. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/gnu/dist/groff/tmac/ascii.tmac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/groff/tmac/ascii.tmac diff -u src/gnu/dist/groff/tmac/ascii.tmac:1.6 src/gnu/dist/groff/tmac/ascii.tmac:1.7 --- src/gnu/dist/groff/tmac/ascii.tmac:1.6 Sat Oct 4 11:29:13 2014 +++ src/gnu/dist/groff/tmac/ascii.tmac Sat Oct 4 11:54:53 2014 @@ -37,6 +37,12 @@ .fchar \(Sd d .\ ogonek .fchar \(ho o +.\ degree +.fchar \(de o +.\ section +.fchar \(sc s +.\ paragraph +.fchar \(ps p .\ Fonts .\ We have no fonts, should be turn things to bold for italic? .ft C
CVS commit: src/sys/arch/luna68k/dev
Module Name:src
Committed By: tsutsui
Date: Sat Oct 4 16:58:17 UTC 2014
Modified Files:
src/sys/arch/luna68k/dev: lunafb.c omrasops.c omrasopsvar.h
Log Message:
Pull LUNA's framebuffer improvements by Kenji Aoyama from OpenBSD/luna88k.
http://marc.info/?l=openbsd-cvsm=141199909120631w=2
Use raster(logic) operation, or ROP, function on LUNA frame buffer.
It makes 4bpp wscons putchar ~20% faster.
This Makes 4bpp wscons putchar ~30% on LUNA-II.
Also use the similar ROP in 1bpp putchar and cursor functions
and the 1bpp putchar is also ~5% faster.
While here, reduce diffs from OpenBSD a bit.
Tested on all 1bpp/4bpp/8bpp framebuffers.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/luna68k/dev/lunafb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/dev/omrasops.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/dev/omrasopsvar.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/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.35 src/sys/arch/luna68k/dev/lunafb.c:1.36
--- src/sys/arch/luna68k/dev/lunafb.c:1.35 Fri Jul 25 16:40:12 2014
+++ src/sys/arch/luna68k/dev/lunafb.c Sat Oct 4 16:58:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.35 2014/07/25 16:40:12 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.36 2014/10/04 16:58:17 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.35 2014/07/25 16:40:12 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.36 2014/10/04 16:58:17 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -75,11 +75,8 @@ struct bt458 {
};
#define OMFB_RFCNT 0xB100 /* video h-origin/v-origin */
-#define OMFB_PLANEMASK 0xB104 /* planemask register */
-#define OMFB_FB_WADDR 0xB1080008 /* common plane */
-#define OMFB_FB_RADDR 0xB10C0008 /* plane #0 */
-#define OMFB_ROPFUNC 0xB12C /* ROP function code */
#define OMFB_RAMDAC 0xC110 /* Bt454/Bt458 RAMDAC */
+
#define OMFB_SIZE (0xB130 - 0xB108 + PAGE_SIZE)
struct hwcmap {
Index: src/sys/arch/luna68k/dev/omrasops.c
diff -u src/sys/arch/luna68k/dev/omrasops.c:1.18 src/sys/arch/luna68k/dev/omrasops.c:1.19
--- src/sys/arch/luna68k/dev/omrasops.c:1.18 Sun Sep 28 05:00:56 2014
+++ src/sys/arch/luna68k/dev/omrasops.c Sat Oct 4 16:58:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: omrasops.c,v 1.18 2014/09/28 05:00:56 tsutsui Exp $ */
+/* $NetBSD: omrasops.c,v 1.19 2014/10/04 16:58:17 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: omrasops.c,v 1.18 2014/09/28 05:00:56 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: omrasops.c,v 1.19 2014/10/04 16:58:17 tsutsui Exp $);
/*
* Designed speficically for 'm68k bitorder';
@@ -78,13 +78,6 @@ static int omrasops_init(struct rasops_i
#define ALIGNMASK (0x1f)
#define BYTESDONE (4)
-#define W(p) (*(uint32_t *)(p))
-#define R(p) (*(uint32_t *)((uint8_t *)(p) + 0x4))
-#define P0(p) (*(uint32_t *)((uint8_t *)(p) + 0x4))
-#define P1(p) (*(uint32_t *)((uint8_t *)(p) + 0x8))
-#define P2(p) (*(uint32_t *)((uint8_t *)(p) + 0xc))
-#define P3(p) (*(uint32_t *)((uint8_t *)(p) + 0x10))
-
/*
* macros to handle unaligned bit copy ops.
* See src/sys/dev/rasops/rasops_mask.h for MI version.
@@ -96,13 +89,13 @@ static int omrasops_init(struct rasops_i
#define FASTGETBITS(psrc, x, w, dst) \
asm(bfextu %3{%1:%2},%0 \
: =d (dst) \
- : di (x), di (w), o ((uint32_t *)(psrc)))
+ : di (x), di (w), o (*(uint32_t *)(psrc)))
/* luna68k version PUTBITS() that puts w bits from bit x at pdst memory */
/* XXX this macro assumes (x + w) = 32 to handle unaligned residual bits */
#define FASTPUTBITS(src, x, w, pdst) \
asm(bfins %3,%0{%1:%2} \
- : +o ((uint32_t *)(pdst)) \
+ : +o (*(uint32_t *)(pdst))\
: di (x), di (w), d (src)\
: memory );
@@ -137,16 +130,23 @@ om1_putchar(void *cookie, int row, int s
rmask = ALL1BITS (-width ALIGNMASK);
if (width = BLITWIDTH) {
lmask = rmask;
+ /* set lmask as ROP mask value, with THROUGH mode */
+ ((volatile uint32_t *)OMFB_ROPFUNC)[ROP_THROUGH] = lmask;
+
while (height 0) {
glyph = 0;
for (i = ri-ri_font-stride; i != 0; i--)
glyph = (glyph 8) | *fb++;
glyph = (4 - ri-ri_font-stride) * NBBY;
glyph = (glyph align) ^ inverse;
- P0(p) = (P0(p) ~lmask) | (glyph lmask);
+
+ *W(p) = glyph;
+
p += scanspan;
height--;
}
+ /* reset mask value */
+ ((volatile uint32_t *)OMFB_ROPFUNC)[ROP_THROUGH] = ALL1BITS;
} else {
uint8_t *q = p;
uint32_t lhalf, rhalf;
@@ -157,14 +157,26 @@ om1_putchar(void *cookie, int row, int s
glyph = (glyph 8) | *fb++;
glyph = (4
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: jmcneill
Date: Sat Oct 4 18:09:33 UTC 2014
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
pass sdhc_softc instead of sdhc_host to sc_vendor_transfer_data_dma, since the
vendor specific code has no visibility into struct sdhc_host and can easily do
device_private(sdhc_softc-sc_dev)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/sdmmc/sdhcvar.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.50 src/sys/dev/sdmmc/sdhc.c:1.51
--- src/sys/dev/sdmmc/sdhc.c:1.50 Thu Oct 2 18:14:38 2014
+++ src/sys/dev/sdmmc/sdhc.c Sat Oct 4 18:09:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.50 2014/10/02 18:14:38 mlelstv Exp $ */
+/* $NetBSD: sdhc.c,v 1.51 2014/10/04 18:09:32 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.50 2014/10/02 18:14:38 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.51 2014/10/04 18:09:32 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -1272,6 +1272,7 @@ sdhc_start_command(struct sdhc_host *hp,
static void
sdhc_transfer_data(struct sdhc_host *hp, struct sdmmc_command *cmd)
{
+ struct sdhc_softc *sc = hp-sc;
int error;
DPRINTF(1,(%s: data transfer: resp=%08x datalen=%u\n, HDEVNAME(hp),
@@ -1289,7 +1290,7 @@ sdhc_transfer_data(struct sdhc_host *hp,
if (cmd-c_dmamap != NULL) {
if (hp-sc-sc_vendor_transfer_data_dma != NULL) {
- error = hp-sc-sc_vendor_transfer_data_dma(hp, cmd);
+ error = hp-sc-sc_vendor_transfer_data_dma(sc, cmd);
if (error == 0 !sdhc_wait_intr(hp,
SDHC_TRANSFER_COMPLETE, SDHC_TRANSFER_TIMEOUT)) {
error = ETIMEDOUT;
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.14 src/sys/dev/sdmmc/sdhcvar.h:1.15
--- src/sys/dev/sdmmc/sdhcvar.h:1.14 Fri Sep 12 19:45:16 2014
+++ src/sys/dev/sdmmc/sdhcvar.h Sat Oct 4 18:09:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.14 2014/09/12 19:45:16 jakllsch Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.15 2014/10/04 18:09:32 jmcneill Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -60,7 +60,7 @@ struct sdhc_softc {
int (*sc_vendor_write_protect)(struct sdhc_softc *);
int (*sc_vendor_card_detect)(struct sdhc_softc *);
int (*sc_vendor_bus_clock)(struct sdhc_softc *, int);
- int (*sc_vendor_transfer_data_dma)(struct sdhc_host *, struct sdmmc_command *);
+ int (*sc_vendor_transfer_data_dma)(struct sdhc_softc *, struct sdmmc_command *);
};
/* Host controller functions called by the attachment driver. */
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: jmcneill
Date: Sat Oct 4 18:10:04 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_emmc.c
Log Message:
vendor_transfer_data_dma callback takes a struct sdhc_softc now
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm2835_emmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.18 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.19
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.18 Wed Oct 1 21:14:58 2014
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Sat Oct 4 18:10:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.18 2014/10/01 21:14:58 jmcneill Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.19 2014/10/04 18:10:04 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.18 2014/10/01 21:14:58 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.19 2014/10/04 18:10:04 jmcneill Exp $);
#include bcmdmac.h
@@ -82,7 +82,7 @@ static int bcmemmc_match(device_t, struc
static void bcmemmc_attach(device_t, device_t, void *);
static void bcmemmc_attach_i(device_t);
#if NBCMDMAC 0
-static int bcmemmc_xfer_data_dma(struct sdhc_host *, struct sdmmc_command *);
+static int bcmemmc_xfer_data_dma(struct sdhc_softc *, struct sdmmc_command *);
static void bcmemmc_dma_done(void *);
#endif
@@ -239,9 +239,9 @@ fail:
#if NBCMDMAC 0
static int
-bcmemmc_xfer_data_dma(struct sdhc_host *hp, struct sdmmc_command *cmd)
+bcmemmc_xfer_data_dma(struct sdhc_softc *sdhc_sc, struct sdmmc_command *cmd)
{
- struct bcmemmc_softc * const sc = *(void **)hp; /* XXX XXX XXX */
+ struct bcmemmc_softc * const sc = device_private(sdhc_sc-sc_dev);
size_t seg;
int error;
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: martin
Date: Sat Oct 4 19:38:17 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_board.c
Log Message:
Make early console work on big endian kernels
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/allwinner/awin_board.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/allwinner/awin_board.c
diff -u src/sys/arch/arm/allwinner/awin_board.c:1.19 src/sys/arch/arm/allwinner/awin_board.c:1.20
--- src/sys/arch/arm/allwinner/awin_board.c:1.19 Thu Sep 11 08:01:31 2014
+++ src/sys/arch/arm/allwinner/awin_board.c Sat Oct 4 19:38:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_board.c,v 1.19 2014/09/11 08:01:31 matt Exp $ */
+/* $NetBSD: awin_board.c,v 1.20 2014/10/04 19:38:17 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.19 2014/09/11 08:01:31 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.20 2014/10/04 19:38:17 martin Exp $);
#include sys/param.h
#include sys/bus.h
@@ -91,10 +91,10 @@ static volatile uint32_t *uart_base;
static int
awin_cngetc(dev_t dv)
{
-if ((uart_base[com_lsr] LSR_RXRDY) == 0)
+if ((le32toh(uart_base[com_lsr]) LSR_RXRDY) == 0)
return -1;
- return uart_base[com_data] 0xff;
+ return le32toh(uart_base[com_data]) 0xff;
}
static void
@@ -102,13 +102,13 @@ awin_cnputc(dev_t dv, int c)
{
int timo = 15;
-while ((uart_base[com_lsr] LSR_TXRDY) == 0 --timo 0)
+while ((le32toh(uart_base[com_lsr]) LSR_TXRDY) == 0 --timo 0)
;
- uart_base[com_data] = c 0xff;
+ uart_base[com_data] = htole32(c 0xff);
timo = 15;
-while ((uart_base[com_lsr] LSR_TSRE) == 0 --timo 0)
+while ((le32toh(uart_base[com_lsr]) LSR_TSRE) == 0 --timo 0)
;
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Sun Oct 5 03:46:56 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Realtek RTL8152, RTL8153. To generate a diff of this commit: cvs rdiff -u -r1.682 -r1.683 src/sys/dev/usb/usbdevs 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.682 src/sys/dev/usb/usbdevs:1.683 --- src/sys/dev/usb/usbdevs:1.682 Wed Sep 24 00:17:13 2014 +++ src/sys/dev/usb/usbdevs Sun Oct 5 03:46:56 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.682 2014/09/24 00:17:13 christos Exp $ +$NetBSD: usbdevs,v 1.683 2014/10/05 03:46:56 nonaka Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2662,6 +2662,8 @@ product REALTEK RTL8188CTV 0x018a RTL818 product REALTEK RTL8188RU_2 0x317f RTL8188RU product REALTEK RTL8150L 0x8150 RTL8150L USB-Ethernet Bridge product REALTEK RTL8151 0x8151 RTL8151 PNA +product REALTEK RTL8152 0x8152 RTL8152 +product REALTEK RTL8153 0x8153 RTL8153 product REALTEK RTL8188CE_0 0x8170 RTL8188CE product REALTEK RTL8171 0x8171 RTL8171 product REALTEK RTL8172 0x8172 RTL8172
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: nonaka
Date: Sun Oct 5 03:47:17 UTC 2014
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.674 -r1.675 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.675 -r1.676 src/sys/dev/usb/usbdevs_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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.674 src/sys/dev/usb/usbdevs.h:1.675
--- src/sys/dev/usb/usbdevs.h:1.674 Wed Sep 24 00:17:42 2014
+++ src/sys/dev/usb/usbdevs.h Sun Oct 5 03:47:17 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.674 2014/09/24 00:17:42 christos Exp $ */
+/* $NetBSD: usbdevs.h,v 1.675 2014/10/05 03:47:17 nonaka Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.682 2014/09/24 00:17:13 christos Exp
+ * NetBSD: usbdevs,v 1.683 2014/10/05 03:46:56 nonaka Exp
*/
/*
@@ -2669,6 +2669,8 @@
#define USB_PRODUCT_REALTEK_RTL8188RU_2 0x317f /* RTL8188RU */
#define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* RTL8150L USB-Ethernet Bridge */
#define USB_PRODUCT_REALTEK_RTL8151 0x8151 /* RTL8151 PNA */
+#define USB_PRODUCT_REALTEK_RTL8152 0x8152 /* RTL8152 */
+#define USB_PRODUCT_REALTEK_RTL8153 0x8153 /* RTL8153 */
#define USB_PRODUCT_REALTEK_RTL8188CE_0 0x8170 /* RTL8188CE */
#define USB_PRODUCT_REALTEK_RTL8171 0x8171 /* RTL8171 */
#define USB_PRODUCT_REALTEK_RTL8172 0x8172 /* RTL8172 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.675 src/sys/dev/usb/usbdevs_data.h:1.676
--- src/sys/dev/usb/usbdevs_data.h:1.675 Wed Sep 24 00:17:42 2014
+++ src/sys/dev/usb/usbdevs_data.h Sun Oct 5 03:47:17 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.675 2014/09/24 00:17:42 christos Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.676 2014/10/05 03:47:17 nonaka Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.682 2014/09/24 00:17:13 christos Exp
+ * NetBSD: usbdevs,v 1.683 2014/10/05 03:46:56 nonaka Exp
*/
/*
@@ -3557,30 +3557,34 @@ static const uint16_t usb_products[] = {
15651, 15660, 1764, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8151,
15673, 15681, 0,
+ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8152,
+ 15685, 0,
+ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8153,
+ 15693, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CE_0,
6845, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8171,
- 15685, 0,
+ 15701, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8172,
- 15693, 0,
+ 15709, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8173,
- 15701, 0,
+ 15717, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8174,
- 15709, 0,
+ 15725, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_0,
4995, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8191CU,
- 15717, 0,
+ 15733, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CU,
4985, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188EU,
- 15727, 0,
+ 15743, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_1,
4995, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_2,
4995, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CE,
- 15737, 0,
+ 15753, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU,
15641, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CE_1,
@@ -3588,165 +3592,165 @@ static const uint16_t usb_products[] = {
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187,
8287, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_0,
- 15747, 0,
+ 15763, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CUS,
7477, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_1,
- 15747, 0,
+ 15763, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_2,
- 15747, 0,
+ 15763, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8712,
- 15756, 0,
+ 15772, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8713,
- 15764, 0,
+ 15780, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_COMBO,
4995, 0,
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192SU,
5133, 0,
USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY,
- 15772, 0,
+ 15788, 0,
USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY_PEARL_DUAL,
- 15772, 15783, 15789, 0,
+ 15788, 15799, 15805, 0,
USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY_PEARL,
- 15772, 15783, 0,
+ 15788, 15799, 0,
USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
- 11887, 15794, 0,
+ 11887, 15810, 0,
USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA100,
- 15801, 4638, 6804, 15808, 0,
+ 15817, 4638, 6804, 15824, 0,
CVS commit: src/sbin/gpt
Module Name:src Committed By: wiz Date: Sat Oct 4 07:15:54 UTC 2014 Modified Files: src/sbin/gpt: gpt.8 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/sdmmc
Module Name:src Committed By: martin Date: Sat Oct 4 08:20:11 UTC 2014 Modified Files: src/sys/dev/sdmmc [netbsd-7]: sdhc.c Log Message: Pull up following revision(s) (requested by skrll in ticket #127): sys/dev/sdmmc/sdhc.c: revision 1.50 Fix divisor calculation for SDHC 3.0. To generate a diff of this commit: cvs rdiff -u -r1.44.2.3 -r1.44.2.4 src/sys/dev/sdmmc/sdhc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Oct 4 08:21:23 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #127 To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src Committed By: riastradh Date: Sat Oct 4 10:30:13 UTC 2014 Modified Files: src/sbin/gpt: gpt_uuid.c Log Message: Make gpt(8) generate v4 (random) uuids. Don't needlessly leak your date/time and MAC address when you edit the disk. Read from /dev/urandom rather than calling arc4random or anything, since this is a tool. (Cygwin seems to have /dev/urandom, but yell if this breaks the build on your exotic platform because it lacks /dev/urandom.) ok apb To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/gpt_uuid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: riastradh Date: Sat Oct 4 11:15:44 UTC 2014 Modified Files: src/sys/kern: init_main.c kern_uuid.c src/sys/sys: uuid.h Log Message: Make uuidgen(2) generate v4 (random) uuids. Rip out all the needless MAC address and date/time leakage. No more uuid_init necessary, nor contention over a global uuid state. While here, simplify uuid_snprintf and fix a strict aliasing violation. To generate a diff of this commit: cvs rdiff -u -r1.459 -r1.460 src/sys/kern/init_main.c cvs rdiff -u -r1.18 -r1.19 src/sys/kern/kern_uuid.c cvs rdiff -u -r1.5 -r1.6 src/sys/sys/uuid.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src Committed By: riastradh Date: Sat Oct 4 11:23:35 UTC 2014 Modified Files: src/sbin/gpt: gpt_uuid.c Log Message: Paranoia: choke noisily on EOF from /dev/urandom. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/gpt_uuid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: apb Date: Sat Oct 4 11:42:13 UTC 2014 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16230 Log Message: Import tzdata2014h from ftp://ftp.iana.org/tz/releases/tzdata2014h.tar.gz Summary of changes in tzdata2014h (2014-09-25 18:59:03 -0700): * America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28. * Shanks says Asia/Novokuznetsk switched from LMT (not NMT) on 1924-05-01, not 1920-01-06. * Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Blantyre, Africa/Bujumbura, Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, Africa/Lusaka, Africa/Maseru, and Africa/Mbabane. * Changes affecting documentation and commentary. Status: Vendor Tag: TZDATA Release Tags: TZDATA2014H U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/Theory U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl No conflicts created by this import
CVS commit: src/external/bsd/elftosb
Module Name:src Committed By: uebayasi Date: Sat Oct 4 11:45:19 UTC 2014 Modified Files: src/external/bsd/elftosb/dist/elftosb2: elftosb_lexer.cpp elftosb_parser.tab.cpp elftosb_parser.tab.hpp Added Files: src/external/bsd/elftosb: elftosb2netbsd Log Message: Remove '#line ...' lines to not confuse mkdep(1). To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/elftosb/elftosb2netbsd cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/elftosb/dist/elftosb2/elftosb_lexer.cpp \ src/external/bsd/elftosb/dist/elftosb2/elftosb_parser.tab.cpp \ src/external/bsd/elftosb/dist/elftosb2/elftosb_parser.tab.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Oct 4 11:49:02 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: tzdata2014h/tzcode2014h have been released. we have updated tzdata. To generate a diff of this commit: cvs rdiff -u -r1.1153 -r1.1154 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sat Oct 4 11:49:58 UTC 2014 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2014h. [apb 20141004] Also delete a stray blank line. To generate a diff of this commit: cvs rdiff -u -r1.1987 -r1.1988 src/doc/CHANGES 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: macallan Date: Sat Oct 4 13:05:57 UTC 2014 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: pay attention to copyin()'s return values To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 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/games/primes
Module Name:src Committed By: wiz Date: Sat Oct 4 13:15:50 UTC 2014 Modified Files: src/games/primes: primes.6 primes.c Log Message: usage police To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/games/primes/primes.6 cvs rdiff -u -r1.20 -r1.21 src/games/primes/primes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/filecorefs
Module Name:src Committed By: hannken Date: Sat Oct 4 13:27:24 UTC 2014 Modified Files: src/sys/fs/filecorefs: filecore_lookup.c filecore_node.c filecore_node.h filecore_vfsops.c Log Message: Change filecore to vcache. Compile-tested only, was not able to get my hands on a readable fs image. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/fs/filecorefs/filecore_lookup.c cvs rdiff -u -r1.26 -r1.27 src/sys/fs/filecorefs/filecore_node.c cvs rdiff -u -r1.5 -r1.6 src/sys/fs/filecorefs/filecore_node.h cvs rdiff -u -r1.76 -r1.77 src/sys/fs/filecorefs/filecore_vfsops.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/arm/allwinner
Module Name:src Committed By: martin Date: Sat Oct 4 15:25:15 UTC 2014 Modified Files: src/sys/arch/arm/allwinner: awin_gige.c Log Message: Initialize all bits of the GMAC clock register, add comments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/allwinner/awin_gige.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: christos Date: Sat Oct 4 15:29:13 UTC 2014 Modified Files: src/gnu/dist/groff/tmac: ascii.tmac Log Message: and a few more. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/gnu/dist/groff/tmac/ascii.tmac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src Committed By: riastradh Date: Sat Oct 4 15:51:23 UTC 2014 Modified Files: src/sys/external/bsd/drm/dist/bsd-core: drm_atomic.h Log Message: Canonicalize boolean result from test_and_set_bit. Not actually semantically significant for any callers, but Linux documentation insists it is important, so we'll follow suit. Fixes last part of PR kern/48999. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.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/luna68k/dev
Module Name:src Committed By: tsutsui Date: Sat Oct 4 16:58:17 UTC 2014 Modified Files: src/sys/arch/luna68k/dev: lunafb.c omrasops.c omrasopsvar.h Log Message: Pull LUNA's framebuffer improvements by Kenji Aoyama from OpenBSD/luna88k. http://marc.info/?l=openbsd-cvsm=141199909120631w=2 Use raster(logic) operation, or ROP, function on LUNA frame buffer. It makes 4bpp wscons putchar ~20% faster. This Makes 4bpp wscons putchar ~30% on LUNA-II. Also use the similar ROP in 1bpp putchar and cursor functions and the 1bpp putchar is also ~5% faster. While here, reduce diffs from OpenBSD a bit. Tested on all 1bpp/4bpp/8bpp framebuffers. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/luna68k/dev/lunafb.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/dev/omrasops.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/dev/omrasopsvar.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/sdmmc
Module Name:src Committed By: jmcneill Date: Sat Oct 4 18:09:33 UTC 2014 Modified Files: src/sys/dev/sdmmc: sdhc.c sdhcvar.h Log Message: pass sdhc_softc instead of sdhc_host to sc_vendor_transfer_data_dma, since the vendor specific code has no visibility into struct sdhc_host and can easily do device_private(sdhc_softc-sc_dev) To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/dev/sdmmc/sdhc.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/sdmmc/sdhcvar.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/broadcom
Module Name:src Committed By: jmcneill Date: Sat Oct 4 18:10:04 UTC 2014 Modified Files: src/sys/arch/arm/broadcom: bcm2835_emmc.c Log Message: vendor_transfer_data_dma callback takes a struct sdhc_softc now To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm2835_emmc.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/arm/allwinner
Module Name:src Committed By: martin Date: Sat Oct 4 19:38:17 UTC 2014 Modified Files: src/sys/arch/arm/allwinner: awin_board.c Log Message: Make early console work on big endian kernels To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/allwinner/awin_board.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: nonaka Date: Sun Oct 5 03:46:56 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Realtek RTL8152, RTL8153. To generate a diff of this commit: cvs rdiff -u -r1.682 -r1.683 src/sys/dev/usb/usbdevs 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: nonaka Date: Sun Oct 5 03:47:17 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.674 -r1.675 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.675 -r1.676 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
