CVS commit: src/sbin/disklabel
Module Name:src Committed By: isaki Date: Sat Aug 3 04:21:37 UTC 2019 Modified Files: src/sbin/disklabel: main.c Log Message: Fix a trivial wrong comment. x68k's arch is not m68010. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sbin/disklabel/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: isaki
Date: Sat Aug 3 04:21:37 UTC 2019
Modified Files:
src/sbin/disklabel: main.c
Log Message:
Fix a trivial wrong comment. x68k's arch is not m68010.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sbin/disklabel/main.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/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.52 src/sbin/disklabel/main.c:1.53
--- src/sbin/disklabel/main.c:1.52 Wed Jul 3 07:05:27 2019
+++ src/sbin/disklabel/main.c Sat Aug 3 04:21:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.52 2019/07/03 07:05:27 mlelstv Exp $ */
+/* $NetBSD: main.c,v 1.53 2019/08/03 04:21:37 isaki Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95";
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
#else
-__RCSID("$NetBSD: main.c,v 1.52 2019/07/03 07:05:27 mlelstv Exp $");
+__RCSID("$NetBSD: main.c,v 1.53 2019/08/03 04:21:37 isaki Exp $");
#endif
#endif /* not lint */
@@ -220,7 +220,7 @@ static const struct disklabel_params {
{ "pmax", 0, 0, 8, 2, 0, 64, LITTLE_ENDIAN }, /* mips */
{ "sun2", 0, 0, 8, 2, 0, 64, BIG_ENDIAN }, /* m68k */
{ "sun68k", 0, 0, 8, 2, 0, 64, BIG_ENDIAN }, /* m68010 */
- { "x68k", 0, 0, 8, 2, 0, 64, BIG_ENDIAN }, /* m68010 */
+ { "x68k", 0, 0, 8, 2, 0, 64, BIG_ENDIAN }, /* m68k */
{ "vax", 0, 0, 12, 2, 8, 64, LITTLE_ENDIAN }, /* vax */
CVS commit: src/sys/dev/spi
Module Name:src Committed By: tnn Date: Sat Aug 3 02:22:06 UTC 2019 Modified Files: src/sys/dev/spi: m25p.c Log Message: m25p: add some ~2010 vintage parts found in junk drawer To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/spi/m25p.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/spi
Module Name:src
Committed By: tnn
Date: Sat Aug 3 02:22:06 UTC 2019
Modified Files:
src/sys/dev/spi: m25p.c
Log Message:
m25p: add some ~2010 vintage parts found in junk drawer
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/spi/m25p.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/spi/m25p.c
diff -u src/sys/dev/spi/m25p.c:1.7 src/sys/dev/spi/m25p.c:1.8
--- src/sys/dev/spi/m25p.c:1.7 Sat Aug 3 00:46:02 2019
+++ src/sys/dev/spi/m25p.c Sat Aug 3 02:22:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: m25p.c,v 1.7 2019/08/03 00:46:02 tnn Exp $ */
+/* $NetBSD: m25p.c,v 1.8 2019/08/03 02:22:06 tnn Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.7 2019/08/03 00:46:02 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.8 2019/08/03 02:22:06 tnn Exp $");
#include
#include
@@ -94,10 +94,18 @@ static const struct m25p_info {
} m25p_infos[] = {
{ 0x16, 0x20, 0x2017, "STMicro M25P64", 8192, 64 }, /* 64Mbit */
{ 0x14, 0x20, 0x2015, "STMicro M25P16", 2048, 64 }, /* 16Mbit */
- { 0x12, 0x20, 0x2013, "STMicro M25P40", 512, 64 }, /* 4Mbit */
+ { 0x12, 0x20, 0x2013, "STMicro M25P40", 512, 64 }, /* 4Mbit */
{ 0xc0, 0x20, 0x7117, "STMicro M25PX64", 8192, 64 }, /* 64Mbit */
{ 0x00, 0x20, 0xBB18, "Numonyx N25Q128", 16384, 64 }, /* 128Mbit */
{ 0x00, 0xBF, 0x2541, "Microchip SST25VF016B", 2048, 64 }, /* 16Mbit */
+ { 0x00, 0xC2, 0x2011, "Macronix MX25L10", 128, 4 }, /* 1Mbit */
+ { 0x00, 0xC2, 0x2012, "Macronix MX25L20", 256, 4 }, /* 2Mbit */
+ { 0x00, 0xC2, 0x2013, "Macronix MX25L40", 512, 4 }, /* 4Mbit */
+ { 0x00, 0xC2, 0x2014, "Macronix MX25L80", 1024, 4 }, /* 8Mbit */
+ { 0x00, 0xEF, 0x3011, "Winbond W25X10", 128, 4 }, /* 1Mbit */
+ { 0x00, 0xEF, 0x3012, "Winbond W25X20", 256, 4 }, /* 2Mbit */
+ { 0x00, 0xEF, 0x3013, "Winbond W25X40", 512, 4 }, /* 4Mbit */
+ { 0x00, 0xEF, 0x3014, "Winbond W25X80", 1024, 4 }, /* 8Mbit */
{ 0x13, 0xEF, 0x4014, "Winbond W25Q80.V", 1024, 64 }, /* 8Mbit */
{ 0x14, 0xEF, 0x4015, "Winbond W25Q16.V", 2048, 64 }, /* 16Mbit */
{ 0x15, 0xEF, 0x4016, "Winbond W25Q32.V", 4096, 64 }, /* 32Mbit */
CVS commit: src/sys/dev/spi
Module Name:src Committed By: tnn Date: Sat Aug 3 00:46:02 UTC 2019 Modified Files: src/sys/dev/spi: m25p.c Log Message: m25p: print vendor & device id before bailing out on unknown devices To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/spi/m25p.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/spi
Module Name:src
Committed By: tnn
Date: Sat Aug 3 00:46:02 UTC 2019
Modified Files:
src/sys/dev/spi: m25p.c
Log Message:
m25p: print vendor & device id before bailing out on unknown devices
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/spi/m25p.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/spi/m25p.c
diff -u src/sys/dev/spi/m25p.c:1.6 src/sys/dev/spi/m25p.c:1.7
--- src/sys/dev/spi/m25p.c:1.6 Wed Jan 31 16:00:03 2018
+++ src/sys/dev/spi/m25p.c Sat Aug 3 00:46:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: m25p.c,v 1.6 2018/01/31 16:00:03 jakllsch Exp $ */
+/* $NetBSD: m25p.c,v 1.7 2019/08/03 00:46:02 tnn Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.6 2018/01/31 16:00:03 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.7 2019/08/03 00:46:02 tnn Exp $");
#include
#include
@@ -168,7 +168,8 @@ m25p_doattach(device_t self)
}
if (info->name == NULL) {
- aprint_error(": unknown or unsupported device\n");
+ aprint_error(": vendor 0x%02X dev 0x%04X sig 0x%02X not supported\n",
+ mfgid, devid, sig);
return;
}
CVS commit: src/sys/dev/rasops
Module Name:src
Committed By: rin
Date: Fri Aug 2 23:24:37 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops.c rasops24.c
Log Message:
Real fix for 24-bpp color:
- When centering screen, locate effective base address of framebuffer to
both word and 24-bit color boundary.
- Consistently convert ri_devcmap to ``big endian'' if not RI_BSWAP.
Also, fix possible bug for 15/16-bpp with RI_BSWAP (not tested).
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/rasops/rasops.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/rasops/rasops24.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/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.107 src/sys/dev/rasops/rasops.c:1.108
--- src/sys/dev/rasops/rasops.c:1.107 Fri Aug 2 04:22:04 2019
+++ src/sys/dev/rasops/rasops.c Fri Aug 2 23:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.107 2019/08/02 04:22:04 rin Exp $ */
+/* $NetBSD: rasops.c,v 1.108 2019/08/02 23:24:37 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.107 2019/08/02 04:22:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.108 2019/08/02 23:24:37 rin Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@@ -412,7 +412,6 @@ rasops_reconfig(struct rasops_info *ri,
} else
#endif
{
-
ri->ri_cols = ri->ri_emuwidth / ri->ri_font->fontwidth;
ri->ri_rows = ri->ri_emuheight / ri->ri_font->fontheight;
}
@@ -434,17 +433,31 @@ rasops_reconfig(struct rasops_info *ri,
/* Now centre our window if needs be */
if ((ri->ri_flg & RI_CENTER) != 0) {
- ri->ri_bits += (((ri->ri_width * bpp >> 3) -
- ri->ri_emustride) >> 1) & ~3;
- ri->ri_bits += ((ri->ri_height - ri->ri_emuheight) >> 1) *
+ uint32_t xoff, yoff;
+
+ xoff = ((ri->ri_width * bpp >> 3) - ri->ri_emustride) >> 1;
+ if (ri->ri_depth != 24) {
+ /*
+ * Truncate to word boundary.
+ */
+ xoff &= ~3;
+ } else {
+ /*
+ * Truncate to word and 24-bit color boundary.
+ */
+ xoff = (xoff / (4 * 3)) * (4 * 3);
+ }
+
+ yoff = ((ri->ri_height - ri->ri_emuheight) >> 1) *
ri->ri_stride;
+
+ ri->ri_bits += xoff;
+ ri->ri_bits += yoff;
if (ri->ri_hwbits != NULL) {
- ri->ri_hwbits += (((ri->ri_width * bpp >> 3) -
- ri->ri_emustride) >> 1) & ~3;
- ri->ri_hwbits +=
- ((ri->ri_height - ri->ri_emuheight) >> 1) *
- ri->ri_stride;
+ ri->ri_hwbits += xoff;
+ ri->ri_hwbits += yoff;
}
+
ri->ri_yorigin = (int)(ri->ri_bits - ri->ri_origbits) /
ri->ri_stride;
ri->ri_xorigin = (((int)(ri->ri_bits - ri->ri_origbits) %
@@ -901,39 +914,49 @@ rasops_init_devcmap(struct rasops_info *
c |= (uint32_t)(*p << (ri->ri_bnum - 8)) << ri->ri_bpos;
p++;
- /* Fill the word for generic routines, which want this */
- if (ri->ri_depth == 8) {
+ /*
+ * Swap byte order if necessary. Then, fill the word for
+ * generic routines, which want this.
+ */
+ switch (ri->ri_depth) {
+ case 8:
c |= c << 8;
c |= c << 16;
- } else if (ri->ri_depth == 15 || ri->ri_depth == 16)
+ break;
+ case 15:
+ case 16:
+ if ((ri->ri_flg & RI_BSWAP) != 0)
+c = bswap16(c);
c |= c << 16;
- else if (ri->ri_depth == 24) {
+ break;
+ case 24:
#if BYTE_ORDER == LITTLE_ENDIAN
-# ifndef RASOPS_SMALL
- if (ri->ri_font->fontwidth != 12)
-# endif
-c = (c & 0xff) << 16 | (c & 0x00ff00) |
-(c & 0xff) >> 16;
-# ifndef RASOPS_SMALL
- else
-c = (c & 0xff) | (c & 0x00ff00) << 8 |
-(c & 0xff) >> 8;
-# endif
+ if ((ri->ri_flg & RI_BSWAP) == 0)
#else
- /* XXXRO What should we do here? */
+ if ((ri->ri_flg & RI_BSWAP) != 0)
#endif
+ {
+/*
+ * Convert to ``big endian'' if not RI_BSWAP.
+ */
+c = (c & 0xff) << 16|
+(c & 0x00ff00) |
+(c & 0xff) >> 16;
+ }
+
+ /*
+ * No worries, we use generic routines only for
+ * gray colors, where all 3 bytes are same.
+ */
c |= (c & 0xff) << 24;
+ break;
+ case 32:
+ if ((ri->ri_flg & RI_BSWAP) != 0)
+c = bswap32(c);
+ break;
}
- /* 24bpp does bswap on the fly. {32,16,15}bpp do it here. */
- if ((ri->ri_flg & RI_BSWAP) == 0)
- ri->ri_devcmap[i] = c;
- else if (ri->ri_depth == 15 || ri->ri_depth == 16)
- ri->ri_devcmap[i] = bswap16(c);
- else if (ri->ri_depth == 32)
- ri->ri_devcmap[i] = bswap32(c);
- else /* 8, 24 */
- ri->ri_devcmap[i] = c;
+ ri->ri_devcmap[i] = c;
}
}
Index: src/sys/dev/rasops/rasops24.c
diff -u src/sys/dev/rasops/rasops24.c:1.45 src/sys/dev/rasops/rasops24.c:1.46
--- src/sys/dev/rasops/rasops24.c:1.45 Fri Aug 2 23:05:42 2019
+++ src/sys/dev/rasops/rasops24.c Fri Aug 2 23:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops24.c,v 1.45 2019/08/02 23:05:42 rin Exp $ */
+/* $NetBSD: rasops24.c,v 1.46 2019/08/02 23:24:37 rin Exp $ */
/*-
CVS commit: src/sys/dev/rasops
Module Name:src Committed By: rin Date: Fri Aug 2 23:24:37 UTC 2019 Modified Files: src/sys/dev/rasops: rasops.c rasops24.c Log Message: Real fix for 24-bpp color: - When centering screen, locate effective base address of framebuffer to both word and 24-bit color boundary. - Consistently convert ri_devcmap to ``big endian'' if not RI_BSWAP. Also, fix possible bug for 15/16-bpp with RI_BSWAP (not tested). To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/dev/rasops/rasops.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/rasops/rasops24.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/rasops
Module Name:src
Committed By: rin
Date: Fri Aug 2 23:05:43 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops24.c
Log Message:
Fix unaligned word write's to buffer, introduced in rev 1.42:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/rasops/rasops24.c#rev1.42
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/rasops/rasops24.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/rasops/rasops24.c
diff -u src/sys/dev/rasops/rasops24.c:1.44 src/sys/dev/rasops/rasops24.c:1.45
--- src/sys/dev/rasops/rasops24.c:1.44 Fri Aug 2 04:39:09 2019
+++ src/sys/dev/rasops/rasops24.c Fri Aug 2 23:05:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops24.c,v 1.44 2019/08/02 04:39:09 rin Exp $ */
+/* $NetBSD: rasops24.c,v 1.45 2019/08/02 23:05:42 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.44 2019/08/02 04:39:09 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.45 2019/08/02 23:05:42 rin Exp $");
#include "opt_rasops.h"
@@ -276,8 +276,8 @@ static void
rasops24_erasecols(void *cookie, int row, int col, int num, long attr)
{
struct rasops_info *ri = (struct rasops_info *)cookie;
- uint8_t *buf = (uint8_t *)ri->ri_buf;
- int height, cnt, full, slop1, slop2, clr, stamp[3];
+ void *buf = ri->ri_buf;
+ int height, cnt, clr, stamp[3];
uint32_t *dp;
uint8_t *rp, *hp, *dbp;
@@ -319,33 +319,9 @@ rasops24_erasecols(void *cookie, int row
clr = ri->ri_devcmap[((uint32_t)attr >> 16) & 0xf] & 0xff;
rasops24_makestamp1(ri, stamp, clr, clr, clr, clr);
- /*
- * The current byte offset mod 4 tells us the number of 24-bit pels
- * we need to write for alignment to 32-bits. Once we're aligned on
- * a 32-bit boundary, we're also aligned on a 4 pixel boundary, so
- * the stamp does not need to be rotated. The following shows the
- * layout of 4 pels in a 3 word region and illustrates this:
- *
- * aaab bbcc cddd
- */
- slop1 = (uintptr_t)rp & 3;
- cnt = slop1;
- full = (num /* - cnt */) / 4;
- cnt += full * 4;
- slop2 = num - cnt;
-
- /* Align to 4 bytes */
- /* XXX handle with masks, bring under control of RI_BSWAP */
- dbp = buf;
- for (cnt = slop1; cnt; cnt--) {
- *dbp++ = (clr >> 16);
- *dbp++ = (clr >> 8);
- *dbp++ = clr;
- }
-
/* 4 pels per loop */
- dp = (uint32_t *)dbp;
- for (cnt = full; cnt; cnt--) {
+ dp = (uint32_t *)buf;
+ for (cnt = num >> 2; cnt; cnt--) {
dp[0] = stamp[0];
dp[1] = stamp[1];
dp[2] = stamp[2];
@@ -355,7 +331,7 @@ rasops24_erasecols(void *cookie, int row
/* Trailing slop */
/* XXX handle with masks, bring under control of RI_BSWAP */
dbp = (uint8_t *)dp;
- for (cnt = slop2; cnt; cnt--) {
+ for (cnt = num & 3; cnt; cnt--) {
*dbp++ = (clr >> 16);
*dbp++ = (clr >> 8);
*dbp++ = clr;
CVS commit: src/sys/dev/rasops
Module Name:src Committed By: rin Date: Fri Aug 2 23:05:43 UTC 2019 Modified Files: src/sys/dev/rasops: rasops24.c Log Message: Fix unaligned word write's to buffer, introduced in rev 1.42: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/rasops/rasops24.c#rev1.42 To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/rasops/rasops24.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Fri Aug 2 22:46:44 UTC 2019
Modified Files:
src/sys/kern: kern_proc.c
Log Message:
Update our vm resource use for sysctl(3) call reading kinfo_proc*
Without this change RSS properties are zeroed unless a process exits or
calls getrusage(2).
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/kern/kern_proc.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/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.233 src/sys/kern/kern_proc.c:1.234
--- src/sys/kern/kern_proc.c:1.233 Tue Jun 11 23:18:55 2019
+++ src/sys/kern/kern_proc.c Fri Aug 2 22:46:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.233 2019/06/11 23:18:55 kamil Exp $ */
+/* $NetBSD: kern_proc.c,v 1.234 2019/08/02 22:46:44 kamil Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.233 2019/06/11 23:18:55 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.234 2019/08/02 22:46:44 kamil Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -1819,6 +1819,8 @@ sysctl_doeproc(SYSCTLFN_ARGS)
if (buflen >= elem_size &&
(type == KERN_PROC || elem_count > 0)) {
+ ruspace(p); /* Update process vm resource use */
+
if (type == KERN_PROC) {
fill_proc(p, >kproc.kp_proc, allowaddr);
fill_eproc(p, >kproc.kp_eproc, zombie,
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Fri Aug 2 22:46:44 UTC 2019 Modified Files: src/sys/kern: kern_proc.c Log Message: Update our vm resource use for sysctl(3) call reading kinfo_proc* Without this change RSS properties are zeroed unless a process exits or calls getrusage(2). To generate a diff of this commit: cvs rdiff -u -r1.233 -r1.234 src/sys/kern/kern_proc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: nakayama Date: Fri Aug 2 19:58:00 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Change uname and gname to sync with etc/mtree/special. It was missing in rev 1.195 changes. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.200 src/etc/mtree/NetBSD.dist.base:1.201 --- src/etc/mtree/NetBSD.dist.base:1.200 Wed Jul 24 06:53:42 2019 +++ src/etc/mtree/NetBSD.dist.base Fri Aug 2 19:58:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.200 2019/07/24 06:53:42 wiz Exp $ +# $NetBSD: NetBSD.dist.base,v 1.201 2019/08/02 19:58:00 nakayama Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1271,7 +1271,7 @@ ./var/chroot/named ./var/chroot/named/dev ./var/chroot/named/etc -./var/chroot/named/etc/namedb +./var/chroot/named/etc/namedb mode=0755 uname=named gname=named ./var/chroot/named/etc/namedb/cache mode=0775 uname=named gname=named ./var/chroot/named/etc/namedb/keys type=dir mode=0775 uname=named gname=named ./var/chroot/named/etc/namedb/nta type=dir mode=0775 uname=named gname=named
CVS commit: src/etc/mtree
Module Name:src Committed By: nakayama Date: Fri Aug 2 19:58:00 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Change uname and gname to sync with etc/mtree/special. It was missing in rev 1.195 changes. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/etc/mtree/NetBSD.dist.base 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/acpi
Module Name:src
Committed By: jmcneill
Date: Fri Aug 2 19:49:17 UTC 2019
Modified Files:
src/sys/arch/arm/acpi: acpi_platform.c
Log Message:
Ignore AccessWidth (PL011 and SBSA console always needs 32-bit access)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/acpi/acpi_platform.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/acpi/acpi_platform.c
diff -u src/sys/arch/arm/acpi/acpi_platform.c:1.15 src/sys/arch/arm/acpi/acpi_platform.c:1.16
--- src/sys/arch/arm/acpi/acpi_platform.c:1.15 Wed Jul 24 19:37:52 2019
+++ src/sys/arch/arm/acpi/acpi_platform.c Fri Aug 2 19:49:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.15 2019/07/24 19:37:52 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.16 2019/08/02 19:49:17 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.15 2019/07/24 19:37:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.16 2019/08/02 19:49:17 jmcneill Exp $");
#include
#include
@@ -278,12 +278,7 @@ acpi_platform_startup(void)
plcom_console.pi_iot = _generic_bs_tag;
plcom_console.pi_iobase = spcr->SerialPort.Address;
plcom_console.pi_size = PL011COM_UART_SIZE;
-if (spcr->InterfaceType == ACPI_DBG2_ARM_SBSA_32BIT) {
- plcom_console.pi_flags = PLC_FLAG_32BIT_ACCESS;
-} else {
- plcom_console.pi_flags = ACPI_ACCESS_BIT_WIDTH(spcr->SerialPort.AccessWidth) == 8 ?
- 0 : PLC_FLAG_32BIT_ACCESS;
-}
+plcom_console.pi_flags = PLC_FLAG_32BIT_ACCESS;
plcomcnattach(_console, baud_rate, 0, TTYDEF_CFLAG, -1);
break;
CVS commit: src/sys/arch/arm/acpi
Module Name:src Committed By: jmcneill Date: Fri Aug 2 19:49:17 UTC 2019 Modified Files: src/sys/arch/arm/acpi: acpi_platform.c Log Message: Ignore AccessWidth (PL011 and SBSA console always needs 32-bit access) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/acpi/acpi_platform.c 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/shared-core
Module Name:src Committed By: hauke Date: Fri Aug 2 14:55:57 UTC 2019 Modified Files: src/sys/external/bsd/drm/dist/shared-core: savage_state.c Log Message: Deal with gcc's "warning: this statement may fall through [-Wimplicit-fallthrough=]" by adding the missing KNF FALLTHROUGH comments. christos@ approved. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm/dist/shared-core/savage_state.c 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/shared-core
Module Name:src
Committed By: hauke
Date: Fri Aug 2 14:55:57 UTC 2019
Modified Files:
src/sys/external/bsd/drm/dist/shared-core: savage_state.c
Log Message:
Deal with gcc's "warning: this statement may fall through
[-Wimplicit-fallthrough=]" by adding the missing KNF FALLTHROUGH
comments.
christos@ approved.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm/dist/shared-core/savage_state.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/shared-core/savage_state.c
diff -u src/sys/external/bsd/drm/dist/shared-core/savage_state.c:1.4 src/sys/external/bsd/drm/dist/shared-core/savage_state.c:1.5
--- src/sys/external/bsd/drm/dist/shared-core/savage_state.c:1.4 Tue Jun 23 04:42:01 2009
+++ src/sys/external/bsd/drm/dist/shared-core/savage_state.c Fri Aug 2 14:55:57 2019
@@ -297,6 +297,7 @@ static int savage_dispatch_dma_prim(drm_
case SAVAGE_PRIM_TRILIST_201:
reorder = 1;
prim = SAVAGE_PRIM_TRILIST;
+ /* FALLTHROUGH */
case SAVAGE_PRIM_TRILIST:
if (n % 3 != 0) {
DRM_ERROR("wrong number of vertices %u in TRILIST\n",
@@ -434,6 +435,7 @@ static int savage_dispatch_vb_prim(drm_s
case SAVAGE_PRIM_TRILIST_201:
reorder = 1;
prim = SAVAGE_PRIM_TRILIST;
+ /* FALLTHROUGH */
case SAVAGE_PRIM_TRILIST:
if (n % 3 != 0) {
DRM_ERROR("wrong number of vertices %u in TRILIST\n",
@@ -555,6 +557,7 @@ static int savage_dispatch_dma_idx(drm_s
case SAVAGE_PRIM_TRILIST_201:
reorder = 1;
prim = SAVAGE_PRIM_TRILIST;
+ /* FALLTHROUGH */
case SAVAGE_PRIM_TRILIST:
if (n % 3 != 0) {
DRM_ERROR("wrong number of indices %u in TRILIST\n", n);
@@ -693,6 +696,7 @@ static int savage_dispatch_vb_idx(drm_sa
case SAVAGE_PRIM_TRILIST_201:
reorder = 1;
prim = SAVAGE_PRIM_TRILIST;
+ /* FALLTHROUGH */
case SAVAGE_PRIM_TRILIST:
if (n % 3 != 0) {
DRM_ERROR("wrong number of indices %u in TRILIST\n", n);
@@ -1060,7 +1064,7 @@ int savage_bci_cmdbuf(struct drm_device
DMA_FLUSH();
return -EINVAL;
}
- /* fall through */
+ /* FALLTHROUGH */
case SAVAGE_CMD_DMA_PRIM:
case SAVAGE_CMD_VB_PRIM:
if (!first_draw_cmd)
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Aug 2 12:07:25 UTC 2019 Modified Files: src/common/lib/libc/arch/arm: features.c src/crypto/external/bsd/openssl.old/dist/crypto: arm_arch.h src/crypto/external/bsd/openssl/dist/crypto: arm_arch.h src/sys/arch/arm/include: cdefs.h Log Message: ARMv6KZ has been misspelled by GCC since forever, but clang only provides the correct name. Support both. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/features.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Aug 2 12:07:25 UTC 2019 Modified Files: src/common/lib/libc/arch/arm: features.c src/crypto/external/bsd/openssl.old/dist/crypto: arm_arch.h src/crypto/external/bsd/openssl/dist/crypto: arm_arch.h src/sys/arch/arm/include: cdefs.h Log Message: ARMv6KZ has been misspelled by GCC since forever, but clang only provides the correct name. Support both. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/features.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/features.c diff -u src/common/lib/libc/arch/arm/features.c:1.1 src/common/lib/libc/arch/arm/features.c:1.2 --- src/common/lib/libc/arch/arm/features.c:1.1 Thu Feb 27 09:37:02 2014 +++ src/common/lib/libc/arch/arm/features.c Fri Aug 2 12:07:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: features.c,v 1.1 2014/02/27 09:37:02 matt Exp $ */ +/* $NetBSD: features.c,v 1.2 2019/08/02 12:07:24 joerg Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -48,7 +48,7 @@ #if defined (HAVE_THUMB2) || defined (__ARM_ARCH_6__) || \ defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6K__) || \ defined (__ARM_ARCH_6Z__) || defined (__ARM_ARCH_6ZK__) || \ -defined (__ARM_ARCH_6ZM__) +defined (__ARM_ARCH_6KZ__) || defined (__ARM_ARCH_6ZM__) #define HAVE_LDREX #endif Index: src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h diff -u src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.1.1.1 src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.2 --- src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.1.1.1 Sat Feb 3 22:43:41 2018 +++ src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h Fri Aug 2 12:07:25 2019 @@ -34,7 +34,7 @@ # elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \ defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__)|| \ -defined(__ARM_ARCH_6T2__) +defined(__ARM_ARCH_6T2__)|| defined(__ARM_ARCH_6KZ__) #define __ARM_ARCH__ 6 # elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)|| \ Index: src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h diff -u src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h:1.6 src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h:1.7 --- src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h:1.6 Sun Sep 23 13:32:55 2018 +++ src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h Fri Aug 2 12:07:25 2019 @@ -43,7 +43,7 @@ # elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \ defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__)|| \ -defined(__ARM_ARCH_6T2__) +defined(__ARM_ARCH_6T2__)|| defined(__ARM_ARCH_6KZ__) #define __ARM_ARCH__ 6 # elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)|| \ Index: src/sys/arch/arm/include/cdefs.h diff -u src/sys/arch/arm/include/cdefs.h:1.15 src/sys/arch/arm/include/cdefs.h:1.16 --- src/sys/arch/arm/include/cdefs.h:1.15 Mon Jun 23 03:40:57 2014 +++ src/sys/arch/arm/include/cdefs.h Fri Aug 2 12:07:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.15 2014/06/23 03:40:57 christos Exp $ */ +/* $NetBSD: cdefs.h,v 1.16 2019/08/02 12:07:25 joerg Exp $ */ #ifndef _ARM_CDEFS_H_ #define _ARM_CDEFS_H_ @@ -25,7 +25,8 @@ #endif #if defined (_ARM_ARCH_T2) || defined (__ARM_ARCH_6__) || \ -defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6K__) || \ +defined (__ARM_ARCH_6J__) || \ +defined (__ARM_ARCH_6K__) || defined (__ARM_ARCH_6KZ__) || \ defined (__ARM_ARCH_6Z__) || defined (__ARM_ARCH_6ZK__) || \ defined (__ARM_ARCH_6ZM__) #define _ARM_ARCH_6
CVS commit: src
Module Name:src
Committed By: joerg
Date: Fri Aug 2 12:06:20 UTC 2019
Modified Files:
src/doc: TODO.clang
src/sys/arch/acorn32/stand/boot32: Makefile
src/sys/arch/acorn32/stand/nbfs: Makefile
Log Message:
Force use of GNU as for acorn32 boot code (pre-unified assembly)
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/doc/TODO.clang
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/stand/boot32/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/acorn32/stand/nbfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/TODO.clang
diff -u src/doc/TODO.clang:1.22 src/doc/TODO.clang:1.23
--- src/doc/TODO.clang:1.22 Tue May 14 19:24:09 2019
+++ src/doc/TODO.clang Fri Aug 2 12:06:20 2019
@@ -1,8 +1,11 @@
-$NetBSD: TODO.clang,v 1.22 2019/05/14 19:24:09 christos Exp $
+$NetBSD: TODO.clang,v 1.23 2019/08/02 12:06:20 joerg Exp $
Hacks for the clang integration
---
+src/sys/arch/acorn32/stand
+"-fno-integrated-as" is used for pre-unified ARM assembler.
+
src/sys/arch/i386/stand
"-no-integrated-as" is used to compensate
for the incomplete explicit positioning support in LLVM MC.
Index: src/sys/arch/acorn32/stand/boot32/Makefile
diff -u src/sys/arch/acorn32/stand/boot32/Makefile:1.5 src/sys/arch/acorn32/stand/boot32/Makefile:1.6
--- src/sys/arch/acorn32/stand/boot32/Makefile:1.5 Sat Apr 1 19:08:08 2006
+++ src/sys/arch/acorn32/stand/boot32/Makefile Fri Aug 2 12:06:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/01 19:08:08 bjh21 Exp $
+# $NetBSD: Makefile,v 1.6 2019/08/02 12:06:20 joerg Exp $
PROG= boot32
PROGSOURCE= rmheader.S rmvers.c srt0.S boot32.c start.S
@@ -17,4 +17,6 @@ rmvers.c: ${.CURDIR}/version
CLEANFILES+= rmvers.c
+AFLAGS.start.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
.include "../Makefile.buildboot"
Index: src/sys/arch/acorn32/stand/nbfs/Makefile
diff -u src/sys/arch/acorn32/stand/nbfs/Makefile:1.3 src/sys/arch/acorn32/stand/nbfs/Makefile:1.4
--- src/sys/arch/acorn32/stand/nbfs/Makefile:1.3 Tue Jul 4 23:08:10 2006
+++ src/sys/arch/acorn32/stand/nbfs/Makefile Fri Aug 2 12:06:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/07/04 23:08:10 bjh21 Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/02 12:06:20 joerg Exp $
PROG= nbfs
PROGSOURCE= rmheader.S rmvers.c nbfs.c rmalloc.c
@@ -13,4 +13,6 @@ rmvers.c: ${.CURDIR}/version
CLEANFILES+= rmvers.c
+AFLAGS.rmheader.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
.include "../Makefile.buildboot"
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Aug 2 12:06:20 UTC 2019 Modified Files: src/doc: TODO.clang src/sys/arch/acorn32/stand/boot32: Makefile src/sys/arch/acorn32/stand/nbfs: Makefile Log Message: Force use of GNU as for acorn32 boot code (pre-unified assembly) To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/doc/TODO.clang cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/stand/boot32/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/arch/acorn32/stand/nbfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sparc/miniroot
Module Name:src Committed By: joerg Date: Fri Aug 2 12:04:46 UTC 2019 Modified Files: src/distrib/sparc/miniroot: Makefile.inc Log Message: Bump sparc miniroot by 100KB for the clang-based build. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/sparc/miniroot/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sparc/miniroot
Module Name:src
Committed By: joerg
Date: Fri Aug 2 12:04:46 UTC 2019
Modified Files:
src/distrib/sparc/miniroot: Makefile.inc
Log Message:
Bump sparc miniroot by 100KB for the clang-based build.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/sparc/miniroot/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc/miniroot/Makefile.inc
diff -u src/distrib/sparc/miniroot/Makefile.inc:1.29 src/distrib/sparc/miniroot/Makefile.inc:1.30
--- src/distrib/sparc/miniroot/Makefile.inc:1.29 Thu Mar 29 13:25:11 2018
+++ src/distrib/sparc/miniroot/Makefile.inc Fri Aug 2 12:04:45 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.29 2018/03/29 13:25:11 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.30 2019/08/02 12:04:45 joerg Exp $
-IMAGESIZE= 9800k
+IMAGESIZE= 9900k
DBG= ${${ACTIVE_CC} == "clang":? -Oz -fomit-frame-pointer : -Os } -fno-unwind-tables
MAKEFS_FLAGS+= -o density=4k
CVS commit: src/sys/arch/mac68k/conf
Module Name:src Committed By: rin Date: Fri Aug 2 10:46:50 UTC 2019 Modified Files: src/sys/arch/mac68k/conf: WSFB.common Log Message: Add commented out GENFB_SHADOWFB option. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mac68k/conf/WSFB.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mac68k/conf
Module Name:src Committed By: rin Date: Fri Aug 2 10:46:50 UTC 2019 Modified Files: src/sys/arch/mac68k/conf: WSFB.common Log Message: Add commented out GENFB_SHADOWFB option. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mac68k/conf/WSFB.common 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/mac68k/conf/WSFB.common diff -u src/sys/arch/mac68k/conf/WSFB.common:1.1 src/sys/arch/mac68k/conf/WSFB.common:1.2 --- src/sys/arch/mac68k/conf/WSFB.common:1.1 Fri Jul 26 10:48:44 2019 +++ src/sys/arch/mac68k/conf/WSFB.common Fri Aug 2 10:46:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: WSFB.common,v 1.1 2019/07/26 10:48:44 rin Exp $ +# $NetBSD: WSFB.common,v 1.2 2019/08/02 10:46:50 rin Exp $ genfb* at intvid? genfb* at macvid? @@ -6,6 +6,13 @@ wsdisplay* at wsemuldisplaydev? options RASOPS_APPLE_PALETTE +# At the expense of memory, boost display output drastically for +# some depth/font settings. +# XXX +# This may have the opposite effect. Specify with care! +# +#options GENFB_SHADOWFB + options WSDISPLAY_DEFAULTSCREENS=1 options WS_KERNEL_FG=WSCOL_GREEN #options WS_KERNEL_BG=WSCOL_BLACK
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Fri Aug 2 10:44:22 UTC 2019
Modified Files:
src/usr.sbin/sysinst: gpt.c
Log Message:
Deal with missing labels when parsing gpt(8) output.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/gpt.c
diff -u src/usr.sbin/sysinst/gpt.c:1.6 src/usr.sbin/sysinst/gpt.c:1.7
--- src/usr.sbin/sysinst/gpt.c:1.6 Sun Jul 28 16:30:36 2019
+++ src/usr.sbin/sysinst/gpt.c Fri Aug 2 10:44:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt.c,v 1.6 2019/07/28 16:30:36 martin Exp $ */
+/* $NetBSD: gpt.c,v 1.7 2019/08/02 10:44:22 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -212,8 +212,7 @@ gpt_add_info(struct gpt_part_entry *part
} else if (strcmp(tag, "GUID:") == 0) {
strlcpy(part->gp_id, val, sizeof(part->gp_id));
} else if (strcmp(tag, "Label:") == 0) {
- if (strlen(val) > 0)
- strlcpy(part->gp_label, val, sizeof(part->gp_label));
+ strlcpy(part->gp_label, val, sizeof(part->gp_label));
} else if (strcmp(tag, "Attributes:") == 0) {
char *n;
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: rin Date: Fri Aug 2 10:34:39 UTC 2019 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: Notify size of shadow framebuffer if enabled. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.67 src/sys/dev/wsfb/genfb.c:1.68 --- src/sys/dev/wsfb/genfb.c:1.67 Mon Jul 29 14:07:37 2019 +++ src/sys/dev/wsfb/genfb.c Fri Aug 2 10:34:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.67 2019/07/29 14:07:37 rin Exp $ */ +/* $NetBSD: genfb.c,v 1.68 2019/08/02 10:34:39 rin Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.67 2019/07/29 14:07:37 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.68 2019/08/02 10:34:39 rin Exp $"); #include #include @@ -261,6 +261,9 @@ genfb_attach(struct genfb_softc *sc, str sc->sc_shadowfb = kmem_alloc(sc->sc_fbsize, KM_SLEEP); if (sc->sc_want_clear == false) memcpy(sc->sc_shadowfb, sc->sc_fbaddr, sc->sc_fbsize); + aprint_verbose_dev(sc->sc_dev, + "shadow framebuffer enabled, size %zu KB\n", + sc->sc_fbsize >> 10); } vcons_init(>vd, sc, >sc_defaultscreen_descr,
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: rin Date: Fri Aug 2 10:34:39 UTC 2019 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: Notify size of shadow framebuffer if enabled. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
