CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Tue Apr 30 05:06:09 UTC 2024 Modified Files: src/sys/arch/hp300/dev: intio.c Log Message: Fix fatal typo that prevents all intio devices probed. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hp300/dev/intio.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/hp300/dev/intio.c diff -u src/sys/arch/hp300/dev/intio.c:1.32 src/sys/arch/hp300/dev/intio.c:1.33 --- src/sys/arch/hp300/dev/intio.c:1.32 Sun Jan 28 17:31:40 2024 +++ src/sys/arch/hp300/dev/intio.c Tue Apr 30 05:06:08 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: intio.c,v 1.32 2024/01/28 17:31:40 thorpej Exp $ */ +/* $NetBSD: intio.c,v 1.33 2024/04/30 05:06:08 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.32 2024/01/28 17:31:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.33 2024/04/30 05:06:08 tsutsui Exp $"); #include #include @@ -68,9 +68,9 @@ CFATTACH_DECL_NEW(intio, sizeof(struct i #endif #define INTIO_3xx_BUILTINS \ - (__BIT(HP_320) | __BIT(HP_330) | __BIT(HP_340) || \ - __BIT(HP_345) | __BIT(HP_345) | __BIT(HP_350) || \ - __BIT(HP_360) | __BIT(HP_370) | __BIT(HP_375) || \ + (__BIT(HP_320) | __BIT(HP_330) | __BIT(HP_340) | \ + __BIT(HP_345) | __BIT(HP_345) | __BIT(HP_350) | \ + __BIT(HP_360) | __BIT(HP_370) | __BIT(HP_375) | \ __BIT(HP_380) | __BIT(HP_385)) #define INTIO_362_BUILTINS __BIT(HP_362)
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Tue Apr 30 05:06:09 UTC 2024 Modified Files: src/sys/arch/hp300/dev: intio.c Log Message: Fix fatal typo that prevents all intio devices probed. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hp300/dev/intio.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
Module Name:src
Committed By: dyoung
Date: Tue Apr 30 02:05:00 UTC 2024
Modified Files:
src/sys/arch/evbarm: Makefile
Log Message:
When creating the tags file, include the sources in sys/arch/arm/xilinx/.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/Makefile
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/Makefile
diff -u src/sys/arch/evbarm/Makefile:1.13 src/sys/arch/evbarm/Makefile:1.14
--- src/sys/arch/evbarm/Makefile:1.13 Sat Oct 29 13:14:38 2022
+++ src/sys/arch/evbarm/Makefile Tue Apr 30 02:05:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/10/29 13:14:38 jmcneill Exp $
+# $NetBSD: Makefile,v 1.14 2024/04/30 02:05:00 dyoung Exp $
# Makefile for evbarm tags file and boot blocks
@@ -37,6 +37,7 @@ SEVBARM+= ${SYSDIR}/arch/evbarm/smdk2xx0
SEVBARM+= ${SYSDIR}/arch/evbarm/tisdp24xx/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/tsarm/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/viper/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/arm/xilinx/*.[ch]
SEVBARM+= ${SYSDIR}/arch/arm/xscale/*.[ch]
AEVBARM= ${SYSDIR}/arch/evbarm/adi_brh/*.S
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: dyoung Date: Tue Apr 30 02:05:00 UTC 2024 Modified Files: src/sys/arch/evbarm: Makefile Log Message: When creating the tags file, include the sources in sys/arch/arm/xilinx/. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base32
Module Name:src Committed By: macallan Date: Tue Apr 30 01:18:40 UTC 2024 Modified Files: src/distrib/sets/lists/base32: md.amd64 Log Message: sprinkle gcc=12 and rump attributes To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base32/md.amd64 diff -u src/distrib/sets/lists/base32/md.amd64:1.5 src/distrib/sets/lists/base32/md.amd64:1.6 --- src/distrib/sets/lists/base32/md.amd64:1.5 Tue Apr 16 19:15:36 2024 +++ src/distrib/sets/lists/base32/md.amd64 Tue Apr 30 01:18:40 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.5 2024/04/16 19:15:36 christos Exp $ +# $NetBSD: md.amd64,v 1.6 2024/04/30 01:18:40 macallan Exp $ ./lib/i386 base-compat-shlib compat ./lib/i386/npf base-compat-shlib compat,npf ./lib/i386/npf/ext_log.so base-compat-shlib compat,npf @@ -88,8 +88,10 @@ ./usr/lib/i386/libarchive.so.5 base-compat-shlib compat ./usr/lib/i386/libarchive.so.5.0 base-compat-shlib compat ./usr/lib/i386/libasan.so base-compat-shlib compat,gcc,cxx -./usr/lib/i386/libasan.so.5 base-compat-shlib compat,gcc,cxx -./usr/lib/i386/libasan.so.5.0 base-compat-shlib compat,gcc,cxx +./usr/lib/i386/libasan.so.5 base-compat-shlib compat,gcc=10,cxx +./usr/lib/i386/libasan.so.5.0 base-compat-shlib compat,gcc=10,cxx +./usr/lib/i386/libasan.so.6 base-compat-shlib compat,gcc=12,cxx +./usr/lib/i386/libasan.so.6.0 base-compat-shlib compat,gcc=12,cxx ./usr/lib/i386/libasn1.so base-compat-shlib compat,kerberos ./usr/lib/i386/libasn1.so.10 base-compat-shlib compat,kerberos ./usr/lib/i386/libasn1.so.10.0 base-compat-shlib compat,kerberos @@ -205,7 +207,8 @@ ./usr/lib/i386/libgnumalloc.so.1.0 base-compat-shlib compat ./usr/lib/i386/libgomp.so base-compat-shlib compat,gcc ./usr/lib/i386/libgomp.so.2 base-compat-shlib compat,gcc -./usr/lib/i386/libgomp.so.2.1 base-compat-shlib compat,gcc +./usr/lib/i386/libgomp.so.2.1 base-compat-shlib compat,gcc=10 +./usr/lib/i386/libgomp.so.2.2 base-compat-shlib compat,gcc=12 ./usr/lib/i386/libgssapi.so base-compat-shlib compat,kerberos ./usr/lib/i386/libgssapi.so.12 base-compat-shlib compat,kerberos ./usr/lib/i386/libgssapi.so.12.0 base-compat-shlib compat,kerberos @@ -280,8 +283,10 @@ ./usr/lib/i386/libldap_r.so.6 base-compat-shlib compat,ldap ./usr/lib/i386/libldap_r.so.6.0 base-compat-shlib compat,ldap ./usr/lib/i386/liblsan.so base-compat-shlib compat,cxx,gcc -./usr/lib/i386/liblsan.so.2 base-compat-shlib compat,cxx,gcc -./usr/lib/i386/liblsan.so.2.0 base-compat-shlib compat,cxx,gcc +./usr/lib/i386/liblsan.so.2 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/i386/liblsan.so.2.0 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/i386/liblsan.so.3 base-compat-shlib compat,cxx,gcc=12 +./usr/lib/i386/liblsan.so.3.0 base-compat-shlib compat,cxx,gcc=12 ./usr/lib/i386/liblua.so base-compat-shlib compat ./usr/lib/i386/liblua.so.6 base-compat-shlib compat ./usr/lib/i386/liblua.so.6.1 base-compat-shlib compat @@ -324,9 +329,9 @@ ./usr/lib/i386/libossaudio.so base-compat-shlib compat ./usr/lib/i386/libossaudio.so.1 base-compat-shlib compat ./usr/lib/i386/libossaudio.so.1.1 base-compat-shlib compat -./usr/lib/i386/libp2k.so base-compat-shlib compat -./usr/lib/i386/libp2k.so.2 base-compat-shlib compat -./usr/lib/i386/libp2k.so.2.0 base-compat-shlib compat +./usr/lib/i386/libp2k.so base-compat-shlib compat,rump +./usr/lib/i386/libp2k.so.2 base-compat-shlib compat,rump +./usr/lib/i386/libp2k.so.2.0 base-compat-shlib compat,rump ./usr/lib/i386/libpam.so base-compat-shlib compat ./usr/lib/i386/libpam.so.4 base-compat-shlib compat ./usr/lib/i386/libpam.so.4.1 base-compat-shlib compat @@ -428,7 +433,8 @@ ./usr/lib/i386/libssl.so.15.0 base-compat-shlib compat ./usr/lib/i386/libstdc++.so base-compat-shlib compat,gcc,cxx,libstdcxx ./usr/lib/i386/libstdc++.so.9 base-compat-shlib compat,gcc,cxx,libstdcxx -./usr/lib/i386/libstdc++.so.9.0 base-compat-shlib compat,gcc,cxx,libstdcxx +./usr/lib/i386/libstdc++.so.9.0 base-compat-shlib compat,gcc=10,cxx,libstdcxx +./usr/lib/i386/libstdc++.so.9.1 base-compat-shlib compat,gcc=12,cxx,libstdcxx ./usr/lib/i386/libtermcap.so base-compat-shlib compat ./usr/lib/i386/libtermcap.so.0 base-compat-shlib compat ./usr/lib/i386/libtermcap.so.0.6 base-compat-shlib compat @@ -442,11 +448,13 @@ ./usr/lib/i386/libtre.so.0 base-compat-shlib compat ./usr/lib/i386/libtre.so.0.8 base-compat-shlib compat ./usr/lib/i386/libubsan.so base-compat-shlib compat,gcc,cxx -./usr/lib/i386/libubsan.so.4 base-compat-shlib compat,gcc,cxx -./usr/lib/i386/libubsan.so.4.0 base-compat-shlib compat,gcc,cxx -./usr/lib/i386/libukfs.so base-compat-shlib compat -./usr/lib/i386/libukfs.so.1 base-compat-shlib compat -./usr/lib/i386/libukfs.so.1.0
CVS commit: src/distrib/sets/lists/base32
Module Name:src Committed By: macallan Date: Tue Apr 30 01:18:40 UTC 2024 Modified Files: src/distrib/sets/lists/base32: md.amd64 Log Message: sprinkle gcc=12 and rump attributes To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Mon Apr 29 22:09:11 UTC 2024 Modified Files: src/distrib/sets/lists/xbase: mi src/etc/mtree: NetBSD.dist.Xorg src/external/mit/xorg/bin/xdm: Makefile src/share/mk: bsd.x11.mk Log Message: xdm(1) was renamed xdm(8) a long while ago. catch up location. add support for section 8 X manuals. amusingly, we already knew to convert __adminmansuffix__ into "8", but not how to create .8 from X .man. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.30 -r1.31 src/etc/mtree/NetBSD.dist.Xorg cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/bin/xdm/Makefile cvs rdiff -u -r1.153 -r1.154 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Mon Apr 29 22:09:11 UTC 2024 Modified Files: src/distrib/sets/lists/xbase: mi src/etc/mtree: NetBSD.dist.Xorg src/external/mit/xorg/bin/xdm: Makefile src/share/mk: bsd.x11.mk Log Message: xdm(1) was renamed xdm(8) a long while ago. catch up location. add support for section 8 X manuals. amusingly, we already knew to convert __adminmansuffix__ into "8", but not how to create .8 from X .man. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.30 -r1.31 src/etc/mtree/NetBSD.dist.Xorg cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/bin/xdm/Makefile cvs rdiff -u -r1.153 -r1.154 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.175 src/distrib/sets/lists/xbase/mi:1.176 --- src/distrib/sets/lists/xbase/mi:1.175 Thu Apr 18 19:17:14 2024 +++ src/distrib/sets/lists/xbase/mi Mon Apr 29 22:09:11 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.175 2024/04/18 19:17:14 jakllsch Exp $ +# $NetBSD: mi,v 1.176 2024/04/29 22:09:11 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1344,7 +1344,7 @@ ./usr/X11R7/man/cat1/xconsole.0xbase-xconsole-catman .cat,xorg ./usr/X11R7/man/cat1/xcutsel.0xbase-xcutsel-catman .cat,xorg ./usr/X11R7/man/cat1/xditview.0xbase-xditview-catman .cat,xorg -./usr/X11R7/man/cat1/xdm.0xbase-xdm-catman .cat,xorg +./usr/X11R7/man/cat1/xdm.0xbase-obsolete obsolete ./usr/X11R7/man/cat1/xdpyinfo.0xbase-xdpyinfo-catman .cat,xorg ./usr/X11R7/man/cat1/xdriinfo.0xbase-xdriinfo-catman .cat,xorg ./usr/X11R7/man/cat1/xedit.0xbase-xedit-catman .cat,xorg @@ -1428,6 +1428,8 @@ ./usr/X11R7/man/cat7/XProjectTeam.0 xbase-x11-catman .cat,xorg ./usr/X11R7/man/cat7/Xsecurity.0 xbase-x11-catman .cat,xorg ./usr/X11R7/man/cat7/xkeyboard-config.0 xbase-xkeyboard-config-catman .cat,xorg +./usr/X11R7/man/cat8 base-x11-root xorg +./usr/X11R7/man/cat8/xdm.0xbase-xdm-catman .cat,xorg ./usr/X11R7/man/html1 base-x11-root xorg ./usr/X11R7/man/html1/appres.html xbase-appres-htmlman html,xorg ./usr/X11R7/man/html1/atobm.html xbase-bitmap-htmlman html,xorg @@ -1497,7 +1499,7 @@ ./usr/X11R7/man/html1/xconsole.html xbase-xconsole-htmlman html,xorg ./usr/X11R7/man/html1/xcutsel.html xbase-xcutsel-htmlman html,xorg ./usr/X11R7/man/html1/xditview.html xbase-xditview-htmlman html,xorg -./usr/X11R7/man/html1/xdm.htmlxbase-xdm-htmlman html,xorg +./usr/X11R7/man/html1/xdm.htmlxbase-obsolete obsolete ./usr/X11R7/man/html1/xdpyinfo.html xbase-xdpyinfo-htmlman html,xorg ./usr/X11R7/man/html1/xdriinfo.html xbase-xdriinfo-htmlman html,xorg ./usr/X11R7/man/html1/xedit.html xbase-xedit-htmlman html,xorg @@ -1581,6 +1583,8 @@ ./usr/X11R7/man/html7/XProjectTeam.html xbase-x11-htmlman html,xorg ./usr/X11R7/man/html7/Xsecurity.html xbase-x11-htmlman html,xorg ./usr/X11R7/man/html7/xkeyboard-config.html xbase-xkeyboard-config-htmlman html,xorg +./usr/X11R7/man/html8 base-x11-root xorg +./usr/X11R7/man/html8/xdm.htmlxbase-xdm-htmlman html,xorg ./usr/X11R7/man/man1 base-x11-root xorg ./usr/X11R7/man/man1/appres.1xbase-appres-man .man,xorg ./usr/X11R7/man/man1/atobm.1xbase-bitmap-man .man,xorg @@ -1651,7 +1655,7 @@ ./usr/X11R7/man/man1/xconsole.1xbase-xconsole-man .man,xorg ./usr/X11R7/man/man1/xcutsel.1xbase-xcutsel-man .man,xorg ./usr/X11R7/man/man1/xditview.1xbase-xditview-man .man,xorg -./usr/X11R7/man/man1/xdm.1xbase-xdm-man .man,xorg +./usr/X11R7/man/man1/xdm.1xbase-obsolete obsolete ./usr/X11R7/man/man1/xdpyinfo.1xbase-xdpyinfo-man .man,xorg ./usr/X11R7/man/man1/xdriinfo.1xbase-xdriinfo-man .man,xorg ./usr/X11R7/man/man1/xedit.1xbase-xedit-man .man,xorg @@ -1735,6 +1739,8 @@ ./usr/X11R7/man/man7/XProjectTeam.7 xbase-x11-man .man,xorg ./usr/X11R7/man/man7/Xsecurity.7 xbase-x11-man .man,xorg ./usr/X11R7/man/man7/xkeyboard-config.7 xbase-xkeyboard-config-man .man,xorg +./usr/X11R7/man/man8 base-x11-root xorg +./usr/X11R7/man/man8/xdm.8xbase-xdm-man .man,xorg ./usr/X11R7/man/whatis.dbxbase-x11-man man,xorg,!makemandb ./usr/X11R7/share base-x11-root xorg ./usr/X11R7/share/aclocalbase-x11-root xorg Index: src/etc/mtree/NetBSD.dist.Xorg diff -u src/etc/mtree/NetBSD.dist.Xorg:1.30 src/etc/mtree/NetBSD.dist.Xorg:1.31 --- src/etc/mtree/NetBSD.dist.Xorg:1.30 Thu Jul 14 06:53:40 2022 +++ src/etc/mtree/NetBSD.dist.Xorg Mon Apr 29 22:09:11 2024 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.Xorg,v 1.30 2022/07/14 06:53:40 mrg Exp $ +# $NetBSD: NetBSD.dist.Xorg,v 1.31 2024/04/29 22:09:11 mrg Exp $ ./usr/X11R7 ./usr/X11R7/bin ./usr/X11R7/include @@ -163,6 +163,7 @@ ./usr/X11R7/man/cat4/x86 ./usr/X11R7/man/cat5
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: andvar
Date: Mon Apr 29 21:29:48 UTC 2024
Modified Files:
src/sys/arch/x86/pci: dwiic_pci.c
Log Message:
Make dwiic_pci compile without ACPI option.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/pci/dwiic_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/dwiic_pci.c
diff -u src/sys/arch/x86/pci/dwiic_pci.c:1.9 src/sys/arch/x86/pci/dwiic_pci.c:1.10
--- src/sys/arch/x86/pci/dwiic_pci.c:1.9 Wed Oct 19 22:28:35 2022
+++ src/sys/arch/x86/pci/dwiic_pci.c Mon Apr 29 21:29:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_pci.c,v 1.9 2022/10/19 22:28:35 riastradh Exp $ */
+/* $NetBSD: dwiic_pci.c,v 1.10 2024/04/29 21:29:48 andvar Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.9 2022/10/19 22:28:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.10 2024/04/29 21:29:48 andvar Exp $");
#include
#include
@@ -58,6 +58,10 @@ __KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,
#define DPRINTF(x)
#endif
+#if NACPICA > 0
+#define I2C_USE_ACPI
+#endif /* NACPICA > 0 */
+
struct pci_dwiic_softc {
struct dwiic_softc sc_dwiic;
pci_chipset_tag_t sc_pc;
@@ -267,12 +271,18 @@ pci_dwiic_attach(device_t parent, device
lpss_write(sc, LPSS_REMAP_HI,
pci_conf_read(sc->sc_pc, sc->sc_ptag, PCI_BAR0 + 0x4));
+#ifdef I2C_USE_ACPI
sc->sc_acpinode = acpi_pcidev_find(0 /*XXX segment*/,
pa->pa_bus, pa->pa_device, pa->pa_function);
+#else
+ sc->sc_acpinode = NULL;
+#endif
if (sc->sc_acpinode) {
+#ifdef I2C_USE_ACPI
sc->sc_dwiic.sc_iba.iba_child_devices =
acpi_enter_i2c_devs(NULL, sc->sc_acpinode);
+#endif
} else {
aprint_verbose_dev(self, "no matching ACPI node\n");
}
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: andvar Date: Mon Apr 29 21:29:48 UTC 2024 Modified Files: src/sys/arch/x86/pci: dwiic_pci.c Log Message: Make dwiic_pci compile without ACPI option. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/pci/dwiic_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: andvar
Date: Mon Apr 29 21:25:34 UTC 2024
Modified Files:
src/sys/dev/i2c: ihidev.c
Log Message:
ihidev(4): make driver compile with ACPI option disabled.
This change unlikely useful in practice, but adds consistency to already
available guards. Driver won't attach currently without ACPI.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/i2c/ihidev.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/i2c/ihidev.c
diff -u src/sys/dev/i2c/ihidev.c:1.29 src/sys/dev/i2c/ihidev.c:1.30
--- src/sys/dev/i2c/ihidev.c:1.29 Tue Aug 1 19:36:45 2023
+++ src/sys/dev/i2c/ihidev.c Mon Apr 29 21:25:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ihidev.c,v 1.29 2023/08/01 19:36:45 riastradh Exp $ */
+/* $NetBSD: ihidev.c,v 1.30 2024/04/29 21:25:34 andvar Exp $ */
/* $OpenBSD ihidev.c,v 1.13 2017/04/08 02:57:23 deraadt Exp $ */
/*-
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.29 2023/08/01 19:36:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.30 2024/04/29 21:25:34 andvar Exp $");
#include
#include
@@ -116,8 +116,10 @@ static void ihidev_intr_fini(struct ihid
static bool ihidev_suspend(device_t, const pmf_qual_t *);
static bool ihidev_resume(device_t, const pmf_qual_t *);
static int ihidev_hid_command(struct ihidev_softc *, int, void *, bool);
+#if NACPICA > 0
static int ihidev_intr(void *);
static void ihidev_work(struct work *, void *);
+#endif
static int ihidev_reset(struct ihidev_softc *, bool);
static int ihidev_hid_desc_parse(struct ihidev_softc *);
@@ -730,14 +732,13 @@ ihidev_intr_fini(struct ihidev_softc *sc
#endif
}
+#if NACPICA > 0
static void
ihidev_intr_mask(struct ihidev_softc * const sc)
{
if (sc->sc_intr_type == IST_LEVEL) {
-#if NACPICA > 0
acpi_intr_mask(sc->sc_ih);
-#endif
}
}
@@ -746,9 +747,7 @@ ihidev_intr_unmask(struct ihidev_softc *
{
if (sc->sc_intr_type == IST_LEVEL) {
-#if NACPICA > 0
acpi_intr_unmask(sc->sc_ih);
-#endif
}
}
@@ -832,6 +831,7 @@ ihidev_work(struct work *wk, void *arg)
*/
ihidev_intr_unmask(sc);
}
+#endif
static int
ihidev_maxrepid(void *buf, int len)
@@ -1009,6 +1009,7 @@ ihidev_set_report(struct device *dev, in
static bool
ihidev_acpi_get_info(struct ihidev_softc *sc)
{
+#if NACPICA > 0
ACPI_HANDLE hdl = (void *)(uintptr_t)sc->sc_phandle;
ACPI_STATUS status;
ACPI_INTEGER val;
@@ -1033,4 +1034,7 @@ ihidev_acpi_get_info(struct ihidev_softc
sc->sc_hid_desc_addr = (u_int)val;
return true;
+#else
+ return false;
+#endif
}
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: andvar Date: Mon Apr 29 21:25:34 UTC 2024 Modified Files: src/sys/dev/i2c: ihidev.c Log Message: ihidev(4): make driver compile with ACPI option disabled. This change unlikely useful in practice, but adds consistency to already available guards. Driver won't attach currently without ACPI. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/i2c/ihidev.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/hp300/dev
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 17:47:27 UTC 2024
Modified Files:
src/sys/arch/hp300/dev: topcat.c
Log Message:
Check tc_waitbusy() before writing palette registers in topcat_setcolor().
This seems to make palette operations more stable on my HP360 with HP98543.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/dev/topcat.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/hp300/dev/topcat.c
diff -u src/sys/arch/hp300/dev/topcat.c:1.8 src/sys/arch/hp300/dev/topcat.c:1.9
--- src/sys/arch/hp300/dev/topcat.c:1.8 Mon Apr 29 17:39:59 2024
+++ src/sys/arch/hp300/dev/topcat.c Mon Apr 29 17:47:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: topcat.c,v 1.8 2024/04/29 17:39:59 tsutsui Exp $ */
+/* $NetBSD: topcat.c,v 1.9 2024/04/29 17:47:27 tsutsui Exp $ */
/* $OpenBSD: topcat.c,v 1.15 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -453,6 +453,8 @@ topcat_setcolor(struct diofb *fb, u_int
if (fb->planemask == 1)
return;
+ tc_waitbusy(tc, fb->planemask);
+
if (tc->regs.fbid != GID_TOPCAT) {
tccm_waitbusy(tc);
tc->plane_mask = fb->planemask;
@@ -542,8 +544,6 @@ topcat_windowmove(struct diofb *fb, uint
tc->wwidth = cx;
tc->wmove = fb->planemask;
- tc_waitbusy(tc, fb->planemask);
-
return 0;
}
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Mon Apr 29 17:47:27 UTC 2024 Modified Files: src/sys/arch/hp300/dev: topcat.c Log Message: Check tc_waitbusy() before writing palette registers in topcat_setcolor(). This seems to make palette operations more stable on my HP360 with HP98543. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/dev/topcat.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/hp300/dev
Module Name:src Committed By: tsutsui Date: Mon Apr 29 17:39:59 UTC 2024 Modified Files: src/sys/arch/hp300/dev: topcat.c Log Message: Use proper planemask per a vaild number of planes. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/dev/topcat.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/hp300/dev
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 17:39:59 UTC 2024
Modified Files:
src/sys/arch/hp300/dev: topcat.c
Log Message:
Use proper planemask per a vaild number of planes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/dev/topcat.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/hp300/dev/topcat.c
diff -u src/sys/arch/hp300/dev/topcat.c:1.7 src/sys/arch/hp300/dev/topcat.c:1.8
--- src/sys/arch/hp300/dev/topcat.c:1.7 Mon Apr 29 15:34:57 2024
+++ src/sys/arch/hp300/dev/topcat.c Mon Apr 29 17:39:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: topcat.c,v 1.7 2024/04/29 15:34:57 tsutsui Exp $ */
+/* $NetBSD: topcat.c,v 1.8 2024/04/29 17:39:59 tsutsui Exp $ */
/* $OpenBSD: topcat.c,v 1.15 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -395,7 +395,7 @@ topcat_restore(struct diofb *fb)
tc->prr = RR_COPY;
/* Enable display */
- tc->nblank = 0xff;
+ tc->nblank = fb->planemask;
}
int
@@ -455,7 +455,7 @@ topcat_setcolor(struct diofb *fb, u_int
if (tc->regs.fbid != GID_TOPCAT) {
tccm_waitbusy(tc);
- tc->plane_mask = 0xff;
+ tc->plane_mask = fb->planemask;
tc->cindex = ~index;
tc->rdata = fb->cmap.r[index];
tc->gdata = fb->cmap.g[index];
@@ -468,7 +468,7 @@ topcat_setcolor(struct diofb *fb, u_int
tc->cindex = 0;
} else {
tccm_waitbusy(tc);
- tc->plane_mask = 0xff;
+ tc->plane_mask = fb->planemask;
tc->rdata = fb->cmap.r[index];
tc->gdata = fb->cmap.g[index];
tc->bdata = fb->cmap.b[index];
@@ -526,12 +526,13 @@ topcat_windowmove(struct diofb *fb, uint
tc_waitbusy(tc, fb->planemask);
- tc->wen = planemask;
- tc->wmrr = rop;
if (planemask != 0xff) {
tc->wen = planemask ^ 0xff;
tc->wmrr = rop ^ 0x0f;
tc->wen = fb->planemask;
+ } else {
+ tc->wen = planemask;
+ tc->wmrr = rop;
}
tc->source_y = sy;
tc->source_x = sx;
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Mon Apr 29 17:25:11 UTC 2024 Modified Files: src/sys/arch/hp300/dev: diofb.c Log Message: Fix MD allocattr to return proper attributes what MI rasops(9) expects. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/dev/diofb.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/hp300/dev/diofb.c diff -u src/sys/arch/hp300/dev/diofb.c:1.8 src/sys/arch/hp300/dev/diofb.c:1.9 --- src/sys/arch/hp300/dev/diofb.c:1.8 Mon Apr 29 15:34:57 2024 +++ src/sys/arch/hp300/dev/diofb.c Mon Apr 29 17:25:11 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: diofb.c,v 1.8 2024/04/29 15:34:57 tsutsui Exp $ */ +/* $NetBSD: diofb.c,v 1.9 2024/04/29 17:25:11 tsutsui Exp $ */ /* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */ /* @@ -351,9 +351,7 @@ diofb_allocattr(void *cookie, int fg, in bg = swap; } - flg = ((flg & WSATTR_UNDERLINE) ? 1 : 0); - - *attr = (bg << 16) | (fg << 24) | flg; + *attr = (bg << 16) | (fg << 24) | (flg & WSATTR_UNDERLINE); return 0; }
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Mon Apr 29 17:25:11 UTC 2024 Modified Files: src/sys/arch/hp300/dev: diofb.c Log Message: Fix MD allocattr to return proper attributes what MI rasops(9) expects. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/dev/diofb.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/hp300/dev
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 15:34:57 UTC 2024
Modified Files:
src/sys/arch/hp300/dev: diofb.c topcat.c
Log Message:
Move a check of topcat(4) specific fb width quirks to topcat.c.
We need to check fb->planes but it's propbed in topcat.c after
common diofb_fbinquire() is called.
Also add a comment that it looks these 1 bpp and 4 bpp boards have
VRAM with sparse address layout and we have to handle
512 pixels per line with 1024 bytes per line.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/dev/diofb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp300/dev/topcat.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/hp300/dev/diofb.c
diff -u src/sys/arch/hp300/dev/diofb.c:1.7 src/sys/arch/hp300/dev/diofb.c:1.8
--- src/sys/arch/hp300/dev/diofb.c:1.7 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/hp300/dev/diofb.c Mon Apr 29 15:34:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: diofb.c,v 1.7 2021/08/07 16:18:53 thorpej Exp $ */
+/* $NetBSD: diofb.c,v 1.8 2024/04/29 15:34:57 tsutsui Exp $ */
/* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */
/*
@@ -146,15 +146,6 @@ diofb_fbinquire(struct diofb *fb, int sc
if (fb->dheight > fb->fbheight)
fb->dheight = fb->fbheight;
- /*
- * Some displays, such as the HP332 and HP340 internal video
- * appear to return a display width of 1024 instead of 512.
- */
- if (fbr->num_planes == 1 || fbr->num_planes == 4) {
- if (fb->dwidth == 1024 && fb->dheight == 400)
- fb->dwidth = 512;
- }
-
fb->planes = fbr->num_planes;
if (fb->planes > 8)
fb->planes = 8;
Index: src/sys/arch/hp300/dev/topcat.c
diff -u src/sys/arch/hp300/dev/topcat.c:1.6 src/sys/arch/hp300/dev/topcat.c:1.7
--- src/sys/arch/hp300/dev/topcat.c:1.6 Wed Nov 30 11:36:50 2022
+++ src/sys/arch/hp300/dev/topcat.c Mon Apr 29 15:34:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: topcat.c,v 1.6 2022/11/30 11:36:50 tsutsui Exp $ */
+/* $NetBSD: topcat.c,v 1.7 2024/04/29 15:34:57 tsutsui Exp $ */
/* $OpenBSD: topcat.c,v 1.15 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -344,6 +344,19 @@ topcat_reset(struct diofb *fb, int scode
fb->planemask = (1 << fb->planes) - 1;
}
+ /*
+ * Some displays, such as the HP332 and HP340 internal video
+ * and HP98542/98543 appear to return a display width of 1024
+ * instead of 512.
+ *
+ * It looks these boards have VRAM with sparse address layout,
+ * i.e. 1 bit or 4 bits per pixel but 2 bytes per pixel, so
+ * we have to handle 512 pixels per line with 1024 bytes per line.
+ */
+ if (fb->planes <= 4 && fb->dwidth == 1024 && fb->dheight == 400) {
+ fb->dwidth = 512;
+ }
+
fb->bmv = topcat_windowmove;
topcat_restore(fb);
diofb_fbsetup(fb);
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Mon Apr 29 15:34:57 UTC 2024 Modified Files: src/sys/arch/hp300/dev: diofb.c topcat.c Log Message: Move a check of topcat(4) specific fb width quirks to topcat.c. We need to check fb->planes but it's propbed in topcat.c after common diofb_fbinquire() is called. Also add a comment that it looks these 1 bpp and 4 bpp boards have VRAM with sparse address layout and we have to handle 512 pixels per line with 1024 bytes per line. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp300/dev/topcat.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/hp300/dev
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 14:58:32 UTC 2024
Modified Files:
src/sys/arch/hp300/dev: topcatreg.h
Log Message:
Increase DELAY() for waitbusy macroes as pre-wscons and 4.4BSD did.
It looks necessary for sane palette ops at least on HP98543 topcat
on 68030 HP 9000/360.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp300/dev/topcatreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/dev/topcatreg.h
diff -u src/sys/arch/hp300/dev/topcatreg.h:1.4 src/sys/arch/hp300/dev/topcatreg.h:1.5
--- src/sys/arch/hp300/dev/topcatreg.h:1.4 Fri Feb 2 22:19:13 2024
+++ src/sys/arch/hp300/dev/topcatreg.h Mon Apr 29 14:58:32 2024
@@ -1,5 +1,5 @@
/* $OpenBSD: topcatreg.h,v 1.2 2005/01/24 21:36:39 miod Exp $ */
-/* $NetBSD: topcatreg.h,v 1.4 2024/02/02 22:19:13 andvar Exp $ */
+/* $NetBSD: topcatreg.h,v 1.5 2024/04/29 14:58:32 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -42,13 +42,13 @@
#define tccm_waitbusy(regaddr) \
do { \
while (((volatile struct tcboxfb *)(regaddr))->cmap_busy & 0x04) \
- DELAY(10); \
+ DELAY(100); \
} while (/* CONSTCOND */0)
#define tc_waitbusy(regaddr,planes) \
do { \
while (((volatile struct tcboxfb *)(regaddr))->busy & planes) \
- DELAY(10); \
+ DELAY(100); \
} while (/* CONSTCOND */0)
struct tcboxfb {
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Mon Apr 29 14:58:32 UTC 2024 Modified Files: src/sys/arch/hp300/dev: topcatreg.h Log Message: Increase DELAY() for waitbusy macroes as pre-wscons and 4.4BSD did. It looks necessary for sane palette ops at least on HP98543 topcat on 68030 HP 9000/360. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp300/dev/topcatreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: mlelstv Date: Mon Apr 29 14:56:01 UTC 2024 Modified Files: src/sys/compat/netbsd32: netbsd32_signal.c Log Message: In netbsd32___sigaction_sigtramp continue to use the compat module when already locked for this process. Needs pullup to netbsd-10. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_signal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: mlelstv
Date: Mon Apr 29 14:56:01 UTC 2024
Modified Files:
src/sys/compat/netbsd32: netbsd32_signal.c
Log Message:
In netbsd32___sigaction_sigtramp continue to use the compat module when
already locked for this process.
Needs pullup to netbsd-10.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_signal.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/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.53 src/sys/compat/netbsd32/netbsd32_signal.c:1.54
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.53 Sat Nov 6 20:42:56 2021
+++ src/sys/compat/netbsd32/netbsd32_signal.c Mon Apr 29 14:56:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.53 2021/11/06 20:42:56 thorpej Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.54 2024/04/29 14:56:01 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.53 2021/11/06 20:42:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.54 2024/04/29 14:56:01 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -184,7 +184,7 @@ netbsd32___sigaction_sigtramp(struct lwp
*/
#ifdef __HAVE_STRUCT_SIGCONTEXT
struct proc *p = l->l_proc;
- bool sigcontext_valid = false;
+ bool sigcontext_valid;
/*
* We need to ensure the compat_netbsd32_16 module
@@ -196,9 +196,7 @@ netbsd32___sigaction_sigtramp(struct lwp
kernconfig_lock();
(void)module_autoload("compat_netbsd32_16",
MODULE_CLASS_ANY);
- if (netbsd32_sendsig_sigcontext_16_hook.hooked) {
-sigcontext_valid = true;
- }
+ sigcontext_valid = netbsd32_sendsig_sigcontext_16_hook.hooked;
mutex_enter(_lock);
/*
* Prevent unload of compat module while
@@ -207,6 +205,11 @@ netbsd32___sigaction_sigtramp(struct lwp
p->p_lflag |= PL_SIGCOMPAT;
mutex_exit(_lock);
kernconfig_unlock();
+ } else {
+ /*
+ * Module is already loaded and locked in memory
+ */
+ sigcontext_valid = netbsd32_sendsig_sigcontext_16_hook.hooked;
}
if (!sigcontext_valid) {
return EINVAL;
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 14:42:07 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/common: if_le.c
Log Message:
Don't panic as a fatal error on receiving packets with invalid length.
Such errors could happen on aged and fragile 10BASE-2 hub etc.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/stand/common/if_le.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/hp300/stand/common/if_le.c
diff -u src/sys/arch/hp300/stand/common/if_le.c:1.15 src/sys/arch/hp300/stand/common/if_le.c:1.16
--- src/sys/arch/hp300/stand/common/if_le.c:1.15 Fri Apr 21 22:43:11 2023
+++ src/sys/arch/hp300/stand/common/if_le.c Mon Apr 29 14:42:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.15 2023/04/21 22:43:11 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.16 2024/04/29 14:42:07 tsutsui Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -492,8 +492,9 @@ le_poll(struct iodesc *desc, void *pkt,
printf("le_poll: length %d\n", length);
#endif
if (length >= BUFSIZE) {
+ printf("le%d_poll: invalid length %d, status 0x%x\n",
+ unit, length, stat);
length = 0;
- panic("csr0 when bad things happen: %x", stat);
goto cleanup;
}
if (!length)
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Mon Apr 29 14:42:07 UTC 2024 Modified Files: src/sys/arch/hp300/stand/common: if_le.c Log Message: Don't panic as a fatal error on receiving packets with invalid length. Such errors could happen on aged and fragile 10BASE-2 hub etc. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/stand/common/if_le.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/hppa/stand/xxboot
Module Name:src
Committed By: skrll
Date: Mon Apr 29 07:34:27 UTC 2024
Modified Files:
src/sys/arch/hppa/stand/xxboot: Makefile
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/stand/xxboot/Makefile
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/hppa/stand/xxboot/Makefile
diff -u src/sys/arch/hppa/stand/xxboot/Makefile:1.5 src/sys/arch/hppa/stand/xxboot/Makefile:1.6
--- src/sys/arch/hppa/stand/xxboot/Makefile:1.5 Mon Apr 29 07:31:18 2024
+++ src/sys/arch/hppa/stand/xxboot/Makefile Mon Apr 29 07:34:27 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2024/04/29 07:31:18 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/29 07:34:27 skrll Exp $
-NODEBUG=yes
-PROG= xxboot
-NOMAN= # defined
-SRCS= start.S main.c readufs.c readufs_ffs.c readufs_lfs.c milli_tiny.S
+NODEBUG= yes
+PROG= xxboot
+NOMAN= # defined
+SRCS= start.S main.c readufs.c readufs_ffs.c readufs_lfs.c milli_tiny.S
.PATH: ${.CURDIR}/../common
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src Committed By: skrll Date: Mon Apr 29 07:34:27 UTC 2024 Modified Files: src/sys/arch/hppa/stand/xxboot: Makefile Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/stand/xxboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/stand
Module Name:src Committed By: skrll Date: Mon Apr 29 07:33:32 UTC 2024 Modified Files: src/sys/arch/hppa/stand: Makefile.buildboot Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/stand/Makefile.buildboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/stand
Module Name:src
Committed By: skrll
Date: Mon Apr 29 07:33:32 UTC 2024
Modified Files:
src/sys/arch/hppa/stand: Makefile.buildboot
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/stand/Makefile.buildboot
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/hppa/stand/Makefile.buildboot
diff -u src/sys/arch/hppa/stand/Makefile.buildboot:1.7 src/sys/arch/hppa/stand/Makefile.buildboot:1.8
--- src/sys/arch/hppa/stand/Makefile.buildboot:1.7 Thu Aug 3 08:16:31 2023
+++ src/sys/arch/hppa/stand/Makefile.buildboot Mon Apr 29 07:33:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.7 2023/08/03 08:16:31 mrg Exp $
+# $NetBSD: Makefile.buildboot,v 1.8 2024/04/29 07:33:32 skrll Exp $
NOPIE=yes
NOSSP=yes
@@ -38,12 +38,12 @@ CFLAGS+= -mdisable-fpregs -mfast-indirec
.include "${S}/conf/newvers_stand.mk"
-CPPFLAGS+= -D_STANDALONE -Dhppa ${DEBUGFLAGS}
-CPPFLAGS+= -DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT}
-CPPFLAGS+= -DNO_NET
+CPPFLAGS+= -D_STANDALONE -Dhppa ${DEBUGFLAGS}
+CPPFLAGS+= -DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT}
+CPPFLAGS+= -DNO_NET
-COMMONSOURCE= cons.c dev_hppa.c dk.c itecons.c \
- machdep.c milli_tiny.S pdc.c time.c
+COMMONSOURCE= cons.c dev_hppa.c dk.c itecons.c \
+ machdep.c milli_tiny.S pdc.c time.c
DRIVERSOURCE=
### find out what to use for libkern
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: skrll
Date: Mon Apr 29 07:31:18 UTC 2024
Modified Files:
src/sys/arch/hppa/stand/xxboot: Makefile
Log Message:
Ensure a user specified DBG isn't used for xxboot.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/stand/xxboot/Makefile
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/hppa/stand/xxboot/Makefile
diff -u src/sys/arch/hppa/stand/xxboot/Makefile:1.4 src/sys/arch/hppa/stand/xxboot/Makefile:1.5
--- src/sys/arch/hppa/stand/xxboot/Makefile:1.4 Fri Jan 13 18:43:43 2023
+++ src/sys/arch/hppa/stand/xxboot/Makefile Mon Apr 29 07:31:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/01/13 18:43:43 martin Exp $
+# $NetBSD: Makefile,v 1.5 2024/04/29 07:31:18 skrll Exp $
NODEBUG=yes
PROG= xxboot
@@ -17,6 +17,9 @@ CPPFLAGS+= -D__daddr_t=int32_t -D__ino_t
CPPFLAGS+= -Dconst=
COPTS+= -Os -fno-delete-null-pointer-checks -funsigned-char -mdisable-fpregs -mpa-risc-1-0
+# Make sure we override any optimization options specified by the user
+DBG= # empty
+
.include
LINKS= ${BINDIR}/${PROG} ${BINDIR}/sdboot
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src Committed By: skrll Date: Mon Apr 29 07:31:18 UTC 2024 Modified Files: src/sys/arch/hppa/stand/xxboot: Makefile Log Message: Ensure a user specified DBG isn't used for xxboot. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/stand/xxboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 07:13:42 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst: Makefile
src/sys/arch/hp300/stand/uboot: Makefile
Log Message:
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/uboot/Makefile
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/hp300/stand/inst/Makefile
diff -u src/sys/arch/hp300/stand/inst/Makefile:1.10 src/sys/arch/hp300/stand/inst/Makefile:1.11
--- src/sys/arch/hp300/stand/inst/Makefile:1.10 Mon Sep 23 13:42:36 2019
+++ src/sys/arch/hp300/stand/inst/Makefile Mon Apr 29 07:13:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:36 christos Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $
PROGAOUT= inst
PROGSOURCE= inst.c
@@ -6,16 +6,14 @@ NEWVERSWHAT= "Miniroot Installer"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_INST
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
- inst.lif ${DESTDIR}${BINDIR}/inst.lif
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_INST
- ln ${DESTDIR}${BINDIR}/inst.lif ${DESTDIR}${BINDIR}/rbootd/SYS_INST
-release: check_RELEASEDIR .WAIT inst.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_INST
Index: src/sys/arch/hp300/stand/uboot/Makefile
diff -u src/sys/arch/hp300/stand/uboot/Makefile:1.10 src/sys/arch/hp300/stand/uboot/Makefile:1.11
--- src/sys/arch/hp300/stand/uboot/Makefile:1.10 Sun Dec 11 07:41:37 2022
+++ src/sys/arch/hp300/stand/uboot/Makefile Mon Apr 29 07:13:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/12/11 07:41:37 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $
PROGAOUT= uboot
PROGSOURCE= uboot.c tgets.c
@@ -7,28 +7,20 @@ NEWVERSWHAT= "Primary Boot"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
CPPFLAGS+= -DSUPPORT_UFS2
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootrd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/sdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootsd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/ctboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootct
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_UBOOT
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 444 \
- uboot.lif ${DESTDIR}${BINDIR}/uboot.lif
- rm -f ${DESTDIR}${BINDIR}/rdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rdboot
- rm -f ${DESTDIR}${BINDIR}/bootrd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootrd
- rm -f ${DESTDIR}${BINDIR}/sdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/sdboot
- rm -f ${DESTDIR}${BINDIR}/bootsd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootsd
- rm -f ${DESTDIR}${BINDIR}/ctboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/ctboot
- rm -f ${DESTDIR}${BINDIR}/bootct
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootct
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
-release: check_RELEASEDIR .WAIT uboot.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_UBOOT
CVS commit: src/sys/arch/hp300/stand
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 07:13:42 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst: Makefile
src/sys/arch/hp300/stand/uboot: Makefile
Log Message:
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/uboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
