CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Sun Jul 14 09:29:21 UTC 2019 Modified Files: src/sys/arch/arm/arm32: locore.S src/sys/arch/hpcarm/hpcarm: locore.S Log Message: Spell initarm correctly in comments To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/arm32/locore.S cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/hpcarm/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Sun Jul 14 09:29:21 UTC 2019
Modified Files:
src/sys/arch/arm/arm32: locore.S
src/sys/arch/hpcarm/hpcarm: locore.S
Log Message:
Spell initarm correctly in comments
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/arm32/locore.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/hpcarm/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/locore.S
diff -u src/sys/arch/arm/arm32/locore.S:1.39 src/sys/arch/arm/arm32/locore.S:1.40
--- src/sys/arch/arm/arm32/locore.S:1.39 Thu Oct 18 09:01:52 2018
+++ src/sys/arch/arm/arm32/locore.S Sun Jul 14 09:29:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.39 2018/10/18 09:01:52 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.40 2019/07/14 09:29:21 skrll Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -43,7 +43,7 @@
/* What size should this really be ? It is only used by init_arm() */
#define INIT_ARM_STACK_SIZE 2048
- RCSID("$NetBSD: locore.S,v 1.39 2018/10/18 09:01:52 skrll Exp $")
+ RCSID("$NetBSD: locore.S,v 1.40 2019/07/14 09:29:21 skrll Exp $")
/*
* This is for kvm_mkdb, and should be the address of the beginning
@@ -92,7 +92,7 @@ ASENTRY_NP(start)
mov fp, #0x /* trace back starts here */
bl _C_LABEL(initarm) /* Off we go */
- /* init arm will return the new stack pointer. */
+ /* initarm will return the new stack pointer. */
mov sp, r0
mov fp, #0x /* trace back starts here */
Index: src/sys/arch/hpcarm/hpcarm/locore.S
diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.18 src/sys/arch/hpcarm/hpcarm/locore.S:1.19
--- src/sys/arch/hpcarm/hpcarm/locore.S:1.18 Sun Mar 2 13:26:30 2014
+++ src/sys/arch/hpcarm/hpcarm/locore.S Sun Jul 14 09:29:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.18 2014/03/02 13:26:30 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.19 2019/07/14 09:29:21 skrll Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -160,7 +160,7 @@ ASENTRY_NP(hpc_start)
mov fp, #0x /* trace back starts here */
bl _C_LABEL(initarm) /* Off we go */
- /* init arm will return the new stack pointer. */
+ /* initarm will return the new stack pointer. */
mov sp, r0
mov fp, #0x /* trace back starts here */
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: skrll Date: Sun Jul 14 09:31:33 UTC 2019 Modified Files: src/sys/arch/mips/mips: pmap_machdep.c Log Message: Use PV_ISKENTER_P. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mips/mips/pmap_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: skrll
Date: Sun Jul 14 09:31:33 UTC 2019
Modified Files:
src/sys/arch/mips/mips: pmap_machdep.c
Log Message:
Use PV_ISKENTER_P. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mips/mips/pmap_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/pmap_machdep.c
diff -u src/sys/arch/mips/mips/pmap_machdep.c:1.23 src/sys/arch/mips/mips/pmap_machdep.c:1.24
--- src/sys/arch/mips/mips/pmap_machdep.c:1.23 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/mips/mips/pmap_machdep.c Sun Jul 14 09:31:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_machdep.c,v 1.23 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: pmap_machdep.c,v 1.24 2019/07/14 09:31:33 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.23 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.24 2019/07/14 09:31:33 skrll Exp $");
/*
* Manages physical address maps.
@@ -945,7 +945,7 @@ pmap_md_vca_add(struct vm_page *pg, vadd
KASSERT(pv->pv_pmap != NULL);
bool ret = false;
for (pv_entry_t npv = pv; npv && npv->pv_pmap;) {
- if (npv->pv_va & PV_KENTER) {
+ if (PV_ISKENTER_P(npv)) {
npv = npv->pv_next;
continue;
}
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: sevan Date: Sun Jul 14 10:43:01 UTC 2019 Modified Files: src/usr.bin/calendar/calendars: calendar.birthday Log Message: Add Fernando Jose Corbato https://multicians.org/corby.html https://www.nytimes.com/2019/07/12/science/fernando-corbato-dead.html To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/calendar/calendars/calendar.birthday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: sevan Date: Sun Jul 14 10:43:01 UTC 2019 Modified Files: src/usr.bin/calendar/calendars: calendar.birthday Log Message: Add Fernando Jose Corbato https://multicians.org/corby.html https://www.nytimes.com/2019/07/12/science/fernando-corbato-dead.html To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/calendar/calendars/calendar.birthday Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.birthday diff -u src/usr.bin/calendar/calendars/calendar.birthday:1.28 src/usr.bin/calendar/calendars/calendar.birthday:1.29 --- src/usr.bin/calendar/calendars/calendar.birthday:1.28 Sun Jun 30 11:21:40 2019 +++ src/usr.bin/calendar/calendars/calendar.birthday Sun Jul 14 10:43:01 2019 @@ -153,6 +153,7 @@ 06/23 Alan Mathison Turing born, 1912 06/25 Eric Arthur Blair (a.k.a. George Orwell) born, 1903 06/27 Helen Keller born, 1880 +07/01 Fernando Jose Corbato was born in Oakland, California, 1926 07/03 Franz Kafka born, 1883 07/04 Nathaniel Hawthorne born in Salem, Massachusetts, 1804 07/04 John Adams and Thomas Jefferson die on same day, 1826 @@ -162,6 +163,7 @@ 07/08 Count Ferdinand von Zeppelin born, 1838 07/10 John Calvin born, 1509 07/11 John Quincy Adams born, 1767 +07/12 Fernando Jose Corbato died in Newburyport, Massachusetts, 2019 07/12 Henry David Thoreau born, 1817 07/15 Clement Clarke Moore born, 1779, author of "A Visit from Saint Nicholas"
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 14 11:25:10 UTC 2019 Modified Files: src/usr.sbin/sysinst: disks.c Log Message: Follow our internal install instructions correctly: newfs when a partition is marked for it, don't second guess from mount point or similar. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/disks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jul 14 11:25:10 UTC 2019
Modified Files:
src/usr.sbin/sysinst: disks.c
Log Message:
Follow our internal install instructions correctly: newfs when a partition
is marked for it, don't second guess from mount point or similar.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.37 src/usr.sbin/sysinst/disks.c:1.38
--- src/usr.sbin/sysinst/disks.c:1.37 Sat Jul 13 17:13:36 2019
+++ src/usr.sbin/sysinst/disks.c Sun Jul 14 11:25:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.37 2019/07/13 17:13:36 martin Exp $ */
+/* $NetBSD: disks.c,v 1.38 2019/07/14 11:25:10 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1053,9 +1053,8 @@ make_filesystems(struct install_partitio
for (i = 0; i < install->num; i++) {
/*
- * newfs and mount. For now, process only BSD filesystems.
- * but if this is the mounted-on root, has no mount
- * point defined, or is marked preserve, don't touch it!
+ * Newfs all file systems mareked as needing this.
+ * Mount the ones that have a mountpoint in the target.
*/
ptn = &install->infos[i];
parts = ptn->parts;
@@ -1068,8 +1067,7 @@ make_filesystems(struct install_partitio
&& is_active_rootpart(devdev, partno))
continue;
- if ((ptn->instflags & PUIINST_MOUNT) == 0)
- /* No mount point */
+ if (!(ptn->instflags & PUIINST_NEWFS))
continue;
parts->pscheme->get_part_device(parts, ptn->cur_part_id,
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jul 14 11:26:18 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
Don't force mounting of newfs'd partitions.
Provide MD hooks for setups where we do not need any bootblocks.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.19 src/usr.sbin/sysinst/bsddisklabel.c:1.20
--- src/usr.sbin/sysinst/bsddisklabel.c:1.19 Fri Jul 12 18:28:08 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Sun Jul 14 11:26:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.19 2019/07/12 18:28:08 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.20 2019/07/14 11:26:18 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1375,8 +1375,6 @@ apply_settings_to_partitions(struct pm_d
infos[i].last_mounted = want->mount;
infos[i].fs_type = want->fs_type;
infos[i].fs_sub_type = want->fs_version;
- if (want->fs_type != FS_UNUSED && want->type != PT_swap)
-want->instflags |= PUIINST_NEWFS|PUIINST_MOUNT;
new_part_id = ps->pscheme->add_partition(ps,
&infos[i], NULL);
if (new_part_id == NO_PART)
@@ -1420,8 +1418,11 @@ apply_settings_to_partitions(struct pm_d
infos[i].last_mounted = want->mount;
infos[i].fs_type = want->fs_type;
infos[i].fs_sub_type = want->fs_version;
- if (want->fs_type != FS_UNUSED && want->type != PT_swap)
- want->instflags |= PUIINST_NEWFS|PUIINST_MOUNT;
+ if (want->fs_type != FS_UNUSED && want->type != PT_swap) {
+ want->instflags |= PUIINST_NEWFS;
+ if (want->mount[0] != 0)
+want->instflags |= PUIINST_MOUNT;
+ }
new_part_id = wanted->parts->pscheme->add_partition(
wanted->parts, &infos[i], NULL);
if (new_part_id == NO_PART)
@@ -1458,9 +1459,6 @@ apply_settings_to_partitions(struct pm_d
infos[i].last_mounted = want->mount;
infos[i].fs_type = want->fs_type;
infos[i].fs_sub_type = want->fs_version;
- if (want->fs_type != FS_UNUSED &&
- want->type != PT_swap)
- want->instflags |= PUIINST_NEWFS|PUIINST_MOUNT;
if (wanted->parts->pscheme->add_outer_partition
!= NULL)
@@ -1663,6 +1661,10 @@ make_bsd_partitions(struct install_parti
return true;
}
+#ifndef MD_NEED_BOOTBLOCK
+#define MD_NEED_BOOTBLOCK(A) true
+#endif
+
/*
* check that there is at least a / somewhere.
*/
@@ -1678,30 +1680,34 @@ check_partitions(struct install_partitio
#endif
#ifdef HAVE_BOOTXX_xFS
- /* check if we have boot code for the root partition type */
- bootxx = bootxx_name(install);
- if (bootxx != NULL) {
- rv = access(bootxx, R_OK);
- free(bootxx);
- } else
- rv = -1;
- if (rv != 0) {
- hit_enter_to_continue(NULL, MSG_No_Bootcode);
- return false;
+ if (MD_NEED_BOOTBLOCK(install)) {
+ /* check if we have boot code for the root partition type */
+ bootxx = bootxx_name(install);
+ if (bootxx != NULL) {
+ rv = access(bootxx, R_OK);
+ free(bootxx);
+ } else
+ rv = -1;
+ if (rv != 0) {
+ hit_enter_to_continue(NULL, MSG_No_Bootcode);
+ return false;
+ }
}
#endif
#ifndef HAVE_UFS2_BOOT
- for (i = 0; i < install->num; i++) {
- if (install->infos[i].type != PT_root)
- continue;
- if (strcmp(install->infos[i].mount, "/") != 0)
- continue;
- if (install->infos[i].fs_type != FS_BSDFFS)
- continue;
- if (install->infos[i].fs_version != 2)
- continue;
- hit_enter_to_continue(NULL, MSG_cannot_ufs2_root);
- return false;
+ if (MD_NEED_BOOTBLOCK(install)) {
+ for (i = 0; i < install->num; i++) {
+ if (install->infos[i].type != PT_root)
+continue;
+ if (strcmp(install->infos[i].mount, "/") != 0)
+continue;
+ if (install->infos[i].fs_type != FS_BSDFFS)
+continue;
+ if (install->infos[i].fs_version != 2)
+continue;
+ hit_enter_to_continue(NULL, MSG_cannot_ufs2_root);
+ return false;
+ }
}
#endif
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 14 11:26:18 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: Don't force mounting of newfs'd partitions. Provide MD hooks for setups where we do not need any bootblocks. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/bsddisklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: martin Date: Sun Jul 14 11:27:34 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/amd64: md.h src/usr.sbin/sysinst/arch/i386: md.c md.h Log Message: Work in progress UEFI boot support, don't try this at home yet! To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/amd64/md.h cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/arch/i386/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/i386/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src
Committed By: martin
Date: Sun Jul 14 11:27:34 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/amd64: md.h
src/usr.sbin/sysinst/arch/i386: md.c md.h
Log Message:
Work in progress UEFI boot support, don't try this at home yet!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/i386/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/amd64/md.h
diff -u src/usr.sbin/sysinst/arch/amd64/md.h:1.5 src/usr.sbin/sysinst/arch/amd64/md.h:1.6
--- src/usr.sbin/sysinst/arch/amd64/md.h:1.5 Wed Jun 12 06:20:18 2019
+++ src/usr.sbin/sysinst/arch/amd64/md.h Sun Jul 14 11:27:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.5 2019/06/12 06:20:18 martin Exp $ */
+/* $NetBSD: md.h,v 1.6 2019/07/14 11:27:33 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -110,3 +110,16 @@ extern struct mbr_bootsel *mbs;
/*
* prototypes for MD code.
*/
+
+/*
+ * When we do an UEFI install, we have completely different default
+ * partitions and need to adjust the description at runtime.
+ */
+void x86_md_part_defaults(struct pm_devs*, struct part_usage_info**,
+size_t *num_usage_infos);
+#define MD_PART_DEFAULTS(A,B,C) x86_md_part_defaults(A,&(B),&(C))
+
+/* no need to install bootblock if installing for UEFI */
+bool x86_md_need_bootblock(struct install_partition_desc *install);
+#define MD_NEED_BOOTBLOCK(A) x86_md_need_bootblock(A)
+
Index: src/usr.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.19 src/usr.sbin/sysinst/arch/i386/md.c:1.20
--- src/usr.sbin/sysinst/arch/i386/md.c:1.19 Sat Jul 13 17:13:38 2019
+++ src/usr.sbin/sysinst/arch/i386/md.c Sun Jul 14 11:27:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.19 2019/07/13 17:13:38 martin Exp $ */
+/* $NetBSD: md.c,v 1.20 2019/07/14 11:27:33 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -60,6 +60,7 @@
#endif
static struct biosdisk_info *biosdisk = NULL;
+static bool uefi_boot;
/* prototypes */
@@ -68,11 +69,30 @@ static int mbr_root_above_chs(void);
static int md_read_bootcode(const char *, struct mbr_sector *);
static unsigned int get_bootmodel(void);
-static int conmib[] = {CTL_MACHDEP, CPU_CONSDEV};
+static int conmib[] = { CTL_MACHDEP, CPU_CONSDEV };
+
+#define BOOT_PART (128*(MEG/512))
+#define BOOT_PART_TYPE PT_EFI_SYSTEM
+
+static const char * uefi_bootloaders[] = {
+ "/usr/mdec/bootia32.efi",
+ "/usr/mdec/bootx64.efi",
+};
void
md_init(void)
{
+ char boot_method[100];
+ size_t len;
+
+ len = sizeof(boot_method);
+ if (sysctlbyname("machdep.bootmethod", boot_method, &len, NULL, 0)
+ != -1) {
+ if (strcmp(boot_method, "BIOS") == 0)
+ uefi_boot = false;
+ else if (strcmp(boot_method, "UEFI") == 0)
+ uefi_boot = true;
+ }
}
void
@@ -150,6 +170,10 @@ md_check_partitions(struct install_parti
int rval;
char *bootxx;
+ /* if booting via UEFI no boot blocks are needed */
+ if (uefi_boot)
+ return true;
+
/* check we have boot code for the root partition type */
bootxx = bootxx_name(install);
rval = access(bootxx, R_OK);
@@ -197,12 +221,10 @@ md_post_disklabel(struct install_partiti
}
/*
- * hook called after upgrade() or install() has finished setting
- * up the target disk but immediately before the user is given the
- * ``disks are now set up'' message.
+ * Do all legacy bootblock update/setup here
*/
-int
-md_post_newfs(struct install_partition_desc *install)
+static int
+md_post_newfs_bios(struct install_partition_desc *install)
{
int ret;
size_t len;
@@ -282,6 +304,82 @@ md_post_newfs(struct install_partition_d
return ret;
}
+/*
+ * Make sure our bootloader(s) are in the proper directory in the boot
+ * boot partition (or update them).
+ */
+static int
+copy_uefi_boot(const struct part_usage_info *boot)
+{
+ char dev[MAXPATHLEN], path[MAXPATHLEN];
+ size_t i;
+ int err;
+
+ if (!boot->parts->pscheme->get_part_device(boot->parts,
+ boot->cur_part_id, dev, sizeof(dev), NULL, plain_name, true))
+ return -1;
+
+ /*
+ * We should have a valid file system on that partition.
+ * Try to mount it and check if there is a /EFI in there.
+ */
+ if (boot->mount[0])
+ strlcpy(path, boot->mount, sizeof(path));
+ else
+ strcpy(path, "/mnt");
+
+ if (!(boot->instflags & PUIINST_MOUNT)) {
+ make_target_dir(path);
+ err = target_mount("", dev, path);
+ if (err != 0)
+ return err;
+ }
+
+ strlcat(path, "/EFI/boot", sizeof(path));
+ make_target_dir(path);
+
+ for (i = 0; i < __arraycount(uefi_bootloaders); i++) {
+ if (access(uefi_bootloaders[i], R_OK) != 0)
+ continue;
+ err = cp_to_target(uefi_bootloaders[i], path);
+ if (err)
+ return err;
+ }
+
+ return 0;
+}
+
+/*
+ * Find (U)EFI boot partition and
CVS commit: src/sys/external/bsd/dwc2/dist
Module Name:src Committed By: mlelstv Date: Sun Jul 14 13:55:43 UTC 2019 Modified Files: src/sys/external/bsd/dwc2/dist: dwc2_hcd.c Log Message: Fix error path, kmem_free doesn't allow NULL pointers. Fix compilation with CONFIG_USB_DWC2_TRACK_MISSED_SOFS. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/dwc2/dist/dwc2_hcd.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/dwc2/dist
Module Name:src Committed By: mlelstv Date: Sun Jul 14 13:55:43 UTC 2019 Modified Files: src/sys/external/bsd/dwc2/dist: dwc2_hcd.c Log Message: Fix error path, kmem_free doesn't allow NULL pointers. Fix compilation with CONFIG_USB_DWC2_TRACK_MISSED_SOFS. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/dwc2/dist/dwc2_hcd.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/dwc2/dist/dwc2_hcd.c diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.22 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.23 --- src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.22 Mon Aug 27 17:13:07 2018 +++ src/sys/external/bsd/dwc2/dist/dwc2_hcd.c Sun Jul 14 13:55:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc2_hcd.c,v 1.22 2018/08/27 17:13:07 riastradh Exp $ */ +/* $NetBSD: dwc2_hcd.c,v 1.23 2019/07/14 13:55:43 mlelstv Exp $ */ /* * hcd.c - DesignWare HS OTG Controller host-mode routines @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.22 2018/08/27 17:13:07 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.23 2019/07/14 13:55:43 mlelstv Exp $"); #include #include @@ -2424,13 +2424,16 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso error3: dwc2_hcd_release(hsotg); error2: - kmem_free(hsotg->core_params, sizeof(*hsotg->core_params)); + if (hsotg->core_params != NULL) + kmem_free(hsotg->core_params, sizeof(*hsotg->core_params)); #ifdef CONFIG_USB_DWC2_TRACK_MISSED_SOFS - kmem_free(hsotg->last_frame_num_array, - sizeof(*hsotg->last_frame_num_array) * FRAME_NUM_ARRAY_SIZE); - kmem_free(hsotg->frame_num_array, - sizeof(*hsotg->frame_num_array) * FRAME_NUM_ARRAY_SIZE); + if (hsotg->last_frame_num_array != NULL) + kmem_free(hsotg->last_frame_num_array, + sizeof(*hsotg->last_frame_num_array) * FRAME_NUM_ARRAY_SIZE); + if (hsotg->frame_num_array != NULL) + kmem_free(hsotg->frame_num_array, + sizeof(*hsotg->frame_num_array) * FRAME_NUM_ARRAY_SIZE); #endif dev_err(hsotg->dev, "%s() FAILED, returning %d\n", __func__, retval); @@ -2460,7 +2463,7 @@ void dwc2_hcd_remove(struct dwc2_hsotg * dwc2_hcd_release(hsotg); #ifdef CONFIG_USB_DWC2_TRACK_MISSED_SOFS - kfree(hsotg->last_frame_num_array); - kfree(hsotg->frame_num_array); + kmem_free(hsotg->last_frame_num_array, sizeof(*hsotg->last_frame_num_array) * FRAME_NUM_ARRAY_SIZE); + kmem_free(hsotg->frame_num_array, sizeof(*hsotg->frame_num_array) * FRAME_NUM_ARRAY_SIZE); #endif }
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jul 14 15:36:57 UTC 2019
Modified Files:
src/usr.sbin/sysinst: partman.c
Log Message:
Fix a few of the very stupid mistakes I made when converting this to
the abstract partitioning interface.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/sysinst/partman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.36 src/usr.sbin/sysinst/partman.c:1.37
--- src/usr.sbin/sysinst/partman.c:1.36 Sat Jul 13 17:13:36 2019
+++ src/usr.sbin/sysinst/partman.c Sun Jul 14 15:36:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.36 2019/07/13 17:13:36 martin Exp $ */
+/* $NetBSD: partman.c,v 1.37 2019/07/14 15:36:57 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -454,11 +454,11 @@ pm_fmt_disk_line(WINDOW *w, const char *
line = out;
}
if (no_size_display != NULL) {
- wprintw(w, "%-34s (%s)", line, no_size_display);
+ wprintw(w, " %-56s (%s)", line, no_size_display);
} else {
humanize_number(human, sizeof(human),
total, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
- wprintw(w, "%-34s %s", line, human);
+ wprintw(w, " %-56s %s", line, human);
}
}
@@ -2650,6 +2650,7 @@ pm_menufmt(menudesc *m, int opt, void *a
char buf[STRSIZE], dev[STRSIZE];
part_id part_num = ((struct part_entry *)arg)[opt].id;
struct pm_devs *pm_cur = ((struct part_entry *)arg)[opt].dev_ptr;
+ struct disk_partitions *parts = ((struct part_entry *)arg)[opt].parts;
struct disk_part_info info;
const char *mount_point, *fstype;
@@ -2668,11 +2669,16 @@ pm_menufmt(menudesc *m, int opt, void *a
dev_status);
break;
case PM_PART:
- pm_cur->parts->pscheme->get_part_device(pm_cur->parts,
- part_num, dev, sizeof dev, NULL, plain_name, false);
- pm_cur->parts->pscheme->get_part_info(pm_cur->parts,
+ if (parts->pscheme->get_part_device != NULL)
+parts->pscheme->get_part_device(
+parts, part_num,
+dev, sizeof dev, NULL, plain_name, false);
+ else
+strcpy(dev, "-");
+ parts->pscheme->get_part_info(parts,
part_num, &info);
- if (pm_cur->mounted[part_num] != NULL &&
+ if (pm_cur->mounted != NULL &&
+ pm_cur->mounted[part_num] != NULL &&
pm_cur->mounted[part_num][0] != 0)
mount_point = msg_string(MSG_pmmounted);
else
@@ -2754,6 +2760,8 @@ pm_upddevlist(menudesc *m, void *arg)
int i = 0;
size_t ii;
struct pm_devs *pm_i;
+ struct disk_partitions *secondary;
+ const struct disk_partitioning_scheme *ps;
struct disk_part_info info;
if (arg != NULL)
@@ -2788,14 +2796,48 @@ pm_upddevlist(menudesc *m, void *arg)
if (pm_i->no_part)
((struct part_entry *)arg)[i].type = PM_SPEC;
else {
+ ps = pm_i->parts != NULL ? pm_i->parts->pscheme : NULL;
+ secondary = NULL;
+
((struct part_entry *)arg)[i].type = PM_DISK;
- for (ii = 0; ii < pm_i->parts->num_part; ii++) {
-if (!pm_i->parts->pscheme->get_part_info(
-pm_i->parts, i, &info))
+
+ for (ii = 0; pm_i->parts != NULL &&
+ ii < pm_i->parts->num_part; ii++) {
+if (!ps->get_part_info(
+pm_i->parts, ii, &info))
continue;
-if (info.flags & (PTI_SEC_CONTAINER|
-PTI_WHOLE_DISK|PTI_PSCHEME_INTERNAL|
-PTI_RAW_PART))
+if (info.flags & PTI_SEC_CONTAINER) {
+ if (secondary == NULL &&
+ ps->secondary_scheme != NULL)
+ secondary = ps->
+ secondary_partitions(
+ pm_i->parts,
+ info.start, false);
+ continue;
+}
+if (info.flags & (PTI_WHOLE_DISK|
+PTI_PSCHEME_INTERNAL|PTI_RAW_PART))
+ continue;
+if (info.fs_type == FS_UNUSED)
+ continue;
+i++;
+m->opts[i].opt_name = NULL;
+m->opts[i].opt_exp_name = NULL;
+m->opts[i].opt_action = pm_submenu;
+((struct part_entry *)arg)[i].parts =
+pm_i->parts;
+((struct part_entry *)arg)[i].dev_ptr = pm_i;
+((struct part_entry *)arg)[i].id = ii;
+((struct part_entry *)arg)[i].type = PM_PART;
+ }
+
+ for (ii = 0; secondary != NULL &&
+ ii < secondary->num_part; ii++) {
+if (!secondary->pscheme->get_part_info(
+secondary, ii, &info))
+ continue;
+if (info.flags & (PTI_WHOLE_DISK|
+PTI_PSCHEME_INTERNAL|PTI_RAW_PART))
continue;
if (info.fs_type == FS_UNUSED)
continue;
@@ -2803,6 +2845,7 @@ pm_upddevlist(menudesc *m, void *arg)
m->opts[i].opt_name = NULL;
m->opts[i].opt_exp_name = NULL;
m->opts[i].opt_action = pm_submenu;
+((struct part_entry *)arg)[i].parts = secondary;
((struct part_entry *)arg)[i].dev_ptr = pm_i;
((struct part_entry *)arg)[i].id = ii;
((struct part_entry *)arg)[i].type = PM_PART;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 14 15:36:57 UTC 2019 Modified Files: src/usr.sbin/sysinst: partman.c Log Message: Fix a few of the very stupid mistakes I made when converting this to the abstract partitioning interface. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/sysinst/partman.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: kamil
Date: Sun Jul 14 16:04:03 UTC 2019
Modified Files:
src/usr.sbin/sysinst: msg.mi.pl
Log Message:
Update sysinst(8) Polish translations
Submitted by Krzysztof Lasocki.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.18 src/usr.sbin/sysinst/msg.mi.pl:1.19
--- src/usr.sbin/sysinst/msg.mi.pl:1.18 Wed Jun 12 06:20:18 2019
+++ src/usr.sbin/sysinst/msg.mi.pl Sun Jul 14 16:04:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.18 2019/06/12 06:20:18 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.19 2019/07/14 16:04:03 kamil Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -46,7 +46,7 @@ message sysinst_message_language
message sysinst_message_locale
{pl_PL.ISO8859-2}
-message out_of_memory {Out of memory!}
+message out_of_memory {Zabraklo pamieci!}
message Yes {Tak}
message No {Nie}
message All {Wszystkie}
@@ -61,13 +61,13 @@ message Off {Wylaczone}
message Delete {Usunac?}
message install
-{zainstalowac}
+{zainstaluj}
message reinstall
{przeinstaluj pakiety dla}
message upgrade
-{zaktualizowac}
+{zaktualizuj}
message mount_failed
{Montowanie %s nie powiodlo sie. Kontynuowac?
@@ -75,11 +75,11 @@ message mount_failed
message hello
{Witaj w sysinst, systemie instalacyjnym NetBSD-@@VERSION@@.
-To, oparte na menu, narzedzie zostalo stworzone aby pomoc ci zainstalowac
+To oparte na menu narzedzie zostalo stworzone aby pomoc ci zainstalowac
NetBSD na twardym dysku, lub zaktualizowac istniejacy system NetBSD,
-zuzywajac minimum czasu. W ponizszych menu mozesz zmienic aktualne
+zuzywajac minimum czasu. W ponizszych menu mozesz zmienic aktualne
ustawienia poprzez naciskanie klawiszy (a, b, c, ...). Klawisze strzalek
-takze moga dzialac. Aktywujesz ustawienie poprzez nacisniecie ENTER.
+takze moga dzialac. Aktywujesz ustawienie poprzez nacisniecie ENTER.
}
message thanks
@@ -170,8 +170,8 @@ message gigname
* $5 = install with X min. 427M
*/
message layout_prologue_none
-{You can use a simple editor to set the sizes of the NetBSD partitions,
-or apply the default partition sizes and contents.}
+{Mozesz uzyc prostego edytora aby ustawic rozmiary partycji NetBSD,
+lub uzyc domyslnych rozmiarow i zawartosci.}
/* Called with:Example
* $0 = device name wd0
@@ -183,9 +183,9 @@ or apply the default partition sizes and
*/
message layout_prologue_existing
-{If you do not want to use the existing partitions, you can
-use a simple editor to set the sizes of the NetBSD partitions,
-or remove existing ones and apply the default partition sizes.}
+{Jezeli nie chcesz uzywac instniejacych partycji, mozesz uzyc
+prostego edytora aby ustawic rozmiary partycji NetBSD, lub usunac
+istniejace partycje i uzyc domyslnych rozmiarow partycji.}
/* Called with:Example
* $0 = device name wd0
@@ -197,13 +197,12 @@ or remove existing ones and apply the de
*/
message layout_main
{
-You will then be given the opportunity to change any of the partition
-details.
+Bedziesz mial szanse zmienic wlasciwosci partycji.
-The NetBSD (or free) part of your disk ($0) is $3.
+Czesc NetBSD (lub wolna) twojego dysku ($0) to $3.
-A full installation requires at least $4 without X and
-at least $5 if the X sets are included.}
+Pelna instalacja wymaga co najmniej $4 bez Xorg, oraz co najmniej $5
+jezeli zainstalujesz z pakietami instalacyjnymi Xorg.}
message Choose_your_size_specifier
{Wybranie Mega/Gigabajtow nada partycji rozmiar bliski twojemu wyborowi,
@@ -227,11 +226,11 @@ Wolna przestrzen zostanie dodana do part
/* Called with: Example
* $0 = list of marker explanations '=' existining, '@' external
*/
-message ptnsizes_markers {Other markers: $0 partition.}
-message ptnsizes_mark_existing {'=' existing}
-message ptnsizes_mark_external {'@' external}
+message ptnsizes_markers {Inne znaczniki: partycja $0.}
+message ptnsizes_mark_existing {'=' istniejacy}
+message ptnsizes_mark_external {'@' zewnetrzny}
-message ptnheaders_size {Size}
+message ptnheaders_size {Rozmiar}
message ptnheaders_filesystem {System plikow}
message askfsmount
@@ -250,7 +249,7 @@ message Whole_disk_cant_change
{Caly dysk}
message Boot_partition_cant_change
-{partycja uruchomic}
+{partycja rozruchowa}
message add_another_ptn
{Dodaj partycje zdefiniowana przez uzytkownika}
@@ -260,18 +259,17 @@ message add_another_ptn
* $1 = size unit GB
*/
message fssizesok
-{Go on. Free space $0 $1.}
+{Dalej. Wolne miejsce: $0 $1.}
/* Called with: Example
* $0 = missing space 1.4
* $1 = size unit GB
*/
message fssizesbad
-{Abort. Not enough space, $0 $1 missing!}
+{Anulowano. Niewystarczajace miejsc
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: kamil Date: Sun Jul 14 16:04:03 UTC 2019 Modified Files: src/usr.sbin/sysinst: msg.mi.pl Log Message: Update sysinst(8) Polish translations Submitted by Krzysztof Lasocki. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/msg.mi.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jul 14 16:12:02 UTC 2019 Modified Files: src/usr.sbin/sysinst: partman.c Log Message: Limit the number of menu entries in extended partitioning to the pre-allocated storage. Minor cosmetics. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/partman.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jul 14 16:12:02 UTC 2019
Modified Files:
src/usr.sbin/sysinst: partman.c
Log Message:
Limit the number of menu entries in extended partitioning to the
pre-allocated storage.
Minor cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/partman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.37 src/usr.sbin/sysinst/partman.c:1.38
--- src/usr.sbin/sysinst/partman.c:1.37 Sun Jul 14 15:36:57 2019
+++ src/usr.sbin/sysinst/partman.c Sun Jul 14 16:12:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.37 2019/07/14 15:36:57 martin Exp $ */
+/* $NetBSD: partman.c,v 1.38 2019/07/14 16:12:02 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -2683,10 +2683,23 @@ pm_menufmt(menudesc *m, int opt, void *a
mount_point = msg_string(MSG_pmmounted);
else
mount_point = msg_string(MSG_pmunused);
- fstype = getfslabelname(info.fs_type, info.fs_sub_type);
- snprintf(buf, STRSIZE, "%s (%s) %s",
-info.last_mounted, fstype, mount_point);
- pm_fmt_disk_line(m->mw, dev, buf, info.size, NULL);
+ fstype = getfslabelname(info.fs_type,
+ info.fs_sub_type);
+ if (info.last_mounted != NULL) {
+snprintf(buf, STRSIZE, "%s (%s) %s",
+info.last_mounted, fstype,
+ mount_point);
+pm_fmt_disk_line(m->mw, dev, buf,
+info.size, NULL);
+ } else {
+if (fstype != NULL) {
+ strlcat(dev, " (", sizeof(dev));
+ strlcat(dev, fstype, sizeof(dev));
+ strlcat(dev, ")", sizeof(dev));
+}
+pm_fmt_disk_line(m->mw, dev, NULL,
+info.size, NULL);
+ }
break;
case PM_SPEC:
/* XXX ? */
@@ -2820,6 +2833,8 @@ pm_upddevlist(menudesc *m, void *arg)
continue;
if (info.fs_type == FS_UNUSED)
continue;
+if (i >= MAX_ENTRIES)
+ break;
i++;
m->opts[i].opt_name = NULL;
m->opts[i].opt_exp_name = NULL;
@@ -2841,6 +2856,8 @@ pm_upddevlist(menudesc *m, void *arg)
continue;
if (info.fs_type == FS_UNUSED)
continue;
+if (i >= MAX_ENTRIES)
+ break;
i++;
m->opts[i].opt_name = NULL;
m->opts[i].opt_exp_name = NULL;
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Sun Jul 14 18:50:58 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-nat.c
Log Message:
PR/54375: Andreas Gustafsson: gdb attached to running process shows extra
thread. When attaching to a process that has threads make sure that we
mutate the inferior_ptid (that currently has lwpid == 0 to the first thread
we encounter.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.12 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.13
--- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.12 Thu Jun 13 21:00:52 2019
+++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Sun Jul 14 14:50:58 2019
@@ -263,7 +263,12 @@ nbsd_add_threads (pid_t pid)
{
ptid_t ptid = ptid_t (pid, pl.pl_lwpid, 0);
if (!in_thread_list (ptid))
- add_thread (ptid);
+ {
+ if (inferior_ptid.lwp () == 0)
+ thread_change_ptid (inferior_ptid, ptid);
+ else
+ add_thread (ptid);
+ }
}
}
@@ -454,7 +459,10 @@ nbsd_nat_target::wait (ptid_t ptid, stru
ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
return wptid;
}
-add_thread (wptid);
+ if (inferior_ptid.lwp () == 0)
+ thread_change_ptid (inferior_ptid, wptid);
+ else
+ add_thread (wptid);
ourstatus->kind = TARGET_WAITKIND_THREAD_CREATED;
if (debug_nbsd_lwp)
fprintf_unfiltered (gdb_stdlog, "NLWP: created LWP %d\n", pst.pe_lwp);
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Sun Jul 14 18:50:58 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-nat.c Log Message: PR/54375: Andreas Gustafsson: gdb attached to running process shows extra thread. When attaching to a process that has threads make sure that we mutate the inferior_ptid (that currently has lwpid == 0 to the first thread we encounter. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/compile
Module Name:src
Committed By: thorpej
Date: Sun Jul 14 20:12:22 UTC 2019
Modified Files:
src/sys/arch/evbarm/compile: rpi-mkknlimg.sh
Log Message:
Add a 'DDTK' tag so that the RPI firmware will load device tree overlays.
Based on a patch I got from Nick Hudson ages ago.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/compile/rpi-mkknlimg.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/compile/rpi-mkknlimg.sh
diff -u src/sys/arch/evbarm/compile/rpi-mkknlimg.sh:1.1 src/sys/arch/evbarm/compile/rpi-mkknlimg.sh:1.2
--- src/sys/arch/evbarm/compile/rpi-mkknlimg.sh:1.1 Sun Dec 10 21:38:26 2017
+++ src/sys/arch/evbarm/compile/rpi-mkknlimg.sh Sun Jul 14 20:12:22 2019
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: rpi-mkknlimg.sh,v 1.1 2017/12/10 21:38:26 skrll Exp $
+# $NetBSD: rpi-mkknlimg.sh,v 1.2 2019/07/14 20:12:22 thorpej Exp $
#
# Tag an RPI kernel so the firmware will load device tree
@@ -8,8 +8,8 @@
magic_rptl=1280594002 # 'RPTL'
magic_283x=2016622642 # '283x'
-magic_ddtk=
-magic_dtok=1263490116
+magic_ddtk=1263813700 # 'DDTK'
+magic_dtok=1263490116 # 'DTOK'
magic_kver=
if [ $# -ne 2 ] ; then
@@ -48,9 +48,12 @@ le32enc()
le32enc 1
le32enc 4
le32enc $magic_dtok
+ le32enc 1
+ le32enc 4
+ le32enc $magic_ddtk
- # length ( 9 * 4 + 8)
- le32enc 44
+ # length ( 11 * 4 + 12)
+ le32enc 56
le32enc 4
le32enc $magic_rptl
} > ${output}
CVS commit: src/sys/arch/evbarm/compile
Module Name:src Committed By: thorpej Date: Sun Jul 14 20:12:22 UTC 2019 Modified Files: src/sys/arch/evbarm/compile: rpi-mkknlimg.sh Log Message: Add a 'DDTK' tag so that the RPI firmware will load device tree overlays. Based on a patch I got from Nick Hudson ages ago. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/compile/rpi-mkknlimg.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Sun Jul 14 21:37:09 UTC 2019
Modified Files:
src/sys/dev/usb: if_axe.c if_axereg.h
Log Message:
move software parts out of the "reg" header.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/if_axereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.98 src/sys/dev/usb/if_axe.c:1.99
--- src/sys/dev/usb/if_axe.c:1.98 Tue May 28 07:41:50 2019
+++ src/sys/dev/usb/if_axe.c Sun Jul 14 21:37:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.98 2019/05/28 07:41:50 msaitoh Exp $ */
+/* $NetBSD: if_axe.c,v 1.99 2019/07/14 21:37:09 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.98 2019/05/28 07:41:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.99 2019/07/14 21:37:09 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -127,6 +127,94 @@ __KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1
#include
+struct axe_type {
+ struct usb_devno axe_dev;
+ uint16_t axe_flags;
+};
+
+struct axe_softc;
+
+struct axe_chain {
+ struct axe_softc *axe_sc;
+ struct usbd_xfer *axe_xfer;
+ uint8_t *axe_buf;
+ int axe_accum;
+ int axe_idx;
+};
+
+struct axe_cdata {
+ struct axe_chain axe_tx_chain[AXE_TX_LIST_CNT];
+ struct axe_chain axe_rx_chain[AXE_RX_LIST_CNT];
+ int axe_tx_prod;
+ int axe_tx_cons;
+ int axe_tx_cnt;
+ int axe_rx_prod;
+};
+
+struct axe_softc {
+ device_t axe_dev;
+ struct ethercom axe_ec;
+ struct mii_data axe_mii;
+ krndsource_t rnd_source;
+ struct usbd_device * axe_udev;
+ struct usbd_interface * axe_iface;
+
+ uint16_t axe_vendor;
+ uint16_t axe_product;
+ uint32_t axe_flags; /* copied from axe_type */
+#define AX178 __BIT(0) /* AX88178 */
+#define AX772 __BIT(1) /* AX88772 */
+#define AX772A __BIT(2) /* AX88772A */
+#define AX772B __BIT(3) /* AX88772B */
+#define AXSTD_FRAME __BIT(12)
+#define AXCSUM_FRAME __BIT(13)
+
+ int axe_ed[AXE_ENDPT_MAX];
+ struct usbd_pipe * axe_ep[AXE_ENDPT_MAX];
+ int axe_if_flags;
+ int axe_phyno;
+ struct axe_cdata axe_cdata;
+ struct callout axe_stat_ch;
+
+ uint8_t axe_enaddr[ETHER_ADDR_LEN];
+
+ int axe_refcnt;
+ bool axe_dying;
+ bool axe_attached;
+
+ struct usb_task axe_tick_task;
+
+ kmutex_t axe_mii_lock;
+
+ int axe_link;
+
+ uint8_t axe_ipgs[3];
+ uint8_t axe_phyaddrs[2];
+ uint16_t sc_pwrcfg;
+ uint16_t sc_lenmask;
+
+ struct timeval axe_rx_notice;
+ int axe_bufsz;
+
+#define sc_if axe_ec.ec_if
+};
+
+#define AXE_IS_178_FAMILY(sc) \
+ ((sc)->axe_flags & (AX772 | AX772A | AX772B | AX178))
+
+#define AXE_IS_772(sc) \
+ ((sc)->axe_flags & (AX772 | AX772A | AX772B))
+
+#define AX_RXCSUM \
+(IFCAP_CSUM_IPv4_Rx | \
+ IFCAP_CSUM_TCPv4_Rx | IFCAP_CSUM_UDPv4_Rx | \
+ IFCAP_CSUM_TCPv6_Rx | IFCAP_CSUM_UDPv6_Rx)
+
+#define AX_TXCSUM \
+(IFCAP_CSUM_IPv4_Tx | \
+ IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx | \
+ IFCAP_CSUM_TCPv6_Tx | IFCAP_CSUM_UDPv6_Tx)
+
/*
* AXE_178_MAX_FRAME_BURST
* max frame burst size for Ax88178 and Ax88772
Index: src/sys/dev/usb/if_axereg.h
diff -u src/sys/dev/usb/if_axereg.h:1.20 src/sys/dev/usb/if_axereg.h:1.21
--- src/sys/dev/usb/if_axereg.h:1.20 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_axereg.h Sun Jul 14 21:37:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axereg.h,v 1.20 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_axereg.h,v 1.21 2019/07/14 21:37:09 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -367,7 +367,7 @@ struct axe_csum_hdr {
#define AXE_CSUM_RXBYTES(x) ((x) & AXE_CSUM_HDR_LEN_MASK)
/*
- * The interrupt and CBW endpoints are currently unused byt the driver.
+ * The interrupt and CBW endpoints are currently unused by tthe driver.
*/
#define AXE_ENDPT_CTRL 0x0
#define AXE_ENDPT_INTR 0x1
@@ -377,91 +377,3 @@ struct axe_csum_hdr {
#define AXx72A_ENDPT_TXCBW 0x5 /* AX88172A, and AX88772A */
#define AX772B_ENDPT_BOTM 0x5 /* AX88772B */
#define AXE_ENDPT_MAX 0x6
-
-struct axe_type {
- struct usb_devno axe_dev;
- uint16_t axe_flags;
-};
-
-struct axe_softc;
-
-struct axe_chain {
- struct axe_softc *axe_sc;
- struct usbd_xfer *axe_xfer;
- uint8_t *axe_buf;
- int axe_accum;
- int axe_idx;
-};
-
-struct axe_cdata {
- struct axe_chain axe_tx_chain[AXE_TX_LIST_CNT];
- struct axe_chain axe_rx_chain[AXE_RX_LIST_CNT];
- int axe_tx_prod;
- int axe_tx_cons;
- int axe_tx_cnt;
- int axe_rx_prod;
-};
-
-struct axe_softc {
- device_t axe_dev;
- struct ethercom axe_ec;
- struct mii_data axe_mii;
- krndsource_t rnd_source;
- struct usbd_device * axe_udev;
- struct usbd_interface * axe_iface;
-
- uint16_t axe_vendor;
- uint16_t axe_product;
- uint32_t axe_flags; /* copied from axe_t
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Sun Jul 14 21:37:09 UTC 2019 Modified Files: src/sys/dev/usb: if_axe.c if_axereg.h Log Message: move software parts out of the "reg" header. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/dev/usb/if_axe.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/if_axereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/getty
Module Name:src Committed By: uwe Date: Mon Jul 15 01:26:15 UTC 2019 Modified Files: src/libexec/getty: gettytab.5 Log Message: Tweak markup some more. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/libexec/getty/gettytab.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/getty/gettytab.5 diff -u src/libexec/getty/gettytab.5:1.39 src/libexec/getty/gettytab.5:1.40 --- src/libexec/getty/gettytab.5:1.39 Fri Jul 12 03:32:41 2019 +++ src/libexec/getty/gettytab.5 Mon Jul 15 01:26:15 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: gettytab.5,v 1.39 2019/07/12 03:32:41 uwe Exp $ +.\" $NetBSD: gettytab.5,v 1.40 2019/07/15 01:26:15 uwe Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -289,19 +289,18 @@ of milliseconds of delay required (a la This delay is simulated by repeated use of the pad character .Ic \&pc . .Pp -The initial message, and login message, -.Ic \&im -and +The initial message +.Ic \&im\^ , +and login message .Ic \&lm may include any of the following character sequences, which expand to information about the environment in which .Xr getty 8 is running. -.Pp -.Bl -tag -width \&%xxx -compact -.It \&%d +.Bl -tag -width ".Li " +.It Li \&%d The current date. -.It \&%h +.It Li \&%h The hostname of the machine, which is normally obtained from the system using .Xr gethostname 3 , @@ -311,27 +310,39 @@ table entry. In either case it may be edited with the .Ic \&he string. -A '@' in the +A +.Ql @ +in the .Ic \&he string causes one character from the real hostname to be copied to the final hostname. -A '#' in the +A +.Ql # +in the .Ic \&he string causes the next character of the real hostname to be skipped. Each character that -is neither '@' nor '#' is copied into the final hostname. -Surplus '@' and '#' characters are ignored. -.It \&%t +is neither +.Ql @ +nor +.Ql # +is copied into the final hostname. +Surplus +.Ql @ +and +.Ql # +characters are ignored. +.It Li \&%t The tty name. -.It "\&%m, \&%r, \&%s, \&%v" +.It Li \&%m , \&%r , \&%s , \&%v The type of machine, release of the operating system, name of the operating system, and version of the kernel, respectively, as returned by .Xr uname 3 . -.It \&%% +.It Li \&%% A -.Dq % +.Ql % character. .El .Pp @@ -351,7 +362,7 @@ string, can be used to enter additional the environment. It is a list of comma separated strings, each of which will presumably be of the form -.Em name=value . +.Ar name Ns Li \^= Ns Ar value . .Pp If a non-zero timeout is specified, with .Ic \&to , @@ -392,7 +403,7 @@ link bringup sequence is recognized, .Xr getty 8 will invoke the program referenced by the .Ic \&pp -string, e.g. +string, e.g.\& .Xr pppd 8 . This can be used to handle incoming .Tn PPP @@ -417,8 +428,14 @@ by .Xr login 1 . In .Em all -cases, '#' or '^H' typed in a login name will be treated as -an erase character, and '@' will be treated as a kill character. +cases, +.Ql # +or +.Ql ^H +typed in a login name will be treated as +an erase character, and +.Ql @ +will be treated as a kill character. .Pp The delay stuff is a real crock. Apart from its general lack of flexibility, some
CVS commit: src/libexec/getty
Module Name:src Committed By: uwe Date: Mon Jul 15 01:26:15 UTC 2019 Modified Files: src/libexec/getty: gettytab.5 Log Message: Tweak markup some more. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/libexec/getty/gettytab.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Mon Jul 15 03:14:22 UTC 2019
Modified Files:
src/sys/dev/usb: if_axen.c
Log Message:
minor white space adjustments.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/if_axen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.49 src/sys/dev/usb/if_axen.c:1.50
--- src/sys/dev/usb/if_axen.c:1.49 Fri Jun 28 01:57:43 2019
+++ src/sys/dev/usb/if_axen.c Mon Jul 15 03:14:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.49 2019/06/28 01:57:43 mrg Exp $ */
+/* $NetBSD: if_axen.c,v 1.50 2019/07/15 03:14:22 mrg Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.49 2019/06/28 01:57:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.50 2019/07/15 03:14:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -902,7 +902,7 @@ axen_attach(device_t parent, device_t se
aprint_normal_dev(self, "AX88179\n");
aprint_normal_dev(self, "Ethernet address %s\n", ether_sprintf(eaddr));
- /* Initialize interface info.*/
+ /* Initialize interface info. */
ifp = &sc->sc_if;
ifp->if_softc = sc;
@@ -1796,7 +1796,6 @@ axen_stop_locked(struct ifnet *ifp, int
if (err) {
aprint_error_dev(sc->axen_dev,
"abort rx pipe failed: %s\n", usbd_errstr(err));
-
}
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Mon Jul 15 03:14:22 UTC 2019 Modified Files: src/sys/dev/usb: if_axen.c Log Message: minor white space adjustments. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/if_axen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xbiff/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:45 UTC 2019 Update of /cvsroot/xsrc/external/mit/xbiff/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2972 Log Message: initial import of xbiff-1.0.4 Status: Vendor Tag: xorg Release Tags: xbiff-1-0-4 U xsrc/external/mit/xbiff/dist/Makefile.am U xsrc/external/mit/xbiff/dist/config.guess U xsrc/external/mit/xbiff/dist/ChangeLog U xsrc/external/mit/xbiff/dist/INSTALL U xsrc/external/mit/xbiff/dist/Mailbox.c N xsrc/external/mit/xbiff/dist/README.md U xsrc/external/mit/xbiff/dist/install-sh U xsrc/external/mit/xbiff/dist/configure U xsrc/external/mit/xbiff/dist/Makefile.in U xsrc/external/mit/xbiff/dist/xbiff.c U xsrc/external/mit/xbiff/dist/aclocal.m4 U xsrc/external/mit/xbiff/dist/missing U xsrc/external/mit/xbiff/dist/depcomp C xsrc/external/mit/xbiff/dist/compile U xsrc/external/mit/xbiff/dist/config.h.in U xsrc/external/mit/xbiff/dist/configure.ac U xsrc/external/mit/xbiff/dist/config.sub U xsrc/external/mit/xbiff/dist/MailboxP.h U xsrc/external/mit/xbiff/dist/Mailbox.h U xsrc/external/mit/xbiff/dist/COPYING U xsrc/external/mit/xbiff/dist/bitmaps/mail-up U xsrc/external/mit/xbiff/dist/bitmaps/mail-down U xsrc/external/mit/xbiff/dist/bitmaps/mail-up-mask U xsrc/external/mit/xbiff/dist/bitmaps/mail-down-mask U xsrc/external/mit/xbiff/dist/man/xbiff.man U xsrc/external/mit/xbiff/dist/man/Makefile.am U xsrc/external/mit/xbiff/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xbiff/dist
CVS import: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:46 UTC 2019 Update of /cvsroot/xsrc/external/mit/xclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24186 Log Message: initial import of xclock-1.0.9 Status: Vendor Tag: xorg Release Tags: xclock-1-0-9 U xsrc/external/mit/xclock/dist/config.rpath U xsrc/external/mit/xclock/dist/clock.bit U xsrc/external/mit/xclock/dist/clmask.bit U xsrc/external/mit/xclock/dist/ChangeLog U xsrc/external/mit/xclock/dist/INSTALL U xsrc/external/mit/xclock/dist/configure U xsrc/external/mit/xclock/dist/xclock.c U xsrc/external/mit/xclock/dist/Clock.h U xsrc/external/mit/xclock/dist/README.md U xsrc/external/mit/xclock/dist/config.sub U xsrc/external/mit/xclock/dist/config.guess U xsrc/external/mit/xclock/dist/config.h.in U xsrc/external/mit/xclock/dist/configure.ac U xsrc/external/mit/xclock/dist/compile U xsrc/external/mit/xclock/dist/Makefile.am C xsrc/external/mit/xclock/dist/Clock.c U xsrc/external/mit/xclock/dist/COPYING U xsrc/external/mit/xclock/dist/Makefile.in U xsrc/external/mit/xclock/dist/ClockP.h U xsrc/external/mit/xclock/dist/missing U xsrc/external/mit/xclock/dist/depcomp U xsrc/external/mit/xclock/dist/aclocal.m4 U xsrc/external/mit/xclock/dist/install-sh U xsrc/external/mit/xclock/dist/man/Makefile.in U xsrc/external/mit/xclock/dist/man/xclock.man U xsrc/external/mit/xclock/dist/man/Makefile.am U xsrc/external/mit/xclock/dist/app-defaults/XClock U xsrc/external/mit/xclock/dist/app-defaults/XClock-color 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xclock/dist
CVS import: xsrc/external/mit/xwininfo/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:49 UTC 2019 Update of /cvsroot/xsrc/external/mit/xwininfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14601 Log Message: initial import of xwininfo-1.1.5 Status: Vendor Tag: xorg Release Tags: xwininfo-1-1-5 U xsrc/external/mit/xwininfo/dist/config.rpath U xsrc/external/mit/xwininfo/dist/COPYING U xsrc/external/mit/xwininfo/dist/clientwin.h U xsrc/external/mit/xwininfo/dist/compile C xsrc/external/mit/xwininfo/dist/xwininfo.c U xsrc/external/mit/xwininfo/dist/dsimple.c U xsrc/external/mit/xwininfo/dist/strnlen.c U xsrc/external/mit/xwininfo/dist/config.h.in U xsrc/external/mit/xwininfo/dist/missing U xsrc/external/mit/xwininfo/dist/config.sub U xsrc/external/mit/xwininfo/dist/config.guess U xsrc/external/mit/xwininfo/dist/depcomp U xsrc/external/mit/xwininfo/dist/ChangeLog U xsrc/external/mit/xwininfo/dist/configure.ac N xsrc/external/mit/xwininfo/dist/README.md U xsrc/external/mit/xwininfo/dist/clientwin.c U xsrc/external/mit/xwininfo/dist/Makefile.am U xsrc/external/mit/xwininfo/dist/configure U xsrc/external/mit/xwininfo/dist/INSTALL U xsrc/external/mit/xwininfo/dist/install-sh U xsrc/external/mit/xwininfo/dist/aclocal.m4 U xsrc/external/mit/xwininfo/dist/Makefile.in U xsrc/external/mit/xwininfo/dist/dsimple.h U xsrc/external/mit/xwininfo/dist/strnlen.h U xsrc/external/mit/xwininfo/dist/man/Makefile.in U xsrc/external/mit/xwininfo/dist/man/xwininfo.man U xsrc/external/mit/xwininfo/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xwininfo/dist
CVS import: xsrc/external/mit/xwininfo/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:49 UTC 2019 Update of /cvsroot/xsrc/external/mit/xwininfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14601 Log Message: initial import of xwininfo-1.1.5 Status: Vendor Tag: xorg Release Tags: xwininfo-1-1-5 U xsrc/external/mit/xwininfo/dist/config.rpath U xsrc/external/mit/xwininfo/dist/COPYING U xsrc/external/mit/xwininfo/dist/clientwin.h U xsrc/external/mit/xwininfo/dist/compile C xsrc/external/mit/xwininfo/dist/xwininfo.c U xsrc/external/mit/xwininfo/dist/dsimple.c U xsrc/external/mit/xwininfo/dist/strnlen.c U xsrc/external/mit/xwininfo/dist/config.h.in U xsrc/external/mit/xwininfo/dist/missing U xsrc/external/mit/xwininfo/dist/config.sub U xsrc/external/mit/xwininfo/dist/config.guess U xsrc/external/mit/xwininfo/dist/depcomp U xsrc/external/mit/xwininfo/dist/ChangeLog U xsrc/external/mit/xwininfo/dist/configure.ac N xsrc/external/mit/xwininfo/dist/README.md U xsrc/external/mit/xwininfo/dist/clientwin.c U xsrc/external/mit/xwininfo/dist/Makefile.am U xsrc/external/mit/xwininfo/dist/configure U xsrc/external/mit/xwininfo/dist/INSTALL U xsrc/external/mit/xwininfo/dist/install-sh U xsrc/external/mit/xwininfo/dist/aclocal.m4 U xsrc/external/mit/xwininfo/dist/Makefile.in U xsrc/external/mit/xwininfo/dist/dsimple.h U xsrc/external/mit/xwininfo/dist/strnlen.h U xsrc/external/mit/xwininfo/dist/man/Makefile.in U xsrc/external/mit/xwininfo/dist/man/xwininfo.man U xsrc/external/mit/xwininfo/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xwininfo/dist
CVS import: xsrc/external/mit/xman/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:47 UTC 2019 Update of /cvsroot/xsrc/external/mit/xman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20498 Log Message: initial import of xman-1.1.5 Status: Vendor Tag: xorg Release Tags: xman-1-1-5 U xsrc/external/mit/xman/dist/tkfuncs.c U xsrc/external/mit/xman/dist/globals.h C xsrc/external/mit/xman/dist/misc.c U xsrc/external/mit/xman/dist/config.guess U xsrc/external/mit/xman/dist/config.sub U xsrc/external/mit/xman/dist/ScrollByL.c U xsrc/external/mit/xman/dist/INSTALL U xsrc/external/mit/xman/dist/config.h.in U xsrc/external/mit/xman/dist/main.c U xsrc/external/mit/xman/dist/man.c U xsrc/external/mit/xman/dist/vendor.c U xsrc/external/mit/xman/dist/ScrollByLP.h N xsrc/external/mit/xman/dist/README.md U xsrc/external/mit/xman/dist/aclocal.m4 U xsrc/external/mit/xman/dist/configure U xsrc/external/mit/xman/dist/depcomp U xsrc/external/mit/xman/dist/missing U xsrc/external/mit/xman/dist/install-sh U xsrc/external/mit/xman/dist/Makefile.am U xsrc/external/mit/xman/dist/icon_open.h U xsrc/external/mit/xman/dist/ChangeLog U xsrc/external/mit/xman/dist/defs.h U xsrc/external/mit/xman/dist/help.c U xsrc/external/mit/xman/dist/globals.c U xsrc/external/mit/xman/dist/handler.c U xsrc/external/mit/xman/dist/man.h U xsrc/external/mit/xman/dist/Makefile.in U xsrc/external/mit/xman/dist/vendor.h U xsrc/external/mit/xman/dist/xman.help U xsrc/external/mit/xman/dist/search.c U xsrc/external/mit/xman/dist/compile U xsrc/external/mit/xman/dist/configure.ac U xsrc/external/mit/xman/dist/COPYING U xsrc/external/mit/xman/dist/iconclosed.h U xsrc/external/mit/xman/dist/icon_help.h U xsrc/external/mit/xman/dist/ScrollByL.h U xsrc/external/mit/xman/dist/buttons.c U xsrc/external/mit/xman/dist/man/Makefile.in U xsrc/external/mit/xman/dist/man/xman.man U xsrc/external/mit/xman/dist/man/Makefile.am U xsrc/external/mit/xman/dist/app-defaults/Xman 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xman/dist
CVS import: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:46 UTC 2019 Update of /cvsroot/xsrc/external/mit/xclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24186 Log Message: initial import of xclock-1.0.9 Status: Vendor Tag: xorg Release Tags: xclock-1-0-9 U xsrc/external/mit/xclock/dist/config.rpath U xsrc/external/mit/xclock/dist/clock.bit U xsrc/external/mit/xclock/dist/clmask.bit U xsrc/external/mit/xclock/dist/ChangeLog U xsrc/external/mit/xclock/dist/INSTALL U xsrc/external/mit/xclock/dist/configure U xsrc/external/mit/xclock/dist/xclock.c U xsrc/external/mit/xclock/dist/Clock.h U xsrc/external/mit/xclock/dist/README.md U xsrc/external/mit/xclock/dist/config.sub U xsrc/external/mit/xclock/dist/config.guess U xsrc/external/mit/xclock/dist/config.h.in U xsrc/external/mit/xclock/dist/configure.ac U xsrc/external/mit/xclock/dist/compile U xsrc/external/mit/xclock/dist/Makefile.am C xsrc/external/mit/xclock/dist/Clock.c U xsrc/external/mit/xclock/dist/COPYING U xsrc/external/mit/xclock/dist/Makefile.in U xsrc/external/mit/xclock/dist/ClockP.h U xsrc/external/mit/xclock/dist/missing U xsrc/external/mit/xclock/dist/depcomp U xsrc/external/mit/xclock/dist/aclocal.m4 U xsrc/external/mit/xclock/dist/install-sh U xsrc/external/mit/xclock/dist/man/Makefile.in U xsrc/external/mit/xclock/dist/man/xclock.man U xsrc/external/mit/xclock/dist/man/Makefile.am U xsrc/external/mit/xclock/dist/app-defaults/XClock U xsrc/external/mit/xclock/dist/app-defaults/XClock-color 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xclock/dist
CVS import: xsrc/external/mit/xman/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:47 UTC 2019 Update of /cvsroot/xsrc/external/mit/xman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20498 Log Message: initial import of xman-1.1.5 Status: Vendor Tag: xorg Release Tags: xman-1-1-5 U xsrc/external/mit/xman/dist/tkfuncs.c U xsrc/external/mit/xman/dist/globals.h C xsrc/external/mit/xman/dist/misc.c U xsrc/external/mit/xman/dist/config.guess U xsrc/external/mit/xman/dist/config.sub U xsrc/external/mit/xman/dist/ScrollByL.c U xsrc/external/mit/xman/dist/INSTALL U xsrc/external/mit/xman/dist/config.h.in U xsrc/external/mit/xman/dist/main.c U xsrc/external/mit/xman/dist/man.c U xsrc/external/mit/xman/dist/vendor.c U xsrc/external/mit/xman/dist/ScrollByLP.h N xsrc/external/mit/xman/dist/README.md U xsrc/external/mit/xman/dist/aclocal.m4 U xsrc/external/mit/xman/dist/configure U xsrc/external/mit/xman/dist/depcomp U xsrc/external/mit/xman/dist/missing U xsrc/external/mit/xman/dist/install-sh U xsrc/external/mit/xman/dist/Makefile.am U xsrc/external/mit/xman/dist/icon_open.h U xsrc/external/mit/xman/dist/ChangeLog U xsrc/external/mit/xman/dist/defs.h U xsrc/external/mit/xman/dist/help.c U xsrc/external/mit/xman/dist/globals.c U xsrc/external/mit/xman/dist/handler.c U xsrc/external/mit/xman/dist/man.h U xsrc/external/mit/xman/dist/Makefile.in U xsrc/external/mit/xman/dist/vendor.h U xsrc/external/mit/xman/dist/xman.help U xsrc/external/mit/xman/dist/search.c U xsrc/external/mit/xman/dist/compile U xsrc/external/mit/xman/dist/configure.ac U xsrc/external/mit/xman/dist/COPYING U xsrc/external/mit/xman/dist/iconclosed.h U xsrc/external/mit/xman/dist/icon_help.h U xsrc/external/mit/xman/dist/ScrollByL.h U xsrc/external/mit/xman/dist/buttons.c U xsrc/external/mit/xman/dist/man/Makefile.in U xsrc/external/mit/xman/dist/man/xman.man U xsrc/external/mit/xman/dist/man/Makefile.am U xsrc/external/mit/xman/dist/app-defaults/Xman 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xman/dist
CVS import: xsrc/external/mit/xbiff/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:45 UTC 2019 Update of /cvsroot/xsrc/external/mit/xbiff/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2972 Log Message: initial import of xbiff-1.0.4 Status: Vendor Tag: xorg Release Tags: xbiff-1-0-4 U xsrc/external/mit/xbiff/dist/Makefile.am U xsrc/external/mit/xbiff/dist/config.guess U xsrc/external/mit/xbiff/dist/ChangeLog U xsrc/external/mit/xbiff/dist/INSTALL U xsrc/external/mit/xbiff/dist/Mailbox.c N xsrc/external/mit/xbiff/dist/README.md U xsrc/external/mit/xbiff/dist/install-sh U xsrc/external/mit/xbiff/dist/configure U xsrc/external/mit/xbiff/dist/Makefile.in U xsrc/external/mit/xbiff/dist/xbiff.c U xsrc/external/mit/xbiff/dist/aclocal.m4 U xsrc/external/mit/xbiff/dist/missing U xsrc/external/mit/xbiff/dist/depcomp C xsrc/external/mit/xbiff/dist/compile U xsrc/external/mit/xbiff/dist/config.h.in U xsrc/external/mit/xbiff/dist/configure.ac U xsrc/external/mit/xbiff/dist/config.sub U xsrc/external/mit/xbiff/dist/MailboxP.h U xsrc/external/mit/xbiff/dist/Mailbox.h U xsrc/external/mit/xbiff/dist/COPYING U xsrc/external/mit/xbiff/dist/bitmaps/mail-up U xsrc/external/mit/xbiff/dist/bitmaps/mail-down U xsrc/external/mit/xbiff/dist/bitmaps/mail-up-mask U xsrc/external/mit/xbiff/dist/bitmaps/mail-down-mask U xsrc/external/mit/xbiff/dist/man/xbiff.man U xsrc/external/mit/xbiff/dist/man/Makefile.am U xsrc/external/mit/xbiff/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xbiff/dist
CVS import: xsrc/external/mit/setxkbmap/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:44 UTC 2019 Update of /cvsroot/xsrc/external/mit/setxkbmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5095 Log Message: initial import of setxkbmap-1.3.2 Status: Vendor Tag: xorg Release Tags: setxkbmap-1-3-2 U xsrc/external/mit/setxkbmap/dist/missing U xsrc/external/mit/setxkbmap/dist/depcomp U xsrc/external/mit/setxkbmap/dist/setxkbmap.c U xsrc/external/mit/setxkbmap/dist/compile U xsrc/external/mit/setxkbmap/dist/config.guess U xsrc/external/mit/setxkbmap/dist/config.sub U xsrc/external/mit/setxkbmap/dist/config.h.in U xsrc/external/mit/setxkbmap/dist/COPYING U xsrc/external/mit/setxkbmap/dist/Makefile.am U xsrc/external/mit/setxkbmap/dist/configure.ac U xsrc/external/mit/setxkbmap/dist/INSTALL U xsrc/external/mit/setxkbmap/dist/ChangeLog U xsrc/external/mit/setxkbmap/dist/Makefile.in U xsrc/external/mit/setxkbmap/dist/install-sh N xsrc/external/mit/setxkbmap/dist/README.md U xsrc/external/mit/setxkbmap/dist/aclocal.m4 U xsrc/external/mit/setxkbmap/dist/configure U xsrc/external/mit/setxkbmap/dist/man/Makefile.am U xsrc/external/mit/setxkbmap/dist/man/Makefile.in U xsrc/external/mit/setxkbmap/dist/man/setxkbmap.man No conflicts created by this import
CVS import: xsrc/external/mit/setxkbmap/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:50:44 UTC 2019 Update of /cvsroot/xsrc/external/mit/setxkbmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5095 Log Message: initial import of setxkbmap-1.3.2 Status: Vendor Tag: xorg Release Tags: setxkbmap-1-3-2 U xsrc/external/mit/setxkbmap/dist/missing U xsrc/external/mit/setxkbmap/dist/depcomp U xsrc/external/mit/setxkbmap/dist/setxkbmap.c U xsrc/external/mit/setxkbmap/dist/compile U xsrc/external/mit/setxkbmap/dist/config.guess U xsrc/external/mit/setxkbmap/dist/config.sub U xsrc/external/mit/setxkbmap/dist/config.h.in U xsrc/external/mit/setxkbmap/dist/COPYING U xsrc/external/mit/setxkbmap/dist/Makefile.am U xsrc/external/mit/setxkbmap/dist/configure.ac U xsrc/external/mit/setxkbmap/dist/INSTALL U xsrc/external/mit/setxkbmap/dist/ChangeLog U xsrc/external/mit/setxkbmap/dist/Makefile.in U xsrc/external/mit/setxkbmap/dist/install-sh N xsrc/external/mit/setxkbmap/dist/README.md U xsrc/external/mit/setxkbmap/dist/aclocal.m4 U xsrc/external/mit/setxkbmap/dist/configure U xsrc/external/mit/setxkbmap/dist/man/Makefile.am U xsrc/external/mit/setxkbmap/dist/man/Makefile.in U xsrc/external/mit/setxkbmap/dist/man/setxkbmap.man No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 15 04:54:48 UTC 2019
Modified Files:
xsrc/external/mit/xbiff/include: config.h
xsrc/external/mit/xclock/dist: Clock.c
xsrc/external/mit/xman/dist: misc.c
xsrc/external/mit/xwininfo/dist: xwininfo.c
xsrc/external/mit/xwininfo/include: config.h
Added Files:
xsrc/external/mit/xbiff/dist: compile
Removed Files:
xsrc/external/mit/setxkbmap/dist: README
xsrc/external/mit/xbiff/dist: README
xsrc/external/mit/xman/dist: README
xsrc/external/mit/xwininfo/dist: README
Log Message:
merge setxkbmap 1.3.2, xbiff 1.0.4, xclock 1.0.9, xman 1.1.5, and
xwininfo 1.1.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/setxkbmap/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xbiff/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xbiff/dist/compile
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xbiff/include/config.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xclock/dist/Clock.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xman/dist/README
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwininfo/dist/README
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xwininfo/dist/xwininfo.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xwininfo/include/config.h
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/xbiff/include/config.h
diff -u xsrc/external/mit/xbiff/include/config.h:1.1 xsrc/external/mit/xbiff/include/config.h:1.2
--- xsrc/external/mit/xbiff/include/config.h:1.1 Mon Feb 21 04:38:54 2011
+++ xsrc/external/mit/xbiff/include/config.h Mon Jul 15 04:54:47 2019
@@ -44,7 +44,7 @@
#define PACKAGE_NAME "xbiff"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xbiff 1.0.3"
+#define PACKAGE_STRING "xbiff 1.0.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xbiff"
@@ -53,7 +53,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.3"
+#define PACKAGE_VERSION "1.0.4"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -62,10 +62,10 @@
#define PACKAGE_VERSION_MINOR 0
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 3
+#define PACKAGE_VERSION_PATCHLEVEL 4
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.3"
+#define VERSION "1.0.4"
Index: xsrc/external/mit/xclock/dist/Clock.c
diff -u xsrc/external/mit/xclock/dist/Clock.c:1.2 xsrc/external/mit/xclock/dist/Clock.c:1.3
--- xsrc/external/mit/xclock/dist/Clock.c:1.2 Mon Mar 4 08:28:59 2019
+++ xsrc/external/mit/xclock/dist/Clock.c Mon Jul 15 04:54:47 2019
@@ -613,7 +613,7 @@ Initialize (Widget request, Widget new,
}
#endif /* NO_I18N */
- (void) gettimeofday(&tv, NULL);
+ X_GETTIMEOFDAY(&tv);
tm = *localtime(&tv.tv_sec);
str = TimeString (w, &tm);
len = strlen(str);
@@ -1611,7 +1611,7 @@ clock_tic(XtPointer client_data, XtInter
}
if (w->clock.show_second_hand &&
(tm.tm_sec != w->clock.otm.tm_sec ||
- tv.tv_usec != w->clock.otv.tv_usec))
+tv.tv_usec != w->clock.otv.tv_usec))
{
RenderSec (w, &w->clock.otm, &w->clock.otv, False);
RenderSec (w, &tm, &tv, False);
@@ -2173,7 +2173,7 @@ SetValues(Widget gcurrent, Widget greque
if (new->clock.update && XtIsRealized( (Widget) new))
new->clock.interval_id = XtAppAddTimeOut(
XtWidgetToApplicationContext(gnew),
- fabsl(new->clock.update)*1000,
+ fabsf(new->clock.update)*1000,
clock_tic, (XtPointer)gnew);
new->clock.show_second_hand =(fabsl(new->clock.update) <= SECOND_HAND_TIME);
Index: xsrc/external/mit/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.8 xsrc/external/mit/xman/dist/misc.c:1.9
--- xsrc/external/mit/xman/dist/misc.c:1.8 Sun Apr 24 17:36:11 2016
+++ xsrc/external/mit/xman/dist/misc.c Mon Jul 15 04:54:48 2019
@@ -667,6 +667,13 @@ static Boolean
ConstructCommand(char *cmdbuf, const char *path,
const char *filename, const char *tempfile)
{
+#ifdef HAVE_MANDB
+int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null",
+filename, tempfile);
+if (used >= BUFSIZ - 1)
+ return FALSE;
+return TRUE;
+#else
/* The original code did the following to produce a command line:
* sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL,
* filename, FORMAT, man_globals->tempfile, "2> /dev/null");
@@ -789,6 +796,7 @@ ConstructCommand(char *cmdbuf, const cha
return (FALSE);
return (TRUE);
+#endif /* man-db */
}
#endif /* HANDLE_ROFFSEQ */
I
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 04:54:48 UTC 2019 Modified Files: xsrc/external/mit/xbiff/include: config.h xsrc/external/mit/xclock/dist: Clock.c xsrc/external/mit/xman/dist: misc.c xsrc/external/mit/xwininfo/dist: xwininfo.c xsrc/external/mit/xwininfo/include: config.h Added Files: xsrc/external/mit/xbiff/dist: compile Removed Files: xsrc/external/mit/setxkbmap/dist: README xsrc/external/mit/xbiff/dist: README xsrc/external/mit/xman/dist: README xsrc/external/mit/xwininfo/dist: README Log Message: merge setxkbmap 1.3.2, xbiff 1.0.4, xclock 1.0.9, xman 1.1.5, and xwininfo 1.1.5. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/setxkbmap/dist/README cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xbiff/dist/README cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xbiff/dist/compile cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xbiff/include/config.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xclock/dist/Clock.c cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xman/dist/README cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xman/dist/misc.c cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwininfo/dist/README cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xwininfo/dist/xwininfo.c cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xwininfo/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/libICE/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:38:06 UTC 2019 Update of /cvsroot/xsrc/external/mit/libICE/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27248 Log Message: initial import of libICE-1.0.10 Status: Vendor Tag: xorg Release Tags: libICE-1-0-10 U xsrc/external/mit/libICE/dist/ltmain.sh U xsrc/external/mit/libICE/dist/configure.ac U xsrc/external/mit/libICE/dist/config.h.in U xsrc/external/mit/libICE/dist/missing U xsrc/external/mit/libICE/dist/depcomp U xsrc/external/mit/libICE/dist/COPYING U xsrc/external/mit/libICE/dist/compile U xsrc/external/mit/libICE/dist/AUTHORS U xsrc/external/mit/libICE/dist/config.sub U xsrc/external/mit/libICE/dist/ChangeLog U xsrc/external/mit/libICE/dist/ice.pc.in U xsrc/external/mit/libICE/dist/Makefile.in N xsrc/external/mit/libICE/dist/README.md U xsrc/external/mit/libICE/dist/docbook.am U xsrc/external/mit/libICE/dist/configure U xsrc/external/mit/libICE/dist/install-sh U xsrc/external/mit/libICE/dist/Makefile.am U xsrc/external/mit/libICE/dist/config.guess U xsrc/external/mit/libICE/dist/aclocal.m4 U xsrc/external/mit/libICE/dist/INSTALL U xsrc/external/mit/libICE/dist/src/process.c U xsrc/external/mit/libICE/dist/src/getauth.c U xsrc/external/mit/libICE/dist/src/setauth.c U xsrc/external/mit/libICE/dist/src/iceauth.c U xsrc/external/mit/libICE/dist/src/protosetup.c U xsrc/external/mit/libICE/dist/src/globals.h U xsrc/external/mit/libICE/dist/src/shutdown.c U xsrc/external/mit/libICE/dist/src/authutil.c U xsrc/external/mit/libICE/dist/src/ICElibint.h U xsrc/external/mit/libICE/dist/src/listen.c U xsrc/external/mit/libICE/dist/src/connect.c U xsrc/external/mit/libICE/dist/src/Makefile.am U xsrc/external/mit/libICE/dist/src/listenwk.c C xsrc/external/mit/libICE/dist/src/icetrans.c U xsrc/external/mit/libICE/dist/src/replywait.c U xsrc/external/mit/libICE/dist/src/Makefile.in U xsrc/external/mit/libICE/dist/src/watch.c U xsrc/external/mit/libICE/dist/src/ping.c U xsrc/external/mit/libICE/dist/src/locking.c U xsrc/external/mit/libICE/dist/src/error.c U xsrc/external/mit/libICE/dist/src/misc.c U xsrc/external/mit/libICE/dist/src/register.c U xsrc/external/mit/libICE/dist/src/accept.c U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEproto.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICE.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEmsg.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICElib.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEutil.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEconn.h U xsrc/external/mit/libICE/dist/specs/Makefile.am U xsrc/external/mit/libICE/dist/specs/Makefile.in U xsrc/external/mit/libICE/dist/specs/ice.xml U xsrc/external/mit/libICE/dist/doc/ICElib.xml U xsrc/external/mit/libICE/dist/doc/Makefile.am U xsrc/external/mit/libICE/dist/doc/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libICE/dist
CVS commit: xsrc/external/mit/libICE/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:38:37 UTC 2019 Modified Files: xsrc/external/mit/libICE/dist/src: icetrans.c Removed Files: xsrc/external/mit/libICE/dist: README Log Message: merge libICE 1.0.10. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libICE/dist/README cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libICE/dist/src/icetrans.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libICE/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:38:37 UTC 2019 Modified Files: xsrc/external/mit/libICE/dist/src: icetrans.c Removed Files: xsrc/external/mit/libICE/dist: README Log Message: merge libICE 1.0.10. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libICE/dist/README cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libICE/dist/src/icetrans.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/libICE/dist/src/icetrans.c diff -u xsrc/external/mit/libICE/dist/src/icetrans.c:1.3 xsrc/external/mit/libICE/dist/src/icetrans.c:1.4 --- xsrc/external/mit/libICE/dist/src/icetrans.c:1.3 Mon Mar 9 05:08:16 2009 +++ xsrc/external/mit/libICE/dist/src/icetrans.c Mon Jul 15 05:38:37 2019 @@ -24,8 +24,4 @@ #include #endif -#define ICE_t 1 -#define TRANS_CLIENT 1 -#define TRANS_SERVER 1 - #include
CVS import: xsrc/external/mit/libICE/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:38:06 UTC 2019 Update of /cvsroot/xsrc/external/mit/libICE/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27248 Log Message: initial import of libICE-1.0.10 Status: Vendor Tag: xorg Release Tags: libICE-1-0-10 U xsrc/external/mit/libICE/dist/ltmain.sh U xsrc/external/mit/libICE/dist/configure.ac U xsrc/external/mit/libICE/dist/config.h.in U xsrc/external/mit/libICE/dist/missing U xsrc/external/mit/libICE/dist/depcomp U xsrc/external/mit/libICE/dist/COPYING U xsrc/external/mit/libICE/dist/compile U xsrc/external/mit/libICE/dist/AUTHORS U xsrc/external/mit/libICE/dist/config.sub U xsrc/external/mit/libICE/dist/ChangeLog U xsrc/external/mit/libICE/dist/ice.pc.in U xsrc/external/mit/libICE/dist/Makefile.in N xsrc/external/mit/libICE/dist/README.md U xsrc/external/mit/libICE/dist/docbook.am U xsrc/external/mit/libICE/dist/configure U xsrc/external/mit/libICE/dist/install-sh U xsrc/external/mit/libICE/dist/Makefile.am U xsrc/external/mit/libICE/dist/config.guess U xsrc/external/mit/libICE/dist/aclocal.m4 U xsrc/external/mit/libICE/dist/INSTALL U xsrc/external/mit/libICE/dist/src/process.c U xsrc/external/mit/libICE/dist/src/getauth.c U xsrc/external/mit/libICE/dist/src/setauth.c U xsrc/external/mit/libICE/dist/src/iceauth.c U xsrc/external/mit/libICE/dist/src/protosetup.c U xsrc/external/mit/libICE/dist/src/globals.h U xsrc/external/mit/libICE/dist/src/shutdown.c U xsrc/external/mit/libICE/dist/src/authutil.c U xsrc/external/mit/libICE/dist/src/ICElibint.h U xsrc/external/mit/libICE/dist/src/listen.c U xsrc/external/mit/libICE/dist/src/connect.c U xsrc/external/mit/libICE/dist/src/Makefile.am U xsrc/external/mit/libICE/dist/src/listenwk.c C xsrc/external/mit/libICE/dist/src/icetrans.c U xsrc/external/mit/libICE/dist/src/replywait.c U xsrc/external/mit/libICE/dist/src/Makefile.in U xsrc/external/mit/libICE/dist/src/watch.c U xsrc/external/mit/libICE/dist/src/ping.c U xsrc/external/mit/libICE/dist/src/locking.c U xsrc/external/mit/libICE/dist/src/error.c U xsrc/external/mit/libICE/dist/src/misc.c U xsrc/external/mit/libICE/dist/src/register.c U xsrc/external/mit/libICE/dist/src/accept.c U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEproto.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICE.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEmsg.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICElib.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEutil.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEconn.h U xsrc/external/mit/libICE/dist/specs/Makefile.am U xsrc/external/mit/libICE/dist/specs/Makefile.in U xsrc/external/mit/libICE/dist/specs/ice.xml U xsrc/external/mit/libICE/dist/doc/ICElib.xml U xsrc/external/mit/libICE/dist/doc/Makefile.am U xsrc/external/mit/libICE/dist/doc/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libICE/dist
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: mrg Date: Mon Jul 15 05:41:17 UTC 2019 Modified Files: src/external/mit/xorg/bin/xbiff: Makefile src/external/mit/xorg/bin/xclock: Makefile src/external/mit/xorg/bin/xman: Makefile Log Message: define _CONST_X_STRING for newer versions. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xbiff/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xclock/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xman/Makefile 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/bin
Module Name:src
Committed By: mrg
Date: Mon Jul 15 05:41:17 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xbiff: Makefile
src/external/mit/xorg/bin/xclock: Makefile
src/external/mit/xorg/bin/xman: Makefile
Log Message:
define _CONST_X_STRING for newer versions.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xbiff/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xclock/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xman/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/bin/xbiff/Makefile
diff -u src/external/mit/xorg/bin/xbiff/Makefile:1.2 src/external/mit/xorg/bin/xbiff/Makefile:1.3
--- src/external/mit/xorg/bin/xbiff/Makefile:1.2 Mon Feb 21 04:40:24 2011
+++ src/external/mit/xorg/bin/xbiff/Makefile Mon Jul 15 05:41:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/21 04:40:24 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/15 05:41:16 mrg Exp $
.include
@@ -10,6 +10,7 @@ DPADD+= ${LIBXEXT} ${LIBXAW} ${LIBXMU} $
${LIBXAU}
CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include
+CPPFLAGS+= -D_CONST_X_STRING
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xclock/Makefile
diff -u src/external/mit/xorg/bin/xclock/Makefile:1.4 src/external/mit/xorg/bin/xclock/Makefile:1.5
--- src/external/mit/xorg/bin/xclock/Makefile:1.4 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xclock/Makefile Mon Jul 15 05:41:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/07/15 05:41:17 mrg Exp $
.include
@@ -6,6 +6,7 @@ PROG= xclock
SRCS= xclock.c Clock.c
CPPFLAGS+=-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=-D_CONST_X_STRING
CPPFLAGS+=-I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=XClock XClock-color
Index: src/external/mit/xorg/bin/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.8 src/external/mit/xorg/bin/xman/Makefile:1.9
--- src/external/mit/xorg/bin/xman/Makefile:1.8 Wed Apr 13 21:54:25 2016
+++ src/external/mit/xorg/bin/xman/Makefile Mon Jul 15 05:41:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/04/13 21:54:25 christos Exp $
+# $NetBSD: Makefile,v 1.9 2019/07/15 05:41:17 mrg Exp $
.include
@@ -9,6 +9,7 @@ SRCS= ScrollByL.c handler.c man.c button
CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_MKSTEMP
CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
+CPPFLAGS+=-D_CONST_X_STRING
APPDEFS=Xman
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:42:04 UTC 2019 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13632 Log Message: initial import of libdrm-2.4.99 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-99 U xsrc/external/mit/libdrm/dist/meson_options.txt U xsrc/external/mit/libdrm/dist/libsync.h C xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/util_math.h U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/libdrm.pc.in C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/config.h.in U xsrc/external/mit/libdrm/dist/aclocal.m4 C xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/xf86drmSL.c C xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/Makefile.am C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/xf86drmHash.h U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/build-aux/config.guess U xsrc/external/mit/libdrm/dist/build-aux/install-sh U xsrc/external/mit/libdrm/dist/build-aux/config.sub U xsrc/external/mit/libdrm/dist/build-aux/depcomp U xsrc/external/mit/libdrm/dist/build-aux/compile U xsrc/external/mit/libdrm/dist/build-aux/test-driver U xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh U xsrc/external/mit/libdrm/dist/build-aux/missing U xsrc/external/mit/libdrm/dist/tegra/tegra.c U xsrc/external/mit/libdrm/dist/tegra/tegra-symbol-check U xsrc/external/mit/libdrm/dist/tegra/tegra.h U xsrc/external/mit/libdrm/dist/tegra/libdrm_tegra.pc.in U xsrc/external/mit/libdrm/dist/tegra/meson.build U xsrc/external/mit/libdrm/dist/tegra/Makefile.am U xsrc/external/mit/libdrm/dist/tegra/private.h U xsrc/external/mit/libdrm/dist/tegra/Makefile.in U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in U xsrc/external/mit/libdrm/dist/amdgpu/meson.build U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.am U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.in U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbol-check U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/meson.build U xsrc/external/mit/libdrm/dist/freedreno/Makefile.am U xsrc/external/mit/libdrm/dist/freedreno/Makefile.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_bo.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_device.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_priv.h U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_device.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/msm_kgsl.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_priv.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_drm.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_pipe.c U xsrc/external/mit/libdrm/dist/include/drm/README C xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h C xsrc/external/mit/libdrm/dist/include/drm/drm.h U xsrc/external/mit/libdrm/dist/include/drm/qxl_drm.h U xsrc/external/mit/libdrm/dist/include/drm/sis_drm.h U xsr
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:42:35 UTC 2019 Modified Files: xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h xf86drmMode.c xf86drmMode.h xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c xsrc/external/mit/libdrm/dist/include/drm: drm.h i915_drm.h xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c Log Message: merge libdrm 2.4.99 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86atomic.h cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/libdrm/dist/xf86drm.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libdrm/dist/xf86drm.h cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drmMode.c cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libdrm/dist/xf86drmMode.h cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/include/drm/drm.h cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h cvs rdiff -u -r1.12 -r1.13 \ xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 15 05:42:35 UTC 2019
Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h i915_drm.h
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Log Message:
merge libdrm 2.4.99
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.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/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.12 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.13
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.12 Mon Mar 4 08:36:42 2019
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h Mon Jul 15 05:42:34 2019
@@ -101,8 +101,6 @@ typedef struct { volatile LIBDRM_ATOMIC_
#error libdrm requires atomic operations, please define them for your CPU/compiler.
#endif
-#undef HAS_ATOMIC_OPS
-
static inline int atomic_add_unless(atomic_t *v, int add, int unless)
{
int c, old;
Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.23 xsrc/external/mit/libdrm/dist/xf86drm.c:1.24
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.23 Mon Mar 4 08:36:42 2019
+++ xsrc/external/mit/libdrm/dist/xf86drm.c Mon Jul 15 05:42:34 2019
@@ -183,7 +183,7 @@ drm_public void drmFree(void *pt)
}
/**
- * Call ioctl, restarting if it is interupted
+ * Call ioctl, restarting if it is interrupted
*/
drm_public int
drmIoctl(int fd, unsigned long request, void *arg)
@@ -293,7 +293,7 @@ static int drmMatchBusID(const char *id1
*
* \internal
* Checks for failure. If failure was caused by signal call chown again.
- * If any other failure happened then it will output error mesage using
+ * If any other failure happened then it will output error message using
* drmMsg() call.
*/
#if !UDEV
@@ -754,8 +754,8 @@ drm_public int drmOpen(const char *name,
*/
drm_public int drmOpenWithType(const char *name, const char *busid, int type)
{
-if (!drmAvailable() && name != NULL && drm_server_info &&
-drm_server_info->load_module) {
+if (name != NULL && drm_server_info &&
+drm_server_info->load_module && !drmAvailable()) {
/* try to load the kernel module */
if (!drm_server_info->load_module(name)) {
drmMsg("[drm] failed to load kernel module \"%s\"\n", name);
@@ -1462,7 +1462,7 @@ drm_public int drmDMA(int fd, drmDMAReqP
*
* \param fd file descriptor.
* \param context context.
- * \param flags flags that determine the sate of the hardware when the function
+ * \param flags flags that determine the state of the hardware when the function
* returns.
*
* \return always zero.
@@ -2747,6 +2747,24 @@ drm_public int drmDropMaster(int fd)
return drmIoctl(fd, DRM_IOCTL_DROP_MASTER, NULL);
}
+drm_public int drmIsMaster(int fd)
+{
+/* Detect master by attempting something that requires master.
+ *
+ * Authenticating magic tokens requires master and 0 is an
+ * internal kernel detail which we could use. Attempting this on
+ * a master fd would fail therefore fail with EINVAL because 0
+ * is invalid.
+ *
+ * A non-master fd will fail with EACCES, as the kernel checks
+ * for master before attempting to do anything else.
+ *
+ * Since we don't want to leak implementation details, use
+ * EACCES.
+ */
+return drmAuthMagic(fd, 0) != -EACCES;
+}
+
drm_public char *drmGetDeviceNameFromFd(int fd)
{
char name[128];
@@ -3682,69 +3700,97 @@ free_device:
return ret;
}
-static int drmParsePlatformBusInfo(int maj, int min, drmPlatformBusInfoPtr info)
+static int drmParseOFBusInfo(int maj, int min, char *fullname)
{
#ifdef __linux__
-char path[PATH_MAX + 1], *name;
+char path[PATH_MAX + 1], *name, *tmp_name;
snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device", maj, min);
name = sysfs_uevent_get(path, "OF_FULLNAME");
-if (!name)
-return -ENOENT;
+tmp_name = name;
+if (!name) {
+/* If the device lacks OF data, pick the MODAL
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:42:04 UTC 2019 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13632 Log Message: initial import of libdrm-2.4.99 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-99 U xsrc/external/mit/libdrm/dist/meson_options.txt U xsrc/external/mit/libdrm/dist/libsync.h C xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/util_math.h U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/libdrm.pc.in C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/config.h.in U xsrc/external/mit/libdrm/dist/aclocal.m4 C xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/xf86drmSL.c C xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/Makefile.am C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/xf86drmHash.h U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/build-aux/config.guess U xsrc/external/mit/libdrm/dist/build-aux/install-sh U xsrc/external/mit/libdrm/dist/build-aux/config.sub U xsrc/external/mit/libdrm/dist/build-aux/depcomp U xsrc/external/mit/libdrm/dist/build-aux/compile U xsrc/external/mit/libdrm/dist/build-aux/test-driver U xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh U xsrc/external/mit/libdrm/dist/build-aux/missing U xsrc/external/mit/libdrm/dist/tegra/tegra.c U xsrc/external/mit/libdrm/dist/tegra/tegra-symbol-check U xsrc/external/mit/libdrm/dist/tegra/tegra.h U xsrc/external/mit/libdrm/dist/tegra/libdrm_tegra.pc.in U xsrc/external/mit/libdrm/dist/tegra/meson.build U xsrc/external/mit/libdrm/dist/tegra/Makefile.am U xsrc/external/mit/libdrm/dist/tegra/private.h U xsrc/external/mit/libdrm/dist/tegra/Makefile.in U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in U xsrc/external/mit/libdrm/dist/amdgpu/meson.build U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.am U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.in U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbol-check U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/meson.build U xsrc/external/mit/libdrm/dist/freedreno/Makefile.am U xsrc/external/mit/libdrm/dist/freedreno/Makefile.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_bo.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_device.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_priv.h U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_device.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/msm_kgsl.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_priv.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_drm.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_pipe.c U xsrc/external/mit/libdrm/dist/include/drm/README C xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h C xsrc/external/mit/libdrm/dist/include/drm/drm.h U xsrc/external/mit/libdrm/dist/include/drm/qxl_drm.h U xsrc/external/mit/libdrm/dist/include/drm/sis_drm.h U xsr
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:53:32 UTC 2019 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5172 Log Message: initial import of libpciaccess-0.15 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-15 U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/compile U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/missing N xsrc/external/mit/libpciaccess/dist/README.md U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 U xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/Makefile.in C xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c N xsrc/external/mit/libpciaccess/dist/src/x86_pci.h U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c N xsrc/external/mit/libpciaccess/dist/src/hurd_pci.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:53:32 UTC 2019 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5172 Log Message: initial import of libpciaccess-0.15 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-15 U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/compile U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/missing N xsrc/external/mit/libpciaccess/dist/README.md U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 U xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/Makefile.in C xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c N xsrc/external/mit/libpciaccess/dist/src/x86_pci.h U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c N xsrc/external/mit/libpciaccess/dist/src/hurd_pci.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS commit: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:54:19 UTC 2019 Modified Files: xsrc/external/mit/libpciaccess/dist/src: common_bridge.c Removed Files: xsrc/external/mit/libpciaccess/dist: README Log Message: merge libpciaccess 0.15. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libpciaccess/dist/README cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/libpciaccess/dist/src/common_bridge.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/libpciaccess/dist/src/common_bridge.c diff -u xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.7 xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.8 --- xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.7 Mon Mar 17 02:42:09 2014 +++ xsrc/external/mit/libpciaccess/dist/src/common_bridge.c Mon Jul 15 05:54:19 2019 @@ -216,7 +216,7 @@ pci_device_get_bridge_info( struct pci_d read_bridge_info(priv); } -return (priv->header_type == 1) ? priv->bridge.pci : NULL; +return ((priv->header_type & 0x7f) == 1) ? priv->bridge.pci : NULL; }
CVS commit: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 05:54:19 UTC 2019 Modified Files: xsrc/external/mit/libpciaccess/dist/src: common_bridge.c Removed Files: xsrc/external/mit/libpciaccess/dist: README Log Message: merge libpciaccess 0.15. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libpciaccess/dist/README cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/libpciaccess/dist/src/common_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 06:01:32 UTC 2019 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13383 Log Message: initial import of xauth-1.1 Status: Vendor Tag: xorg Release Tags: xauth-1-1 U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/compile U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/parsedpy.c C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/xauth.c U xsrc/external/mit/xauth/dist/xauth.h N xsrc/external/mit/xauth/dist/README.md U xsrc/external/mit/xauth/dist/test-driver U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/tests/Makefile.am U xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/tests/test_xauth.c U xsrc/external/mit/xauth/dist/tests/setup-sourced U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS commit: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 06:01:53 UTC 2019 Modified Files: xsrc/external/mit/xauth/dist: process.c Removed Files: xsrc/external/mit/xauth/dist: README Log Message: merge xauth 1.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/xauth/dist/README cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xauth/dist/process.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 15 06:01:32 UTC 2019 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13383 Log Message: initial import of xauth-1.1 Status: Vendor Tag: xorg Release Tags: xauth-1-1 U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/compile U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/parsedpy.c C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/xauth.c U xsrc/external/mit/xauth/dist/xauth.h N xsrc/external/mit/xauth/dist/README.md U xsrc/external/mit/xauth/dist/test-driver U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/tests/Makefile.am U xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/tests/test_xauth.c U xsrc/external/mit/xauth/dist/tests/setup-sourced U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS commit: xsrc/external/mit/xauth/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 15 06:01:53 UTC 2019
Modified Files:
xsrc/external/mit/xauth/dist: process.c
Removed Files:
xsrc/external/mit/xauth/dist: README
Log Message:
merge xauth 1.1.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/xauth/dist/README
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xauth/dist/process.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/xauth/dist/process.c
diff -u xsrc/external/mit/xauth/dist/process.c:1.6 xsrc/external/mit/xauth/dist/process.c:1.7
--- xsrc/external/mit/xauth/dist/process.c:1.6 Sat Mar 4 23:01:34 2017
+++ xsrc/external/mit/xauth/dist/process.c Mon Jul 15 06:01:53 2019
@@ -890,19 +890,11 @@ auth_finalize(void)
"%s: unable to write authority file %s\n",
ProgramName, temp_name);
} else {
- (void) unlink (xauth_filename);
-#if defined(WIN32) || defined(__UNIXOS2__)
- if (rename(temp_name, xauth_filename) == -1)
-#else
- /* Attempt to rename() if link() fails, since this may be on a FS that does not support hard links */
- if (link (temp_name, xauth_filename) == -1 && rename(temp_name, xauth_filename) == -1)
-#endif
- {
+ if (rename(temp_name, xauth_filename) == -1) {
fprintf (stderr,
- "%s: unable to link authority file %s, use %s\n",
+ "%s: unable to rename authority file %s, use %s\n",
ProgramName, xauth_filename, temp_name);
- } else {
- (void) unlink (temp_name);
+unlink(temp_name);
}
}
}
@@ -1008,7 +1000,7 @@ dump_entry(const char *inputfilename, in
fprintf (fp, "%s", dpyname);
break;
}
- /* else fall through to default */
+ /* else fall through */
default:
fprintf (fp, "#%04x#", auth->family);
fprintfhex (fp, auth->address_length, auth->address);
@@ -1057,16 +1049,22 @@ extract_entry(const char *inputfilename,
static int
-eq_auth(Xauth *a, Xauth *b)
+eq_auth_dpy_and_name(Xauth *a, Xauth *b)
{
return((a->family == b->family &&
a->address_length == b->address_length &&
a->number_length == b->number_length &&
a->name_length == b->name_length &&
- a->data_length == b->data_length &&
memcmp(a->address, b->address, a->address_length) == 0 &&
memcmp(a->number, b->number, a->number_length) == 0 &&
- memcmp(a->name, b->name, a->name_length) == 0 &&
+ memcmp(a->name, b->name, a->name_length) == 0) ? 1 : 0);
+}
+
+static int
+eq_auth(Xauth *a, Xauth *b)
+{
+return((eq_auth_dpy_and_name(a, b) &&
+ a->data_length == b->data_length &&
memcmp(a->data, b->data, a->data_length) == 0) ? 1 : 0);
}
@@ -1100,17 +1098,6 @@ match_auth_dpy(register Xauth *a, regist
return 1;
}
-/* return non-zero iff display and authorization type are the same */
-
-static int
-match_auth(register Xauth *a, register Xauth *b)
-{
-return ((match_auth_dpy(a, b)
- && a->name_length == b->name_length
- && memcmp(a->name, b->name, a->name_length) == 0) ? 1 : 0);
-}
-
-
static int
merge_entries(AuthList **firstp, AuthList *second, int *nnewp, int *nreplp)
{
@@ -1144,7 +1131,7 @@ merge_entries(AuthList **firstp, AuthLis
a = first;
for (;;) {
- if (match_auth (a->auth, b->auth)) { /* found a duplicate */
+ if (eq_auth_dpy_and_name (a->auth, b->auth)) { /* found a duplicate */
AuthList tmp; /* swap it in for old one */
tmp = *a;
*a = *b;
@@ -1175,6 +1162,45 @@ merge_entries(AuthList **firstp, AuthLis
}
+static void
+sort_entries(AuthList **firstp)
+{
+/* Insert sort, in each pass it removes auth records of certain */
+/* cathegory from the given list and inserts them into the sorted list. */
+
+AuthList *sorted = NULL, *sorted_tail = NULL;
+AuthList *prev, *iter, *next;
+
+#define SORT_OUT(EXPRESSION) { \
+ prev = NULL; \
+ for (iter = *firstp; iter; iter = next) { \
+ next = iter->next; \
+ if (EXPRESSION) { \
+ if (prev) \
+ prev->next = next; \
+ else \
+ *firstp = next; \
+ if (sorted_tail == NULL) { \
+ sorted = sorted_tail = iter; \
+ } else { \
+ sorted_tail->next = iter; \
+ sorted_tail = iter; \
+ } \
+ iter->next = NULL; \
+ } else { \
+ prev = iter; \
+ } \
+ } \
+}
+
+SORT_OUT(iter->auth->family != FamilyWild && iter->auth->number_length != 0);
+SORT_OUT(iter->auth->family != FamilyWild && iter->auth->number_length == 0);
+SORT_OUT(iter->auth->family == FamilyWild && iter->auth->number_length != 0);
+SORT_OUT(iter->auth->family == FamilyWild && iter->auth->number_length == 0);
+
+*firstp = sorted;
+}
+
static Xauth *
copyAuth(Xauth *auth)
{
@@ -1513,6 +1539,7 @@ do_merge(const char *inputfilename, int
printf ("%d entries read in: %d new, %d replacement%s\n",
nentries, nnew, nrepl, nrepl != 1 ? "s" : "");
if (nentries > 0) xauth_modified = True;
+ sor
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Mon Jul 15 06:40:21 UTC 2019 Modified Files: src/sys/dev/usb: if_axe.c Log Message: adjust axe(4) similar to recent axen(4)/cdce(4)/ure(4) updates (which were in turn partly based upon smsc(4) changes): - mark network interface MPSAFE, and use MPSAFE calls - convert to local tick task doing watchdog timeout - add global, tx and rx locks - add ratelimited tx error message - split many functions into locked/unlocked version - use more const - fix some comments - remove spl - don't bother with OACTIVE and do it all internally (axe_tx_cnt) additional changes here: - use axe_stop() to abort pipes in detach fixes a crash potential i only saw when almost finished debugging these changes.. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/if_axe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Mon Jul 15 06:40:21 UTC 2019
Modified Files:
src/sys/dev/usb: if_axe.c
Log Message:
adjust axe(4) similar to recent axen(4)/cdce(4)/ure(4) updates
(which were in turn partly based upon smsc(4) changes):
- mark network interface MPSAFE, and use MPSAFE calls
- convert to local tick task doing watchdog timeout
- add global, tx and rx locks
- add ratelimited tx error message
- split many functions into locked/unlocked version
- use more const
- fix some comments
- remove spl
- don't bother with OACTIVE and do it all internally (axe_tx_cnt)
additional changes here:
- use axe_stop() to abort pipes in detach
fixes a crash potential i only saw when almost finished debugging
these changes..
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/if_axe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.99 src/sys/dev/usb/if_axe.c:1.100
--- src/sys/dev/usb/if_axe.c:1.99 Sun Jul 14 21:37:09 2019
+++ src/sys/dev/usb/if_axe.c Mon Jul 15 06:40:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.99 2019/07/14 21:37:09 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.100 2019/07/15 06:40:21 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.99 2019/07/14 21:37:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.100 2019/07/15 06:40:21 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -161,6 +161,7 @@ struct axe_softc {
uint16_t axe_vendor;
uint16_t axe_product;
+ uint16_t axe_timer;
uint32_t axe_flags; /* copied from axe_type */
#define AX178 __BIT(0) /* AX88178 */
#define AX772 __BIT(1) /* AX88772 */
@@ -174,17 +175,22 @@ struct axe_softc {
int axe_if_flags;
int axe_phyno;
struct axe_cdata axe_cdata;
- struct callout axe_stat_ch;
+ struct callout axe_stat_ch;
uint8_t axe_enaddr[ETHER_ADDR_LEN];
int axe_refcnt;
bool axe_dying;
+ bool axe_stopping;
bool axe_attached;
struct usb_task axe_tick_task;
+ kmutex_t axe_lock;
kmutex_t axe_mii_lock;
+ kmutex_t axe_rxlock;
+ kmutex_t axe_txlock;
+ kcondvar_t axe_detachcv;
int axe_link;
@@ -194,6 +200,7 @@ struct axe_softc {
uint16_t sc_lenmask;
struct timeval axe_rx_notice;
+ struct timeval axe_tx_notice;
int axe_bufsz;
#define sc_if axe_ec.ec_if
@@ -342,19 +349,23 @@ static void axe_txeof(struct usbd_xfer *
static void axe_tick(void *);
static void axe_tick_task(void *);
static void axe_start(struct ifnet *);
+static void axe_start_locked(struct ifnet *);
static int axe_ioctl(struct ifnet *, u_long, void *);
static int axe_init(struct ifnet *);
+static int axe_init_locked(struct ifnet *);
static void axe_stop(struct ifnet *, int);
+static void axe_stop_locked(struct ifnet *, int);
static void axe_watchdog(struct ifnet *);
-static int axe_miibus_readreg_locked(device_t, int, int, uint16_t *);
static int axe_miibus_readreg(device_t, int, int, uint16_t *);
-static int axe_miibus_writereg_locked(device_t, int, int, uint16_t);
+static int axe_miibus_readreg_locked(device_t, int, int, uint16_t *);
static int axe_miibus_writereg(device_t, int, int, uint16_t);
+static int axe_miibus_writereg_locked(device_t, int, int, uint16_t);
static void axe_miibus_statchg(struct ifnet *);
static int axe_cmd(struct axe_softc *, int, int, int, void *);
static void axe_reset(struct axe_softc *);
static void axe_setmulti(struct axe_softc *);
+static void axe_setmulti_locked(struct axe_softc *);
static void axe_lock_mii(struct axe_softc *);
static void axe_unlock_mii(struct axe_softc *);
@@ -368,6 +379,18 @@ static void
axe_lock_mii(struct axe_softc *sc)
{
+ mutex_enter(&sc->axe_lock);
+ sc->axe_refcnt++;
+ mutex_exit(&sc->axe_lock);
+
+ mutex_enter(&sc->axe_mii_lock);
+}
+
+static void
+axe_lock_mii_sc_locked(struct axe_softc *sc)
+{
+ KASSERT(mutex_owned(&sc->axe_lock));
+
sc->axe_refcnt++;
mutex_enter(&sc->axe_mii_lock);
}
@@ -377,8 +400,20 @@ axe_unlock_mii(struct axe_softc *sc)
{
mutex_exit(&sc->axe_mii_lock);
+ mutex_enter(&sc->axe_lock);
if (--sc->axe_refcnt < 0)
- usb_detach_wakeupold((sc->axe_dev));
+ cv_broadcast(&sc->axe_detachcv);
+ mutex_exit(&sc->axe_lock);
+}
+
+static void
+axe_unlock_mii_sc_locked(struct axe_softc *sc)
+{
+ KASSERT(mutex_owned(&sc->axe_lock));
+
+ mutex_exit(&sc->axe_mii_lock);
+ if (--sc->axe_refcnt < 0)
+ cv_broadcast(&sc->axe_detachcv);
}
static int
@@ -421,12 +456,20 @@ axe_miibus_readreg_locked(device_t dev,
usbd_status err;
uint16_t data;
+ mutex_enter(&sc->axe_lock);
+ if (sc->axe_dying || sc->axe_phyno != phy) {
+ mutex_exit(&sc->axe_lock);
+ return -1;
+ }
+ mutex_exit(&sc->axe_lock);
+
DPRINTFN(30, "phy 0x%jx reg 0x%jx\n", phy, reg, 0, 0);
axe_cmd(sc, AXE_CMD_MII_OPMODE_SW,
