CVS commit: src/external/gpl3/gdb/dist/bfd
Module Name:src
Committed By: christos
Date: Sat Sep 19 21:47:03 UTC 2020
Modified Files:
src/external/gpl3/gdb/dist/bfd: elf.c
Log Message:
remove mis-merged code and make the auxv core offset 0. Now loading auxv
from core files works.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/dist/bfd/elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/bfd/elf.c
diff -u src/external/gpl3/gdb/dist/bfd/elf.c:1.12 src/external/gpl3/gdb/dist/bfd/elf.c:1.13
--- src/external/gpl3/gdb/dist/bfd/elf.c:1.12 Mon Sep 14 22:05:16 2020
+++ src/external/gpl3/gdb/dist/bfd/elf.c Sat Sep 19 17:47:03 2020
@@ -10893,7 +10893,7 @@ elfcore_grok_netbsd_note (bfd *abfd, Elf
#ifdef NT_NETBSDCORE_AUXV
case NT_NETBSDCORE_AUXV:
/* NetBSD-specific Elf Auxiliary Vector data. */
- return elfcore_make_auxv_note_section (abfd, note, 4);
+ return elfcore_make_auxv_note_section (abfd, note, 0);
#endif
#ifdef NT_NETBSDCORE_LWPSTATUS
case NT_NETBSDCORE_LWPSTATUS:
@@ -11023,20 +11023,6 @@ elfcore_grok_openbsd_note (bfd *abfd, El
if (note->type == NT_OPENBSD_AUXV)
return elfcore_make_auxv_note_section (abfd, note, 0);
- if (note->type == NT_OPENBSD_WCOOKIE)
-{
- asection *sect = bfd_make_section_anyway_with_flags (abfd, ".wcookie",
- SEC_HAS_CONTENTS);
-
- if (sect == NULL)
- return FALSE;
- sect->size = note->descsz;
- sect->filepos = note->descpos;
- sect->alignment_power = 1 + bfd_get_arch_size (abfd) / 32;
-
- return TRUE;
-}
-
return TRUE;
}
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Sat Sep 19 21:45:45 UTC 2020 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-nat.c Log Message: The lid of the main thread == pid now. Should we fix the kernel to return this? Now debugging live programs work. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.16 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.17 --- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.16 Wed Sep 16 22:12:31 2020 +++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Sat Sep 19 17:45:45 2020 @@ -587,6 +587,9 @@ nbsd_nat_target::wait (ptid_t ptid, stru siginfo_t *si = _siginfo; int lwp = psi.psi_lwpid; + // XXX: should the kernel return this? + if (lwp == 0) +lwp = pid; int signo = si->si_signo; const int code = si->si_code;
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: ryo Date: Sat Sep 19 18:19:09 UTC 2020 Modified Files: src/sys/arch/arm/rockchip: rk_i2c.c Log Message: fix to work on big endian To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/rockchip/rk_i2c.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/rockchip/rk_i2c.c diff -u src/sys/arch/arm/rockchip/rk_i2c.c:1.7 src/sys/arch/arm/rockchip/rk_i2c.c:1.8 --- src/sys/arch/arm/rockchip/rk_i2c.c:1.7 Sun Dec 22 23:23:29 2019 +++ src/sys/arch/arm/rockchip/rk_i2c.c Sat Sep 19 18:19:09 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_i2c.c,v 1.7 2019/12/22 23:23:29 thorpej Exp $ */ +/* $NetBSD: rk_i2c.c,v 1.8 2020/09/19 18:19:09 ryo Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.7 2019/12/22 23:23:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.8 2020/09/19 18:19:09 ryo Exp $"); #include #include @@ -251,6 +251,10 @@ rk_i2c_write(struct rk_i2c_softc *sc, i2 txdata.data8[0] = addr << 1; memcpy([1], cmd, cmdlen); memcpy([1 + cmdlen], buf, buflen); +#if _BYTE_ORDER == _BIG_ENDIAN + for (int i = 0; i < howmany(len + 1, 4); i++) + LE32TOH(txdata.data32[i]); +#endif bus_space_write_region_4(sc->sc_bst, sc->sc_bsh, RKI2C_TXDATA(0), txdata.data32, howmany(len + 1, 4)); WR4(sc, RKI2C_MTXCNT, __SHIFTIN(len + 1, RKI2C_MTXCNT_MTXCNT)); @@ -312,6 +316,11 @@ rk_i2c_read(struct rk_i2c_softc *sc, i2c rxdata[n/4] = RD4(sc, RKI2C_RXDATA(n/4)); #endif +#if _BYTE_ORDER == _BIG_ENDIAN + for (int i = 0; i < howmany(buflen, 4); i++) + HTOLE32(rxdata[i]); +#endif + memcpy(buf, rxdata, buflen); return 0;
CVS commit: src/sys/arch/alpha/jensenio
Module Name:src Committed By: tsutsui Date: Sat Sep 19 16:54:34 UTC 2020 Modified Files: src/sys/arch/alpha/jensenio: com_jensenio.c Log Message: Possible fix for hangup on Jensen mentioned in PR/36628. According to comments in Linux drivers/tty/serial/8250/8250.h, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/tty/serial/8250/8250.h?h=v5.8#n242 the driver has to set OUT1 and OUT2 lines for "some ALPHA" otherwise "the machine locks up with endless interrupts." Note OUT2 (MCR_IENABLE) is set in MI com_attach_subr() so we have to set OUT1 (MCR_DSR) in the MD attachment. The information was notified from Miod Vallat. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/jensenio/com_jensenio.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/alpha/jensenio/com_jensenio.c diff -u src/sys/arch/alpha/jensenio/com_jensenio.c:1.15 src/sys/arch/alpha/jensenio/com_jensenio.c:1.16 --- src/sys/arch/alpha/jensenio/com_jensenio.c:1.15 Sat Dec 8 17:46:09 2018 +++ src/sys/arch/alpha/jensenio/com_jensenio.c Sat Sep 19 16:54:34 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: com_jensenio.c,v 1.15 2018/12/08 17:46:09 thorpej Exp $ */ +/* $NetBSD: com_jensenio.c,v 1.16 2020/09/19 16:54:34 tsutsui Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: com_jensenio.c,v 1.15 2018/12/08 17:46:09 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_jensenio.c,v 1.16 2020/09/19 16:54:34 tsutsui Exp $"); #include #include @@ -106,6 +106,16 @@ com_jensenio_attach(device_t parent, dev sc->sc_frequency = COM_FREQ; + /* + * According to comments in Linux drivers/tty/serial/8250/8250.h, + * the driver has to set OUT1 and OUT2 lines for "some ALPHA" + * otherwise "the machine locks up with endless interrupts." + * Note OUT2 (MCR_IENABLE) is set in MI com_attach_subr() + * so we have to set OUT1 (MCR_DSR) in the MD attachment. + * See also PR/36628. + */ + SET(sc->sc_mcr, MCR_DRS); + com_attach_subr(sc); scb_set(ja->ja_irq[0], com_jensenio_intr, jsc, IPL_VM);
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Sat Sep 19 16:31:40 UTC 2020
Modified Files:
src/sys/arch/aarch64/include: vmparam.h
src/sys/arch/evbarm/fdt: platform.h
Log Message:
Define VM_KERNEL_VM_{BASE,SIZE} for aarch64 and remove an #ifdef in
fdt/platform.h
NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/include/vmparam.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/fdt/platform.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/aarch64/include/vmparam.h
diff -u src/sys/arch/aarch64/include/vmparam.h:1.13 src/sys/arch/aarch64/include/vmparam.h:1.14
--- src/sys/arch/aarch64/include/vmparam.h:1.13 Wed Sep 16 18:26:15 2020
+++ src/sys/arch/aarch64/include/vmparam.h Sat Sep 19 16:31:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.13 2020/09/16 18:26:15 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.14 2020/09/19 16:31:40 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -150,6 +150,9 @@
#define VM_KERNEL_IO_ADDRESS 0xf000L
#define VM_KERNEL_IO_SIZE (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
+#define VM_KERNEL_VM_BASE VM_MIN_KERNEL_ADDRESS
+#define VM_KERNEL_VM_SIZE (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_VM_BASE)
+
/*
* Reserved space for EFI runtime services
*/
Index: src/sys/arch/evbarm/fdt/platform.h
diff -u src/sys/arch/evbarm/fdt/platform.h:1.8 src/sys/arch/evbarm/fdt/platform.h:1.9
--- src/sys/arch/evbarm/fdt/platform.h:1.8 Fri Jul 10 12:14:58 2020
+++ src/sys/arch/evbarm/fdt/platform.h Sat Sep 19 16:31:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.h,v 1.8 2020/07/10 12:14:58 skrll Exp $ */
+/* $NetBSD: platform.h,v 1.9 2020/09/19 16:31:40 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -36,16 +36,7 @@ void fdt_add_reserved_memory_range(uint6
#define KERNEL_IO_VBASE VM_KERNEL_IO_ADDRESS
#define KERNEL_IO_VSIZE VM_KERNEL_IO_SIZE
-#ifdef __aarch64__
-
-#define KERNEL_VM_BASE VM_MIN_KERNEL_ADDRESS
-#define KERNEL_VM_SIZE (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS)
-
-#else
-
#define KERNEL_VM_BASE VM_KERNEL_VM_BASE
#define KERNEL_VM_SIZE VM_KERNEL_VM_SIZE
-#endif /* !__aarch64 */
-
#endif /* _EVBARM_FDT_PLATFORM_H */
CVS commit: src/sys/arch/aarch64
Module Name:src
Committed By: skrll
Date: Sat Sep 19 13:33:08 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: asan.h pmap.h
Log Message:
Make __md_palloc pmap agnostic (think sys/uvm/pmap)
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/include/asan.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/aarch64/include/pmap.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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.89 src/sys/arch/aarch64/aarch64/pmap.c:1.90
--- src/sys/arch/aarch64/aarch64/pmap.c:1.89 Mon Sep 14 10:06:35 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c Sat Sep 19 13:33:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.89 2020/09/14 10:06:35 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.90 2020/09/19 13:33:08 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.89 2020/09/14 10:06:35 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.90 2020/09/19 13:33:08 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -598,7 +598,7 @@ pmap_reference(struct pmap *pm)
atomic_inc_uint(>pm_refcnt);
}
-paddr_t
+static paddr_t
pmap_alloc_pdp(struct pmap *pm, struct vm_page **pgp, int flags, bool waitok)
{
paddr_t pa;
Index: src/sys/arch/aarch64/include/asan.h
diff -u src/sys/arch/aarch64/include/asan.h:1.11 src/sys/arch/aarch64/include/asan.h:1.12
--- src/sys/arch/aarch64/include/asan.h:1.11 Thu Sep 10 14:10:46 2020
+++ src/sys/arch/aarch64/include/asan.h Sat Sep 19 13:33:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.11 2020/09/10 14:10:46 maxv Exp $ */
+/* $NetBSD: asan.h,v 1.12 2020/09/19 13:33:08 skrll Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -68,12 +68,29 @@ __md_palloc(void)
{
paddr_t pa;
- if (__predict_false(__md_early))
+ if (__predict_false(__md_early)) {
pa = (paddr_t)pmapboot_pagealloc();
- else
- pa = pmap_alloc_pdp(pmap_kernel(), NULL, 0, false);
+ return pa;
+ }
+
+ vaddr_t va;
+ if (!uvm.page_init_done) {
+ va = uvm_pageboot_alloc(PAGE_SIZE);
+ pa = AARCH64_KVA_TO_PA(va);
+ } else {
+ struct vm_page *pg;
+retry:
+ pg = uvm_pagealloc(NULL, 0, NULL, 0);
+ if (pg == NULL) {
+ uvm_wait(__func__);
+ goto retry;
+ }
+
+ pa = VM_PAGE_TO_PHYS(pg);
+ va = AARCH64_PA_TO_KVA(pa);
+ }
- /* The page is zeroed. */
+ __builtin_memset((void *)va, 0, PAGE_SIZE);
return pa;
}
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.42 src/sys/arch/aarch64/include/pmap.h:1.43
--- src/sys/arch/aarch64/include/pmap.h:1.42 Wed Aug 12 13:36:36 2020
+++ src/sys/arch/aarch64/include/pmap.h Sat Sep 19 13:33:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.42 2020/08/12 13:36:36 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.43 2020/09/19 13:33:08 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -205,8 +205,6 @@ const struct pmap_devmap *pmap_devmap_fi
vaddr_t pmap_devmap_phystov(paddr_t);
paddr_t pmap_devmap_vtophys(paddr_t);
-paddr_t pmap_alloc_pdp(struct pmap *, struct vm_page **, int, bool);
-
#define L1_TRUNC_BLOCK(x) ((x) & L1_FRAME)
#define L1_ROUND_BLOCK(x) L1_TRUNC_BLOCK((x) + L1_SIZE - 1)
#define L2_TRUNC_BLOCK(x) ((x) & L2_FRAME)
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Sep 19 12:36:09 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1606 To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.36 src/doc/CHANGES-8.3:1.1.2.37 --- src/doc/CHANGES-8.3:1.1.2.36 Wed Sep 16 13:32:11 2020 +++ src/doc/CHANGES-8.3 Sat Sep 19 12:36:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.36 2020/09/16 13:32:11 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.37 2020/09/19 12:36:09 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1056,3 +1056,10 @@ sys/dev/ic/mpt_netbsd.c1.37 mpt(4) may eroneously report a limit of zero devices. [mlelstv, ticket #1605] +sys/dev/hid/hidkbdmap.c1.11 (patch) + (applied to sys/dev/usb/ukbdmap.c) + + PR 55608: for jp keymap map also scan code 49 to right bracket + to handle ARCHISS keyboard model. + [nonaka, ticket #1606] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Sep 19 12:32:59 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #1086 and #1087 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-9.1 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-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.112 src/doc/CHANGES-9.1:1.1.2.113 --- src/doc/CHANGES-9.1:1.1.2.112 Wed Sep 16 13:30:42 2020 +++ src/doc/CHANGES-9.1 Sat Sep 19 12:32:59 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.112 2020/09/16 13:30:42 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.113 2020/09/19 12:32:59 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -4985,3 +4985,14 @@ sys/dev/ic/mpt_netbsd.c1.37 mpt(4) may eroneously report a limit of zero devices. [mlelstv, ticket #1085] +sys/dev/hid/hidkbdmap.c1.11 + + PR 55608: for jp keymap map also scan code 49 to right bracket + to handle ARCHISS keyboard model. + [nonaka, ticket #1086] + +external/mit/xorg/lib/libX11/Makefile.libx11 1.20,1.21 + + Fix libXcursor version for dynamic loading. + [nia, ticket #1087] +
CVS commit: [netbsd-9] src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: martin
Date: Sat Sep 19 12:23:34 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-9]: Makefile.libx11
Log Message:
Pull up following revision(s) (requested by nia in ticket #1087):
external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.20
external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.21
libx11: Dynamically load unversioned libxcursor shared object
the version number is wrong for NetBSD, should be libXcursor.so.2
someone pointed out it makes sense to load the exact libXcursor version
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 \
src/external/mit/xorg/lib/libX11/Makefile.libx11
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19.2.1
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19 Mon Jul 8 23:06:15 2019
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sat Sep 19 12:23:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.19 2019/07/08 23:06:15 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.19.2.1 2020/09/19 12:23:34 martin Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -423,7 +423,7 @@ SETID_DEFINES= -DHASSETUGID
SHM_DEFINES= -DHAS_SHM
SOCK_DEFINES= -DBSD44SOCKETS
TRANS_INCLUDES= -I${X11SRCDIR.xtrans}
-XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.1\"
+XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.2\"
XDMAUTHDEFS= -DHASXDMAUTH
XF86BIGFONT_DEFINES= -DXF86BIGFONT
XKB_DEFINES= -DXKB
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sat Sep 19 12:20:36 UTC 2020 Modified Files: src/sys/dev/usb [netbsd-8]: ukbdmap.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #1606): sys/dev/hid/hidkbdmap.c: revision 1.11 (patch) (applied to sys/dev/usb/ukbdmap.c) for jp keymap map also scan code 49 to right bracket to handle ARCHISS model PR kern/55608 by Shinichi Doyashiki To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.31.10.1 src/sys/dev/usb/ukbdmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ukbdmap.c diff -u src/sys/dev/usb/ukbdmap.c:1.31 src/sys/dev/usb/ukbdmap.c:1.31.10.1 --- src/sys/dev/usb/ukbdmap.c:1.31 Sat Apr 23 10:15:32 2016 +++ src/sys/dev/usb/ukbdmap.c Sat Sep 19 12:20:36 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ukbdmap.c,v 1.31 2016/04/23 10:15:32 skrll Exp $ */ +/* $NetBSD: ukbdmap.c,v 1.31.10.1 2020/09/19 12:20:36 martin Exp $ */ /* * Copyright (c) 1999,2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.31 2016/04/23 10:15:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.31.10.1 2020/09/19 12:20:36 martin Exp $"); #include #include @@ -171,7 +171,8 @@ Static const keysym_t ukbd_keydesc_jp[] KC(46), KS_asciicircum, KS_asciitilde, KC(47), KS_at, KS_grave, KC(48), KS_bracketleft, KS_braceleft, -KC(50), KS_bracketright, KS_braceright, +KC(49), /* ARCHISS */ KS_bracketright, KS_braceright, +KC(50), /* other model */ KS_bracketright, KS_braceright, KC(51), KS_semicolon, KS_plus, KC(52), KS_colon, KS_asterisk, KC(53), KS_Zenkaku_Hankaku, /* replace grave/tilde */
CVS commit: [netbsd-9] src/sys/dev/hid
Module Name:src Committed By: martin Date: Sat Sep 19 12:16:14 UTC 2020 Modified Files: src/sys/dev/hid [netbsd-9]: hidkbdmap.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #1086): sys/dev/hid/hidkbdmap.c: revision 1.11 for jp keymap map also scan code 49 to right bracket to handle ARCHISS model PR kern/55608 by Shinichi Doyashiki To generate a diff of this commit: cvs rdiff -u -r1.1.10.2 -r1.1.10.3 src/sys/dev/hid/hidkbdmap.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/hid/hidkbdmap.c diff -u src/sys/dev/hid/hidkbdmap.c:1.1.10.2 src/sys/dev/hid/hidkbdmap.c:1.1.10.3 --- src/sys/dev/hid/hidkbdmap.c:1.1.10.2 Mon Jul 13 14:22:47 2020 +++ src/sys/dev/hid/hidkbdmap.c Sat Sep 19 12:16:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: hidkbdmap.c,v 1.1.10.2 2020/07/13 14:22:47 martin Exp $ */ +/* $NetBSD: hidkbdmap.c,v 1.1.10.3 2020/09/19 12:16:14 martin Exp $ */ /* * Copyright (c) 1999,2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.1.10.2 2020/07/13 14:22:47 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.1.10.3 2020/09/19 12:16:14 martin Exp $"); #include #include @@ -171,7 +171,8 @@ Static const keysym_t hidkbd_keydesc_jp[ KC(46), KS_asciicircum, KS_asciitilde, KC(47), KS_at, KS_grave, KC(48), KS_bracketleft, KS_braceleft, -KC(50), KS_bracketright, KS_braceright, +KC(49), /* ARCHISS */ KS_bracketright, KS_braceright, +KC(50), /* other model */ KS_bracketright, KS_braceright, KC(51), KS_semicolon, KS_plus, KC(52), KS_colon, KS_asterisk, KC(53), KS_Zenkaku_Hankaku, /* replace grave/tilde */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: kim Date: Sat Sep 19 07:30:32 UTC 2020 Modified Files: src/sys/dev/pci: vioscsi.c Log Message: Update the Proxmox comment with link to their bugzilla To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/vioscsi.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/pci/vioscsi.c diff -u src/sys/dev/pci/vioscsi.c:1.23 src/sys/dev/pci/vioscsi.c:1.24 --- src/sys/dev/pci/vioscsi.c:1.23 Fri Sep 18 14:55:28 2020 +++ src/sys/dev/pci/vioscsi.c Sat Sep 19 07:30:32 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vioscsi.c,v 1.23 2020/09/18 14:55:28 jakllsch Exp $ */ +/* $NetBSD: vioscsi.c,v 1.24 2020/09/19 07:30:32 kim Exp $ */ /* $OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.23 2020/09/18 14:55:28 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.24 2020/09/19 07:30:32 kim Exp $"); #include #include @@ -199,8 +199,16 @@ vioscsi_attach(device_t parent, device_t /* * XXX Remove this when scsipi is REPORT LUNS-aware. * scsipi(4) insists that LUNs must be contiguous starting from 0. - * This is not true on Linode (circa 2020) and Proxmox 6 hosts - * with more than one disk exported to guest. + * This is not true on Linode (circa 2020). + * + * Also if explicitly selecting the 'Virtio SCSI Single' + * controller (which is not the default SCSI controller) on + * Proxmox hosts, each disk will be on its own scsi bus at + * target 0 but unexpectedly on a LUN matching the drive number + * on the system (i.e. drive 0 will be bus 0, target 0, lun + * 0; drive 1 will be bus 1, target 0, lun 1, drive 2 will be + * bus 2, target 0, lun 2 -- which is where the gaps start + * happening). https://bugzilla.proxmox.com/show_bug.cgi?id=2985 */ chan->chan_defquirks = PQUIRK_FORCELUNS;
