CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 00:53:48 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/linux: linux_pci.c
Log Message:
linux_pci: Nix pci enumeration kludges.
Now that we can pass a cookie through, this stuff will be a little
less fragile.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/linux/linux_pci.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/drm2/linux/linux_pci.c
diff -u src/sys/external/bsd/drm2/linux/linux_pci.c:1.28 src/sys/external/bsd/drm2/linux/linux_pci.c:1.29
--- src/sys/external/bsd/drm2/linux/linux_pci.c:1.28 Sun May 19 17:36:08 2024
+++ src/sys/external/bsd/drm2/linux/linux_pci.c Sun Jun 23 00:53:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_pci.c,v 1.28 2024/05/19 17:36:08 riastradh Exp $ */
+/* $NetBSD: linux_pci.c,v 1.29 2024/06/23 00:53:48 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.28 2024/05/19 17:36:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.29 2024/06/23 00:53:48 riastradh Exp $");
#if NACPICA > 0
#include
@@ -573,24 +573,20 @@ pci_bus_alloc_resource(struct pci_bus *b
return 0;
}
-/*
- * XXX Mega-kludgerific! pci_get_bus_and_slot and pci_get_class are
- * defined only for their single purposes in i915drm, in
- * i915_get_bridge_dev and intel_detect_pch. We can't define them more
- * generally without adapting pci_find_device (and pci_enumerate_bus
- * internally) to pass a cookie through.
- */
+struct pci_domain_bus_and_slot {
+ int domain, bus, slot;
+};
static int
-pci_kludgey_match_bus0_dev0_func0(const struct pci_attach_args *pa)
+pci_match_domain_bus_and_slot(void *cookie, const struct pci_attach_args *pa)
{
+ const struct pci_domain_bus_and_slot *C = cookie;
- /* XXX domain */
- if (pa->pa_bus != 0)
+ if (pci_get_segment(pa->pa_pc) != C->domain)
return 0;
- if (pa->pa_device != 0)
+ if (pa->pa_bus != C->bus)
return 0;
- if (pa->pa_function != 0)
+ if (PCI_DEVFN(pa->pa_device, pa->pa_function) != C->slot)
return 0;
return 1;
@@ -600,12 +596,10 @@ struct pci_dev *
pci_get_domain_bus_and_slot(int domain, int bus, int slot)
{
struct pci_attach_args pa;
+ struct pci_domain_bus_and_slot context = {domain, bus, slot},
+ *C =
- KASSERT(domain == 0);
- KASSERT(bus == 0);
- KASSERT(slot == PCI_DEVFN(0, 0));
-
- if (!pci_find_device(, _kludgey_match_bus0_dev0_func0))
+ if (!pci_find_device1(, _match_domain_bus_and_slot, C))
return NULL;
struct pci_dev *const pdev = kmem_zalloc(sizeof(*pdev), KM_SLEEP);
@@ -614,101 +608,59 @@ pci_get_domain_bus_and_slot(int domain,
return pdev;
}
-static int
-pci_kludgey_match_isa_bridge(const struct pci_attach_args *pa)
-{
-
- if (PCI_CLASS(pa->pa_class) != PCI_CLASS_BRIDGE)
- return 0;
- if (PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_BRIDGE_ISA)
- return 0;
-
- return 1;
-}
-
-static int
-pci_kludgey_match_other_display(const struct pci_attach_args *pa)
+void
+pci_dev_put(struct pci_dev *pdev)
{
- if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
- return 0;
- if (PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_DISPLAY_MISC)
- return 0;
+ if (pdev == NULL)
+ return;
- return 1;
+ KASSERT(ISSET(pdev->pd_kludges, NBPCI_KLUDGE_GET_MUMBLE));
+ kmem_free(pdev->bus, sizeof(*pdev->bus));
+ kmem_free(pdev, sizeof(*pdev));
}
-static int
-pci_kludgey_match_vga_display(const struct pci_attach_args *pa)
-{
-
- if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
- return 0;
- if (PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_DISPLAY_VGA)
- return 0;
-
- return 1;
-}
+struct pci_get_class_state {
+ uint32_t class_subclass_shifted;
+ const struct pci_dev *from;
+};
static int
-pci_kludgey_match_3d_display(const struct pci_attach_args *pa)
+pci_get_class_match(void *cookie, const struct pci_attach_args *pa)
{
+ struct pci_get_class_state *C = cookie;
- if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
+ if (C->from) {
+ if ((pci_get_segment(C->from->pd_pa.pa_pc) ==
+ pci_get_segment(pa->pa_pc)) &&
+ C->from->pd_pa.pa_bus == pa->pa_bus &&
+ C->from->pd_pa.pa_device == pa->pa_device &&
+ C->from->pd_pa.pa_function == pa->pa_function)
+ C->from = NULL;
return 0;
- if (PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_DISPLAY_3D)
+ }
+ if (C->class_subclass_shifted !=
+ (PCI_CLASS(pa->pa_class) << 8 | PCI_SUBCLASS(pa->pa_class)))
return 0;
return 1;
}
-void
-pci_dev_put(struct pci_dev *pdev)
-{
-
- if (pdev == NULL)
- return;
-
- KASSERT(ISSET(pdev->pd_kludges, NBPCI_KLUDGE_GET_MUMBLE));
- kmem_free(pdev->bus, sizeof(*pdev->bus));
- kmem_free(pdev, sizeof(*pdev));
-}
-
-struct pci_dev * /* XXX i915/amdgpu kludge */
+struct pci_dev *
pci_get_class(uint32_t class_subclass_shifted, struct pci_dev *from)
{
+ struct
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sun Jun 23 00:53:48 UTC 2024 Modified Files: src/sys/external/bsd/drm2/linux: linux_pci.c Log Message: linux_pci: Nix pci enumeration kludges. Now that we can pass a cookie through, this stuff will be a little less fragile. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/linux/linux_pci.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: Sun Jun 23 00:53:34 UTC 2024
Modified Files:
src/sys/arch/sparc64/dev: pci_machdep.c
src/sys/arch/sparc64/include: pci_machdep.h
src/sys/arch/xen/include: pci_machdep.h
src/sys/arch/xen/xen: xpci_xenbus.c
src/sys/dev/acpi: acpi_mcfg.c
src/sys/dev/pci: pci.c pcivar.h
Log Message:
pci: Pass cookie through pci_find_device, pci_enumerate_bus, take 2.
New functions pci_find_device1 and pci_enumerate_bus1 have the cookie
argument. Existing symbols pci_find_device and pci_enumerate_bus are
now wrappers for the cookieless version.
This will allow pci_find_device callers to pass a cookie through to
the match function so they can keep state or pass in extra parameters
like b/d/f numbers, which will allow us to nix some horrible kludges
in the Linux PCI API emulation for drm (and, perhaps, Intel wifi).
This change drops the symbol pci_probe_device, in favour of a new
pci_probe_device1 with the cookie argument. But I don't think that
requires a revbump because it's only called by MD pci_enumerate_bus1
implementations, which don't live in modules anyway.
Take 2: Make sure to handle NULL match function.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sparc64/dev/pci_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/include/pci_machdep.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/include/pci_machdep.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_mcfg.c
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/pci/pcivar.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/sparc64/dev/pci_machdep.c
diff -u src/sys/arch/sparc64/dev/pci_machdep.c:1.82 src/sys/arch/sparc64/dev/pci_machdep.c:1.83
--- src/sys/arch/sparc64/dev/pci_machdep.c:1.82 Mon May 20 19:15:48 2024
+++ src/sys/arch/sparc64/dev/pci_machdep.c Sun Jun 23 00:53:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.82 2024/05/20 19:15:48 riastradh Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.83 2024/06/23 00:53:34 riastradh Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.82 2024/05/20 19:15:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.83 2024/06/23 00:53:34 riastradh Exp $");
#include
#include
@@ -244,8 +244,9 @@ pci_decompose_tag(pci_chipset_tag_t pc,
}
int
-sparc64_pci_enumerate_bus(struct pci_softc *sc, const int *locators,
-int (*match)(const struct pci_attach_args *), struct pci_attach_args *pap)
+sparc64_pci_enumerate_bus1(struct pci_softc *sc, const int *locators,
+int (*match)(void *, const struct pci_attach_args *), void *cookie,
+struct pci_attach_args *pap)
{
struct ofw_pci_register reg;
pci_chipset_tag_t pc = sc->sc_pc;
@@ -307,8 +308,10 @@ sparc64_pci_enumerate_bus(struct pci_sof
if (OF_getprop(node, "class-code", , sizeof(class)) !=
sizeof(class))
continue;
- if (OF_getprop(node, "reg", , sizeof(reg)) < sizeof(reg))
- panic("pci_enumerate_bus: \"%s\" regs too small", name);
+ if (OF_getprop(node, "reg", , sizeof(reg)) < sizeof(reg)) {
+ panic("pci_enumerate_bus1: \"%s\" regs too small",
+ name);
+ }
b = OFW_PCI_PHYS_HI_BUS(reg.phys_hi);
d = OFW_PCI_PHYS_HI_DEVICE(reg.phys_hi);
@@ -361,7 +364,7 @@ sparc64_pci_enumerate_bus(struct pci_sof
(cl << PCI_CACHELINE_SHIFT);
pci_conf_write(pc, tag, PCI_BHLC_REG, bhlc);
- ret = pci_probe_device(sc, tag, match, pap);
+ ret = pci_probe_device1(sc, tag, match, cookie, pap);
if (match != NULL && ret != 0)
return (ret);
}
Index: src/sys/arch/sparc64/include/pci_machdep.h
diff -u src/sys/arch/sparc64/include/pci_machdep.h:1.30 src/sys/arch/sparc64/include/pci_machdep.h:1.31
--- src/sys/arch/sparc64/include/pci_machdep.h:1.30 Mon May 20 19:15:48 2024
+++ src/sys/arch/sparc64/include/pci_machdep.h Sun Jun 23 00:53:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.30 2024/05/20 19:15:48 riastradh Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.31 2024/06/23 00:53:34 riastradh Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -95,10 +95,10 @@ int pci_intr_map(const struct pci_attac
pci_intr_handle_t *);
void pci_intr_disestablish(pci_chipset_tag_t, void *);
-int sparc64_pci_enumerate_bus(struct pci_softc *, const int *,
- int (*)(const struct pci_attach_args *),
+int sparc64_pci_enumerate_bus1(struct pci_softc *, const int *,
+ int (*)(void *, const struct pci_attach_args *), void *,
struct pci_attach_args *);
-#define PCI_MACHDEP_ENUMERATE_BUS sparc64_pci_enumerate_bus
+#define PCI_MACHDEP_ENUMERATE_BUS1 sparc64_pci_enumerate_bus1
#define pci_conf_read(pc, tag, reg) \
((pc)->spc_conf_read(pc, tag, reg))
Index:
CVS commit: src/sys
Module Name:src Committed By: riastradh Date: Sun Jun 23 00:53:34 UTC 2024 Modified Files: src/sys/arch/sparc64/dev: pci_machdep.c src/sys/arch/sparc64/include: pci_machdep.h src/sys/arch/xen/include: pci_machdep.h src/sys/arch/xen/xen: xpci_xenbus.c src/sys/dev/acpi: acpi_mcfg.c src/sys/dev/pci: pci.c pcivar.h Log Message: pci: Pass cookie through pci_find_device, pci_enumerate_bus, take 2. New functions pci_find_device1 and pci_enumerate_bus1 have the cookie argument. Existing symbols pci_find_device and pci_enumerate_bus are now wrappers for the cookieless version. This will allow pci_find_device callers to pass a cookie through to the match function so they can keep state or pass in extra parameters like b/d/f numbers, which will allow us to nix some horrible kludges in the Linux PCI API emulation for drm (and, perhaps, Intel wifi). This change drops the symbol pci_probe_device, in favour of a new pci_probe_device1 with the cookie argument. But I don't think that requires a revbump because it's only called by MD pci_enumerate_bus1 implementations, which don't live in modules anyway. Take 2: Make sure to handle NULL match function. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sparc64/dev/pci_machdep.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/include/pci_machdep.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/include/pci_machdep.h cvs rdiff -u -r1.28 -r1.29 src/sys/arch/xen/xen/xpci_xenbus.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_mcfg.c cvs rdiff -u -r1.167 -r1.168 src/sys/dev/pci/pci.c cvs rdiff -u -r1.119 -r1.120 src/sys/dev/pci/pcivar.h 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/drm2/dist/drm/i915/gem
Module Name:src Committed By: riastradh Date: Sun Jun 23 00:53:16 UTC 2024 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c Log Message: i915: Reduce diff in fault routine. - Omit needless i915_gem_object_pin/unpin_pages cycle in i915_gem_fault. This is already done by vm_fault_cpu and vm_fault_gtt. - Omit needless EINTR interception. This is now already handled by i915_error_to_vmf_fault. No functional change intended, except that the transient pin count will be one lower than before during the fault routine. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.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/drm2/dist/drm/i915/gem
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 00:53:16 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
i915: Reduce diff in fault routine.
- Omit needless i915_gem_object_pin/unpin_pages cycle in
i915_gem_fault. This is already done by vm_fault_cpu and
vm_fault_gtt.
- Omit needless EINTR interception. This is now already handled by
i915_error_to_vmf_fault.
No functional change intended, except that the transient pin count
will be one lower than before during the fault routine.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.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/drm2/dist/drm/i915/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.23 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.24
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.23 Tue Jun 4 21:42:40 2024
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Jun 23 00:53:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.23 2024/06/04 21:42:40 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.24 2024/06/23 00:53:16 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.23 2024/06/04 21:42:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.24 2024/06/23 00:53:16 riastradh Exp $");
#include
#include
@@ -252,14 +252,14 @@ compute_partial_view(const struct drm_i9
*/
int pmap_enter_default(pmap_t, vaddr_t, paddr_t, vm_prot_t, unsigned);
#define pmap_enter pmap_enter_default
+#endif
+#ifdef __NetBSD__
static int
i915_error_to_vmf_fault(int err)
-{
- return err;
-}
#else
static vm_fault_t i915_error_to_vmf_fault(int err)
+#endif
{
switch (err) {
default:
@@ -269,11 +269,19 @@ static vm_fault_t i915_error_to_vmf_faul
case -EFAULT: /* purged object */
case -ENODEV: /* bad object, how did you get here! */
case -ENXIO: /* unable to access backing store (on device) */
+#ifdef __NetBSD__
+ return EINVAL; /* SIGBUS */
+#else
return VM_FAULT_SIGBUS;
+#endif
case -ENOSPC: /* shmemfs allocation failure */
case -ENOMEM: /* our allocation failure */
+#ifdef __NetBSD__
+ return ENOMEM;
+#else
return VM_FAULT_OOM;
+#endif
case 0:
case -EAGAIN:
@@ -284,10 +292,13 @@ static vm_fault_t i915_error_to_vmf_faul
* EBUSY is ok: this just means that another thread
* already did the job.
*/
+#ifdef __NetBSD__
+ return 0; /* retry access in userland */
+#else
return VM_FAULT_NOPAGE;
+#endif
}
}
-#endif
#ifdef __NetBSD__
static int
@@ -313,7 +324,7 @@ static vm_fault_t vm_fault_cpu(struct vm
/* Sanity check that we allow writing into this object */
if (unlikely(i915_gem_object_is_readonly(obj) && write))
#ifdef __NetBSD__
- return -EFAULT;
+ return EINVAL; /* SIGBUS */
#else
return VM_FAULT_SIGBUS;
#endif
@@ -420,7 +431,7 @@ static vm_fault_t vm_fault_gtt(struct vm
/* Sanity check that we allow writing into this object */
if (i915_gem_object_is_readonly(obj) && write)
#ifdef __NetBSD__
- return -EFAULT;
+ return EINVAL; /* SIGBUS */
#else
return VM_FAULT_SIGBUS;
#endif
@@ -565,7 +576,6 @@ i915_gem_fault(struct uvm_faultinfo *ufi
struct i915_mmap_offset *mmo =
container_of(uobj, struct i915_mmap_offset, uobj);
struct drm_i915_gem_object *obj = mmo->obj;
- bool pinned = false;
int error;
KASSERT(rw_lock_held(obj->base.filp->vmobjlock));
@@ -585,22 +595,15 @@ i915_gem_fault(struct uvm_faultinfo *ufi
*/
rw_exit(obj->base.filp->vmobjlock);
- /* XXX errno Linux->NetBSD */
- error = -i915_gem_object_pin_pages(obj);
- if (error)
- goto out;
- pinned = true;
-
switch (mmo->mmap_type) {
case I915_MMAP_TYPE_WC:
case I915_MMAP_TYPE_WB:
case I915_MMAP_TYPE_UC:
- /* XXX errno Linux->NetBSD */
- error = -vm_fault_cpu(ufi, mmo, vaddr, pps, npages, centeridx,
+ error = vm_fault_cpu(ufi, mmo, vaddr, pps, npages, centeridx,
flags);
break;
case I915_MMAP_TYPE_GTT:
- error = -vm_fault_gtt(ufi, mmo, vaddr, pps, npages, centeridx,
+ error = vm_fault_gtt(ufi, mmo, vaddr, pps, npages, centeridx,
flags);
break;
default:
@@ -608,19 +611,7 @@ i915_gem_fault(struct uvm_faultinfo *ufi
mmo->mmap_type);
}
-out: if (pinned)
- i915_gem_object_unpin_pages(obj);
uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
-
- /*
- * Remap EINTR to success, so that we return to userland.
- * On the way out, we'll deliver the signal, and if the signal
- * is not fatal then the user code which faulted will most likely
- * fault again, and we'll come back here for another try.
- */
- if (error == EINTR)
- error = 0;
-
return error;
}
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 00:49:31 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
ttm: Add XXX about readahead fault failures.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.27 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.28
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.27 Sun Jun 23 00:49:20 2024
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Sun Jun 23 00:49:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.27 2024/06/23 00:49:20 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.28 2024/06/23 00:49:31 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.27 2024/06/23 00:49:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.28 2024/06/23 00:49:31 riastradh Exp $");
#include
@@ -290,6 +290,11 @@ ttm_bo_uvm_fault_reserved(struct uvm_fau
ret = pmap_enter(vmf->orig_map->pmap, vaddr + i*PAGE_SIZE,
paddr, vm_prot, PMAP_CANFAIL | prot);
if (ret) {
+ /*
+ * XXX Continue with ret=0 if i != centeridx,
+ * so we don't fail if only readahead pages
+ * fail?
+ */
KASSERT(ret != ERESTART);
break;
}
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src Committed By: riastradh Date: Sun Jun 23 00:49:31 UTC 2024 Modified Files: src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c Log Message: ttm: Add XXX about readahead fault failures. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/drm2/ttm
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 00:49:20 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
ttm: Sync cacheability flag logic with Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.26 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.27
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.26 Sun Jun 23 00:49:06 2024
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Sun Jun 23 00:49:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.26 2024/06/23 00:49:06 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.27 2024/06/23 00:49:20 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.26 2024/06/23 00:49:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.27 2024/06/23 00:49:20 riastradh Exp $");
#include
@@ -183,8 +183,8 @@ ttm_bo_uvm_fault_reserved(struct uvm_fau
voff_t uoffset; /* offset in bytes into bo */
unsigned startpage; /* offset in pages into bo */
unsigned i;
- vm_prot_t vm_prot; /* VM_PROT_* */
- pgprot_t pgprot; /* VM_PROT_* | PMAP_* cacheability flags */
+ vm_prot_t vm_prot = vmf->entry->protection; /* VM_PROT_* */
+ pgprot_t prot = vm_prot; /* VM_PROT_* | PMAP_* cacheability flags */
int err, ret;
/*
@@ -233,20 +233,17 @@ ttm_bo_uvm_fault_reserved(struct uvm_fau
goto out_io_unlock;
}
- vm_prot = vmf->entry->protection;
+ prot = ttm_io_prot(bo->mem.placement, prot);
if (!bo->mem.bus.is_iomem) {
struct ttm_operation_ctx ctx = {
.interruptible = false,
.no_wait_gpu = false,
.flags = TTM_OPT_FLAG_FORCE_ALLOC
+
};
u.ttm = bo->ttm;
size = (size_t)bo->ttm->num_pages << PAGE_SHIFT;
- if (ISSET(bo->mem.placement, TTM_PL_FLAG_CACHED))
- pgprot = vm_prot;
- else
- pgprot = ttm_io_prot(bo->mem.placement, vm_prot);
if (ttm_tt_populate(bo->ttm, )) {
ret = ENOMEM;
goto out_io_unlock;
@@ -254,7 +251,6 @@ ttm_bo_uvm_fault_reserved(struct uvm_fau
} else {
u.base = (bo->mem.bus.base + bo->mem.bus.offset);
size = bo->mem.bus.size;
- pgprot = ttm_io_prot(bo->mem.placement, vm_prot);
}
KASSERT(vmf->entry->start <= vaddr);
@@ -287,9 +283,12 @@ ttm_bo_uvm_fault_reserved(struct uvm_fau
vm_prot, 0);
paddr = pmap_phys_address(cookie);
+#if 0/* XXX Why no PMAP_* flags added here? */
+ mmapflags = pmap_mmap_flags(cookie);
+#endif
}
ret = pmap_enter(vmf->orig_map->pmap, vaddr + i*PAGE_SIZE,
- paddr, vm_prot, (PMAP_CANFAIL | pgprot));
+ paddr, vm_prot, PMAP_CANFAIL | prot);
if (ret) {
KASSERT(ret != ERESTART);
break;
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src Committed By: riastradh Date: Sun Jun 23 00:49:20 UTC 2024 Modified Files: src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c Log Message: ttm: Sync cacheability flag logic with Linux. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/drm2/ttm
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 00:49:06 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
ttm: Respect PGO_ALLPAGES.
Not sure this is useful but it reduces XXX's and makes this match
udv_fault better so it's easier to understand.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.25 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.26
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.25 Sun Jun 23 00:48:56 2024
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Sun Jun 23 00:49:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.25 2024/06/23 00:48:56 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.26 2024/06/23 00:49:06 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.25 2024/06/23 00:48:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.26 2024/06/23 00:49:06 riastradh Exp $");
#include
@@ -272,7 +272,8 @@ ttm_bo_uvm_fault_reserved(struct uvm_fau
for (i = 0; i < npages; i++) {
paddr_t paddr;
- /* XXX PGO_ALLPAGES? */
+ if ((flags & PGO_ALLPAGES) == 0 && i != centeridx)
+ continue;
if (pps[i] == PGO_DONTCARE)
continue;
if (!bo->mem.bus.is_iomem) {
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src Committed By: riastradh Date: Sun Jun 23 00:49:06 UTC 2024 Modified Files: src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c Log Message: ttm: Respect PGO_ALLPAGES. Not sure this is useful but it reduces XXX's and makes this match udv_fault better so it's easier to understand. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/drm2/ttm
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 00:48:56 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
ttm: Sync more with Linux.
Add the original copyright and attribution since this is now,
intentionally, a modified copy of the original and not just roughly
the same algorithm.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.24 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.25
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.24 Sun May 19 13:50:04 2024
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Sun Jun 23 00:48:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.24 2024/05/19 13:50:04 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.25 2024/06/23 00:48:56 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,8 +29,38 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ *
+ * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **/
+/*
+ * Authors: Thomas Hellstrom
+ */
+
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.24 2024/05/19 13:50:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.25 2024/06/23 00:48:56 riastradh Exp $");
#include
@@ -44,8 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,
#include
-static int ttm_bo_uvm_fault_idle(struct ttm_buffer_object *,
- struct uvm_faultinfo *);
static int ttm_bo_uvm_lookup(struct ttm_bo_device *, unsigned long,
unsigned long, struct ttm_buffer_object **);
@@ -67,12 +95,81 @@ ttm_bo_uvm_detach(struct uvm_object *uob
ttm_bo_put(bo);
}
-int
-ttm_bo_uvm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr,
+static int
+ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo, struct uvm_faultinfo *vmf)
+{
+ int err, ret = 0;
+
+ if (__predict_true(!bo->moving))
+ goto out_unlock;
+
+ /*
+ * Quick non-stalling check for idle.
+ */
+ if (dma_fence_is_signaled(bo->moving))
+ goto out_clear;
+
+ /*
+ * If possible, avoid waiting for GPU with mmap_sem
+ * held.
+ */
+ if (1) { /* always retriable in NetBSD */
+ ret = ERESTART;
+
+ ttm_bo_get(bo);
+ uvmfault_unlockall(vmf, vmf->entry->aref.ar_amap, NULL);
+ (void) dma_fence_wait(bo->moving, true);
+ dma_resv_unlock(bo->base.resv);
+ ttm_bo_put(bo);
+ goto out_unlock;
+ }
+
+ /*
+ * Ordinary wait.
+ */
+ err = dma_fence_wait(bo->moving, true);
+ if (__predict_false(err != 0)) {
+ ret = (err != -ERESTARTSYS) ? EINVAL/*SIGBUS*/ :
+ 0/*retry access in userland*/;
+ goto out_unlock;
+ }
+
+out_clear:
+ dma_fence_put(bo->moving);
+ bo->moving = NULL;
+
+out_unlock:
+ return ret;
+}
+
+static int
+ttm_bo_vm_reserve(struct ttm_buffer_object *bo, struct uvm_faultinfo *vmf)
+{
+
+ /*
+ * Work around locking order reversal in fault / nopfn
+ * between mmap_sem and bo_reserve: Perform a trylock operation
+ * for reserve, and if it fails, retry the fault after waiting
+ * for the buffer to become unreserved.
+ */
+ if (__predict_false(!dma_resv_trylock(bo->base.resv))) {
+ ttm_bo_get(bo);
+ uvmfault_unlockall(vmf, vmf->entry->aref.ar_amap, NULL);
+ if (!dma_resv_lock_interruptible(bo->base.resv, NULL))
+ dma_resv_unlock(bo->base.resv);
+ ttm_bo_put(bo);
+ return ERESTART;
+ }
+
+ return 0;
+}
+
+static int
+ttm_bo_uvm_fault_reserved(struct uvm_faultinfo *vmf, vaddr_t vaddr,
struct vm_page **pps, int npages, int centeridx, vm_prot_t access_type,
int flags)
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src Committed By: riastradh Date: Sun Jun 23 00:48:56 UTC 2024 Modified Files: src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c Log Message: ttm: Sync more with Linux. Add the original copyright and attribution since this is now, intentionally, a modified copy of the original and not just roughly the same algorithm. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: mrg Date: Sun Jun 23 00:37:12 UTC 2024 Modified Files: src/etc: Makefile Log Message: allow XZ_OPT to be overriden. -9 is slow when doing this a lot. To generate a diff of this commit: cvs rdiff -u -r1.472 -r1.473 src/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src
Committed By: mrg
Date: Sun Jun 23 00:37:12 UTC 2024
Modified Files:
src/etc: Makefile
Log Message:
allow XZ_OPT to be overriden. -9 is slow when doing this a lot.
To generate a diff of this commit:
cvs rdiff -u -r1.472 -r1.473 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.472 src/etc/Makefile:1.473
--- src/etc/Makefile:1.472 Wed Jun 5 17:20:18 2024
+++ src/etc/Makefile Sun Jun 23 00:37:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.472 2024/06/05 17:20:18 tsutsui Exp $
+# $NetBSD: Makefile,v 1.473 2024/06/23 00:37:12 mrg Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -411,7 +411,7 @@ distrib-dirs: .PHONY check_DESTDIR
cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs
COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
-XZ_OPT=-9
+XZ_OPT?=-9
TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
# release, snapshot --
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sat Jun 22 23:51:26 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: add generated tmux.1 to CLEANDIRFILES so it gets removed too To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sat Jun 22 23:51:26 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
add generated tmux.1 to CLEANDIRFILES so it gets removed too
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.34 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.35
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.34 Sat Jun 22 23:49:17 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sat Jun 22 23:51:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/06/22 23:49:17 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2024/06/22 23:51:26 wiz Exp $
.include
@@ -260,4 +260,6 @@ COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNI
tmux.1: $(SRCDIR)/tmux.1
sed -e 's|@SYSCONFDIR@|/etc|g' $> > $@
+CLEANDIRFILES+= tmux.1
+
.include
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sat Jun 22 23:49:17 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: notify.c is now sign-compare-safe To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sat Jun 22 23:49:17 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
notify.c is now sign-compare-safe
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.33 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.34
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.33 Sat Jun 22 20:08:16 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sat Jun 22 23:49:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2024/06/22 20:08:16 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2024/06/22 23:49:17 wiz Exp $
.include
@@ -250,7 +250,6 @@ DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LI
COPTS.format.c += -Wno-format-nonliteral
COPTS.input.c += -Wno-sign-compare -Wno-pointer-sign
-COPTS.notify.c += -Wno-sign-compare
COPTS.tty.c += -Wno-pointer-sign
COPTS.utempter.c+= ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNINITIALIZED} -Wno-pointer-sign
CVS commit: src/external/bsd/tmux/dist
Module Name:src
Committed By: wiz
Date: Sat Jun 22 23:45:53 UTC 2024
Modified Files:
src/external/bsd/tmux/dist: tty-term.c xmalloc.h
Removed Files:
src/external/bsd/tmux/dist: utmp.c
Log Message:
tmux: reduce diffs to upstream even more
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tmux/dist/tty-term.c
cvs rdiff -u -r1.1 -r0 src/external/bsd/tmux/dist/utmp.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/xmalloc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/dist/tty-term.c
diff -u src/external/bsd/tmux/dist/tty-term.c:1.17 src/external/bsd/tmux/dist/tty-term.c:1.18
--- src/external/bsd/tmux/dist/tty-term.c:1.17 Sat Jun 22 20:07:14 2024
+++ src/external/bsd/tmux/dist/tty-term.c Sat Jun 22 23:45:53 2024
@@ -778,7 +778,7 @@ tty_term_string_i(struct tty_term *term,
#elif defined(HAVE_TIPARM)
s = tiparm(x, a);
#else
- s = tparm(x, a, 0, 0, 0, 0, 0, 0, 0, 0);
+ s = tparm((char *)x, a, 0, 0, 0, 0, 0, 0, 0, 0);
#endif
if (s == NULL) {
log_debug("could not expand %s", tty_term_codes[code].name);
@@ -797,7 +797,7 @@ tty_term_string_ii(struct tty_term *term
#elif defined(HAVE_TIPARM)
s = tiparm(x, a, b);
#else
- s = tparm(x, a, b, 0, 0, 0, 0, 0, 0, 0);
+ s = tparm((char *)x, a, b, 0, 0, 0, 0, 0, 0, 0);
#endif
if (s == NULL) {
log_debug("could not expand %s", tty_term_codes[code].name);
@@ -817,7 +817,7 @@ tty_term_string_iii(struct tty_term *ter
#elif defined(HAVE_TIPARM)
s = tiparm(x, a, b, c);
#else
- s = tparm(x, a, b, c, 0, 0, 0, 0, 0, 0);
+ s = tparm((char *)x, a, b, c, 0, 0, 0, 0, 0, 0);
#endif
if (s == NULL) {
log_debug("could not expand %s", tty_term_codes[code].name);
@@ -836,7 +836,7 @@ tty_term_string_s(struct tty_term *term,
#elif defined(HAVE_TIPARM)
s = tiparm(x, a);
#else
- s = tparm(x, (long)a, 0, 0, 0, 0, 0, 0, 0, 0);
+ s = tparm((char *)x, (long)a, 0, 0, 0, 0, 0, 0, 0, 0);
#endif
if (s == NULL) {
log_debug("could not expand %s", tty_term_codes[code].name);
@@ -856,7 +856,7 @@ tty_term_string_ss(struct tty_term *term
#elif defined(HAVE_TIPARM)
s = tiparm(x, a, b);
#else
- s = tparm(x, (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0);
+ s = tparm((char *)x, (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0);
#endif
if (s == NULL) {
log_debug("could not expand %s", tty_term_codes[code].name);
Index: src/external/bsd/tmux/dist/xmalloc.h
diff -u src/external/bsd/tmux/dist/xmalloc.h:1.6 src/external/bsd/tmux/dist/xmalloc.h:1.7
--- src/external/bsd/tmux/dist/xmalloc.h:1.6 Wed Jun 28 22:21:26 2023
+++ src/external/bsd/tmux/dist/xmalloc.h Sat Jun 22 23:45:53 2024
@@ -31,13 +31,13 @@ void *xrecallocarray(void *, size_t, siz
char *xstrdup(const char *);
char *xstrndup(const char *, size_t);
int xasprintf(char **, const char *, ...)
- __attribute__((__format__ (__printf__, 2, 3)))
+ __attribute__((__format__ (printf, 2, 3)))
__attribute__((__nonnull__ (2)));
int xvasprintf(char **, const char *, va_list)
__attribute__((__format__ (printf, 2, 0)))
__attribute__((__nonnull__ (2)));
int xsnprintf(char *, size_t, const char *, ...)
- __attribute__((__format__ (__printf__, 3, 4)))
+ __attribute__((__format__ (printf, 3, 4)))
__attribute__((__nonnull__ (3)))
__attribute__((__bounded__ (__string__, 1, 2)));
int xvsnprintf(char *, size_t, const char *, va_list)
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: wiz Date: Sat Jun 22 23:45:53 UTC 2024 Modified Files: src/external/bsd/tmux/dist: tty-term.c xmalloc.h Removed Files: src/external/bsd/tmux/dist: utmp.c Log Message: tmux: reduce diffs to upstream even more To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tmux/dist/tty-term.c cvs rdiff -u -r1.1 -r0 src/external/bsd/tmux/dist/utmp.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/xmalloc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Sat Jun 22 23:45:09 UTC 2024 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 Log Message: don't mark the gcc-10 + sanitizer directories obsolete yet. they're still created by the build, and they're owned by the base set. i'll clean the up when i delete gcc-10 entirely. To generate a diff of this commit: cvs rdiff -u -r1.300 -r1.301 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.208 -r1.209 src/distrib/sets/lists/comp/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.300 src/distrib/sets/lists/comp/md.amd64:1.301 --- src/distrib/sets/lists/comp/md.amd64:1.300 Sat Jun 22 20:17:25 2024 +++ src/distrib/sets/lists/comp/md.amd64 Sat Jun 22 23:45:09 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.300 2024/06/22 20:17:25 riastradh Exp $ +# $NetBSD: md.amd64,v 1.301 2024/06/22 23:45:09 mrg Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -724,8 +724,6 @@ ./usr/include/gcc-10/rdseedintrin.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/rtmintrin.h comp-c-include gcc=10 ./usr/include/gcc-10/rtmintrin.h comp-obsolete obsolete,gcc=12 -./usr/include/gcc-10/sanitizer comp-c-include gcc=10 -./usr/include/gcc-10/sanitizer comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/sgxintrin.h comp-c-include gcc=10 ./usr/include/gcc-10/sgxintrin.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/shaintrin.h comp-c-include gcc=10 Index: src/distrib/sets/lists/comp/md.i386 diff -u src/distrib/sets/lists/comp/md.i386:1.208 src/distrib/sets/lists/comp/md.i386:1.209 --- src/distrib/sets/lists/comp/md.i386:1.208 Sat Jun 22 20:17:25 2024 +++ src/distrib/sets/lists/comp/md.i386 Sat Jun 22 23:45:09 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.208 2024/06/22 20:17:25 riastradh Exp $ +# $NetBSD: md.i386,v 1.209 2024/06/22 23:45:09 mrg Exp $ ./usr/include/clang-3.4/__wmmintrin_aes.h comp-obsolete obsolete ./usr/include/clang-3.4/__wmmintrin_pclmul.h comp-obsolete obsolete ./usr/include/clang-3.4/ammintrin.h comp-obsolete obsolete @@ -1052,8 +1052,6 @@ ./usr/include/gcc-10/rdseedintrin.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/rtmintrin.h comp-c-include gcc=10 ./usr/include/gcc-10/rtmintrin.h comp-obsolete obsolete,gcc=12 -./usr/include/gcc-10/sanitizer comp-c-include gcc=10 -./usr/include/gcc-10/sanitizer comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/sgxintrin.h comp-c-include gcc=10 ./usr/include/gcc-10/sgxintrin.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/shaintrin.h comp-c-include gcc=10
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Sat Jun 22 23:45:09 UTC 2024 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 Log Message: don't mark the gcc-10 + sanitizer directories obsolete yet. they're still created by the build, and they're owned by the base set. i'll clean the up when i delete gcc-10 entirely. To generate a diff of this commit: cvs rdiff -u -r1.300 -r1.301 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.208 -r1.209 src/distrib/sets/lists/comp/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: wiz Date: Sat Jun 22 23:33:50 UTC 2024 Modified Files: src/external/bsd/tmux/dist: tmux.1 Log Message: tmux: bump man page date to last release date (after import) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tmux/dist/tmux.1 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/tmux/dist/tmux.1 diff -u src/external/bsd/tmux/dist/tmux.1:1.17 src/external/bsd/tmux/dist/tmux.1:1.18 --- src/external/bsd/tmux/dist/tmux.1:1.17 Sat Jun 22 20:07:14 2024 +++ src/external/bsd/tmux/dist/tmux.1 Sat Jun 22 23:33:50 2024 @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd January 6, 2020 +.Dd February 13, 2024 .Dt TMUX 1 .Os .Sh NAME
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: wiz Date: Sat Jun 22 23:33:50 UTC 2024 Modified Files: src/external/bsd/tmux/dist: tmux.1 Log Message: tmux: bump man page date to last release date (after import) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tmux/dist/tmux.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/dist
Module Name:src
Committed By: wiz
Date: Sat Jun 22 23:33:20 UTC 2024
Modified Files:
src/external/bsd/tmux/dist: style.c
Log Message:
Reduce diff to upstream.
gcc bug workaround doesn't seem to be necessary any longer.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/style.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/bsd/tmux/dist/style.c
diff -u src/external/bsd/tmux/dist/style.c:1.7 src/external/bsd/tmux/dist/style.c:1.8
--- src/external/bsd/tmux/dist/style.c:1.7 Sat Jun 22 20:07:14 2024
+++ src/external/bsd/tmux/dist/style.c Sat Jun 22 23:33:20 2024
@@ -255,8 +255,6 @@ style_tostring(struct style *sy)
tmp = "left-marker";
else if (sy->list == STYLE_LIST_RIGHT_MARKER)
tmp = "right-marker";
- else
- abort(); // XXX: gcc
off += xsnprintf(s + off, sizeof s - off, "%slist=%s", comma,
tmp);
comma = ",";
@@ -279,8 +277,7 @@ style_tostring(struct style *sy)
} else if (sy->range_type == STYLE_RANGE_USER) {
snprintf(b, sizeof b, "user|%s", sy->range_string);
tmp = b;
- } else
- abort(); // XXX: gcc
+ }
off += xsnprintf(s + off, sizeof s - off, "%srange=%s", comma,
tmp);
comma = ",";
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: wiz Date: Sat Jun 22 23:33:20 UTC 2024 Modified Files: src/external/bsd/tmux/dist: style.c Log Message: Reduce diff to upstream. gcc bug workaround doesn't seem to be necessary any longer. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/style.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sat Jun 22 23:26:37 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: now that alpha builds with xorg-server 21 again, switch it back. To generate a diff of this commit: cvs rdiff -u -r1.1382 -r1.1383 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Jun 22 23:26:37 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
now that alpha builds with xorg-server 21 again, switch it back.
To generate a diff of this commit:
cvs rdiff -u -r1.1382 -r1.1383 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1382 src/share/mk/bsd.own.mk:1.1383
--- src/share/mk/bsd.own.mk:1.1382 Sun Jun 16 21:48:23 2024
+++ src/share/mk/bsd.own.mk Sat Jun 22 23:26:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1382 2024/06/16 21:48:23 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1383 2024/06/22 23:26:37 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1345,7 +1345,7 @@ MKDTB.riscv64= yes
# During transition from xorg-server 1.10 to 1.20
# XXX sgimips uses XAA which is removed in 1.20, and EXA is hard
# XXX to do the same with.
-.if ${MACHINE} == "sgimips" || ${MACHINE} == "alpha"
+.if ${MACHINE} == "sgimips"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Sat Jun 22 23:24:46 UTC 2024 Modified Files: src/distrib/sets/lists/xserver: md.alpha Log Message: fix error in the previous: don't leave the obsolete trident entries. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xserver/md.alpha Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xserver/md.alpha diff -u src/distrib/sets/lists/xserver/md.alpha:1.66 src/distrib/sets/lists/xserver/md.alpha:1.67 --- src/distrib/sets/lists/xserver/md.alpha:1.66 Sat Jun 22 23:20:38 2024 +++ src/distrib/sets/lists/xserver/md.alpha Sat Jun 22 23:24:46 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.66 2024/06/22 23:20:38 mrg Exp $ +# $NetBSD: md.alpha,v 1.67 2024/06/22 23:24:46 mrg Exp $ ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg @@ -100,8 +100,6 @@ ./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg ./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg -./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete -./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/drivers/tseng_drv.so xserver-xf86-video-tseng-drivers xorg ./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 xserver-xf86-video-tseng-drivers xorg ./usr/X11R7/lib/modules/drivers/vga_drv.so xserver-obsolete obsolete
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Sat Jun 22 23:24:46 UTC 2024 Modified Files: src/distrib/sets/lists/xserver: md.alpha Log Message: fix error in the previous: don't leave the obsolete trident entries. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xserver/md.alpha Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sat Jun 22 23:21:56 UTC 2024
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
normalise some comment styles.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.112 src/external/mit/xorg/server/drivers/Makefile:1.113
--- src/external/mit/xorg/server/drivers/Makefile:1.112 Sat Jun 22 23:20:39 2024
+++ src/external/mit/xorg/server/drivers/Makefile Sat Jun 22 23:21:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2024/06/22 23:20:39 mrg Exp $
+# $NetBSD: Makefile,v 1.113 2024/06/22 23:21:56 mrg Exp $
.include
@@ -56,6 +56,8 @@ SUBDIR+= \
xf86-video-vesa \
xf86-video-wsfb
+# XXX add -qxl, also for arm?
+
# needs porting for xorg-server 1.6
# xf86-video-imstt
# xf86-video-rendition
@@ -99,8 +101,18 @@ SUBDIR+= \
xf86-video-trident \
xf86-video-tseng \
xf86-video-wsfb
+
+# needs porting for xorg-server 1.6
# xf86-video-imstt
-# needs porting for xorg-server 1.18, and 21.1
+
+# needs porting for xorg-server 1.18
+# xf86-video-apm
+# xf86-video-glint
+
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+# xf86-video-tga
+
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-apm \
@@ -108,6 +120,7 @@ SUBDIR+= \
xf86-video-s3 \
xf86-video-tga
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+
.endif # ${MACHINE} == "alpha"
.if ${MACHINE} == "amiga"
@@ -153,7 +166,7 @@ SUBDIR+= \
# xf86-video-tga
# needs porting for xorg-server 1.18
-# xf86-video-apm \
+# xf86-video-apm
# xf86-video-glint
.endif # ${MACHINE} == "cats"
@@ -242,9 +255,11 @@ SUBDIR+= \
xf86-video-tdfx \
xf86-video-wsfb
+# needs porting for xorg-server 1.6
+# xf86-video-imstt
+
# needs porting for xorg-server 21.1.3
# xf86-video-glint
-# xf86-video-imstt
.endif # ${MACHINE} == "macppc"
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: mrg Date: Sat Jun 22 23:21:56 UTC 2024 Modified Files: src/external/mit/xorg/server/drivers: Makefile Log Message: normalise some comment styles. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Jun 22 23:20:39 UTC 2024 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 md.cats md.i386 src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386 src/external/mit/xorg/server/drivers: Makefile Log Message: also enable xf86-video-trident for xorg-server 21 builds, it builds fine. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.128 -r1.129 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.111 -r1.112 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.66 src/distrib/sets/lists/xdebug/md.amd64:1.67 --- src/distrib/sets/lists/xdebug/md.amd64:1.66 Sat Jun 22 23:02:44 2024 +++ src/distrib/sets/lists/xdebug/md.amd64 Sat Jun 22 23:20:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.66 2024/06/22 23:02:44 mrg Exp $ +# $NetBSD: md.amd64,v 1.67 2024/06/22 23:20:38 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.axdebug-libI810XvMC-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a xdebug-libIntelXvMC-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a xdebug-libchromeXvMCPro-debuglib xorg,debuglib,compatx11file @@ -168,7 +168,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug xdebug-obsolete obsolete -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-obsolete obsolete +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-xf86-video-trident-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug xdebug-xf86-video-tseng-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vboxvideo_drv.so.1.debug xdebug-xf86-video-vboxvideo-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug xdebug-xf86-video-vesa-debug xorg,debug Index: src/distrib/sets/lists/xdebug/md.cats diff -u src/distrib/sets/lists/xdebug/md.cats:1.24 src/distrib/sets/lists/xdebug/md.cats:1.25 --- src/distrib/sets/lists/xdebug/md.cats:1.24 Sat Jun 22 23:02:44 2024 +++ src/distrib/sets/lists/xdebug/md.cats Sat Jun 22 23:20:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.cats,v 1.24 2024/06/22 23:02:44 mrg Exp $ +# $NetBSD: md.cats,v 1.25 2024/06/22 23:20:38 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libcfb32_g.a xdebug-obsolete xorg,obsolete ./usr/X11R7/lib/modules/extensions/libcfb_g.a xdebug-obsolete xorg,obsolete ./usr/X11R7/lib/modules/extensions/libdbe_g.a xdebug-obsolete xorg,obsolete @@ -84,7 +84,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug xdebug-xf86-video-siliconmotion-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug xdebug-xf86-video-tdfx-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug xdebug-obsolete obsolete -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-obsolete obsolete +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-xf86-video-trident-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug xdebug-xf86-video-tseng-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug xdebug-xf86-video-vesa-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug xdebug-xf86-input-ws-debug xorg,debug Index: src/distrib/sets/lists/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.63 src/distrib/sets/lists/xdebug/md.i386:1.64 --- src/distrib/sets/lists/xdebug/md.i386:1.63 Sat Jun 22 23:02:44 2024 +++ src/distrib/sets/lists/xdebug/md.i386 Sat Jun 22 23:20:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.63 2024/06/22 23:02:44 mrg Exp $ +# $NetBSD: md.i386,v 1.64 2024/06/22 23:20:38 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.axdebug-libI810XvMC-debuglib xorg,debuglib ./usr/X11R7/lib/libIntelXvMC_g.a xdebug-libIntelXvMC-debuglib xorg,debuglib ./usr/X11R7/lib/libchromeXvMCPro_g.a xdebug-libchromeXvMCPro-debuglib xorg,debuglib @@ -180,7 +180,7 @@
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Jun 22 23:20:39 UTC 2024 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 md.cats md.i386 src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386 src/external/mit/xorg/server/drivers: Makefile Log Message: also enable xf86-video-trident for xorg-server 21 builds, it builds fine. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.128 -r1.129 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.111 -r1.112 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Jun 22 23:02:45 UTC 2024 Modified Files: src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.cats md.i386 src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386 src/external/mit/xorg/server/drivers: Makefile Log Message: xf86-video-ark builds with xorg-server 21. enable it where it was diabled: x86, alpha, cats. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xdebug/md.alpha cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.127 -r1.128 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.110 -r1.111 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xdebug/md.alpha diff -u src/distrib/sets/lists/xdebug/md.alpha:1.22 src/distrib/sets/lists/xdebug/md.alpha:1.23 --- src/distrib/sets/lists/xdebug/md.alpha:1.22 Fri Jan 26 12:58:51 2024 +++ src/distrib/sets/lists/xdebug/md.alpha Sat Jun 22 23:02:44 2024 @@ -1,11 +1,10 @@ -# $NetBSD: md.alpha,v 1.22 2024/01/26 12:58:51 tsutsui Exp $ +# $NetBSD: md.alpha,v 1.23 2024/06/22 23:02:44 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libdri2_g.a xdebug-obsolete xorg,obsolete ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-xf86-video-apm-debug xorg,debug,xorg_server_ver=110 -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120 -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug,xorg_server_ver=110 +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug xdebug-xf86-video-ast-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug xdebug-obsolete obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug xdebug-obsolete obsolete Index: src/distrib/sets/lists/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.65 src/distrib/sets/lists/xdebug/md.amd64:1.66 --- src/distrib/sets/lists/xdebug/md.amd64:1.65 Fri Jan 26 13:06:36 2024 +++ src/distrib/sets/lists/xdebug/md.amd64 Sat Jun 22 23:02:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.65 2024/01/26 13:06:36 tsutsui Exp $ +# $NetBSD: md.amd64,v 1.66 2024/06/22 23:02:44 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.axdebug-libI810XvMC-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a xdebug-libIntelXvMC-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a xdebug-libchromeXvMCPro-debuglib xorg,debuglib,compatx11file @@ -77,8 +77,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.23.debug xdebug-xf86-video-amdgpu-debug xorg,debug,xorg_server_ver=120 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-xf86-video-apm-debug xorg,debug,xorg_server_ver=110 -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120 -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug,xorg_server_ver=110 +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug xdebug-xf86-video-ast-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug xdebug-obsolete obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug xdebug-obsolete obsolete Index: src/distrib/sets/lists/xdebug/md.cats diff -u src/distrib/sets/lists/xdebug/md.cats:1.23 src/distrib/sets/lists/xdebug/md.cats:1.24 --- src/distrib/sets/lists/xdebug/md.cats:1.23 Fri Jan 26 13:06:36 2024 +++ src/distrib/sets/lists/xdebug/md.cats Sat Jun 22 23:02:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.cats,v 1.23 2024/01/26 13:06:36 tsutsui Exp $ +# $NetBSD: md.cats,v 1.24 2024/06/22 23:02:44 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libcfb32_g.a
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Jun 22 23:02:45 UTC 2024 Modified Files: src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.cats md.i386 src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386 src/external/mit/xorg/server/drivers: Makefile Log Message: xf86-video-ark builds with xorg-server 21. enable it where it was diabled: x86, alpha, cats. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xdebug/md.alpha cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.127 -r1.128 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.110 -r1.111 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: wiz Date: Sat Jun 22 21:30:51 UTC 2024 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Properly mark an entry as obsolete for gcc=12. To generate a diff of this commit: cvs rdiff -u -r1.2459 -r1.2460 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2459 src/distrib/sets/lists/comp/mi:1.2460 --- src/distrib/sets/lists/comp/mi:1.2459 Sat Jun 22 20:17:25 2024 +++ src/distrib/sets/lists/comp/mi Sat Jun 22 21:30:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2459 2024/06/22 20:17:25 riastradh Exp $ +# $NetBSD: mi,v 1.2460 2024/06/22 21:30:51 wiz Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -1337,7 +1337,7 @@ ./usr/include/g++/cxxabi-forced.h comp-obsolete obsolete ./usr/include/g++/cxxabi.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/debug/array comp-cxx-include gcc,cxx,libstdcxx,gcc=10 -./usr/include/g++/debug/array comp-cxx-include gcc,cxx,libstdcxx,obsolete,gcc=10 +./usr/include/g++/debug/array comp-cxx-include gcc,cxx,libstdcxx,obsolete,gcc=12 ./usr/include/g++/debug/assertions.h comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/debug/bitset comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/debug/debug.h comp-cxx-include gcc,cxx,libstdcxx
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: wiz Date: Sat Jun 22 21:30:51 UTC 2024 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Properly mark an entry as obsolete for gcc=12. To generate a diff of this commit: cvs rdiff -u -r1.2459 -r1.2460 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: riastradh Date: Sat Jun 22 20:17:25 UTC 2024 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.hppa ad.m68k ad.mips ad.powerpc ad.riscv ad.sh3 md.alpha md.amd64 md.hppa md.i386 md.ia64 md.or1k md.sparc md.sparc64 md.vax mi Log Message: distrib/lists/sets/comp: Add gcc=12 obsolete entries for gcc-10/*.h. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/comp/ad.hppa cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.299 -r1.300 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.hppa cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/md.ia64 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/md.or1k cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.215 -r1.216 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/comp/md.vax cvs rdiff -u -r1.2458 -r1.2459 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: riastradh Date: Sat Jun 22 20:17:25 UTC 2024 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.hppa ad.m68k ad.mips ad.powerpc ad.riscv ad.sh3 md.alpha md.amd64 md.hppa md.i386 md.ia64 md.or1k md.sparc md.sparc64 md.vax mi Log Message: distrib/lists/sets/comp: Add gcc=12 obsolete entries for gcc-10/*.h. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/comp/ad.hppa cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.299 -r1.300 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.hppa cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/md.ia64 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/md.or1k cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.215 -r1.216 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/comp/md.vax cvs rdiff -u -r1.2458 -r1.2459 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.aarch64 diff -u src/distrib/sets/lists/comp/ad.aarch64:1.52 src/distrib/sets/lists/comp/ad.aarch64:1.53 --- src/distrib/sets/lists/comp/ad.aarch64:1.52 Mon Jun 3 18:47:23 2024 +++ src/distrib/sets/lists/comp/ad.aarch64 Sat Jun 22 20:17:25 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.52 2024/06/03 18:47:23 riastradh Exp $ +# $NetBSD: ad.aarch64,v 1.53 2024/06/22 20:17:25 riastradh Exp $ ./usr/include/aarch64comp-c-include ./usr/include/aarch64/ansi.h comp-c-include ./usr/include/aarch64/aout_machdep.h comp-c-include @@ -158,11 +158,17 @@ ./usr/include/gcc-9/arm_neon.h comp-obsolete obsolete ./usr/include/gcc-9/tgmath.h comp-obsolete obsolete ./usr/include/gcc-10/arm_acle.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_acle.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_bf16.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_bf16.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_fp16.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_fp16.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_neon.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_neon.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_sve.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_sve.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/tgmath.h comp-c-include gcc=10 +./usr/include/gcc-10/tgmath.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-12/arm_acle.h comp-c-include gcc=12 ./usr/include/gcc-12/arm_bf16.h comp-c-include gcc=12 ./usr/include/gcc-12/arm_fp16.h comp-c-include gcc=12 Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.109 src/distrib/sets/lists/comp/ad.arm:1.110 --- src/distrib/sets/lists/comp/ad.arm:1.109 Tue Aug 29 04:35:26 2023 +++ src/distrib/sets/lists/comp/ad.arm Sat Jun 22 20:17:25 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.109 2023/08/29 04:35:26 mrg Exp $ +# $NetBSD: ad.arm,v 1.110 2024/06/22 20:17:25 riastradh Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/include/acorn26comp-obsolete obsolete ./usr/include/acorn26/ansi.h comp-obsolete obsolete @@ -443,15 +443,25 @@ ./usr/include/gcc-9/mmintrin.h comp-obsolete obsolete ./usr/include/gcc-9/tgmath.h comp-obsolete obsolete ./usr/include/gcc-10/arm_acle.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_acle.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_bf16.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_bf16.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_cde.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_cde.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_cmse.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_cmse.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_fp16.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_fp16.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_mve.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_mve.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_mve_types.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_mve_types.h comp-obsolete obsolete,gcc=12 ./usr/include/gcc-10/arm_neon.h comp-c-include gcc=10 +./usr/include/gcc-10/arm_neon.h
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sat Jun 22 20:10:32 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: doc: update for tmux 3.4 import To generate a diff of this commit: cvs rdiff -u -r1.2015 -r1.2016 src/doc/3RDPARTY cvs rdiff -u -r1.3065 -r1.3066 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/3RDPARTY diff -u src/doc/3RDPARTY:1.2015 src/doc/3RDPARTY:1.2016 --- src/doc/3RDPARTY:1.2015 Thu Jun 20 19:09:22 2024 +++ src/doc/3RDPARTY Sat Jun 22 20:10:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2015 2024/06/20 19:09:22 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.2016 2024/06/22 20:10:32 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1391,12 +1391,12 @@ perhaps this implementation should be ke purposes. Package: tmux -Version: 3.3a -Current Vers: 3.3a +Version: 3.4 +Current Vers: 3.4 Maintainer: Nicholas Marriott Archive site: https://github.com/tmux/tmux Home page: http://tmux.github.io -Date: 2022-06-09 +Date: 2024-06-22 Mailing List: tmux-us...@googlegroups.com Responsible: christos License: BSD Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3065 src/doc/CHANGES:1.3066 --- src/doc/CHANGES:1.3065 Tue Jun 11 15:14:00 2024 +++ src/doc/CHANGES Sat Jun 22 20:10:32 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3065 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3066 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -419,3 +419,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: libarchive: Import libarchive-3.7.4. [christos 20240609] pkg_install: Import pkg_install-20240307. [wiz 20240611] OpenSSL: Imported 3.0.14. [christos 2020611] + tmux(1): Import version 3.4 with Sixel support enabled. [wiz 20240622]
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sat Jun 22 20:10:32 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: doc: update for tmux 3.4 import To generate a diff of this commit: cvs rdiff -u -r1.2015 -r1.2016 src/doc/3RDPARTY cvs rdiff -u -r1.3065 -r1.3066 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/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sat Jun 22 20:08:16 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
Adapt build for tmux 3.4.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.32 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.33
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.32 Thu Jan 4 13:20:22 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sat Jun 22 20:08:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/01/04 13:20:22 uwe Exp $
+# $NetBSD: Makefile,v 1.33 2024/06/22 20:08:16 wiz Exp $
.include
@@ -93,6 +93,9 @@ format.c \
grid-reader.c \
grid-view.c \
grid.c \
+hyperlinks.c \
+image.c \
+image-sixel.c \
input-keys.c \
input.c \
job.c \
@@ -132,6 +135,7 @@ tty-keys.c \
tty-term.c \
tty.c \
utf8.c \
+utf8-combined.c \
window-buffer.c \
window-client.c \
window-clock.c \
@@ -150,6 +154,8 @@ SRCS+= imsg.c
SRCS+= fdforkpty.c
SRCS+= freezero.c
SRCS+= explicit_bzero.c
+SRCS+= htonll.c
+SRCS+= ntohll.c
SRCS+= recallocarray.c
SRCS+= getdtablecount.c
#SRCS+= strtonum.c
@@ -163,7 +169,7 @@ CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
# Would be nicer to stick this in a config.h file, but the upstream code
# does not use one at this moment.
-# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually; HAVE_BSD_GETOPT_H necessary due to local patches
+# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually; HAVE_BSD_GETOPT necessary due to local patches
CPPFLAGS+= \
-DHAVE_ASPRINTF=1 \
-DHAVE_B64_NTOP=1 \
@@ -175,6 +181,7 @@ CPPFLAGS+= \
-DHAVE_CURSES_H=1 \
-DHAVE_DAEMON=1 \
-DHAVE_DIRENT_H=1 \
+-DENABLE_SIXEL=1 \
-DHAVE_EVENT2_EVENT_H=1 \
-DHAVE_FCNTL_CLOSEM=1 \
-DHAVE_FCNTL_H=1 \
@@ -212,6 +219,7 @@ CPPFLAGS+= \
-DHAVE_SYS_STAT_H=1 \
-DHAVE_SYS_TREE_H=1 \
-DHAVE_SYS_TYPES_H=1 \
+-DHAVE_TIPARM=1 \
-DHAVE_TREE_H=1 \
-DHAVE_UNISTD_H=1 \
-DHAVE_UTIL_H=1 \
@@ -220,17 +228,17 @@ CPPFLAGS+= \
-DPACKAGE=\"tmux\" \
-DPACKAGE_BUGREPORT=\"\" \
-DPACKAGE_NAME=\"tmux\" \
--DPACKAGE_STRING=\"tmux\ 3.3a\" \
+-DPACKAGE_STRING=\"tmux\ 3.4\" \
-DPACKAGE_TARNAME=\"tmux\" \
-DPACKAGE_URL=\"\" \
--DPACKAGE_VERSION=\"3.3a\" \
+-DPACKAGE_VERSION=\"3.4\" \
-DSTDC_HEADERS=1 \
-DTMUX_CONF='"/etc/tmux.conf:~/.tmux.conf:$XDG_CONFIG_HOME/tmux/tmux.conf:~/.config/tmux/tmux.conf"' \
+-DTMUX_LOCK_CMD='"lock -np"' \
-DTMUX_TERM='"tmux-256color"' \
--DTMUX_VERSION='"3.3a"' \
--DVERSION=\"3.3a\" \
+-DTMUX_VERSION='"3.4"' \
+-DVERSION=\"3.4\" \
-D_ALL_SOURCE=1 \
--D_FORTIFY_SOURCE=2 \
-D_GNU_SOURCE=1 \
-D_OPENBSD_SOURCE \
-D_POSIX_PTHREAD_SEMANTICS=1 \
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sat Jun 22 20:08:16 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: Adapt build for tmux 3.4. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: wiz Date: Sat Jun 22 20:07:14 UTC 2024 Modified Files: src/external/bsd/tmux/dist: arguments.c client.c cmd-attach-session.c cmd-capture-pane.c cmd-display-menu.c cmd-display-message.c cmd-load-buffer.c cmd-new-session.c cmd-new-window.c cmd-parse.y cmd-paste-buffer.c cmd-queue.c cmd-resize-window.c cmd-send-keys.c cmd-split-window.c colour.c compat.h control.c environ.c format.c grid.c hyperlinks.c image-sixel.c input-keys.c input.c key-bindings.c menu.c mode-tree.c notify.c options.c paste.c proc.c screen-write.c screen.c server-client.c server-fn.c server.c session.c spawn.c status.c style.c tmux.1 tmux.c tmux.h tty-acs.c tty-keys.c tty-term.c tty.c utf8.c window-buffer.c window-client.c window-copy.c window-tree.c window.c src/external/bsd/tmux/dist/compat: imsg-buffer.c imsg.c Log Message: Merge tmux-3.4, adding some build fixes. To generate a diff of this commit: cvs rdiff -u -r1.1.1.12 -r1.2 src/external/bsd/tmux/dist/arguments.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/tmux/dist/client.c \ src/external/bsd/tmux/dist/cmd-display-message.c \ src/external/bsd/tmux/dist/cmd-send-keys.c \ src/external/bsd/tmux/dist/grid.c \ src/external/bsd/tmux/dist/key-bindings.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tmux/dist/cmd-attach-session.c \ src/external/bsd/tmux/dist/cmd-capture-pane.c \ src/external/bsd/tmux/dist/cmd-new-window.c \ src/external/bsd/tmux/dist/cmd-paste-buffer.c \ src/external/bsd/tmux/dist/tty.c src/external/bsd/tmux/dist/window-tree.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/cmd-display-menu.c \ src/external/bsd/tmux/dist/paste.c src/external/bsd/tmux/dist/style.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tmux/dist/cmd-load-buffer.c \ src/external/bsd/tmux/dist/cmd-new-session.c \ src/external/bsd/tmux/dist/cmd-split-window.c \ src/external/bsd/tmux/dist/colour.c src/external/bsd/tmux/dist/environ.c \ src/external/bsd/tmux/dist/server-client.c \ src/external/bsd/tmux/dist/tty-acs.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tmux/dist/cmd-parse.y \ src/external/bsd/tmux/dist/spawn.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tmux/dist/cmd-queue.c \ src/external/bsd/tmux/dist/notify.c \ src/external/bsd/tmux/dist/window-client.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/cmd-resize-window.c \ src/external/bsd/tmux/dist/compat.h src/external/bsd/tmux/dist/control.c \ src/external/bsd/tmux/dist/menu.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/tmux/dist/format.c \ src/external/bsd/tmux/dist/screen-write.c \ src/external/bsd/tmux/dist/screen.c \ src/external/bsd/tmux/dist/server-fn.c \ src/external/bsd/tmux/dist/session.c src/external/bsd/tmux/dist/tmux.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tmux/dist/hyperlinks.c \ src/external/bsd/tmux/dist/image-sixel.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tmux/dist/input-keys.c \ src/external/bsd/tmux/dist/options.c cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tmux/dist/input.c \ src/external/bsd/tmux/dist/tty-keys.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tmux/dist/mode-tree.c \ src/external/bsd/tmux/dist/utf8.c \ src/external/bsd/tmux/dist/window-buffer.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/proc.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tmux/dist/server.c cvs rdiff -u -r1.15 -r1.16 src/external/bsd/tmux/dist/status.c \ src/external/bsd/tmux/dist/window-copy.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/tmux/dist/tmux.1 \ src/external/bsd/tmux/dist/tty-term.c src/external/bsd/tmux/dist/window.c cvs rdiff -u -r1.21 -r1.22 src/external/bsd/tmux/dist/tmux.h cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tmux/dist/compat/imsg-buffer.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tmux/dist/compat/imsg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/tmux/dist
Module Name:src Committed By: wiz Date: Sat Jun 22 20:04:46 UTC 2024 Update of /cvsroot/src/external/bsd/tmux/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23683 Log Message: Import tmux-3.4. Status: Vendor Tag: TMUX Release Tags: tmux-3-4 U src/external/bsd/tmux/dist/Makefile.am U src/external/bsd/tmux/dist/configure U src/external/bsd/tmux/dist/configure.ac U src/external/bsd/tmux/dist/aclocal.m4 U src/external/bsd/tmux/dist/Makefile.in U src/external/bsd/tmux/dist/COPYING U src/external/bsd/tmux/dist/README C src/external/bsd/tmux/dist/cmd-parse.c U src/external/bsd/tmux/dist/alerts.c U src/external/bsd/tmux/dist/arguments.c U src/external/bsd/tmux/dist/attributes.c U src/external/bsd/tmux/dist/cfg.c C src/external/bsd/tmux/dist/client.c C src/external/bsd/tmux/dist/cmd-attach-session.c U src/external/bsd/tmux/dist/cmd-bind-key.c U src/external/bsd/tmux/dist/cmd-break-pane.c C src/external/bsd/tmux/dist/cmd-capture-pane.c U src/external/bsd/tmux/dist/cmd-choose-tree.c U src/external/bsd/tmux/dist/cmd-command-prompt.c U src/external/bsd/tmux/dist/cmd.c U src/external/bsd/tmux/dist/cmd-confirm-before.c U src/external/bsd/tmux/dist/cmd-copy-mode.c U src/external/bsd/tmux/dist/cmd-detach-client.c C src/external/bsd/tmux/dist/cmd-display-menu.c C src/external/bsd/tmux/dist/cmd-display-message.c U src/external/bsd/tmux/dist/cmd-display-panes.c U src/external/bsd/tmux/dist/cmd-find-window.c U src/external/bsd/tmux/dist/cmd-find.c U src/external/bsd/tmux/dist/cmd-if-shell.c U src/external/bsd/tmux/dist/cmd-join-pane.c U src/external/bsd/tmux/dist/cmd-kill-pane.c U src/external/bsd/tmux/dist/cmd-kill-server.c U src/external/bsd/tmux/dist/cmd-kill-session.c U src/external/bsd/tmux/dist/cmd-kill-window.c U src/external/bsd/tmux/dist/cmd-list-buffers.c U src/external/bsd/tmux/dist/cmd-list-clients.c U src/external/bsd/tmux/dist/cmd-list-keys.c U src/external/bsd/tmux/dist/cmd-list-panes.c U src/external/bsd/tmux/dist/cmd-list-sessions.c U src/external/bsd/tmux/dist/cmd-list-windows.c C src/external/bsd/tmux/dist/cmd-load-buffer.c U src/external/bsd/tmux/dist/cmd-lock-server.c U src/external/bsd/tmux/dist/cmd-move-window.c C src/external/bsd/tmux/dist/cmd-new-session.c C src/external/bsd/tmux/dist/cmd-new-window.c C src/external/bsd/tmux/dist/cmd-parse.y C src/external/bsd/tmux/dist/cmd-paste-buffer.c U src/external/bsd/tmux/dist/cmd-pipe-pane.c C src/external/bsd/tmux/dist/cmd-queue.c U src/external/bsd/tmux/dist/cmd-refresh-client.c U src/external/bsd/tmux/dist/cmd-rename-session.c U src/external/bsd/tmux/dist/cmd-rename-window.c U src/external/bsd/tmux/dist/cmd-resize-pane.c C src/external/bsd/tmux/dist/cmd-resize-window.c U src/external/bsd/tmux/dist/cmd-respawn-pane.c U src/external/bsd/tmux/dist/cmd-respawn-window.c U src/external/bsd/tmux/dist/cmd-rotate-window.c U src/external/bsd/tmux/dist/file.c U src/external/bsd/tmux/dist/cmd-run-shell.c U src/external/bsd/tmux/dist/cmd-save-buffer.c U src/external/bsd/tmux/dist/cmd-select-layout.c U src/external/bsd/tmux/dist/cmd-select-pane.c U src/external/bsd/tmux/dist/cmd-select-window.c C src/external/bsd/tmux/dist/cmd-send-keys.c U src/external/bsd/tmux/dist/cmd-server-access.c U src/external/bsd/tmux/dist/cmd-set-buffer.c U src/external/bsd/tmux/dist/cmd-set-environment.c U src/external/bsd/tmux/dist/cmd-set-option.c U src/external/bsd/tmux/dist/cmd-show-environment.c U src/external/bsd/tmux/dist/cmd-show-messages.c U src/external/bsd/tmux/dist/cmd-show-options.c U src/external/bsd/tmux/dist/cmd-show-prompt-history.c U src/external/bsd/tmux/dist/cmd-source-file.c C src/external/bsd/tmux/dist/cmd-split-window.c U src/external/bsd/tmux/dist/cmd-swap-pane.c U src/external/bsd/tmux/dist/cmd-swap-window.c U src/external/bsd/tmux/dist/cmd-switch-client.c U src/external/bsd/tmux/dist/cmd-unbind-key.c U src/external/bsd/tmux/dist/cmd-wait-for.c C src/external/bsd/tmux/dist/colour.c C src/external/bsd/tmux/dist/compat.h U src/external/bsd/tmux/dist/control-notify.c C src/external/bsd/tmux/dist/control.c C src/external/bsd/tmux/dist/environ.c C src/external/bsd/tmux/dist/format.c U src/external/bsd/tmux/dist/format-draw.c U src/external/bsd/tmux/dist/grid-reader.c U src/external/bsd/tmux/dist/grid-view.c C src/external/bsd/tmux/dist/grid.c N src/external/bsd/tmux/dist/hyperlinks.c C src/external/bsd/tmux/dist/input-keys.c C src/external/bsd/tmux/dist/input.c U src/external/bsd/tmux/dist/job.c C src/external/bsd/tmux/dist/key-bindings.c U src/external/bsd/tmux/dist/key-string.c U src/external/bsd/tmux/dist/layout-custom.c U src/external/bsd/tmux/dist/layout-set.c U src/external/bsd/tmux/dist/layout.c U src/external/bsd/tmux/dist/log.c C src/external/bsd/tmux/dist/menu.c C src/external/bsd/tmux/dist/mode-tree.c U src/external/bsd/tmux/dist/names.c C src/external/bsd/tmux/dist/notify.c U src/external/bsd/tmux/dist/options-table.c C src/external/bsd/tmux/dist/options.c C src/external/bsd/tmux/dist/paste.c U
CVS import: src/external/bsd/tmux/dist
Module Name:src Committed By: wiz Date: Sat Jun 22 20:04:46 UTC 2024 Update of /cvsroot/src/external/bsd/tmux/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23683 Log Message: Import tmux-3.4. Status: Vendor Tag: TMUX Release Tags: tmux-3-4 U src/external/bsd/tmux/dist/Makefile.am U src/external/bsd/tmux/dist/configure U src/external/bsd/tmux/dist/configure.ac U src/external/bsd/tmux/dist/aclocal.m4 U src/external/bsd/tmux/dist/Makefile.in U src/external/bsd/tmux/dist/COPYING U src/external/bsd/tmux/dist/README C src/external/bsd/tmux/dist/cmd-parse.c U src/external/bsd/tmux/dist/alerts.c U src/external/bsd/tmux/dist/arguments.c U src/external/bsd/tmux/dist/attributes.c U src/external/bsd/tmux/dist/cfg.c C src/external/bsd/tmux/dist/client.c C src/external/bsd/tmux/dist/cmd-attach-session.c U src/external/bsd/tmux/dist/cmd-bind-key.c U src/external/bsd/tmux/dist/cmd-break-pane.c C src/external/bsd/tmux/dist/cmd-capture-pane.c U src/external/bsd/tmux/dist/cmd-choose-tree.c U src/external/bsd/tmux/dist/cmd-command-prompt.c U src/external/bsd/tmux/dist/cmd.c U src/external/bsd/tmux/dist/cmd-confirm-before.c U src/external/bsd/tmux/dist/cmd-copy-mode.c U src/external/bsd/tmux/dist/cmd-detach-client.c C src/external/bsd/tmux/dist/cmd-display-menu.c C src/external/bsd/tmux/dist/cmd-display-message.c U src/external/bsd/tmux/dist/cmd-display-panes.c U src/external/bsd/tmux/dist/cmd-find-window.c U src/external/bsd/tmux/dist/cmd-find.c U src/external/bsd/tmux/dist/cmd-if-shell.c U src/external/bsd/tmux/dist/cmd-join-pane.c U src/external/bsd/tmux/dist/cmd-kill-pane.c U src/external/bsd/tmux/dist/cmd-kill-server.c U src/external/bsd/tmux/dist/cmd-kill-session.c U src/external/bsd/tmux/dist/cmd-kill-window.c U src/external/bsd/tmux/dist/cmd-list-buffers.c U src/external/bsd/tmux/dist/cmd-list-clients.c U src/external/bsd/tmux/dist/cmd-list-keys.c U src/external/bsd/tmux/dist/cmd-list-panes.c U src/external/bsd/tmux/dist/cmd-list-sessions.c U src/external/bsd/tmux/dist/cmd-list-windows.c C src/external/bsd/tmux/dist/cmd-load-buffer.c U src/external/bsd/tmux/dist/cmd-lock-server.c U src/external/bsd/tmux/dist/cmd-move-window.c C src/external/bsd/tmux/dist/cmd-new-session.c C src/external/bsd/tmux/dist/cmd-new-window.c C src/external/bsd/tmux/dist/cmd-parse.y C src/external/bsd/tmux/dist/cmd-paste-buffer.c U src/external/bsd/tmux/dist/cmd-pipe-pane.c C src/external/bsd/tmux/dist/cmd-queue.c U src/external/bsd/tmux/dist/cmd-refresh-client.c U src/external/bsd/tmux/dist/cmd-rename-session.c U src/external/bsd/tmux/dist/cmd-rename-window.c U src/external/bsd/tmux/dist/cmd-resize-pane.c C src/external/bsd/tmux/dist/cmd-resize-window.c U src/external/bsd/tmux/dist/cmd-respawn-pane.c U src/external/bsd/tmux/dist/cmd-respawn-window.c U src/external/bsd/tmux/dist/cmd-rotate-window.c U src/external/bsd/tmux/dist/file.c U src/external/bsd/tmux/dist/cmd-run-shell.c U src/external/bsd/tmux/dist/cmd-save-buffer.c U src/external/bsd/tmux/dist/cmd-select-layout.c U src/external/bsd/tmux/dist/cmd-select-pane.c U src/external/bsd/tmux/dist/cmd-select-window.c C src/external/bsd/tmux/dist/cmd-send-keys.c U src/external/bsd/tmux/dist/cmd-server-access.c U src/external/bsd/tmux/dist/cmd-set-buffer.c U src/external/bsd/tmux/dist/cmd-set-environment.c U src/external/bsd/tmux/dist/cmd-set-option.c U src/external/bsd/tmux/dist/cmd-show-environment.c U src/external/bsd/tmux/dist/cmd-show-messages.c U src/external/bsd/tmux/dist/cmd-show-options.c U src/external/bsd/tmux/dist/cmd-show-prompt-history.c U src/external/bsd/tmux/dist/cmd-source-file.c C src/external/bsd/tmux/dist/cmd-split-window.c U src/external/bsd/tmux/dist/cmd-swap-pane.c U src/external/bsd/tmux/dist/cmd-swap-window.c U src/external/bsd/tmux/dist/cmd-switch-client.c U src/external/bsd/tmux/dist/cmd-unbind-key.c U src/external/bsd/tmux/dist/cmd-wait-for.c C src/external/bsd/tmux/dist/colour.c C src/external/bsd/tmux/dist/compat.h U src/external/bsd/tmux/dist/control-notify.c C src/external/bsd/tmux/dist/control.c C src/external/bsd/tmux/dist/environ.c C src/external/bsd/tmux/dist/format.c U src/external/bsd/tmux/dist/format-draw.c U src/external/bsd/tmux/dist/grid-reader.c U src/external/bsd/tmux/dist/grid-view.c C src/external/bsd/tmux/dist/grid.c N src/external/bsd/tmux/dist/hyperlinks.c C src/external/bsd/tmux/dist/input-keys.c C src/external/bsd/tmux/dist/input.c U src/external/bsd/tmux/dist/job.c C src/external/bsd/tmux/dist/key-bindings.c U src/external/bsd/tmux/dist/key-string.c U src/external/bsd/tmux/dist/layout-custom.c U src/external/bsd/tmux/dist/layout-set.c U src/external/bsd/tmux/dist/layout.c U src/external/bsd/tmux/dist/log.c C src/external/bsd/tmux/dist/menu.c C src/external/bsd/tmux/dist/mode-tree.c U src/external/bsd/tmux/dist/names.c C src/external/bsd/tmux/dist/notify.c U src/external/bsd/tmux/dist/options-table.c C src/external/bsd/tmux/dist/options.c C src/external/bsd/tmux/dist/paste.c U
CVS commit: [netbsd-10] src/doc
Module Name:src
Committed By: martin
Date: Sat Jun 22 18:33:21 UTC 2024
Modified Files:
src/doc [netbsd-10]: CHANGES-10.1
Log Message:
Tickets #699 - #724, #726
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-10.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-10.1
diff -u src/doc/CHANGES-10.1:1.1.2.12 src/doc/CHANGES-10.1:1.1.2.13
--- src/doc/CHANGES-10.1:1.1.2.12 Mon Jun 17 18:09:35 2024
+++ src/doc/CHANGES-10.1 Sat Jun 22 18:33:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.1,v 1.1.2.12 2024/06/17 18:09:35 martin Exp $
+# $NetBSD: CHANGES-10.1,v 1.1.2.13 2024/06/22 18:33:21 martin Exp $
A complete list of changes from the NetBSD 10.0 release on 2024-03-28
until the 10.1 release:
@@ -330,3 +330,243 @@ sys/arch/sgimips/sgimips/machdep.c 1.15
sgimips: PR 58269: call mips_vector_init earlier to fix boot.
[skrll, ticket #695]
+external/bsd/tre/dist/src/agrep.c 1.5,1.6
+
+ agrep(1): PR 53513: rewrite check for binary files.
+ [andvar, ticket #699]
+
+distrib/sets/lists/man/mi 1.1773 (adapted)
+share/man/man4/man4.i386/Makefile 1.81
+share/man/man4/man4.i386/viac7temp.4 delete
+share/man/man4/man4.x86/Makefile 1.24
+share/man/man4/man4.x86/viac7temp.4 1.1
+sys/arch/amd64/conf/ALL1.188
+sys/arch/amd64/conf/GENERIC 1.612
+sys/arch/i386/conf/ALL1.519
+sys/arch/i386/conf/GENERIC 1.1256
+sys/arch/x86/x86/viac7temp.c 1.11
+
+ viac7temp(4): rewrite temperature sensor to read value from MSR.
+ Add the driver to amd64 GENERIC.
+ [andvar, ticket #700]
+
+
+sys/arch/x86/x86/fpu.c1.88
+
+ xen: workaround panic "fpudna from userland" on i386 Xen PV domU.
+ [manu, ticket #701]
+
+sys/dev/usb/if_urtwn.c1.108
+sys/dev/usb/usbdevs1.812
+sys/dev/usb/usbdevs.h(regen)
+sys/dev/usb/usbdevs_data.h (regen)
+
+ urtwn(4): PR 57819: add Mercusys and Mercusys MW150USV2 support.
+ [nia, ticket #702]
+
+usr.bin/aiomixer/main.c1.6
+
+ aiomixer(1): fix setting volume on sb(4) emulated in QEMU.
+ [nia, ticket #703]
+
+usr.bin/ftp/ftp.11.154
+
+ ftp.1: drop a sentence that's no longer accurate.
+ [gutteridge, ticket #704]
+
+distrib/sets/lists/base/mi 1.1345
+external/public-domain/tz/share/zoneinfo/Makefile 1.5
+
+ Install /usr/share/zoneinfo/leap-seconds.list.
+ [kre, ticket #705]
+
+sys/fs/msdosfs/msdosfs_rename.c 1.4
+
+ PR 58146: fix msdosfs rename crash in RUMP.
+ [rhialto, ticket #706]
+
+sys/arch/macppc/macppc/mainbus.c 1.26
+
+ macppc: PR 57394: check for proper error value from OF_finddevice().
+ [tsutsui, ticket #707]
+
+sys/arch/mac68k/dev/aed.c 1.39
+sys/arch/macppc/dev/aed.c 1.35
+
+ mac68k/macppc: PR 58303: fix passing of emulated 2nd and 3rd button
+ events to the corresponding adb mouse.
+ [nat, ticket #708]
+
+crypto/external/bsd/openssh/bin/Makefile.inc 1.5
+
+ openssh: use ${EXTERNAL_OPENSSL_SUBDIR} instead of hard-coded
+ `openssl`.
+ [rin, ticket #709]
+
+usr.sbin/envstat/prog_ops.h 1.3
+usr.sbin/powerd/prog_ops.h 1.2
+usr.sbin/traceroute/prog_ops.h 1.3
+
+ envstat(8), powerd(8), traceroute(8): add support to CRUNCHOPS
+ to enable building rump-fied programs as crunched binaries.
+ [rin, ticket #710]
+
+lib/libpthread/pthread.c 1.185
+
+ libpthread: PR 57831: fix resource leak in pthread_create().
+ [hannken, ticket #711]
+
+sys/dev/mii/miidevs1.169-1.171
+sys/dev/mii/miidevs.h(regen)
+sys/dev/mii/miidevs_data.h (regen)
+
+ miidevs: Add MaxLinear GPY21[125] 2.5G PHY and
+ GPY115 Gigabit PHY.
+ [msaitoh, ticket #712]
+
+sys/dev/pci/igc/if_igc.c 1.7-1.9,1.14
+
+ igc(4):
+ - Fix build of the MODULAR kernel, which explicitly excludes vlans.
+ - Notify which of 64- or 32-bit DMA is used
+ - Cleanup
+ [rin, ticket #713]
+
+sys/dev/clk/clk.c1.8
+
+ clk(4): clk_set_rate: Add KASSERT to check `clk != NULL`
+ [rin, ticket #714]
+
+sys/dev/fdt/fdt_powerdomain.c 1.2
+
+ fdt_powerdomain: fix out of bounds data access in the "all"
+ (index -1) case.
+ [rin, ticket #715]
+
+sys/lib/libsa/netif.c1.27
+
+ libsa: do not panic when the requested NIC is not available.
+ [rin, ticket #716]
+
+sys/arch/x86/x86/coretemp.c 1.40,1.41
+
+ coretemp(4): do not accept impossibly low TjMax values.
+ [gutteridge, ticket #717]
+
+sys/dev/pckbport/synaptics.c 1.83
+
+ pms(4): PR 57874: fix synaptics capability parsing to
+ unbreak old devices.
+ [gutteridge, ticket #718]
+
+etc/etc.aarch64/MAKEDEV.conf 1.10
+etc/etc.amd64/MAKEDEV.conf 1.36
+etc/etc.i386/MAKEDEV.conf 1.36
+
+ Fix some missing device nodes. PRs 58093, 58100, 58101 and 58102.
+ [skrll, ticket #719]
+
+xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c 1.2
+
+ PR 58321: make sure we fill in the name field in generated/
+ converted modes.
+ [tsutsui, ticket #720]
+
+external/gpl3/gcc.old/dist/gcc/doc/gcc.info 1.15
+external/gpl3/gcc.old/dist/gcc/doc/gcc.texi 1.13
+ (applied to external/gpl3/gcc)
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sat Jun 22 18:33:21 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #699 - #724, #726 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/xen/xen
Module Name:src
Committed By: martin
Date: Sat Jun 22 18:30:13 UTC 2024
Modified Files:
src/sys/arch/xen/xen [netbsd-10]: xbdback_xenbus.c
Log Message:
Pull up the following, requested by bouyer in ticket #726:
sys/arch/xen/xen/xbdback_xenbus.c upto 1.107
Restore "sparse" segements support which was lost in rev 1.83, causing
VBD corruption with linux guests.
The segments in a single request are not always contigous in VA; this means
that the end of a segment is not always 7 and the start of the next one is not
always 0. When this happens this means that a contigous chunk of data from
disk has to be dispatched to various non-contigous VA, in chunks of VBD_BSIZE
bytes (or the other way round for writes).
Linux I/O subsystems seems to support this natively; to emulate this allocate
a MAXPHYS bounce buffer to do the I/O and then memcpy() the data from/to
the segments as requested. If the request is contigous do the I/O
directly to the mapped VA.
This means that we need to keep segments details until iodone(); so move
the blkif_request_segment array from xbdback_instance to xbdback_io. The
array is allocated separately to guarantee proper page alignement.
non-contigous segments seems rare so allocate one bounce buffer per
xbdback_instance, and stall the ring if the bounce buffer is already in use.
For this add back a mechanism to restart an I/O at a specific point
after thread sleep/wakeup.
While there guard some more printfs with ratecheck() and add more checks on
segments bounds.
Tested with a HVM scientific linux install from iso image; the install would
fail with a xfs corruption when installing grub.
(Plus mostly cosmetic/minor changes.)
To generate a diff of this commit:
cvs rdiff -u -r1.101.4.1 -r1.101.4.2 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.101.4.1 src/sys/arch/xen/xen/xbdback_xenbus.c:1.101.4.2
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.101.4.1 Mon Jul 31 15:23:02 2023
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Sat Jun 22 18:30:13 2024
@@ -1,7 +1,7 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.101.4.1 2023/07/31 15:23:02 martin Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.101.4.2 2024/06/22 18:30:13 martin Exp $ */
/*
- * Copyright (c) 2006 Manuel Bouyer.
+ * Copyright (c) 2006,2024 Manuel Bouyer.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.101.4.1 2023/07/31 15:23:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.101.4.2 2024/06/22 18:30:13 martin Exp $");
#include
#include
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbdback_xenb
#define VBD_MAXSECT ((PAGE_SIZE / VBD_BSIZE) - 1)
#define VBD_VA_SIZE MAXPHYS
-#define VBD_MAX_INDIRECT_SEGMENTS VBD_VA_SIZE >> PAGE_SHIFT
+#define VBD_MAX_INDIRECT_SEGMENTS (VBD_VA_SIZE >> PAGE_SHIFT)
CTASSERT(XENSHM_MAX_PAGES_PER_REQUEST >= VBD_MAX_INDIRECT_SEGMENTS);
@@ -100,6 +100,10 @@ typedef enum {WAITING, RUN, DISCONNECTIN
* condition before it starts processing requests again from where it left.
* Continuation state is "stored" in the xbdback instance (xbdi_cont),
* and should only be manipulated by the instance thread.
+ * If a continuation has to be restarted from a specific point,
+ * the callback and argument can be stored in xbdi_cont_restart and
+ * xbdi_cont_restart_obj
+ *
*
* As xbdback(4) has to handle different sort of asynchronous events (Xen
* event channels, biointr() soft interrupts, xenbus commands), the xbdi_lock
@@ -111,9 +115,7 @@ typedef enum {WAITING, RUN, DISCONNECTIN
* xbdback_co_main()
*| --> xbdback_co_cache_flush()
*| ||
- *| |-> xbdback_co_cache_doflush() or NULL
- *| ||
- *| |-> xbdback_co_do_io()
+ *| |-> xbdback_co_do_io() or NULL
* xbdback_co_main_loop()-|
*| |-> xbdback_co_main_done2() or NULL
*| |
@@ -121,9 +123,7 @@ typedef enum {WAITING, RUN, DISCONNECTIN
*|
* xbdback_co_io() -> xbdback_co_main_incr() -> xbdback_co_main_loop()
*|
- * xbdback_co_io_gotio() -> xbdback_map_shm()
- *| |
- *| xbdback_co_main_incr() -> xbdback_co_main_loop()
+ * xbdback_co_io_gotio() -> xbdback_co_main_incr() -> xbdback_co_main_loop()
*|
* xbdback_co_do_io()
*|
@@ -152,8 +152,12 @@ struct xbdback_io {
SLIST_ENTRY(xbdback_io) xio_next;
/* The instance pointer is duplicated for convenience. */
struct
CVS commit: [netbsd-10] src/sys/arch/xen/xen
Module Name:src Committed By: martin Date: Sat Jun 22 18:30:13 UTC 2024 Modified Files: src/sys/arch/xen/xen [netbsd-10]: xbdback_xenbus.c Log Message: Pull up the following, requested by bouyer in ticket #726: sys/arch/xen/xen/xbdback_xenbus.c upto 1.107 Restore "sparse" segements support which was lost in rev 1.83, causing VBD corruption with linux guests. The segments in a single request are not always contigous in VA; this means that the end of a segment is not always 7 and the start of the next one is not always 0. When this happens this means that a contigous chunk of data from disk has to be dispatched to various non-contigous VA, in chunks of VBD_BSIZE bytes (or the other way round for writes). Linux I/O subsystems seems to support this natively; to emulate this allocate a MAXPHYS bounce buffer to do the I/O and then memcpy() the data from/to the segments as requested. If the request is contigous do the I/O directly to the mapped VA. This means that we need to keep segments details until iodone(); so move the blkif_request_segment array from xbdback_instance to xbdback_io. The array is allocated separately to guarantee proper page alignement. non-contigous segments seems rare so allocate one bounce buffer per xbdback_instance, and stall the ring if the bounce buffer is already in use. For this add back a mechanism to restart an I/O at a specific point after thread sleep/wakeup. While there guard some more printfs with ratecheck() and add more checks on segments bounds. Tested with a HVM scientific linux install from iso image; the install would fail with a xfs corruption when installing grub. (Plus mostly cosmetic/minor changes.) To generate a diff of this commit: cvs rdiff -u -r1.101.4.1 -r1.101.4.2 src/sys/arch/xen/xen/xbdback_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Jun 22 18:23:25 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1845 - #1848 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-9.5 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.5 diff -u src/doc/CHANGES-9.5:1.1.2.5 src/doc/CHANGES-9.5:1.1.2.6 --- src/doc/CHANGES-9.5:1.1.2.5 Mon Jun 17 18:10:13 2024 +++ src/doc/CHANGES-9.5 Sat Jun 22 18:23:25 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.5,v 1.1.2.5 2024/06/17 18:10:13 martin Exp $ +# $NetBSD: CHANGES-9.5,v 1.1.2.6 2024/06/22 18:23:25 martin Exp $ A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 release: @@ -65,3 +65,28 @@ share/man/man4/eap.41.18-1.20 eap(4): improve man page. [nia, ticket #1844] +external/bsd/tre/dist/src/agrep.c 1.5,1.6 (patch) + + agrep(1): PR 53513: rewrite check for binary files. + [andvar, ticket #1845] + +sys/dev/usb/if_urtwn.c1.108 +sys/dev/usb/usbdevs1.812 +sys/dev/usb/usbdevs.h(regen) +sys/dev/usb/usbdevs_data.h (regen) + + urtwn(4): PR 57819: add Mercusys and Mercusys MW150USV2 support. + [nia, ticket #1846] + +sys/arch/mac68k/dev/aed.c 1.39 +sys/arch/macppc/dev/aed.c 1.35 + + mac68k/macppc: PR 58303: fix passing of emulated 2nd and 3rd button + events to the corresponding adb mouse. + [nat, ticket #1847] + +sys/arch/x86/x86/coretemp.c 1.40,1.41 + + coretemp(4): do not accept impossibly low TjMax values. + [gutteridge, ticket #1848] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Jun 22 18:23:25 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1845 - #1848 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-9.5 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: mrg Date: Sat Jun 22 17:59:49 UTC 2024 Modified Files: src/distrib/sets/lists/xserver: md.alpha src/external/mit/xorg/server/drivers: Makefile Log Message: fix alpha builds with xorg-server 21.3. the s3, tga, and trident drivers are not ported to newer xorg-server so mark them as xorg 1.10 only, and obsolete with newer. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.109 -r1.110 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Jun 22 17:59:49 UTC 2024 Modified Files: src/distrib/sets/lists/xserver: md.alpha src/external/mit/xorg/server/drivers: Makefile Log Message: fix alpha builds with xorg-server 21.3. the s3, tga, and trident drivers are not ported to newer xorg-server so mark them as xorg 1.10 only, and obsolete with newer. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.109 -r1.110 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xserver/md.alpha diff -u src/distrib/sets/lists/xserver/md.alpha:1.63 src/distrib/sets/lists/xserver/md.alpha:1.64 --- src/distrib/sets/lists/xserver/md.alpha:1.63 Sun Jan 28 06:20:02 2024 +++ src/distrib/sets/lists/xserver/md.alpha Sat Jun 22 17:59:49 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.63 2024/01/28 06:20:02 tsutsui Exp $ +# $NetBSD: md.alpha,v 1.64 2024/06/22 17:59:49 mrg Exp $ ./usr/X11R7/bin/X xserver-xorg-server-bin xorg ./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg ./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg @@ -82,8 +82,10 @@ ./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 xserver-xf86-video-radeon-kms-drivers xorg ./usr/X11R7/lib/modules/drivers/radeonhd_drv.so xserver-obsolete xorg,obsolete ./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 xserver-obsolete xorg,obsolete -./usr/X11R7/lib/modules/drivers/s3_drv.so xserver-xf86-video-s3-drivers xorg -./usr/X11R7/lib/modules/drivers/s3_drv.so.0 xserver-xf86-video-s3-drivers xorg +./usr/X11R7/lib/modules/drivers/s3_drv.so xserver-xf86-video-s3-drivers xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/s3_drv.so.0 xserver-xf86-video-s3-drivers xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/s3_drv.so xserver-xf86-video-s3-drivers xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/drivers/s3_drv.so.0 xserver-xf86-video-s3-drivers xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/drivers/s3virge_drv.so xserver-xf86-video-s3virge-drivers xorg ./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 xserver-xf86-video-s3virge-drivers xorg ./usr/X11R7/lib/modules/drivers/savage_drv.so xserver-xf86-video-savage-drivers xorg @@ -94,10 +96,14 @@ ./usr/X11R7/lib/modules/drivers/sis_drv.so.0 xserver-xf86-video-sis-drivers xorg ./usr/X11R7/lib/modules/drivers/tdfx_drv.so xserver-xf86-video-tdfx-drivers xorg ./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 xserver-xf86-video-tdfx-drivers xorg -./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-xf86-video-tga-drivers xorg -./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg -./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg -./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg +./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-xf86-video-tga-drivers xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-xf86-video-tga-drivers xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/drivers/tseng_drv.so xserver-xf86-video-tseng-drivers xorg ./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 xserver-xf86-video-tseng-drivers xorg ./usr/X11R7/lib/modules/drivers/vga_drv.so xserver-obsolete obsolete @@ -396,13 +402,15 @@ ./usr/X11R7/man/man4/r128.4xserver-xf86-video-r128-man .man,xorg ./usr/X11R7/man/man4/radeon.4xserver-xf86-video-radeon-kms-man .man,xorg ./usr/X11R7/man/man4/radeonhd.4xserver-obsolete .man,xorg,obsolete -./usr/X11R7/man/man4/s3.4xserver-xf86-video-s3-man .man,xorg +./usr/X11R7/man/man4/s3.4xserver-xf86-video-s3-man .man,xorg,xorg_server_ver=110 +./usr/X11R7/man/man4/s3.4xserver-xf86-video-s3-man .man,xorg,xorg_server_ver=120,obsolete ./usr/X11R7/man/man4/s3virge.4xserver-xf86-video-s3virge-man .man,xorg ./usr/X11R7/man/man4/savage.4xserver-xf86-video-savage-man .man,xorg ./usr/X11R7/man/man4/siliconmotion.4 xserver-xf86-video-siliconmotion-man .man,xorg ./usr/X11R7/man/man4/sis.4xserver-xf86-video-sis-man .man,xorg ./usr/X11R7/man/man4/tdfx.4xserver-xf86-video-tdfx-man
Re: CVS commit: src/external/mit/libcbor/lib
On Saturday, June 22, 2024 3:36:54 PM GMT+2 Taylor R Campbell wrote: > Module Name: src > Committed By: riastradh > Date: Sat Jun 22 13:36:54 UTC 2024 > > Modified Files: > src/external/mit/libcbor/lib: Makefile > > Log Message: > libcbor: Fix make dependencies on configuration.h. > > PR lib/58359 > > > To generate a diff of this commit: > cvs rdiff -u -r1.3 -r1.4 src/external/mit/libcbor/lib/Makefile The correct approach is IMO to use DPADD to ensure that the file is generated in the depends phase and let regular *.d do the rest for any rebuilds. Joerg
CVS commit: src/external/mit/libcbor/lib
Module Name:src
Committed By: riastradh
Date: Sat Jun 22 13:36:54 UTC 2024
Modified Files:
src/external/mit/libcbor/lib: Makefile
Log Message:
libcbor: Fix make dependencies on configuration.h.
PR lib/58359
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/libcbor/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/libcbor/lib/Makefile
diff -u src/external/mit/libcbor/lib/Makefile:1.3 src/external/mit/libcbor/lib/Makefile:1.4
--- src/external/mit/libcbor/lib/Makefile:1.3 Wed Mar 4 17:22:49 2020
+++ src/external/mit/libcbor/lib/Makefile Sat Jun 22 13:36:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/03/04 17:22:49 christos Exp $
+# $NetBSD: Makefile,v 1.4 2024/06/22 13:36:54 riastradh Exp $
NOLINT=
NOMAN=
@@ -92,7 +92,7 @@ SHLIB_MINOR=5
.include
-${OBJS}: cbor/configuration.h
+${ALLOBJS}: cbor/configuration.h
cbor/configuration.h: ${VERS_FILE}
@mkdir -p cbor && ( \
CVS commit: src/external/mit/libcbor/lib
Module Name:src Committed By: riastradh Date: Sat Jun 22 13:36:54 UTC 2024 Modified Files: src/external/mit/libcbor/lib: Makefile Log Message: libcbor: Fix make dependencies on configuration.h. PR lib/58359 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/libcbor/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Sat Jun 22 11:11:53 UTC 2024
Modified Files:
src/share/mk [netbsd-10]: bsd.kmodule.mk
src/sys/arch/aarch64/aarch64 [netbsd-10]: netbsd32_machdep_13.c
netbsd32_machdep_16.c
src/sys/arch/mips/mips [netbsd-10]: netbsd32_machdep_13.c
netbsd32_machdep_16.c
src/sys/arch/powerpc/powerpc [netbsd-10]: compat_13_machdep.c
compat_16_machdep.c
src/sys/arch/sun2/sun2 [netbsd-10]: enable.h genassym.cf
src/sys/modules/compat_13 [netbsd-10]: Makefile
src/sys/modules/compat_16 [netbsd-10]: Makefile
src/sys/modules/compat_netbsd32_13 [netbsd-10]: Makefile
src/sys/modules/compat_netbsd32_16 [netbsd-10]: Makefile
Added Files:
src/sys/modules [netbsd-10]: Makefile.compat
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #724):
sys/modules/compat_netbsd32_16/Makefile: revision 1.5
sys/arch/powerpc/powerpc/compat_16_machdep.c: revision 1.25
sys/arch/powerpc/powerpc/compat_16_machdep.c: revision 1.26
sys/modules/compat_16/Makefile: revision 1.3
sys/modules/compat_netbsd32_13/Makefile: revision 1.5
sys/modules/compat_16/Makefile: revision 1.4
sys/arch/sun2/sun2/genassym.cf: revision 1.17
sys/arch/sun2/sun2/enable.h: revision 1.5
sys/modules/compat_13/Makefile: revision 1.3
sys/modules/compat_13/Makefile: revision 1.4
sys/modules/compat_13/Makefile: revision 1.5
sys/arch/mips/mips/netbsd32_machdep_16.c: revision 1.8
sys/modules/Makefile.compat: revision 1.1
sys/arch/mips/mips/netbsd32_machdep_13.c: revision 1.4
share/mk/bsd.kmodule.mk: revision 1.86
sys/arch/aarch64/aarch64/netbsd32_machdep_16.c: revision 1.4
sys/arch/powerpc/powerpc/compat_13_machdep.c: revision 1.23
sys/arch/aarch64/aarch64/netbsd32_machdep_13.c: revision 1.4
Import AFLAGS to allow processing of assembler files in modules.
Prerequisite for kern/583346.
Introduce sys/modules/Makefile.compat and hook some compat_1[36]
machdep code into the modules. kern/58346
Ooops missed a source file!
Proteect #include of kernel options files with #ifdef _KERNEL_OPT
XXX Add to existing 10.0 and 9.0 tickets for kern/583346
Include required headers
Add required include for compat_16 machdep code
fix the m68k compat_13 build.
include Makefile.assym to generate assym.h.
use -I. and -x assembler-with-cpp to actually use cpp and find assym.h.
also apply m68k assym.h fix here as well as compat_13.
powerpc64: Provide dummy stubs for compat1[36]
as done for amd64. We haven't had working userland for powerpc64,
and therefore compatible to 1.[36] is only useful for netbsd32.
Fix build failure for evbppc64 for PR kern/58346 (my bug!).
sun2/genassym.cf: Skip KERNBASE for _MODULE
as it is not a compile-time constant; see sun2/vmparam.h.
It should not be, and is not actually, used for modules.
PR kern/58346
sun2/enable.h: Fix -Wold-style-definition for WARNS=5 build as modules
Finally fix sun2 build for PR kern/58346
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.81.2.1 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.3 -r1.3.4.1 \
src/sys/arch/aarch64/aarch64/netbsd32_machdep_13.c \
src/sys/arch/aarch64/aarch64/netbsd32_machdep_16.c
cvs rdiff -u -r1.3 -r1.3.26.1 src/sys/arch/mips/mips/netbsd32_machdep_13.c
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/mips/mips/netbsd32_machdep_16.c
cvs rdiff -u -r1.22 -r1.22.4.1 \
src/sys/arch/powerpc/powerpc/compat_13_machdep.c
cvs rdiff -u -r1.23 -r1.23.4.1 \
src/sys/arch/powerpc/powerpc/compat_16_machdep.c
cvs rdiff -u -r1.4 -r1.4.118.1 src/sys/arch/sun2/sun2/enable.h
cvs rdiff -u -r1.14 -r1.14.24.1 src/sys/arch/sun2/sun2/genassym.cf
cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/Makefile.compat
cvs rdiff -u -r1.2 -r1.2.32.1 src/sys/modules/compat_13/Makefile
cvs rdiff -u -r1.2 -r1.2.32.1 src/sys/modules/compat_16/Makefile
cvs rdiff -u -r1.4 -r1.4.26.1 src/sys/modules/compat_netbsd32_13/Makefile
cvs rdiff -u -r1.4 -r1.4.26.1 src/sys/modules/compat_netbsd32_16/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.81 src/share/mk/bsd.kmodule.mk:1.81.2.1
--- src/share/mk/bsd.kmodule.mk:1.81 Sun Aug 7 23:42:09 2022
+++ src/share/mk/bsd.kmodule.mk Sat Jun 22 11:11:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.81 2022/08/07 23:42:09 riastradh Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.81.2.1 2024/06/22 11:11:53 martin Exp $
# We are not building this with PIE
MKPIE=no
@@ -31,6 +31,7 @@ CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -i
CPPFLAGS+= -isystem ${S}/../common/include
CPPFLAGS+= -D_KERNEL -D_MODULE -DSYSCTL_INCLUDE_DESCR
CPPFLAGS+= ${${MKDTRACE:Uno} != "no" :? -DKDTRACE_HOOKS :}
+AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sat Jun 22 11:11:53 UTC 2024 Modified Files: src/share/mk [netbsd-10]: bsd.kmodule.mk src/sys/arch/aarch64/aarch64 [netbsd-10]: netbsd32_machdep_13.c netbsd32_machdep_16.c src/sys/arch/mips/mips [netbsd-10]: netbsd32_machdep_13.c netbsd32_machdep_16.c src/sys/arch/powerpc/powerpc [netbsd-10]: compat_13_machdep.c compat_16_machdep.c src/sys/arch/sun2/sun2 [netbsd-10]: enable.h genassym.cf src/sys/modules/compat_13 [netbsd-10]: Makefile src/sys/modules/compat_16 [netbsd-10]: Makefile src/sys/modules/compat_netbsd32_13 [netbsd-10]: Makefile src/sys/modules/compat_netbsd32_16 [netbsd-10]: Makefile Added Files: src/sys/modules [netbsd-10]: Makefile.compat Log Message: Pull up following revision(s) (requested by pgoyette in ticket #724): sys/modules/compat_netbsd32_16/Makefile: revision 1.5 sys/arch/powerpc/powerpc/compat_16_machdep.c: revision 1.25 sys/arch/powerpc/powerpc/compat_16_machdep.c: revision 1.26 sys/modules/compat_16/Makefile: revision 1.3 sys/modules/compat_netbsd32_13/Makefile: revision 1.5 sys/modules/compat_16/Makefile: revision 1.4 sys/arch/sun2/sun2/genassym.cf: revision 1.17 sys/arch/sun2/sun2/enable.h: revision 1.5 sys/modules/compat_13/Makefile: revision 1.3 sys/modules/compat_13/Makefile: revision 1.4 sys/modules/compat_13/Makefile: revision 1.5 sys/arch/mips/mips/netbsd32_machdep_16.c: revision 1.8 sys/modules/Makefile.compat: revision 1.1 sys/arch/mips/mips/netbsd32_machdep_13.c: revision 1.4 share/mk/bsd.kmodule.mk: revision 1.86 sys/arch/aarch64/aarch64/netbsd32_machdep_16.c: revision 1.4 sys/arch/powerpc/powerpc/compat_13_machdep.c: revision 1.23 sys/arch/aarch64/aarch64/netbsd32_machdep_13.c: revision 1.4 Import AFLAGS to allow processing of assembler files in modules. Prerequisite for kern/583346. Introduce sys/modules/Makefile.compat and hook some compat_1[36] machdep code into the modules. kern/58346 Ooops missed a source file! Proteect #include of kernel options files with #ifdef _KERNEL_OPT XXX Add to existing 10.0 and 9.0 tickets for kern/583346 Include required headers Add required include for compat_16 machdep code fix the m68k compat_13 build. include Makefile.assym to generate assym.h. use -I. and -x assembler-with-cpp to actually use cpp and find assym.h. also apply m68k assym.h fix here as well as compat_13. powerpc64: Provide dummy stubs for compat1[36] as done for amd64. We haven't had working userland for powerpc64, and therefore compatible to 1.[36] is only useful for netbsd32. Fix build failure for evbppc64 for PR kern/58346 (my bug!). sun2/genassym.cf: Skip KERNBASE for _MODULE as it is not a compile-time constant; see sun2/vmparam.h. It should not be, and is not actually, used for modules. PR kern/58346 sun2/enable.h: Fix -Wold-style-definition for WARNS=5 build as modules Finally fix sun2 build for PR kern/58346 To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.81.2.1 src/share/mk/bsd.kmodule.mk cvs rdiff -u -r1.3 -r1.3.4.1 \ src/sys/arch/aarch64/aarch64/netbsd32_machdep_13.c \ src/sys/arch/aarch64/aarch64/netbsd32_machdep_16.c cvs rdiff -u -r1.3 -r1.3.26.1 src/sys/arch/mips/mips/netbsd32_machdep_13.c cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/mips/mips/netbsd32_machdep_16.c cvs rdiff -u -r1.22 -r1.22.4.1 \ src/sys/arch/powerpc/powerpc/compat_13_machdep.c cvs rdiff -u -r1.23 -r1.23.4.1 \ src/sys/arch/powerpc/powerpc/compat_16_machdep.c cvs rdiff -u -r1.4 -r1.4.118.1 src/sys/arch/sun2/sun2/enable.h cvs rdiff -u -r1.14 -r1.14.24.1 src/sys/arch/sun2/sun2/genassym.cf cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/Makefile.compat cvs rdiff -u -r1.2 -r1.2.32.1 src/sys/modules/compat_13/Makefile cvs rdiff -u -r1.2 -r1.2.32.1 src/sys/modules/compat_16/Makefile cvs rdiff -u -r1.4 -r1.4.26.1 src/sys/modules/compat_netbsd32_13/Makefile cvs rdiff -u -r1.4 -r1.4.26.1 src/sys/modules/compat_netbsd32_16/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jun 22 11:01:18 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: pcireg.h Log Message: Pull up following revision(s) (requested by rin in ticket #723): sys/dev/pci/pcireg.h: revision 1.171 PCI_CLASS_MASK: Use unsigned to avoid undefined behavior. Found by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.168.2.1 src/sys/dev/pci/pcireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jun 22 11:01:18 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: pcireg.h Log Message: Pull up following revision(s) (requested by rin in ticket #723): sys/dev/pci/pcireg.h: revision 1.171 PCI_CLASS_MASK: Use unsigned to avoid undefined behavior. Found by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.168.2.1 src/sys/dev/pci/pcireg.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/pci/pcireg.h diff -u src/sys/dev/pci/pcireg.h:1.168 src/sys/dev/pci/pcireg.h:1.168.2.1 --- src/sys/dev/pci/pcireg.h:1.168 Mon Oct 17 03:05:32 2022 +++ src/sys/dev/pci/pcireg.h Sat Jun 22 11:01:18 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pcireg.h,v 1.168 2022/10/17 03:05:32 mrg Exp $ */ +/* $NetBSD: pcireg.h,v 1.168.2.1 2024/06/22 11:01:18 martin Exp $ */ /* * Copyright (c) 1995, 1996, 1999, 2000 @@ -135,7 +135,7 @@ typedef u_int8_t pci_interface_t; typedef u_int8_t pci_revision_t; #define PCI_CLASS_SHIFT 24 -#define PCI_CLASS_MASK 0xff +#define PCI_CLASS_MASK 0xffU #define PCI_CLASS(cr) \ (((cr) >> PCI_CLASS_SHIFT) & PCI_CLASS_MASK)
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sat Jun 22 10:57:11 UTC 2024 Modified Files: src/distrib/hp300/cdroms/installcd [netbsd-10]: Makefile src/sys/arch/hp300/dev [netbsd-10]: dcm.c dcmreg.h diofbreg.h diofbvar.h dma.c dnkbd.c dvbox.c frodoreg.h hpib.c mcclock_frodo.c rbox.c rboxreg.h rtc.c sti_sgc.c topcatreg.h src/sys/arch/hp300/hp300 [netbsd-10]: autoconf.c machdep.c trap.c src/sys/arch/hp300/include [netbsd-10]: bus.h cpu.h src/sys/arch/hp300/stand [netbsd-10]: Makefile.buildboot src/sys/arch/hp300/stand/common [netbsd-10]: clock.c conf.c conf.h devopen.c hil.c ite_dumb.c ite_sti.c machdep.c netio.c prf.c rd.c scsi.c scsireg.h scsivar.h sd.c src/sys/arch/hp300/stand/inst [netbsd-10]: Makefile inst.c src/sys/arch/hp300/stand/mkboot [netbsd-10]: Makefile mkboot.c src/sys/arch/hp300/stand/uboot [netbsd-10]: Makefile src/sys/fs/cd9660 [netbsd-10]: cd9660_extern.h cd9660_util.c src/sys/sys [netbsd-10]: bootblock.h src/tools [netbsd-10]: Makefile.nbincludes src/usr.sbin/installboot [netbsd-10]: Makefile fstypes.c installboot.8 installboot.h src/usr.sbin/installboot/arch [netbsd-10]: hp300.c Added Files: src/usr.sbin/installboot [netbsd-10]: cd9660.c Removed Files: src/sys/arch/hp300/stand/mkboot [netbsd-10]: volhdr.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #722): sys/fs/cd9660/cd9660_util.c: revision 1.16 sys/arch/hp300/stand/common/clock.c: revision 1.14 sys/arch/hp300/stand/common/scsireg.h: revision 1.5 sys/arch/hp300/stand/common/scsireg.h: revision 1.6 sys/arch/hp300/stand/Makefile.buildboot: revision 1.38 sys/arch/hp300/include/bus.h: revision 1.23 sys/arch/hp300/stand/Makefile.buildboot: revision 1.39 sys/arch/hp300/stand/common/sd.c: revision 1.12 sys/arch/hp300/stand/common/prf.c: revision 1.6 sys/arch/hp300/stand/common/sd.c: revision 1.13 usr.sbin/installboot/installboot.8: revision 1.106 usr.sbin/installboot/Makefile: revision 1.59 sys/arch/hp300/stand/common/devopen.c: revision 1.14 usr.sbin/installboot/installboot.8: revision 1.107 sys/arch/hp300/stand/common/ite_dumb.c: revision 1.2 sys/arch/hp300/stand/common/devopen.c: revision 1.15 usr.sbin/installboot/installboot.8: revision 1.108 sys/fs/cd9660/cd9660_extern.h: revision 1.29 usr.sbin/installboot/installboot.8: revision 1.109 tools/Makefile.nbincludes: revision 1.11 (patch) sys/arch/hp300/dev/rboxreg.h: revision 1.3 sys/arch/hp300/stand/common/scsivar.h: revision 1.5 sys/arch/hp300/dev/dnkbd.c: revision 1.14 sys/arch/hp300/hp300/trap.c: revision 1.156 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.12 sys/arch/hp300/dev/frodoreg.h: revision 1.6 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.13 sys/arch/hp300/stand/common/ite_sti.c: revision 1.2 sys/arch/hp300/stand/common/hil.c: revision 1.15 usr.sbin/installboot/arch/hp300.c: revision 1.18 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.14 sys/arch/hp300/dev/rbox.c: revision 1.4 usr.sbin/installboot/arch/hp300.c: revision 1.19 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.15 sys/sys/bootblock.h: revision 1.59 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.16 usr.sbin/installboot/installboot.h: revision 1.44 sys/arch/hp300/stand/mkboot/volhdr.h: file removal sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.17 sys/arch/hp300/dev/hpib.c: revision 1.45 usr.sbin/installboot/installboot.h: revision 1.45 usr.sbin/installboot/cd9660.c: revision 1.1 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.18 sys/arch/hp300/dev/topcatreg.h: revision 1.3 usr.sbin/installboot/cd9660.c: revision 1.2 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.19 sys/arch/hp300/stand/inst/inst.c: revision 1.25 sys/arch/hp300/stand/uboot/Makefile: revision 1.12 sys/arch/hp300/dev/dvbox.c: revision 1.4 sys/arch/hp300/dev/dma.c: revision 1.45 sys/arch/hp300/stand/uboot/Makefile: revision 1.13 sys/arch/hp300/stand/common/rd.c: revision 1.16 sys/arch/hp300/stand/inst/Makefile: revision 1.12 distrib/hp300/cdroms/installcd/Makefile: revision 1.4 sys/arch/hp300/stand/mkboot/volhdr.h: revision 1.6 sys/arch/hp300/stand/common/machdep.c: revision 1.16 usr.sbin/installboot/fstypes.c: revision 1.14 sys/arch/hp300/hp300/machdep.c: revision 1.238 sys/arch/hp300/include/cpu.h: revision 1.73 sys/arch/hp300/dev/diofbreg.h: revision 1.4 sys/arch/hp300/stand/common/scsi.c: revision 1.12
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sat Jun 22 10:57:11 UTC 2024 Modified Files: src/distrib/hp300/cdroms/installcd [netbsd-10]: Makefile src/sys/arch/hp300/dev [netbsd-10]: dcm.c dcmreg.h diofbreg.h diofbvar.h dma.c dnkbd.c dvbox.c frodoreg.h hpib.c mcclock_frodo.c rbox.c rboxreg.h rtc.c sti_sgc.c topcatreg.h src/sys/arch/hp300/hp300 [netbsd-10]: autoconf.c machdep.c trap.c src/sys/arch/hp300/include [netbsd-10]: bus.h cpu.h src/sys/arch/hp300/stand [netbsd-10]: Makefile.buildboot src/sys/arch/hp300/stand/common [netbsd-10]: clock.c conf.c conf.h devopen.c hil.c ite_dumb.c ite_sti.c machdep.c netio.c prf.c rd.c scsi.c scsireg.h scsivar.h sd.c src/sys/arch/hp300/stand/inst [netbsd-10]: Makefile inst.c src/sys/arch/hp300/stand/mkboot [netbsd-10]: Makefile mkboot.c src/sys/arch/hp300/stand/uboot [netbsd-10]: Makefile src/sys/fs/cd9660 [netbsd-10]: cd9660_extern.h cd9660_util.c src/sys/sys [netbsd-10]: bootblock.h src/tools [netbsd-10]: Makefile.nbincludes src/usr.sbin/installboot [netbsd-10]: Makefile fstypes.c installboot.8 installboot.h src/usr.sbin/installboot/arch [netbsd-10]: hp300.c Added Files: src/usr.sbin/installboot [netbsd-10]: cd9660.c Removed Files: src/sys/arch/hp300/stand/mkboot [netbsd-10]: volhdr.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #722): sys/fs/cd9660/cd9660_util.c: revision 1.16 sys/arch/hp300/stand/common/clock.c: revision 1.14 sys/arch/hp300/stand/common/scsireg.h: revision 1.5 sys/arch/hp300/stand/common/scsireg.h: revision 1.6 sys/arch/hp300/stand/Makefile.buildboot: revision 1.38 sys/arch/hp300/include/bus.h: revision 1.23 sys/arch/hp300/stand/Makefile.buildboot: revision 1.39 sys/arch/hp300/stand/common/sd.c: revision 1.12 sys/arch/hp300/stand/common/prf.c: revision 1.6 sys/arch/hp300/stand/common/sd.c: revision 1.13 usr.sbin/installboot/installboot.8: revision 1.106 usr.sbin/installboot/Makefile: revision 1.59 sys/arch/hp300/stand/common/devopen.c: revision 1.14 usr.sbin/installboot/installboot.8: revision 1.107 sys/arch/hp300/stand/common/ite_dumb.c: revision 1.2 sys/arch/hp300/stand/common/devopen.c: revision 1.15 usr.sbin/installboot/installboot.8: revision 1.108 sys/fs/cd9660/cd9660_extern.h: revision 1.29 usr.sbin/installboot/installboot.8: revision 1.109 tools/Makefile.nbincludes: revision 1.11 (patch) sys/arch/hp300/dev/rboxreg.h: revision 1.3 sys/arch/hp300/stand/common/scsivar.h: revision 1.5 sys/arch/hp300/dev/dnkbd.c: revision 1.14 sys/arch/hp300/hp300/trap.c: revision 1.156 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.12 sys/arch/hp300/dev/frodoreg.h: revision 1.6 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.13 sys/arch/hp300/stand/common/ite_sti.c: revision 1.2 sys/arch/hp300/stand/common/hil.c: revision 1.15 usr.sbin/installboot/arch/hp300.c: revision 1.18 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.14 sys/arch/hp300/dev/rbox.c: revision 1.4 usr.sbin/installboot/arch/hp300.c: revision 1.19 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.15 sys/sys/bootblock.h: revision 1.59 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.16 usr.sbin/installboot/installboot.h: revision 1.44 sys/arch/hp300/stand/mkboot/volhdr.h: file removal sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.17 sys/arch/hp300/dev/hpib.c: revision 1.45 usr.sbin/installboot/installboot.h: revision 1.45 usr.sbin/installboot/cd9660.c: revision 1.1 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.18 sys/arch/hp300/dev/topcatreg.h: revision 1.3 usr.sbin/installboot/cd9660.c: revision 1.2 sys/arch/hp300/stand/mkboot/mkboot.c: revision 1.19 sys/arch/hp300/stand/inst/inst.c: revision 1.25 sys/arch/hp300/stand/uboot/Makefile: revision 1.12 sys/arch/hp300/dev/dvbox.c: revision 1.4 sys/arch/hp300/dev/dma.c: revision 1.45 sys/arch/hp300/stand/uboot/Makefile: revision 1.13 sys/arch/hp300/stand/common/rd.c: revision 1.16 sys/arch/hp300/stand/inst/Makefile: revision 1.12 distrib/hp300/cdroms/installcd/Makefile: revision 1.4 sys/arch/hp300/stand/mkboot/volhdr.h: revision 1.6 sys/arch/hp300/stand/common/machdep.c: revision 1.16 usr.sbin/installboot/fstypes.c: revision 1.14 sys/arch/hp300/hp300/machdep.c: revision 1.238 sys/arch/hp300/include/cpu.h: revision 1.73 sys/arch/hp300/dev/diofbreg.h: revision 1.4 sys/arch/hp300/stand/common/scsi.c: revision 1.12
CVS commit: [netbsd-10] src/external/gpl3/gcc/dist/gcc/doc
Module Name:src Committed By: martin Date: Sat Jun 22 10:37:58 UTC 2024 Modified Files: src/external/gpl3/gcc/dist/gcc/doc [netbsd-10]: gcc.info gcc.texi Log Message: Pull up following revision(s) (requested by hgutch in ticket #721): external/gpl3/gcc.old/dist/gcc/doc/gcc.texi: revision 1.13 external/gpl3/gcc.old/dist/gcc/doc/gcc.info: revision 1.15 (applied to external/gpl3/gcc/dist/gcc/doc) Fix broken gcc.info file sortinfo (called during builds in order to sort share/info/dir) trips over this linebreak and leaves a broken file behind. As a result, share/info/dir is effectively cleared out when installing gcc.info and at the end of the build will only contain whatever got added after gcc.info. With this, the "man" set is reproducible again. Fixes PR/58336. To generate a diff of this commit: cvs rdiff -u -r1.15.2.1 -r1.15.2.2 \ src/external/gpl3/gcc/dist/gcc/doc/gcc.info cvs rdiff -u -r1.1.1.12 -r1.1.1.12.6.1 \ src/external/gpl3/gcc/dist/gcc/doc/gcc.texi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] xsrc/external/mit/xorg-server/dist/hw/xfree86/modes
Module Name:xsrc Committed By: martin Date: Sat Jun 22 10:30:08 UTC 2024 Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes [netbsd-10]: xf86Modes.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #720): external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c: revision 1.2 make sure we fill in the name field in generated / converted modes fixes PR 58321, tested by tsutsui@ To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.1.1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.1.1.8.2.1 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.1.1.8 Fri Jul 15 02:12:51 2022 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c Sat Jun 22 10:30:08 2024 @@ -818,6 +818,7 @@ xf86CVTMode(int HDisplay, int VDisplay, Mode->VTotal = libxcvt_mode_info->vtotal; Mode->VRefresh = libxcvt_mode_info->vrefresh; Mode->Flags = libxcvt_mode_info->mode_flags; +xf86SetModeDefaultName(Mode); free(libxcvt_mode_info);
CVS commit: [netbsd-10] xsrc/external/mit/xorg-server/dist/hw/xfree86/modes
Module Name:xsrc Committed By: martin Date: Sat Jun 22 10:30:08 UTC 2024 Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes [netbsd-10]: xf86Modes.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #720): external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c: revision 1.2 make sure we fill in the name field in generated / converted modes fixes PR 58321, tested by tsutsui@ To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/etc
Module Name:src Committed By: martin Date: Sat Jun 22 10:27:44 UTC 2024 Modified Files: src/etc/etc.aarch64 [netbsd-10]: MAKEDEV.conf src/etc/etc.amd64 [netbsd-10]: MAKEDEV.conf src/etc/etc.i386 [netbsd-10]: MAKEDEV.conf Log Message: Pull up following revision(s) (requested by skrll in ticket #719): etc/etc.amd64/MAKEDEV.conf: revision 1.36 etc/etc.aarch64/MAKEDEV.conf: revision 1.10 etc/etc.i386/MAKEDEV.conf: revision 1.36 MAKEDEV: Tidy some entries on x86 and Arm. While here, reduce some diffs arising from ordering and formatting between these architectures. Only difference between evbarm and aarch64 now is /dev/vchiq. Not sure offhand if it makes sense on aarch64 or only 32-bit Arm. PR port-amd64/58093: /dev/efi missing on x86 PR port-arm/58100: /dev/ttyVI* missing on aarch64 PR port-arm/58101: /dev/nvme* missing on aarch64 PR port-arm/58102: /dev/raid* missing on aarch64 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.2.1 src/etc/etc.aarch64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.35.2.1 src/etc/etc.amd64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.35.2.1 src/etc/etc.i386/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.aarch64/MAKEDEV.conf diff -u src/etc/etc.aarch64/MAKEDEV.conf:1.9 src/etc/etc.aarch64/MAKEDEV.conf:1.9.2.1 --- src/etc/etc.aarch64/MAKEDEV.conf:1.9 Sat Jul 24 11:39:18 2021 +++ src/etc/etc.aarch64/MAKEDEV.conf Sat Jun 22 10:27:44 2024 @@ -1,10 +1,16 @@ -# $NetBSD: MAKEDEV.conf,v 1.9 2021/07/24 11:39:18 jmcneill Exp $ +# $NetBSD: MAKEDEV.conf,v 1.9.2.1 2024/06/22 10:27:44 martin Exp $ all_md) makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 + makedev nvme0 nvme0ns1 nvme0ns2 nvme0ns3 nvme0ns4 + makedev nvme1 nvme1ns1 nvme1ns2 nvme1ns3 nvme1ns4 + makedev nvme2 nvme2ns1 nvme2ns2 nvme2ns3 nvme2ns4 + makedev nvme3 nvme3ns1 nvme3ns2 nvme3ns3 nvme3ns4 + makedev raid0 raid1 raid2 raid3 makedev ld0 ld1 ld2 ld3 ld4 ld5 ld6 ld7 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7 - makedev tty0 tty1 plcom0 st0 st1 ch0 cd0 cd1 + makedev tty0 tty1 tty2 tty3 plcom0 + makedev st0 st1 ch0 cd0 cd1 makedev uk0 uk1 ss0 makedev lpa0 lpt0 makedev usbs @@ -20,8 +26,8 @@ all_md) makedev spiflash0 makedev bpf makedev openfirm - makedev acpi - makedev smbios + makedev acpi smbios efi + makedev ttyVI ;; ramdisk|floppy) Index: src/etc/etc.amd64/MAKEDEV.conf diff -u src/etc/etc.amd64/MAKEDEV.conf:1.35 src/etc/etc.amd64/MAKEDEV.conf:1.35.2.1 --- src/etc/etc.amd64/MAKEDEV.conf:1.35 Sun Dec 11 17:35:56 2022 +++ src/etc/etc.amd64/MAKEDEV.conf Sat Jun 22 10:27:43 2024 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.35 2022/12/11 17:35:56 kre Exp $ +# $NetBSD: MAKEDEV.conf,v 1.35.2.1 2024/06/22 10:27:43 martin Exp $ # As of 2003-04-17, the "init" case must not create more than 890 entries. all_md) @@ -45,8 +45,7 @@ all_md) makedev kttcp makedev bio makedev xmm0 - makedev acpi - makedev smbios + makedev acpi smbios efi makedev ttyVI ;; Index: src/etc/etc.i386/MAKEDEV.conf diff -u src/etc/etc.i386/MAKEDEV.conf:1.35 src/etc/etc.i386/MAKEDEV.conf:1.35.2.1 --- src/etc/etc.i386/MAKEDEV.conf:1.35 Fri Aug 12 11:15:41 2022 +++ src/etc/etc.i386/MAKEDEV.conf Sat Jun 22 10:27:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.35 2022/08/12 11:15:41 riastradh Exp $ +# $NetBSD: MAKEDEV.conf,v 1.35.2.1 2024/06/22 10:27:44 martin Exp $ # As of 2005-03-15, the "init" case must not create more than 1024 entries. all_md) @@ -23,6 +23,7 @@ all_md) makedev usbs makedev ipty makedev local + makedev cfs makedev lpa0 lpa1 lpa2 makedev lpt0 lpt1 lpt2 makedev ss0 uk0 uk1 @@ -48,9 +49,7 @@ all_md) makedev kttcp makedev io makedev bio - makedev cfs - makedev acpi - makedev smbios + makedev acpi smbios efi makedev ttyVI ;;
CVS commit: [netbsd-10] src/etc
Module Name:src Committed By: martin Date: Sat Jun 22 10:27:44 UTC 2024 Modified Files: src/etc/etc.aarch64 [netbsd-10]: MAKEDEV.conf src/etc/etc.amd64 [netbsd-10]: MAKEDEV.conf src/etc/etc.i386 [netbsd-10]: MAKEDEV.conf Log Message: Pull up following revision(s) (requested by skrll in ticket #719): etc/etc.amd64/MAKEDEV.conf: revision 1.36 etc/etc.aarch64/MAKEDEV.conf: revision 1.10 etc/etc.i386/MAKEDEV.conf: revision 1.36 MAKEDEV: Tidy some entries on x86 and Arm. While here, reduce some diffs arising from ordering and formatting between these architectures. Only difference between evbarm and aarch64 now is /dev/vchiq. Not sure offhand if it makes sense on aarch64 or only 32-bit Arm. PR port-amd64/58093: /dev/efi missing on x86 PR port-arm/58100: /dev/ttyVI* missing on aarch64 PR port-arm/58101: /dev/nvme* missing on aarch64 PR port-arm/58102: /dev/raid* missing on aarch64 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.2.1 src/etc/etc.aarch64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.35.2.1 src/etc/etc.amd64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.35.2.1 src/etc/etc.i386/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: palle
Date: Sat Jun 22 10:10:07 UTC 2024
Modified Files:
src/sys/dev/scsipi: scsiconf.c
Log Message:
Add quirk for sparc64/sun4v ldom virtual cd devices
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/sys/dev/scsipi/scsiconf.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/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.303 src/sys/dev/scsipi/scsiconf.c:1.304
--- src/sys/dev/scsipi/scsiconf.c:1.303 Sat Oct 15 18:42:49 2022
+++ src/sys/dev/scsipi/scsiconf.c Sat Jun 22 10:10:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.303 2022/10/15 18:42:49 jmcneill Exp $ */
+/* $NetBSD: scsiconf.c,v 1.304 2024/06/22 10:10:07 palle Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.303 2022/10/15 18:42:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.304 2024/06/22 10:10:07 palle Exp $");
#include
#include
@@ -864,6 +864,8 @@ static const struct scsi_quirk_inquiry_p
"SONY", "CDL1100 ", ""}, PQUIRK_NOLUNS},
{{T_ENCLOSURE, T_FIXED,
"SUN ", "SENA", ""}, PQUIRK_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "SUN ", "Virtual CDROM ", ""}, PQUIRK_NOREADDISCINFO},
};
/*
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: palle Date: Sat Jun 22 10:10:07 UTC 2024 Modified Files: src/sys/dev/scsipi: scsiconf.c Log Message: Add quirk for sparc64/sun4v ldom virtual cd devices To generate a diff of this commit: cvs rdiff -u -r1.303 -r1.304 src/sys/dev/scsipi/scsiconf.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/scsipi
Module Name:src Committed By: palle Date: Sat Jun 22 10:07:46 UTC 2024 Modified Files: src/sys/dev/scsipi: cd.c scsipiconf.h Log Message: Add quirk for devices that does not handle READ_DISCINFO To generate a diff of this commit: cvs rdiff -u -r1.354 -r1.355 src/sys/dev/scsipi/cd.c cvs rdiff -u -r1.130 -r1.131 src/sys/dev/scsipi/scsipiconf.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/scsipi
Module Name:src
Committed By: palle
Date: Sat Jun 22 10:07:46 UTC 2024
Modified Files:
src/sys/dev/scsipi: cd.c scsipiconf.h
Log Message:
Add quirk for devices that does not handle READ_DISCINFO
To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/scsipi/scsipiconf.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/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.354 src/sys/dev/scsipi/cd.c:1.355
--- src/sys/dev/scsipi/cd.c:1.354 Sun Jun 26 21:00:28 2022
+++ src/sys/dev/scsipi/cd.c Sat Jun 22 10:07:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.354 2022/06/26 21:00:28 andvar Exp $ */
+/* $NetBSD: cd.c,v 1.355 2024/06/22 10:07:46 palle Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.354 2022/06/26 21:00:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.355 2024/06/22 10:07:46 palle Exp $");
#include
#include
@@ -1545,6 +1545,11 @@ read_cd_capacity(struct scsipi_periph *p
*blksize = 2048; /* some drives lie ! */
}
+ /* If the device doesn't handle READ_DISCINFO properly, */
+ /* return the dummies */
+ if (periph->periph_quirks & PQUIRK_NOREADDISCINFO)
+ return 0;
+
/* recordables have READ_DISCINFO implemented */
flags = XS_CTL_DATA_IN | XS_CTL_SILENT;
memset(_cmd, 0, sizeof(di_cmd));
@@ -2414,11 +2419,12 @@ cd_setblksize(struct cd_softc *cd)
}
if (bsize == 0) {
-printf("cd_setblksize: trying to change bsize, but no blk_desc\n");
+ printf("cd_setblksize: trying to change bsize, but no blk_desc\n");
+
return (EINVAL);
}
if (_3btol(bdesc->blklen) == 2048) {
-printf("cd_setblksize: trying to change bsize, but blk_desc is correct\n");
+ printf("cd_setblksize: trying to change bsize, but blk_desc is correct\n");
return (EINVAL);
}
Index: src/sys/dev/scsipi/scsipiconf.h
diff -u src/sys/dev/scsipi/scsipiconf.h:1.130 src/sys/dev/scsipi/scsipiconf.h:1.131
--- src/sys/dev/scsipi/scsipiconf.h:1.130 Thu Mar 28 10:44:29 2019
+++ src/sys/dev/scsipi/scsipiconf.h Sat Jun 22 10:07:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.130 2019/03/28 10:44:29 kardel Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.131 2024/06/22 10:07:46 palle Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -504,6 +504,8 @@ struct scsipi_periph {
#define PQUIRK_NOREPSUPPOPC 0x0100 /* does not grok
REPORT SUPPORTED OPCODES
to fetch device timeouts */
+#define PQUIRK_NOREADDISCINFO 0x0200 /* device doesn't do
+ READ_DISCINFO properly */
/*
* Error values an adapter driver may return
*/
CVS commit: [netbsd-10] src/sys/dev/pckbport
Module Name:src Committed By: martin Date: Sat Jun 22 10:02:05 UTC 2024 Modified Files: src/sys/dev/pckbport [netbsd-10]: synaptics.c Log Message: Pull up following revision(s) (requested by gutteridge in ticket #718): sys/dev/pckbport/synaptics.c: revision 1.83 Renamed border/boundary variables to better describe their use. Fix edge default values, factor out percentage calculation for more consistent values. Use device_printf/DPRINTF to show errors instead of aprint variants. Print raw input for debugging. Correct capability parsing. Old devices were probed with nonexistent commands and then used undefined boundary values that made them unusuable. Fixes PR 57874. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.81.4.1 src/sys/dev/pckbport/synaptics.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pckbport
Module Name:src
Committed By: martin
Date: Sat Jun 22 10:02:05 UTC 2024
Modified Files:
src/sys/dev/pckbport [netbsd-10]: synaptics.c
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #718):
sys/dev/pckbport/synaptics.c: revision 1.83
Renamed border/boundary variables to better describe their use.
Fix edge default values, factor out percentage calculation for more
consistent
values. Use device_printf/DPRINTF to show errors instead of aprint
variants.
Print raw input for debugging.
Correct capability parsing. Old devices were probed with nonexistent
commands and then used undefined boundary values that made them
unusuable.
Fixes PR 57874.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.81.4.1 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.81 src/sys/dev/pckbport/synaptics.c:1.81.4.1
--- src/sys/dev/pckbport/synaptics.c:1.81 Wed Sep 28 16:43:00 2022
+++ src/sys/dev/pckbport/synaptics.c Sat Jun 22 10:02:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.81 2022/09/28 16:43:00 nia Exp $ */
+/* $NetBSD: synaptics.c,v 1.81.4.1 2024/06/22 10:02:05 martin Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.81 2022/09/28 16:43:00 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.81.4.1 2024/06/22 10:02:05 martin Exp $");
#include
#include
@@ -112,10 +112,10 @@ static int synaptics_edge_bottom = SYNAP
static int synaptics_edge_motion_delta = 32;
static u_int synaptics_finger_high = SYNAPTICS_FINGER_LIGHT + 5;
static u_int synaptics_finger_low = SYNAPTICS_FINGER_LIGHT - 10;
-static int synaptics_horiz_pct = 0;
-static int synaptics_vert_pct = 0;
-static int synaptics_button_pct = 30;
-static int synaptics_button_boundary;
+static int synaptics_hscroll_pct = 0;
+static int synaptics_vscroll_pct = 0;
+static int synaptics_button_pct = 0;
+static int synaptics_button_boundary = SYNAPTICS_EDGE_BOTTOM;
static int synaptics_button2;
static int synaptics_button3;
static int synaptics_two_fingers_emul = 0;
@@ -166,23 +166,26 @@ static int synaptics_movement_threshold_
static int synaptics_movement_enable_nodenum;
static int synaptics_button_region_movement_nodenum;
static int synaptics_aux_mid_button_scroll_nodenum;
-static int synaptics_horiz_pct_nodenum;
-static int synaptics_vert_pct_nodenum;
+static int synaptics_hscroll_pct_nodenum;
+static int synaptics_vscroll_pct_nodenum;
static int synaptics_button_pct_nodenum;
/*
* copy of edges so we can recalculate edge limit if there is
* vertical scroll region
*/
-static int synaptics_actual_edge_right;
-static int synaptics_actual_edge_bottom;
+static int synaptics_true_edge_right;
+static int synaptics_true_edge_bottom;
-static int synaptics_old_vert_pct = 0;
-static int synaptics_old_horiz_pct = 0;
-static int synaptics_old_button_pct = 0;
-static int synaptics_old_button_boundary = SYNAPTICS_EDGE_BOTTOM;
-static int synaptics_old_horiz_edge = SYNAPTICS_EDGE_BOTTOM;
-static int synaptics_old_vert_edge = SYNAPTICS_EDGE_RIGHT;
+/*
+ * invalid old values, recalculate everything
+ */
+static int synaptics_old_vscroll_pct = -1;
+static int synaptics_old_hscroll_pct = -1;
+static int synaptics_old_button_pct = -1;
+static int synaptics_old_button_boundary = -1;
+static int synaptics_old_edge_right = -1;
+static int synaptics_old_edge_bottom = -1;
/*
* This holds the processed packet data, it is global because multiple
@@ -208,7 +211,7 @@ synaptics_poll_cmd(struct pms_softc *psc
int res = pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot, cmd, i, 0,
NULL, 0);
if (res)
- aprint_error_dev(psc->sc_dev, "command error %#x\n", cmd[0]);
+ device_printf(psc->sc_dev, "command error %#x\n", cmd[0]);
return res;
}
@@ -221,7 +224,7 @@ synaptics_poll_reset(struct pms_softc *p
u_char cmd[1] = { PMS_RESET };
res = pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot, cmd, 1, 2,
resp, 1);
- aprint_debug_dev(psc->sc_dev, "reset %d 0x%02x 0x%02x\n",
+ DPRINTF(10, >u.synaptics, "reset %d 0x%02x 0x%02x\n",
res, resp[0], resp[1]);
return res;
}
@@ -251,80 +254,90 @@ synaptics_special_write(struct pms_softc
return res;
}
+static int
+synaptics_value(int pct, int low, int high)
+{
+ return low + pct * (high - low) / 100UL;
+}
+
+static int
+synaptics_percentage(int val, int low, int high)
+{
+ return ((val - low) * 100UL + high - low - 1) / (high - low);
+}
+
static void
pms_synaptics_set_boundaries(void)
{
- if (synaptics_vert_pct != synaptics_old_vert_pct ) {
- synaptics_edge_right = synaptics_actual_edge_right -
- ((unsigned long) synaptics_vert_pct *
- (synaptics_actual_edge_right - synaptics_edge_left)) / 100;
-
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Sat Jun 22 09:58:56 UTC 2024 Modified Files: src/sys/arch/x86/x86 [netbsd-9]: coretemp.c Log Message: Pull up following revision(s) (requested by gutteridge in ticket #1848): sys/arch/x86/x86/coretemp.c: revision 1.40 sys/arch/x86/x86/coretemp.c: revision 1.41 coretemp.c: fix grammar in a warning message (I get several of these warnings on boot on a particular machine. Now, it also seems that the code isn't retrieving the correct value, either; TBD.) coretemp.c: don't accept impossibly low TjMax values r. 1.39 introduced a regression where instead of applying a reasonable default maximum (as was done prior to that change), incorrect values were accepted and applied, as failures to retrieve an expected MSR value weren't accounted for. Apply different logic for unexpectedly low vs. high maximums, with distinct warnings for each. Also add another warning about a retrieval failure right at the outset (which also just uses the default, then). This change fundamentally doesn't address the fact that __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT) doesn't necessarily return a valid value. It just restores prior behaviour, which is more reasonable than applying a zero value, which started happening on some older hardware. (I infer this is most likely an issue with dated generations of Intel hardware with this feature.) The challenge is that this evidently isn't all documented properly anywhere. Various "magic values" in this driver need further investigation. While here, also fix output so warnings are cleanly formatted, rather than the slightly scrambled way they were appearing. Tested on older Intel hardware I had on hand: E7500 (now falls back to default 100 rather than 0) E5540 (successfully retrieves 97, as before) i5-3340M (successfully retrieves 105, as before) To generate a diff of this commit: cvs rdiff -u -r1.36.4.2 -r1.36.4.3 src/sys/arch/x86/x86/coretemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Sat Jun 22 09:58:56 UTC 2024
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: coretemp.c
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #1848):
sys/arch/x86/x86/coretemp.c: revision 1.40
sys/arch/x86/x86/coretemp.c: revision 1.41
coretemp.c: fix grammar in a warning message
(I get several of these warnings on boot on a particular machine. Now,
it also seems that the code isn't retrieving the correct value, either;
TBD.)
coretemp.c: don't accept impossibly low TjMax values
r. 1.39 introduced a regression where instead of applying a reasonable
default maximum (as was done prior to that change), incorrect values
were accepted and applied, as failures to retrieve an expected MSR
value weren't accounted for.
Apply different logic for unexpectedly low vs. high maximums, with
distinct warnings for each. Also add another warning about a retrieval
failure right at the outset (which also just uses the default, then).
This change fundamentally doesn't address the fact that
__SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT)
doesn't necessarily return a valid value. It just restores prior
behaviour, which is more reasonable than applying a zero value, which
started happening on some older hardware. (I infer this is most likely
an issue with dated generations of Intel hardware with this feature.)
The challenge is that this evidently isn't all documented properly
anywhere. Various "magic values" in this driver need further
investigation.
While here, also fix output so warnings are cleanly formatted, rather
than the slightly scrambled way they were appearing.
Tested on older Intel hardware I had on hand:
E7500 (now falls back to default 100 rather than 0)
E5540 (successfully retrieves 97, as before)
i5-3340M (successfully retrieves 105, as before)
To generate a diff of this commit:
cvs rdiff -u -r1.36.4.2 -r1.36.4.3 src/sys/arch/x86/x86/coretemp.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/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.36.4.2 src/sys/arch/x86/x86/coretemp.c:1.36.4.3
--- src/sys/arch/x86/x86/coretemp.c:1.36.4.2 Sat Jul 29 11:01:14 2023
+++ src/sys/arch/x86/x86/coretemp.c Sat Jun 22 09:58:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.36.4.2 2023/07/29 11:01:14 martin Exp $ */
+/* $NetBSD: coretemp.c,v 1.36.4.3 2024/06/22 09:58:56 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.36.4.2 2023/07/29 11:01:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.36.4.3 2024/06/22 09:58:56 martin Exp $");
#include
#include
@@ -110,7 +110,7 @@ static int coretemp_match(device_t, cfda
static void coretemp_attach(device_t, device_t, void *);
static int coretemp_detach(device_t, int);
static int coretemp_quirks(struct cpu_info *);
-static void coretemp_tjmax(device_t);
+static int coretemp_tjmax(device_t);
static void coretemp_refresh(struct sysmon_envsys *, envsys_data_t *);
static void coretemp_refresh_xcall(void *, void *);
@@ -194,9 +194,10 @@ coretemp_attach(device_t parent, device_
if (sysmon_envsys_register(sc->sc_sme) != 0)
goto fail;
- coretemp_tjmax(self);
- aprint_verbose(", Tjmax=%d", sc->sc_tjmax);
- aprint_normal("\n");
+ if (coretemp_tjmax(self) == 0) {
+ aprint_verbose(", Tjmax=%d", sc->sc_tjmax);
+ aprint_normal("\n");
+ }
return;
fail:
@@ -258,7 +259,7 @@ coretemp_quirks(struct cpu_info *ci)
return 1;
}
-void
+static int
coretemp_tjmax(device_t self)
{
struct coretemp_softc *sc = device_private(self);
@@ -288,17 +289,19 @@ coretemp_tjmax(device_t self)
if ((model < 0x17) && ((msr & __BIT(28)) == 0))
goto notee;
- if (rdmsr_safe(MSR_IA32_EXT_CONFIG, ) == EFAULT)
- return;
+ if (rdmsr_safe(MSR_IA32_EXT_CONFIG, ) == EFAULT) {
+ aprint_normal("\n");
+ aprint_error_dev(sc->sc_dev,
+ "Failed to read MSR_IA32_EXT_CONFIG MSR. "
+ "Using default (%d)\n", sc->sc_tjmax);
+ return 1;
+ }
- if ((msr & __BIT(30)) != 0) {
+ if ((msr & __BIT(30)) != 0)
sc->sc_tjmax = 85;
- return;
- }
} else if (model == 0x17 && stepping == 0x06) {
/* The mobile Penryn family. */
sc->sc_tjmax = 105;
- return;
} else if (model == 0x1c) {
if (stepping == 0x0a) {
/* 45nm Atom D400, N400 and D500 series */
@@ -307,21 +310,39 @@ coretemp_tjmax(device_t self)
sc->sc_tjmax = 90;
} else {
notee:
- /* Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET. */
+ /*
+ * Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET.
+ * It is not fully known which CPU models have the MSR.
+ */
if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT) {
+ aprint_normal("\n");
aprint_error_dev(sc->sc_dev,
"Failed to read TEMPERATURE_TARGET MSR. "
- "Use the default (%d)\n",
CVS commit: [netbsd-10] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Sat Jun 22 09:57:21 UTC 2024
Modified Files:
src/sys/arch/x86/x86 [netbsd-10]: coretemp.c
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #717):
sys/arch/x86/x86/coretemp.c: revision 1.40
sys/arch/x86/x86/coretemp.c: revision 1.41
coretemp.c: fix grammar in a warning message
(I get several of these warnings on boot on a particular machine. Now,
it also seems that the code isn't retrieving the correct value, either;
TBD.)
coretemp.c: don't accept impossibly low TjMax values
r. 1.39 introduced a regression where instead of applying a reasonable
default maximum (as was done prior to that change), incorrect values
were accepted and applied, as failures to retrieve an expected MSR
value weren't accounted for.
Apply different logic for unexpectedly low vs. high maximums, with
distinct warnings for each. Also add another warning about a retrieval
failure right at the outset (which also just uses the default, then).
This change fundamentally doesn't address the fact that
__SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT)
doesn't necessarily return a valid value. It just restores prior
behaviour, which is more reasonable than applying a zero value, which
started happening on some older hardware. (I infer this is most likely
an issue with dated generations of Intel hardware with this feature.)
The challenge is that this evidently isn't all documented properly
anywhere. Various "magic values" in this driver need further
investigation.
While here, also fix output so warnings are cleanly formatted, rather
than the slightly scrambled way they were appearing.
Tested on older Intel hardware I had on hand:
E7500 (now falls back to default 100 rather than 0)
E5540 (successfully retrieves 97, as before)
i5-3340M (successfully retrieves 105, as before)
To generate a diff of this commit:
cvs rdiff -u -r1.38.4.1 -r1.38.4.2 src/sys/arch/x86/x86/coretemp.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/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.38.4.1 src/sys/arch/x86/x86/coretemp.c:1.38.4.2
--- src/sys/arch/x86/x86/coretemp.c:1.38.4.1 Sat Jul 29 10:58:02 2023
+++ src/sys/arch/x86/x86/coretemp.c Sat Jun 22 09:57:21 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.38.4.1 2023/07/29 10:58:02 martin Exp $ */
+/* $NetBSD: coretemp.c,v 1.38.4.2 2024/06/22 09:57:21 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.38.4.1 2023/07/29 10:58:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.38.4.2 2024/06/22 09:57:21 martin Exp $");
#include
#include
@@ -110,7 +110,7 @@ static int coretemp_match(device_t, cfda
static void coretemp_attach(device_t, device_t, void *);
static int coretemp_detach(device_t, int);
static int coretemp_quirks(struct cpu_info *);
-static void coretemp_tjmax(device_t);
+static int coretemp_tjmax(device_t);
static void coretemp_refresh(struct sysmon_envsys *, envsys_data_t *);
static void coretemp_refresh_xcall(void *, void *);
@@ -194,9 +194,10 @@ coretemp_attach(device_t parent, device_
if (sysmon_envsys_register(sc->sc_sme) != 0)
goto fail;
- coretemp_tjmax(self);
- aprint_verbose(", Tjmax=%d", sc->sc_tjmax);
- aprint_normal("\n");
+ if (coretemp_tjmax(self) == 0) {
+ aprint_verbose(", Tjmax=%d", sc->sc_tjmax);
+ aprint_normal("\n");
+ }
return;
fail:
@@ -258,7 +259,7 @@ coretemp_quirks(struct cpu_info *ci)
return 1;
}
-void
+static int
coretemp_tjmax(device_t self)
{
struct coretemp_softc *sc = device_private(self);
@@ -288,17 +289,19 @@ coretemp_tjmax(device_t self)
if ((model < 0x17) && ((msr & __BIT(28)) == 0))
goto notee;
- if (rdmsr_safe(MSR_IA32_EXT_CONFIG, ) == EFAULT)
- return;
+ if (rdmsr_safe(MSR_IA32_EXT_CONFIG, ) == EFAULT) {
+ aprint_normal("\n");
+ aprint_error_dev(sc->sc_dev,
+ "Failed to read MSR_IA32_EXT_CONFIG MSR. "
+ "Using default (%d)\n", sc->sc_tjmax);
+ return 1;
+ }
- if ((msr & __BIT(30)) != 0) {
+ if ((msr & __BIT(30)) != 0)
sc->sc_tjmax = 85;
- return;
- }
} else if (model == 0x17 && stepping == 0x06) {
/* The mobile Penryn family. */
sc->sc_tjmax = 105;
- return;
} else if (model == 0x1c) {
if (stepping == 0x0a) {
/* 45nm Atom D400, N400 and D500 series */
@@ -307,21 +310,39 @@ coretemp_tjmax(device_t self)
sc->sc_tjmax = 90;
} else {
notee:
- /* Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET. */
+ /*
+ * Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET.
+ * It is not fully known which CPU models have the MSR.
+ */
if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT) {
+ aprint_normal("\n");
aprint_error_dev(sc->sc_dev,
"Failed to read TEMPERATURE_TARGET MSR. "
- "Use the default (%d)\n",
CVS commit: [netbsd-10] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Sat Jun 22 09:57:21 UTC 2024 Modified Files: src/sys/arch/x86/x86 [netbsd-10]: coretemp.c Log Message: Pull up following revision(s) (requested by gutteridge in ticket #717): sys/arch/x86/x86/coretemp.c: revision 1.40 sys/arch/x86/x86/coretemp.c: revision 1.41 coretemp.c: fix grammar in a warning message (I get several of these warnings on boot on a particular machine. Now, it also seems that the code isn't retrieving the correct value, either; TBD.) coretemp.c: don't accept impossibly low TjMax values r. 1.39 introduced a regression where instead of applying a reasonable default maximum (as was done prior to that change), incorrect values were accepted and applied, as failures to retrieve an expected MSR value weren't accounted for. Apply different logic for unexpectedly low vs. high maximums, with distinct warnings for each. Also add another warning about a retrieval failure right at the outset (which also just uses the default, then). This change fundamentally doesn't address the fact that __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT) doesn't necessarily return a valid value. It just restores prior behaviour, which is more reasonable than applying a zero value, which started happening on some older hardware. (I infer this is most likely an issue with dated generations of Intel hardware with this feature.) The challenge is that this evidently isn't all documented properly anywhere. Various "magic values" in this driver need further investigation. While here, also fix output so warnings are cleanly formatted, rather than the slightly scrambled way they were appearing. Tested on older Intel hardware I had on hand: E7500 (now falls back to default 100 rather than 0) E5540 (successfully retrieves 97, as before) i5-3340M (successfully retrieves 105, as before) To generate a diff of this commit: cvs rdiff -u -r1.38.4.1 -r1.38.4.2 src/sys/arch/x86/x86/coretemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jun 22 06:24:46 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: msg_380.c msg_381.c Log Message: tests/lint: skip tests for converting large floating point to integer These tests differ between the platforms supported by lint. The differences may be caused by hardware differences, the default rounding mode, bugs in the emulator running the tests, bugs in the platform-specific string-to-float or float-to-string conversions and probably some more. For now, accept that lint will behave differently on those platforms. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_380.c \ src/tests/usr.bin/xlint/lint1/msg_381.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/msg_380.c diff -u src/tests/usr.bin/xlint/lint1/msg_380.c:1.1 src/tests/usr.bin/xlint/lint1/msg_380.c:1.2 --- src/tests/usr.bin/xlint/lint1/msg_380.c:1.1 Sun Jun 9 10:27:39 2024 +++ src/tests/usr.bin/xlint/lint1/msg_380.c Sat Jun 22 06:24:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: msg_380.c,v 1.1 2024/06/09 10:27:39 rillig Exp $ */ +/* $NetBSD: msg_380.c,v 1.2 2024/06/22 06:24:46 rillig Exp $ */ # 3 "msg_380.c" // Test for message: lossy conversion of %Lg to '%s', arg #%d [380] @@ -50,11 +50,22 @@ conversions(void) take_u64(0.0); /* expect+1: warning: lossy conversion of 3.141 to 'unsigned long long', arg #1 [380] */ take_u64(3.141); - take_u64(18446744073709550591.0); - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] */ - take_u64(18446744073709550592.0); - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] */ - take_u64(18446744073709551615.0); - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] */ - take_u64(18446744073709551616.0); + + // Warning on: alpha + // No warning on: aarch64 aarch64-compat32 arm i386 mips powerpc riscv64 sh3 sparc x86_64 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709550591.0); + + // Warning on: aarch64 alpha arm i386 mips riscv64 sparc x86_64 + // No warning on: aarch64-compat32 powerpc sh3 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709550592.0); + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709551615.0); + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709551616.0); } Index: src/tests/usr.bin/xlint/lint1/msg_381.c diff -u src/tests/usr.bin/xlint/lint1/msg_381.c:1.1 src/tests/usr.bin/xlint/lint1/msg_381.c:1.2 --- src/tests/usr.bin/xlint/lint1/msg_381.c:1.1 Sun Jun 9 10:27:39 2024 +++ src/tests/usr.bin/xlint/lint1/msg_381.c Sat Jun 22 06:24:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: msg_381.c,v 1.1 2024/06/09 10:27:39 rillig Exp $ */ +/* $NetBSD: msg_381.c,v 1.2 2024/06/22 06:24:46 rillig Exp $ */ # 3 "msg_381.c" // Test for message: lossy conversion of %Lg to '%s' [381] @@ -50,11 +50,22 @@ conversions(void) u64 = 0.0; /* expect+1: warning: lossy conversion of 3.141 to 'unsigned long long' [381] */ u64 = 3.141; - u64 = 18446744073709550591.0; - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] */ - u64 = 18446744073709550592.0; - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] */ - u64 = 18446744073709551615.0; - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] */ - u64 = 18446744073709551616.0; + + // Warning on: alpha + // No warning on: aarch64 aarch64-compat32 arm i386 mips powerpc riscv64 sh3 sparc x86_64 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709550591.0; + + // Warning on: aarch64 alpha arm i386 mips riscv64 sparc x86_64 + // No warning on: aarch64-compat32 powerpc sh3 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709550592.0; + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709551615.0; + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709551616.0; }
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jun 22 06:24:46 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: msg_380.c msg_381.c Log Message: tests/lint: skip tests for converting large floating point to integer These tests differ between the platforms supported by lint. The differences may be caused by hardware differences, the default rounding mode, bugs in the emulator running the tests, bugs in the platform-specific string-to-float or float-to-string conversions and probably some more. For now, accept that lint will behave differently on those platforms. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_380.c \ src/tests/usr.bin/xlint/lint1/msg_381.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
