CVS commit: src/sys/dev/usb
Module Name:src Committed By: flxd Date: Fri Jun 19 11:54:01 UTC 2020 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.772 -r1.773 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: flxd Date: Fri Jun 19 11:52:42 UTC 2020 Modified Files: src/sys/dev/usb: umass_quirks.c usbdevs Log Message: Add umass quirk for Alcor AU6366 multi-card reader. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/dev/usb/umass_quirks.c cvs rdiff -u -r1.782 -r1.783 src/sys/dev/usb/usbdevs 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: flxd
Date: Fri Jun 19 11:52:42 UTC 2020
Modified Files:
src/sys/dev/usb: umass_quirks.c usbdevs
Log Message:
Add umass quirk for Alcor AU6366 multi-card reader.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/usb/umass_quirks.c
cvs rdiff -u -r1.782 -r1.783 src/sys/dev/usb/usbdevs
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/umass_quirks.c
diff -u src/sys/dev/usb/umass_quirks.c:1.101 src/sys/dev/usb/umass_quirks.c:1.102
--- src/sys/dev/usb/umass_quirks.c:1.101 Mon Apr 13 09:26:43 2020
+++ src/sys/dev/usb/umass_quirks.c Fri Jun 19 11:52:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_quirks.c,v 1.101 2020/04/13 09:26:43 jdolecek Exp $ */
+/* $NetBSD: umass_quirks.c,v 1.102 2020/06/19 11:52:42 flxd Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.101 2020/04/13 09:26:43 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.102 2020/06/19 11:52:42 flxd Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -330,6 +330,19 @@ Static const struct umass_quirk umass_qu
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
+
+ /*
+ * Fix Alcor multi-card readers in many HP machines (like net-tops).
+ * FreeBSD applies the no-sync-cache quirk for /all/ Alcor usb devices
+ * as well as a no-test-unit-ready quirk. Mine works without the latter.
+ */
+ { { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU6366 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NOSYNCCACHE,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
};
const struct umass_quirk *
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.782 src/sys/dev/usb/usbdevs:1.783
--- src/sys/dev/usb/usbdevs:1.782 Wed Apr 29 08:05:10 2020
+++ src/sys/dev/usb/usbdevs Fri Jun 19 11:52:42 2020
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.782 2020/04/29 08:05:10 nia Exp $
+$NetBSD: usbdevs,v 1.783 2020/06/19 11:52:42 flxd Exp $
/*-
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -803,6 +803,7 @@ product ALCATELT ST121G 0x0121 SpeedTou
/* Alcor Micro, Inc. products */
product ALCOR2 KBD_HUB 0x2802 Kbd Hub
+product ALCOR AU6366 0x6366 AU6366 USB2.0 Single LUN Multiple Flash Card Reader Controller
product ALCOR MA_KBD_HUB 0x9213 MacAlly Kbd Hub
product ALCOR AU9814 0x9215 AU9814 Hub
product ALCOR SM_KBD 0x9410 MicroConnectors/StrongMan Keyboard
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: flxd
Date: Sat Mar 3 15:47:50 UTC 2018
Modified Files:
src/sys/arch/mips/mips: cache.c
Log Message:
Add missing call to mips_dcache_compute_align() affecting "modern" MIPS
(MIPS32{,R2}/MIPS64{,R2}). Thanks jmcneill@; OK skrll@.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mips/mips/cache.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: flxd
Date: Sat Mar 3 15:47:50 UTC 2018
Modified Files:
src/sys/arch/mips/mips: cache.c
Log Message:
Add missing call to mips_dcache_compute_align() affecting "modern" MIPS
(MIPS32{,R2}/MIPS64{,R2}). Thanks jmcneill@; OK skrll@.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mips/mips/cache.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/cache.c
diff -u src/sys/arch/mips/mips/cache.c:1.58 src/sys/arch/mips/mips/cache.c:1.59
--- src/sys/arch/mips/mips/cache.c:1.58 Sun May 14 09:37:13 2017
+++ src/sys/arch/mips/mips/cache.c Sat Mar 3 15:47:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.c,v 1.58 2017/05/14 09:37:13 skrll Exp $ */
+/* $NetBSD: cache.c,v 1.59 2018/03/03 15:47:49 flxd Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.58 2017/05/14 09:37:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.59 2018/03/03 15:47:49 flxd Exp $");
#include "opt_cputype.h"
#include "opt_mips_cache.h"
@@ -1455,5 +1455,7 @@ mips_config_cache_modern(uint32_t cpu_id
mco->mco_intern_pdcache_sync_range_index = no_cache_op_range_index;
mco->mco_intern_pdcache_sync_range = no_cache_op_range;
}
+
+ mips_dcache_compute_align();
}
#endif /* MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2 > 0 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: flxd Date: Wed Feb 28 18:03:48 UTC 2018 Modified Files: src/sys/dev/pci: if_vr.c Log Message: Cosmetic printf/aprint changes. Add missing return statement after failed pci_intr_establish(). To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/dev/pci/if_vr.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/pci
Module Name:src
Committed By: flxd
Date: Wed Feb 28 18:03:48 UTC 2018
Modified Files:
src/sys/dev/pci: if_vr.c
Log Message:
Cosmetic printf/aprint changes.
Add missing return statement after failed pci_intr_establish().
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/dev/pci/if_vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.122 src/sys/dev/pci/if_vr.c:1.123
--- src/sys/dev/pci/if_vr.c:1.122 Wed Feb 28 17:13:44 2018
+++ src/sys/dev/pci/if_vr.c Wed Feb 28 18:03:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.122 2018/02/28 17:13:44 flxd Exp $ */
+/* $NetBSD: if_vr.c,v 1.123 2018/02/28 18:03:48 flxd Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.122 2018/02/28 17:13:44 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.123 2018/02/28 18:03:48 flxd Exp $");
@@ -436,8 +436,7 @@ vr_mii_statchg(struct ifnet *ifp)
}
if (i == 0) {
#ifdef VR_DEBUG
- printf("%s: rx shutdown error!\n",
- device_xname(sc->vr_dev));
+ aprint_error_dev(sc->vr_dev, "rx shutdown error!\n");
#endif
sc->vr_flags |= VR_F_RESTART;
}
@@ -522,12 +521,12 @@ vr_reset(struct vr_softc *sc)
}
if (i == VR_TIMEOUT) {
if (sc->vr_revid < REV_ID_VT3065_A) {
- printf("%s: reset never completed!\n",
- device_xname(sc->vr_dev));
+ aprint_error_dev(sc->vr_dev,
+ "reset never completed!\n");
} else {
/* Use newer force reset command */
- printf("%s: using force reset command.\n",
- device_xname(sc->vr_dev));
+ aprint_normal_dev(sc->vr_dev,
+ "using force reset command.\n");
VR_SETBIT(sc, VR_MISC_CR1, VR_MISCCR1_FORSRST);
}
}
@@ -649,7 +648,7 @@ vr_rxeof(struct vr_softc *sc)
errstr = "unknown rx error";
break;
}
- printf("%s: receive error: %s\n", device_xname(sc->vr_dev),
+ aprint_error_dev(sc->vr_dev, "receive error: %s\n",
errstr);
VR_INIT_RXDESC(sc, i);
@@ -664,10 +663,10 @@ vr_rxeof(struct vr_softc *sc)
*/
ifp->if_ierrors++;
- printf("%s: receive error: incomplete frame; "
- "size = %d, status = 0x%x\n",
- device_xname(sc->vr_dev),
- VR_RXBYTES(le32toh(d->vr_status)), rxstat);
+ aprint_error_dev(sc->vr_dev,
+ "receive error: incomplete frame; "
+ "size = %d, status = 0x%x\n",
+ VR_RXBYTES(le32toh(d->vr_status)), rxstat);
VR_INIT_RXDESC(sc, i);
@@ -688,9 +687,9 @@ vr_rxeof(struct vr_softc *sc)
*/
ifp->if_ierrors++;
- printf("%s: receive error: zero-length packet; "
- "status = 0x%x\n",
- device_xname(sc->vr_dev), rxstat);
+ aprint_error_dev(sc->vr_dev,
+ "receive error: zero-length packet; "
+ "status = 0x%x\n", rxstat);
VR_INIT_RXDESC(sc, i);
@@ -805,8 +804,7 @@ vr_rxeoc(struct vr_softc *sc)
}
if (i == VR_TIMEOUT) {
/* XXX need reset? */
- printf("%s: RX shutdown never complete\n",
- device_xname(sc->vr_dev));
+ aprint_error_dev(sc->vr_dev, "RX shutdown never completed\n");
}
vr_rxeof(sc);
@@ -854,8 +852,8 @@ vr_txeof(struct vr_softc *sc)
}
if (j == VR_TIMEOUT) {
/* XXX need reset? */
-printf("%s: TX shutdown never complete\n",
-device_xname(sc->vr_dev));
+aprint_error_dev(sc->vr_dev,
+"TX shutdown never completed\n");
}
d->vr_status = htole32(VR_TXSTAT_OWN);
CSR_WRITE_4(sc, VR_TXADDR, VR_CDTXADDR(sc, i));
@@ -930,7 +928,7 @@ vr_intr(void *arg)
vr_rxeof(sc);
if (status & VR_ISR_RX_DROPPED) {
- printf("%s: rx packet lost\n", device_xname(sc->vr_dev));
+ aprint_error_dev(sc->vr_dev, "rx packet lost\n");
ifp->if_ierrors++;
}
@@ -941,11 +939,10 @@ vr_intr(void *arg)
if (status & (VR_ISR_BUSERR | VR_ISR_TX_UNDERRUN)) {
if (status & VR_ISR_BUSERR)
-printf("%s: PCI bus error\n",
-device_xname(sc->vr_dev));
+aprint_error_dev(sc->vr_dev, "PCI bus error\n");
if (status & VR_ISR_TX_UNDERRUN)
-printf("%s: transmit underrun\n",
-device_xname(sc->vr_dev));
+aprint_error_dev(sc->vr_dev,
+"transmit underrun\n");
/* vr_init() calls vr_start() */
dotx = 0;
(void)vr_init(ifp);
@@ -960,11 +957,11 @@ vr_intr(void *arg)
if (status &
(VR_ISR_TX_ABRT | VR_ISR_TX_ABRT2 | VR_ISR_TX_UDFI)) {
if (status & (VR_ISR_TX_ABRT | VR_ISR_TX_ABRT2))
-printf("%s: transmit aborted\n",
-device_xname(sc->vr_dev));
+aprint_error_dev(sc->vr_dev,
+"transmit aborted\n");
if (status & VR_ISR_TX_UDFI)
-printf("%s: transmit underflow\n",
-device_xname(sc->vr_dev));
+aprint_error_dev(sc->vr_dev,
+"transmit underflow\n");
ifp->if_oerrors++;
dotx = 1;
vr_txeof(sc);
@@ -1045,15 +1042,15 @@ vr_start(struct ifnet *ifp)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: flxd Date: Wed Feb 28 17:13:44 UTC 2018 Modified Files: src/sys/dev/pci: if_vr.c if_vrreg.h Log Message: Cosmetic fix for the Physical Address Registers PAR0 to PAR5. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/pci/if_vr.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_vrreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_vr.c diff -u src/sys/dev/pci/if_vr.c:1.121 src/sys/dev/pci/if_vr.c:1.122 --- src/sys/dev/pci/if_vr.c:1.121 Thu Dec 15 09:28:05 2016 +++ src/sys/dev/pci/if_vr.c Wed Feb 28 17:13:44 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.121 2016/12/15 09:28:05 ozaki-r Exp $ */ +/* $NetBSD: if_vr.c,v 1.122 2018/02/28 17:13:44 flxd Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.121 2016/12/15 09:28:05 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.122 2018/02/28 17:13:44 flxd Exp $"); @@ -1594,8 +1594,7 @@ vr_attach(device_t parent, device_t self * Get station address. The way the Rhine chips work, * you're not allowed to directly access the EEPROM once * they've been programmed a special way. Consequently, - * we need to read the node address from the PAR0 and PAR1 - * registers. + * we need to read the node address from the PAR registers. * * XXXSCW: On the Rhine III, setting VR_EECSR_LOAD forces a reload * of the *whole* EEPROM, not just the MAC address. This is Index: src/sys/dev/pci/if_vrreg.h diff -u src/sys/dev/pci/if_vrreg.h:1.16 src/sys/dev/pci/if_vrreg.h:1.17 --- src/sys/dev/pci/if_vrreg.h:1.16 Sun Nov 5 13:05:18 2006 +++ src/sys/dev/pci/if_vrreg.h Wed Feb 28 17:13:44 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vrreg.h,v 1.16 2006/11/05 13:05:18 tsutsui Exp $ */ +/* $NetBSD: if_vrreg.h,v 1.17 2018/02/28 17:13:44 flxd Exp $ */ /* * Copyright (c) 1997, 1998 @@ -38,8 +38,12 @@ * Rhine register definitions. */ -#define VR_PAR0 0x00 /* node address 0 to 4 */ -#define VR_PAR1 0x04 /* node address 2 to 6 */ +#define VR_PAR0 0x00 /* node address 0 */ +#define VR_PAR1 0x01 /* node address 1 */ +#define VR_PAR2 0x02 /* node address 2 */ +#define VR_PAR3 0x03 /* node address 3 */ +#define VR_PAR4 0x04 /* node address 4 */ +#define VR_PAR5 0x05 /* node address 5 */ #define VR_RXCFG 0x06 /* receiver config register */ #define VR_TXCFG 0x07 /* transmit config register */ #define VR_COMMAND 0x08 /* command register */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: flxd Date: Wed Feb 28 17:13:44 UTC 2018 Modified Files: src/sys/dev/pci: if_vr.c if_vrreg.h Log Message: Cosmetic fix for the Physical Address Registers PAR0 to PAR5. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/pci/if_vr.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_vrreg.h 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: flxd
Date: Sat Jan 27 10:07:41 UTC 2018
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
src/sys/arch/powerpc/booke: trap.c
Log Message:
Fix more printf format strings for mfspr() (hi mrg).
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/booke/trap.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/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.42 src/sys/arch/evbppc/mpc85xx/machdep.c:1.43
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.42 Thu Dec 22 14:47:57 2016
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Sat Jan 27 10:07:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.42 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.43 2018/01/27 10:07:41 flxd Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -1245,8 +1245,8 @@ initppc(vaddr_t startkernel, vaddr_t end
/*
*
*/
- printf(" hid0=%#lx/%#lx", hid0, mfspr(SPR_HID0));
- printf(" hid1=%#lx", mfspr(SPR_HID1));
+ printf(" hid0=%#lx/%#jx", hid0, (uintmax_t)mfspr(SPR_HID0));
+ printf(" hid1=%#jx", (uintmax_t)mfspr(SPR_HID1));
printf(" pordevsr=%#x", cpu_read_4(GLOBAL_BASE + PORDEVSR));
printf(" devdisr=%#x", cpu_read_4(GLOBAL_BASE + DEVDISR));
Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.26 src/sys/arch/powerpc/booke/trap.c:1.27
--- src/sys/arch/powerpc/booke/trap.c:1.26 Thu Jul 31 12:11:37 2014
+++ src/sys/arch/powerpc/booke/trap.c Sat Jan 27 10:07:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.26 2014/07/31 12:11:37 joerg Exp $ */
+/* $NetBSD: trap.c,v 1.27 2018/01/27 10:07:41 flxd Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.26 2014/07/31 12:11:37 joerg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.27 2018/01/27 10:07:41 flxd Exp $");
#include
#include
@@ -734,9 +734,10 @@ trap(enum ppc_booke_exceptions trap_code
if ((VM_MAX_ADDRESS & 0x8000) == 0
&& usertrap && (tf->tf_fixreg[1] & 0x8000)) {
- printf("%s(entry): pid %d.%d (%s): %s invalid sp %#lx (sprg1=%#lx)\n",
- __func__, p->p_pid, l->l_lid, p->p_comm,
- trap_names[trap_code], tf->tf_fixreg[1], mfspr(SPR_SPRG1));
+ printf("%s(entry): pid %d.%d (%s): %s invalid sp %#lx "
+ "(sprg1=%#jx)\n", __func__, p->p_pid, l->l_lid, p->p_comm,
+ trap_names[trap_code], tf->tf_fixreg[1],
+ (uintmax_t)mfspr(SPR_SPRG1));
dump_trapframe(tf, NULL);
Debugger();
}
CVS commit: src/sys/arch
Module Name:src Committed By: flxd Date: Sat Jan 27 10:07:41 UTC 2018 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c src/sys/arch/powerpc/booke: trap.c Log Message: Fix more printf format strings for mfspr() (hi mrg). To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbppc/mpc85xx/machdep.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/booke/trap.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/powerpc/booke
Module Name:src
Committed By: flxd
Date: Fri Jan 26 17:49:55 UTC 2018
Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
Another try fixing printf format using the ultimate uintmax_t idiom.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.36 src/sys/arch/powerpc/booke/e500_intr.c:1.37
--- src/sys/arch/powerpc/booke/e500_intr.c:1.36 Fri Jan 26 09:26:43 2018
+++ src/sys/arch/powerpc/booke/e500_intr.c Fri Jan 26 17:49:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.36 2018/01/26 09:26:43 christos Exp $ */
+/* $NetBSD: e500_intr.c,v 1.37 2018/01/26 17:49:55 flxd Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
#define __INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.36 2018/01/26 09:26:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.37 2018/01/26 17:49:55 flxd Exp $");
#include
#include
@@ -1150,8 +1150,8 @@ e500_intr_init(void)
break;
#endif
default:
- panic("%s: don't know how to deal with SVR %#" PRIxREGISTER,
- __func__, mfspr(SPR_SVR));
+ panic("%s: don't know how to deal with SVR %#jx",
+ __func__, (uintmax_t)mfspr(SPR_SVR));
}
/*
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: flxd Date: Fri Jan 26 17:49:55 UTC 2018 Modified Files: src/sys/arch/powerpc/booke: e500_intr.c Log Message: Another try fixing printf format using the ultimate uintmax_t idiom. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/booke/e500_intr.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: flxd Date: Mon Jan 22 18:15:57 UTC 2018 Modified Files: src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c Log Message: Use right variable as revealed by previous typo... To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/bus_space_alignstride_chipdep.c diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.30 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.31 --- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.30 Sun Jan 21 16:38:25 2018 +++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Mon Jan 22 18:15:56 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.30 2018/01/21 16:38:25 flxd Exp $ */ +/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.31 2018/01/22 18:15:56 flxd Exp $ */ /*- * Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -86,7 +86,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.30 2018/01/21 16:38:25 flxd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.31 2018/01/22 18:15:56 flxd Exp $"); #ifdef CHIP_EXTENT #include @@ -842,9 +842,9 @@ __BS(write_2)(void *v, bus_space_handle_ h &= ~((bus_space_handle_t)(CHIP_ACCESS_SIZE - 1)); CHIP_TYPE cval = ((CHIP_TYPE)CHIP_SWAP16(val)) << shift; # if CHIP_ACCESS_SIZE == 8 - mips3_sd(h, val); + mips3_sd(h, cval); # else - mips_sw(h, val); + mips_sw(h, cval); # endif #endif }
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: flxd Date: Mon Jan 22 18:15:57 UTC 2018 Modified Files: src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c Log Message: Use right variable as revealed by previous typo... To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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: flxd Date: Sun Jan 21 16:38:25 UTC 2018 Modified Files: src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/bus_space_alignstride_chipdep.c diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.29 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.30 --- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.29 Wed Jul 20 17:57:00 2016 +++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Sun Jan 21 16:38:25 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.29 2016/07/20 17:57:00 macallan Exp $ */ +/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.30 2018/01/21 16:38:25 flxd Exp $ */ /*- * Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -86,7 +86,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.29 2016/07/20 17:57:00 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.30 2018/01/21 16:38:25 flxd Exp $"); #ifdef CHIP_EXTENT #include @@ -835,7 +835,7 @@ __BS(write_2)(void *v, bus_space_handle_ KASSERT((off & 1) == 0); h += CHIP_OFF16(off); -#if CHIP_ACCES_SIZE <= 2 +#if CHIP_ACCESS_SIZE <= 2 mips_sh(h, CHIP_SWAP16(val)); #else const int shift = (h & (CHIP_ACCESS_SIZE - 1)) * 8;
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: flxd Date: Sun Jan 21 16:38:25 UTC 2018 Modified Files: src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/pmax/conf
Module Name:src Committed By: flxd Date: Fri Jan 5 13:20:46 UTC 2018 Modified Files: src/sys/arch/pmax/conf: GENERIC Log Message: Comment out DIAGNOSTIC/DEBUG/LOCKDEBUG from r1.192 slowing down real machines. OK christos@ To generate a diff of this commit: cvs rdiff -u -r1.194 -r1.195 src/sys/arch/pmax/conf/GENERIC 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/pmax/conf/GENERIC diff -u src/sys/arch/pmax/conf/GENERIC:1.194 src/sys/arch/pmax/conf/GENERIC:1.195 --- src/sys/arch/pmax/conf/GENERIC:1.194 Thu Sep 14 07:58:42 2017 +++ src/sys/arch/pmax/conf/GENERIC Fri Jan 5 13:20:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.194 2017/09/14 07:58:42 mrg Exp $ +# $NetBSD: GENERIC,v 1.195 2018/01/05 13:20:45 flxd Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.194 $" +#ident "GENERIC-$Revision: 1.195 $" maxusers 64 @@ -47,9 +47,9 @@ makeoptions DEBUG="-g" options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options DDB_ONPANIC=0 # don't enter debugger on panic -options DIAGNOSTIC # extra kernel debugging checks -options DEBUG # extra kernel debugging support -options LOCKDEBUG +#options DIAGNOSTIC # extra kernel debugging checks +#options DEBUG # extra kernel debugging support +#options LOCKDEBUG #options VMFAULT_TRACE #options PMAP_FAULTINFO options KTRACE # system call tracing support
CVS commit: src/sys/arch/pmax/conf
Module Name:src Committed By: flxd Date: Fri Jan 5 13:20:46 UTC 2018 Modified Files: src/sys/arch/pmax/conf: GENERIC Log Message: Comment out DIAGNOSTIC/DEBUG/LOCKDEBUG from r1.192 slowing down real machines. OK christos@ To generate a diff of this commit: cvs rdiff -u -r1.194 -r1.195 src/sys/arch/pmax/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/pmax/ibus
Module Name:src
Committed By: flxd
Date: Fri Jan 5 13:11:32 UTC 2018
Modified Files:
src/sys/arch/pmax/ibus: pm.c
Log Message:
Check presence of VFB01/VFB02 frame buffer option on DEC(station|system) 3100.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/pmax/ibus/pm.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/pmax/ibus/pm.c
diff -u src/sys/arch/pmax/ibus/pm.c:1.13 src/sys/arch/pmax/ibus/pm.c:1.14
--- src/sys/arch/pmax/ibus/pm.c:1.13 Tue Jun 13 19:13:55 2017
+++ src/sys/arch/pmax/ibus/pm.c Fri Jan 5 13:11:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pm.c,v 1.13 2017/06/13 19:13:55 spz Exp $ */
+/* $NetBSD: pm.c,v 1.14 2018/01/05 13:11:32 flxd Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.13 2017/06/13 19:13:55 spz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.14 2018/01/05 13:11:32 flxd Exp $");
#include
#include
@@ -90,6 +90,7 @@ struct pm_softc {
int pm_match(device_t, cfdata_t, void *);
void pm_attach(device_t, device_t, void *);
+int pm_check_vfb(void);
int pm_ioctl(void *, void *, u_long, void *, int, struct lwp *);
paddr_t pm_mmap(void *, void *, off_t, int);
int pm_alloc_screen(void *, const struct wsscreen_descr *,
@@ -174,6 +175,9 @@ pm_attach(device_t parent, device_t self
if (console) {
sc->sc_nscreens = 1;
ri->ri_flg &= ~RI_NO_AUTO;
+ } else if (!pm_check_vfb()) {
+ printf(": VFB01/VFB02 frame buffer option not found\n");
+ return;
} else
pm_common_init();
@@ -192,6 +196,27 @@ pm_attach(device_t parent, device_t self
config_found(self, , wsemuldisplaydevprint);
}
+int
+pm_check_vfb(void)
+{
+ int *mem;
+ const int magic = 0xcafebabe;
+
+ mem = (void *)MIPS_PHYS_TO_KSEG1(KN01_PHYS_FBUF_START);
+
+ *mem = magic;
+ wbflush();
+ if (*mem != magic)
+ return 0;
+
+ *mem = ~magic;
+ wbflush();
+ if (*mem != ~magic)
+ return 0;
+
+ return 1;
+}
+
void
pm_init_cmap(struct pm_softc *sc)
{
CVS commit: src/sys/arch/pmax/ibus
Module Name:src Committed By: flxd Date: Fri Jan 5 13:11:32 UTC 2018 Modified Files: src/sys/arch/pmax/ibus: pm.c Log Message: Check presence of VFB01/VFB02 frame buffer option on DEC(station|system) 3100. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/pmax/ibus/pm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: flxd Date: Sat Oct 14 08:22:38 UTC 2017 Modified Files: src/share/man/man4: slhci.4 Log Message: Add TC-USB. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/slhci.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: flxd Date: Sat Oct 14 08:22:38 UTC 2017 Modified Files: src/share/man/man4: slhci.4 Log Message: Add TC-USB. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/slhci.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/slhci.4 diff -u src/share/man/man4/slhci.4:1.10 src/share/man/man4/slhci.4:1.11 --- src/share/man/man4/slhci.4:1.10 Sun Apr 28 12:51:04 2013 +++ src/share/man/man4/slhci.4 Sat Oct 14 08:22:38 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: slhci.4,v 1.10 2013/04/28 12:51:04 wiz Exp $ +.\" $NetBSD: slhci.4,v 1.11 2017/10/14 08:22:38 flxd Exp $ .\" .\" Not (c) 2007 Matthew Orgass .\" This file is public domain, meaning anyone can make any use of part or all @@ -22,6 +22,10 @@ .Ss ISA controllers .Cd "slhci* at isa? port ? irq ?" .Cd "usb* at slhci?" +.Ss TURBOchannel controllers +.Cd "tcu* at tc? slot ? offset ?" +.Cd "slhci* at tcu?" +.Cd "usb* at slhci?" .Ss x68k .Cd "slhci0 at intio0 addr 0xece380 intr 251" .Cd "slhci1 at intio0 addr 0xeceb80 intr 250" @@ -99,11 +103,16 @@ Ethernet/USB/Memory board .It .Tn Thylacine USB Host Controller +.It +.Tn flxd +.Em TC-USB .El .Sh SEE ALSO .Xr config 1 , .Xr isa 4 , .Xr pcmcia 4 , +.Xr tc 4 , +.Xr tcu 4 , .Xr usb 4 .Rs .%T Cypress SL811HS datasheet, errata, and application note
CVS commit: src/sys/arch/mac68k/obio
Module Name:src Committed By: flxd Date: Thu Oct 12 09:48:53 UTC 2017 Modified Files: src/sys/arch/mac68k/obio: asc.c Log Message: Exclude Enhanced Apple Sound Chip (EASC) without support for wavetable mode used by asc(4). To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/mac68k/obio/asc.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/mac68k/obio
Module Name:src
Committed By: flxd
Date: Thu Oct 12 09:48:53 UTC 2017
Modified Files:
src/sys/arch/mac68k/obio: asc.c
Log Message:
Exclude Enhanced Apple Sound Chip (EASC) without support for wavetable mode
used by asc(4).
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/mac68k/obio/asc.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/mac68k/obio/asc.c
diff -u src/sys/arch/mac68k/obio/asc.c:1.57 src/sys/arch/mac68k/obio/asc.c:1.58
--- src/sys/arch/mac68k/obio/asc.c:1.57 Fri Jul 25 08:10:34 2014
+++ src/sys/arch/mac68k/obio/asc.c Thu Oct 12 09:48:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.57 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: asc.c,v 1.58 2017/10/12 09:48:53 flxd Exp $ */
/*
* Copyright (C) 1997 Scott Reynolds
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.57 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.58 2017/10/12 09:48:53 flxd Exp $");
#include
#include
@@ -135,6 +135,8 @@ const struct cdevsw asc_cdevsw = {
.d_flag = 0
};
+static const uint8_t easc_version_tab[] = { 0xb0 };
+
static int
ascmatch(device_t parent, cfdata_t cf, void *aux)
{
@@ -142,6 +144,7 @@ ascmatch(device_t parent, cfdata_t cf, v
bus_addr_t addr;
bus_space_handle_t bsh;
int rval = 0;
+ uint8_t ver;
if (oa->oa_addr != (-1))
addr = (bus_addr_t)oa->oa_addr;
@@ -155,9 +158,20 @@ ascmatch(device_t parent, cfdata_t cf, v
if (bus_space_map(oa->oa_tag, addr, MAC68K_ASC_LEN, 0, ))
return (0);
- if (mac68k_bus_space_probe(oa->oa_tag, bsh, 0, 1))
+ if (mac68k_bus_space_probe(oa->oa_tag, bsh, 0, 1)) {
rval = 1;
- else
+
+ /*
+ * Enhanced Apple Sound Chip (EASC) does not support wavetable
+ * mode, exclude it for now.
+ */
+ ver = bus_space_read_1(oa->oa_tag, bsh, 0x800);
+ for (size_t i = 0; i < __arraycount(easc_version_tab); i++)
+ if (ver == easc_version_tab[i]) {
+rval = 0;
+break;
+ }
+ } else
rval = 0;
bus_space_unmap(oa->oa_tag, bsh, MAC68K_ASC_LEN);
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: flxd
Date: Sun Oct 8 12:09:44 UTC 2017
Modified Files:
src/sys/arch/arm/arm32: vm_machdep.c
Log Message:
In vmapbuf use pmap_enter(pmap_kernel(), ...) and not pmap_kenter_pa as the
former handles multiple mappings for VIPT AND VIVT correctly whereas the latter
doesn't work for VIVT. PR port-shark/52102
>From skrll@. Tested by martin@ and me.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/arm/arm32/vm_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/arm/arm32/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.70 src/sys/arch/arm/arm32/vm_machdep.c:1.71
--- src/sys/arch/arm/arm32/vm_machdep.c:1.70 Sun Mar 29 09:47:48 2015
+++ src/sys/arch/arm/arm32/vm_machdep.c Sun Oct 8 12:09:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.70 2015/03/29 09:47:48 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.71 2017/10/08 12:09:44 flxd Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.70 2015/03/29 09:47:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.71 2017/10/08 12:09:44 flxd Exp $");
#include "opt_armfpe.h"
#include "opt_pmap_debug.h"
@@ -245,7 +245,7 @@ vmapbuf(struct buf *bp, vsize_t len)
*/
while (len) {
(void) pmap_extract(pm, faddr, );
- pmap_kenter_pa(taddr, fpa, VM_PROT_READ|VM_PROT_WRITE,
+ pmap_enter(pmap_kernel(), taddr, fpa, VM_PROT_READ|VM_PROT_WRITE,
PMAP_WIRED);
faddr += PAGE_SIZE;
taddr += PAGE_SIZE;
@@ -281,7 +281,7 @@ vunmapbuf(struct buf *bp, vsize_t len)
off = (vaddr_t)bp->b_data - addr;
len = round_page(off + len);
- pmap_kremove(addr, len);
+ pmap_remove(pmap_kernel(), addr, len);
pmap_update(pmap_kernel());
uvm_km_free(phys_map, addr, len, UVM_KMF_VAONLY);
bp->b_data = bp->b_saveaddr;
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: flxd
Date: Sun Oct 8 12:08:31 UTC 2017
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Revert attempt at tracking unmanaged mappings for VIVT as it was incomplete and
buggy. PR port-shark/52102
>From skrll@. Tested by martin@ and me.
To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.357 src/sys/arch/arm/arm32/pmap.c:1.358
--- src/sys/arch/arm/arm32/pmap.c:1.357 Wed Sep 6 11:51:33 2017
+++ src/sys/arch/arm/arm32/pmap.c Sun Oct 8 12:08:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.357 2017/09/06 11:51:33 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.358 2017/10/08 12:08:30 flxd Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.357 2017/09/06 11:51:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.358 2017/10/08 12:08:30 flxd Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -3586,7 +3586,7 @@ pmap_remove(pmap_t pm, vaddr_t sva, vadd
pmap_release_pmap_lock(pm);
}
-#if !defined(ARM_MMU_EXTENDED)
+#if defined(PMAP_CACHE_VIPT) && !defined(ARM_MMU_EXTENDED)
static struct pv_entry *
pmap_kremove_pg(struct vm_page *pg, vaddr_t va)
{
@@ -3594,9 +3594,7 @@ pmap_kremove_pg(struct vm_page *pg, vadd
paddr_t pa = VM_PAGE_TO_PHYS(pg);
struct pv_entry *pv;
-#ifdef PMAP_CACHE_VIPT
KASSERT(arm_cache_prefer_mask == 0 || md->pvh_attrs & (PVF_COLORED|PVF_NC));
-#endif
KASSERT((md->pvh_attrs & PVF_KMPAGE) == 0);
KASSERT(pmap_page_locked_p(md));
@@ -3614,18 +3612,16 @@ pmap_kremove_pg(struct vm_page *pg, vadd
if (SLIST_EMPTY(>pvh_list)) {
md->pvh_attrs &= ~PVF_EXEC;
PMAPCOUNT(exec_discarded_kremove);
-#ifdef PMAP_CACHE_VIPT
} else {
pmap_syncicache_page(md, pa);
PMAPCOUNT(exec_synced_kremove);
-#endif
}
}
pmap_vac_me_harder(md, pa, pmap_kernel(), 0);
return pv;
}
-#endif /* !ARM_MMU_EXTENDED */
+#endif /* PMAP_CACHE_VIPT && !ARM_MMU_EXTENDED */
/*
* pmap_kenter_pa: enter an unmanaged, wired kernel mapping
@@ -3637,11 +3633,16 @@ pmap_kremove_pg(struct vm_page *pg, vadd
void
pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{
+#ifdef PMAP_CACHE_VIVT
+ struct vm_page *pg = (flags & PMAP_KMPAGE) ? PHYS_TO_VM_PAGE(pa) : NULL;
+#endif
+#ifdef PMAP_CACHE_VIPT
struct vm_page *pg = PHYS_TO_VM_PAGE(pa);
struct vm_page *opg;
#ifndef ARM_MMU_EXTENDED
struct pv_entry *pv = NULL;
#endif
+#endif
struct vm_page_md *md = pg != NULL ? VM_PAGE_TO_MD(pg) : NULL;
UVMHIST_FUNC(__func__);
@@ -3675,13 +3676,12 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
l2b->l2b_occupancy += PAGE_SIZE / L2_S_SIZE;
} else {
PMAPCOUNT(kenter_remappings);
+#ifdef PMAP_CACHE_VIPT
opg = PHYS_TO_VM_PAGE(l2pte_pa(opte));
+#if !defined(ARM_MMU_EXTENDED) || defined(DIAGNOSTIC)
struct vm_page_md *omd __diagused = VM_PAGE_TO_MD(opg);
- if (opg
-#ifdef PMAP_CACHE_VIPT
- && arm_cache_prefer_mask != 0
#endif
- && true) {
+ if (opg && arm_cache_prefer_mask != 0) {
KASSERT(opg != pg);
KASSERT((omd->pvh_attrs & PVF_KMPAGE) == 0);
KASSERT((flags & PMAP_KMPAGE) == 0);
@@ -3691,6 +3691,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
pmap_release_page_lock(omd);
#endif
}
+#endif
if (l2pte_valid_p(opte)) {
l2pte_reset(ptep);
PTE_SYNC(ptep);
@@ -3749,14 +3750,8 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
md->pvh_attrs |= PVF_KMPAGE;
#endif
atomic_inc_32(_kmpages);
- } else if (false
#if defined(PMAP_CACHE_VIPT) && !defined(ARM_MMU_EXTENDED)
- || arm_cache_prefer_mask != 0
-#elif defined(PMAP_CACHE_VIVT)
- || true
-#endif
- || false) {
-#if !defined(ARM_MMU_EXTENDED)
+ } else if (arm_cache_prefer_mask != 0) {
if (pv == NULL) {
pv = pool_get(_pv_pool, PR_NOWAIT);
KASSERT(pv != NULL);
@@ -3773,7 +3768,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
pmap_release_page_lock(md);
#endif
}
-#if !defined(ARM_MMU_EXTENDED)
+#if defined(PMAP_CACHE_VIPT) && !defined(ARM_MMU_EXTENDED)
} else {
if (pv != NULL)
pool_put(_pv_pool, pv);
@@ -3834,14 +3829,8 @@ pmap_kremove(vaddr_t va, vsize_t len)
}
#endif
atomic_dec_32(_kmpages);
-} else if (false
#if defined(PMAP_CACHE_VIPT) && !defined(ARM_MMU_EXTENDED)
-|| arm_cache_prefer_mask != 0
-#elif defined(PMAP_CACHE_VIVT)
-|| true
-#endif
-|| false) {
-#if !defined(ARM_MMU_EXTENDED)
+} else if (arm_cache_prefer_mask != 0) {
pmap_acquire_page_lock(omd);
pool_put(_pv_pool,
pmap_kremove_pg(opg, va));
CVS commit: src/share/man/man4/man4.pmax
Module Name:src Committed By: flxd Date: Fri Jul 28 15:58:24 UTC 2017 Modified Files: src/share/man/man4/man4.pmax: intro.4 sii.4 Log Message: * sii(4) was never used in VAXstation 3100 (uses si(4) and is NCR-based). * Reference scsi(4) in sii(4). * Add more machines to pmax/intro(4). * Small fixes. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/man4.pmax/intro.4 cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.pmax/sii.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.pmax/intro.4 diff -u src/share/man/man4/man4.pmax/intro.4:1.20 src/share/man/man4/man4.pmax/intro.4:1.21 --- src/share/man/man4/man4.pmax/intro.4:1.20 Tue Jul 25 08:30:45 2017 +++ src/share/man/man4/man4.pmax/intro.4 Fri Jul 28 15:58:24 2017 @@ -27,9 +27,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $NetBSD: intro.4,v 1.20 2017/07/25 08:30:45 wiz Exp $ +.\" $NetBSD: intro.4,v 1.21 2017/07/28 15:58:24 flxd Exp $ .\" -.Dd February 17, 2017 +.Dd July 28, 2017 .Dt INTRO 4 pmax .Os .Sh NAME @@ -94,7 +94,8 @@ The following systems are supported: .Pp .Bl -tag -width speaker -offset indent -compact .It DECstation 2100 and 3100 -also known as "pmax". The 2100 and 3100 differ only in CPU clock speed. +also known as "PMIN" and "PMAX". The 2100 and 3100 differ only in CPU clock +speed. .It DECsystem 5100 also known as "MIPSMATE". .It DECstation 5000/200 @@ -107,9 +108,9 @@ The 5000/1xx comes in 20 MHz, 25 MHz, an numbered appropriately. Two 12.5 MHz TURBOchannel slots are provided. -.It DECstation 5000/2x +.It DECstation 5000/xx also known as "Personal DECstation" or "MAXINE". -The 5000/xx comes in 20 MHz and 25 MHz variants. +The 5000/xx comes in 20 MHz, 25 MHz, and 33 MHz variants. A baseboard 1024x786 framebuffer, and two 12.5 MHz TURBOchannel slots are provided. .It DECstation 5000/240 and DECsystem 5900 @@ -137,7 +138,7 @@ baseboard or PMAZ-AA SCSI option card. baseboard audio on 5000/xx systems. .It dz serial driver for DEC custom four-port serial device (dc7085 DZ-11 clone) -on the baseboard of DECstation 2100/31000, 5100, and 5000/200 systems. +on the baseboard of DECstation 2100/3100, 5100, and 5000/200 systems. .It zsc serial driver for Zilog SCC asynchronous/synchronous devices on the baseboard of DECstation 5000-series systems (excluding 5000/200). @@ -152,7 +153,7 @@ if support for baseboard devices or the Pseudo-device driver supporting glass-tty console emulation on DEC framebuffers, DEC mice, and LK-201 family keyboards. .It sii -DEC custom SCSI adaptor on DECstation 2100, 3100, 5100, and VAXstation 3100. +DEC custom SCSI adaptor on DECstation 2100, 3100, and 5100. .It pm DECstation 2100/3100 baseboard framebuffer .It tc Index: src/share/man/man4/man4.pmax/sii.4 diff -u src/share/man/man4/man4.pmax/sii.4:1.13 src/share/man/man4/man4.pmax/sii.4:1.14 --- src/share/man/man4/man4.pmax/sii.4:1.13 Tue Jul 25 03:51:41 2017 +++ src/share/man/man4/man4.pmax/sii.4 Fri Jul 28 15:58:24 2017 @@ -27,9 +27,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $NetBSD: sii.4,v 1.13 2017/07/25 03:51:41 ryoon Exp $ +.\" $NetBSD: sii.4,v 1.14 2017/07/28 15:58:24 flxd Exp $ .\" -.Dd February 17, 2017 +.Dd July 28, 2017 .Dt SII 4 pmax .Os .Sh NAME @@ -45,7 +45,7 @@ The driver provides support for the .Tn DEC SII SCSI adaptor ASIC used in -the DECstation 2100, 3100, and 5100, and in the VAXstation 3100. +the DECstation 2100, 3100, and 5100. .Pp The .Nm @@ -65,6 +65,7 @@ to and from the DMA region. .Xr ch 4 , .Xr pmax/ibus 4 , .Xr pmax/intro 4 , +.Xr scsi 4 , .Xr sd 4 , .Xr st 4 .Sh HISTORY
CVS commit: src/share/man/man4/man4.pmax
Module Name:src Committed By: flxd Date: Fri Jul 28 15:58:24 UTC 2017 Modified Files: src/share/man/man4/man4.pmax: intro.4 sii.4 Log Message: * sii(4) was never used in VAXstation 3100 (uses si(4) and is NCR-based). * Reference scsi(4) in sii(4). * Add more machines to pmax/intro(4). * Small fixes. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/man4.pmax/intro.4 cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.pmax/sii.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.vax
Module Name:src Committed By: flxd Date: Mon Jun 26 17:45:56 UTC 2017 Modified Files: src/etc/etc.vax: Makefile.inc Log Message: Add GENERIC_USB to vax kernel sets, but not to sysinst (yet), as bootloader cannot handle kernels that large (yet). To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/etc/etc.vax/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.vax/Makefile.inc diff -u src/etc/etc.vax/Makefile.inc:1.24 src/etc/etc.vax/Makefile.inc:1.25 --- src/etc/etc.vax/Makefile.inc:1.24 Sun Jan 15 17:36:55 2012 +++ src/etc/etc.vax/Makefile.inc Mon Jun 26 17:45:56 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.24 2012/01/15 17:36:55 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.25 2017/06/26 17:45:56 flxd Exp $ # # etc.vax/Makefile.inc -- vax-specific etc Makefile targets # @@ -6,7 +6,7 @@ # If you change the list of distributed kernels, don't forget # to update the release documentation in distrib/notes/common/contents -KERNEL_SETS= GENERIC GENERIC.MP +KERNEL_SETS= GENERIC GENERIC.MP GENERIC_USB BUILD_KERNELS= INSTALL
CVS commit: src/etc/etc.vax
Module Name:src Committed By: flxd Date: Mon Jun 26 17:45:56 UTC 2017 Modified Files: src/etc/etc.vax: Makefile.inc Log Message: Add GENERIC_USB to vax kernel sets, but not to sysinst (yet), as bootloader cannot handle kernels that large (yet). To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/etc/etc.vax/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: flxd Date: Fri Jun 23 15:24:36 UTC 2017 Modified Files: src/share/man/man4: tc.4 Log Message: Add vax. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/tc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: flxd Date: Fri Jun 23 15:24:36 UTC 2017 Modified Files: src/share/man/man4: tc.4 Log Message: Add vax. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/tc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/tc.4 diff -u src/share/man/man4/tc.4:1.6 src/share/man/man4/tc.4:1.7 --- src/share/man/man4/tc.4:1.6 Mon Dec 26 16:03:50 2016 +++ src/share/man/man4/tc.4 Fri Jun 23 15:24:35 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: tc.4,v 1.6 2016/12/26 16:03:50 wiz Exp $ +.\" $NetBSD: tc.4,v 1.7 2017/06/23 15:24:35 flxd Exp $ .\" .\" Copyright (c) 1996, 1997 Jonathan Stone. .\" All rights reserved. @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 26, 2016 +.Dd June 23, 2017 .Dt TC 4 .Os .Sh NAME @@ -39,12 +39,15 @@ .Cd "tc* at tcasic?" .Ss pmax .Cd "tc* at mainbus0" +.Ss vax +.Cd "tc0 at vsbus0" .Sh DESCRIPTION The .Nm driver provides machine-independent support for the DEC TURBOchannel -expansion bus found on all DEC 5000-series machines with MIPS and DEC -3000-series with Alpha processors. +expansion bus found on all DEC 5000-series machines with MIPS, DEC +3000-series with Alpha processors and VAXstation 4000 machines with the +optional TURBOchannel adaptor. .Pp Your system may support additional .Tn TURBOchannel
CVS commit: src
Module Name:src Committed By: flxd Date: Thu Jun 22 17:51:22 UTC 2017 Modified Files: src/etc/etc.vax: MAKEDEV.conf src/sys/arch/vax/conf: files.vax majors.vax Added Files: src/sys/arch/vax/conf: GENERIC_USB Log Message: USB for vax (similar to pmax; no/negligible impact on legacy): * Add USB device files/majors. * Make kernel configs with USB work. * Provide a USB-enabled kernel config. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/etc/etc.vax/MAKEDEV.conf cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/conf/GENERIC_USB cvs rdiff -u -r1.122 -r1.123 src/sys/arch/vax/conf/files.vax cvs rdiff -u -r1.26 -r1.27 src/sys/arch/vax/conf/majors.vax 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: flxd Date: Thu Jun 22 17:51:22 UTC 2017 Modified Files: src/etc/etc.vax: MAKEDEV.conf src/sys/arch/vax/conf: files.vax majors.vax Added Files: src/sys/arch/vax/conf: GENERIC_USB Log Message: USB for vax (similar to pmax; no/negligible impact on legacy): * Add USB device files/majors. * Make kernel configs with USB work. * Provide a USB-enabled kernel config. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/etc/etc.vax/MAKEDEV.conf cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/conf/GENERIC_USB cvs rdiff -u -r1.122 -r1.123 src/sys/arch/vax/conf/files.vax cvs rdiff -u -r1.26 -r1.27 src/sys/arch/vax/conf/majors.vax Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.vax/MAKEDEV.conf diff -u src/etc/etc.vax/MAKEDEV.conf:1.18 src/etc/etc.vax/MAKEDEV.conf:1.19 --- src/etc/etc.vax/MAKEDEV.conf:1.18 Tue Jun 20 15:10:03 2017 +++ src/etc/etc.vax/MAKEDEV.conf Thu Jun 22 17:51:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.18 2017/06/20 15:10:03 flxd Exp $ +# $NetBSD: MAKEDEV.conf,v 1.19 2017/06/22 17:51:22 flxd Exp $ all_md) makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0 @@ -7,6 +7,7 @@ all_md) makedev scsibus0 scsibus1 scsibus2 scsibus3 makedev ses0 ses1 ses2 ses3 makedev audio speaker + makedev usbs makedev std_vax ;; Index: src/sys/arch/vax/conf/files.vax diff -u src/sys/arch/vax/conf/files.vax:1.122 src/sys/arch/vax/conf/files.vax:1.123 --- src/sys/arch/vax/conf/files.vax:1.122 Thu Jun 22 16:46:53 2017 +++ src/sys/arch/vax/conf/files.vax Thu Jun 22 17:51:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: files.vax,v 1.122 2017/06/22 16:46:53 flxd Exp $ +# $NetBSD: files.vax,v 1.123 2017/06/22 17:51:22 flxd Exp $ # # new style config file for vax architecture # @@ -180,6 +180,11 @@ device si: scsi, ncr5380sbc attach si at vsbus with si_vsbus file arch/vax/vsa/ncr.c si_vsbus +# +# Machine-independent ATA drivers +# +include "dev/ata/files.ata" + # Monochrome framebuffer on VS3100. device smg: displaydev, wsemuldisplaydev attach smg at vsbus @@ -412,4 +417,12 @@ include "compat/vax1k/files.vax1k" #arch/vax/if/if_vv.c optional vv device-driver #arch/vax/if/raw_hy.c optional hy device-driver +# this wants to be probed as late as possible. +# +# Machine-independent USB device support +# +include "dev/usb/files.usb" + +include "dev/bluetooth/files.bluetooth" + include "arch/vax/conf/majors.vax" Index: src/sys/arch/vax/conf/majors.vax diff -u src/sys/arch/vax/conf/majors.vax:1.26 src/sys/arch/vax/conf/majors.vax:1.27 --- src/sys/arch/vax/conf/majors.vax:1.26 Sun Jul 5 03:06:27 2015 +++ src/sys/arch/vax/conf/majors.vax Thu Jun 22 17:51:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: majors.vax,v 1.26 2015/07/05 03:06:27 matt Exp $ +# $NetBSD: majors.vax,v 1.27 2017/06/22 17:51:22 flxd Exp $ # # Device majors for vax # @@ -97,3 +97,5 @@ device-major uu block 13 uu # Majors up to 143 are reserved for machine-dependent drivers. # New machine-independent driver majors are assigned in # sys/conf/majors. + +include "conf/majors.usb" Added files: Index: src/sys/arch/vax/conf/GENERIC_USB diff -u /dev/null src/sys/arch/vax/conf/GENERIC_USB:1.1 --- /dev/null Thu Jun 22 17:51:22 2017 +++ src/sys/arch/vax/conf/GENERIC_USB Thu Jun 22 17:51:22 2017 @@ -0,0 +1,16 @@ +# $NetBSD: GENERIC_USB,v 1.1 2017/06/22 17:51:22 flxd Exp $ +# +# GENERIC kernel with USB + +include "arch/vax/conf/GENERIC" + +# TC-USB +tcu* at tc? slot ? offset ? +slhci* at tcu? +gpio* at gpiobus? + +# USB bus support +usb* at slhci? + +include "dev/usb/usbdevices.config" +midi* at midibus?
CVS commit: src/sys/dev/tc
Module Name:src Committed By: flxd Date: Thu Jun 22 17:01:34 UTC 2017 Modified Files: src/sys/dev/tc: tcdevs.h tcdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/tc/tcdevs.h \ src/sys/dev/tc/tcdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/tc
Module Name:src Committed By: flxd Date: Thu Jun 22 17:01:34 UTC 2017 Modified Files: src/sys/dev/tc: tcdevs.h tcdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/tc/tcdevs.h \ src/sys/dev/tc/tcdevs_data.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/tc/tcdevs.h diff -u src/sys/dev/tc/tcdevs.h:1.24 src/sys/dev/tc/tcdevs.h:1.25 --- src/sys/dev/tc/tcdevs.h:1.24 Fri Oct 14 15:01:39 2016 +++ src/sys/dev/tc/tcdevs.h Thu Jun 22 17:01:34 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: tcdevs.h,v 1.24 2016/10/14 15:01:39 flxd Exp $ */ +/* $NetBSD: tcdevs.h,v 1.25 2017/06/22 17:01:34 flxd Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: tcdevs,v 1.22 2016/08/11 09:05:42 christos Exp + * NetBSD: tcdevs,v 1.23 2017/06/22 16:46:53 flxd Exp */ /* @@ -150,7 +150,7 @@ #define TC_DESCRIPTION_PMAP_AA "Prestoserve" #define TC_DEVICE_PMAT_AA "tra" -#define TC_DESCRIPTION_PMAT_AA "DEC TurboChannel Token Ring Controller" +#define TC_DESCRIPTION_PMAT_AA "DEC TURBOchannel Token Ring Controller" #define TC_DEVICE_PMAZ_AA "asc" #define TC_DESCRIPTION_PMAZ_AA "53c94 SCSI" @@ -177,10 +177,10 @@ #define TC_DESCRIPTION_PMTNV_AA "Non-volatile RAM option card" #define TC_DEVICE_T1D4PKT "ds" -#define TC_DESCRIPTION_T1D4PKT "DECWRL Turbochannel T1" +#define TC_DESCRIPTION_T1D4PKT "DECWRL TURBOchannel T1" #define TC_DEVICE_T3PKT "tt" -#define TC_DESCRIPTION_T3PKT "DECWRL Turbochannel T3" +#define TC_DESCRIPTION_T3PKT "DECWRL TURBOchannel T3" #define TC_DEVICE_TC_USB "tcu" #define TC_DESCRIPTION_TC_USB "flxd TC-USB" Index: src/sys/dev/tc/tcdevs_data.h diff -u src/sys/dev/tc/tcdevs_data.h:1.24 src/sys/dev/tc/tcdevs_data.h:1.25 --- src/sys/dev/tc/tcdevs_data.h:1.24 Fri Oct 14 15:01:39 2016 +++ src/sys/dev/tc/tcdevs_data.h Thu Jun 22 17:01:34 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: tcdevs_data.h,v 1.24 2016/10/14 15:01:39 flxd Exp $ */ +/* $NetBSD: tcdevs_data.h,v 1.25 2017/06/22 17:01:34 flxd Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: tcdevs,v 1.22 2016/08/11 09:05:42 christos Exp + * NetBSD: tcdevs,v 1.23 2017/06/22 16:46:53 flxd Exp */ /*
CVS commit: src
Module Name:src Committed By: flxd Date: Thu Jun 22 16:46:53 UTC 2017 Modified Files: src/distrib/notes/alpha: hardware install src/distrib/notes/pmax: hardware install src/share/man/man4: scc.4 src/share/man/man8/man8.pmax: boot.8 src/sys/arch/alpha/include: bus_defs.h cfbreg.h tc_machdep.h src/sys/arch/alpha/tc: tc_3000_300.h tc_3000_500.h tc_bus_mem.c tc_conf.h tc_dma_3000_500.c tc_sgmap.h tcasic.c src/sys/arch/arc/arc: arcbios.h src/sys/arch/mipsco/mipsco: autoconf.c src/sys/arch/news68k/news68k: autoconf.c src/sys/arch/newsmips/newsmips: autoconf.c src/sys/arch/pmax/pmax: kn03.h src/sys/arch/pmax/stand/common: rz.c src/sys/arch/vax/conf: files.vax src/sys/conf: files src/sys/dev/dec: if_le_dec.c src/sys/dev/ic: pdqvar.h src/sys/dev/tc: if_fta.c if_le_tc.c tcdevs tcds.c tcreg.h Log Message: spelling (DEC called it "TURBOchannel") To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/alpha/hardware cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/alpha/install cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/pmax/hardware cvs rdiff -u -r1.41 -r1.42 src/distrib/notes/pmax/install cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/scc.4 cvs rdiff -u -r1.15 -r1.16 src/share/man/man8/man8.pmax/boot.8 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/bus_defs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/include/cfbreg.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/include/tc_machdep.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/tc/tc_3000_300.h \ src/sys/arch/alpha/tc/tc_3000_500.h cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/tc/tc_bus_mem.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/tc/tc_conf.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/tc/tc_dma_3000_500.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/tc/tc_sgmap.h cvs rdiff -u -r1.46 -r1.47 src/sys/arch/alpha/tc/tcasic.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/arc/arcbios.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mipsco/mipsco/autoconf.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/news68k/news68k/autoconf.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/newsmips/newsmips/autoconf.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/pmax/pmax/kn03.h cvs rdiff -u -r1.26 -r1.27 src/sys/arch/pmax/stand/common/rz.c cvs rdiff -u -r1.121 -r1.122 src/sys/arch/vax/conf/files.vax cvs rdiff -u -r1.1178 -r1.1179 src/sys/conf/files cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dec/if_le_dec.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/pdqvar.h cvs rdiff -u -r1.28 -r1.29 src/sys/dev/tc/if_fta.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/tc/if_le_tc.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/tc/tcdevs cvs rdiff -u -r1.25 -r1.26 src/sys/dev/tc/tcds.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/tc/tcreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/alpha/hardware diff -u src/distrib/notes/alpha/hardware:1.18 src/distrib/notes/alpha/hardware:1.19 --- src/distrib/notes/alpha/hardware:1.18 Tue May 19 19:30:26 2015 +++ src/distrib/notes/alpha/hardware Thu Jun 22 16:46:52 2017 @@ -1,10 +1,10 @@ -.\" $NetBSD: hardware,v 1.18 2015/05/19 19:30:26 snj Exp $ +.\" $NetBSD: hardware,v 1.19 2017/06/22 16:46:52 flxd Exp $ . .Nx*M \*V runs on most of the .Tn DEC Alpha PCI platforms, on all -of the TURBOChannel models, on the high end 8200 and 8400 systems, +of the TURBOchannel models, on the high end 8200 and 8400 systems, and on the 4100 series. .Pp The SRM console is required. @@ -40,7 +40,7 @@ it is actually possible to boot and inst in only 16 MB of RAM, you will want to have at least 32 MB. . -We support add-in devices on the PCI, ISA, EISA and TurboChannel buses. +We support add-in devices on the PCI, ISA, EISA and TURBOchannel buses. Because .Nx has an extremely machine-independent device driver @@ -192,7 +192,7 @@ BusLogic 7xx SCSI .bullet) .bullet) . -.Ss2 Supported Turbochannel bus devices +.Ss2 Supported TURBOchannel bus devices .(bullet -offset indent Graphics Adapters .(bullet -compact @@ -206,7 +206,7 @@ SFB video (PMAGB-BA, Although these boards are supported by .Nx*M since there is no keyboard or mouse support available for the -TurboChannel systems, they aren't very useful. +TURBOchannel systems, they aren't very useful. .\" XXX: is this still true now that the MI sfb.c is used??? .Note) .It Index: src/distrib/notes/alpha/install diff -u src/distrib/notes/alpha/install:1.37 src/distrib/notes/alpha/install:1.38 --- src/distrib/notes/alpha/install:1.37 Sat Apr 25 21:21:47 2009 +++ src/distrib/notes/alpha/install Thu Jun 22 16:46:52 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.37 2009/04/25 21:21:47 snj Exp $ +.\" $NetBSD: install,v 1.38 2017/06/22 16:46:52 flxd Exp $ .\" .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -358,7 +358,7 @@ with: .Pp
CVS commit: src
Module Name:src Committed By: flxd Date: Thu Jun 22 16:46:53 UTC 2017 Modified Files: src/distrib/notes/alpha: hardware install src/distrib/notes/pmax: hardware install src/share/man/man4: scc.4 src/share/man/man8/man8.pmax: boot.8 src/sys/arch/alpha/include: bus_defs.h cfbreg.h tc_machdep.h src/sys/arch/alpha/tc: tc_3000_300.h tc_3000_500.h tc_bus_mem.c tc_conf.h tc_dma_3000_500.c tc_sgmap.h tcasic.c src/sys/arch/arc/arc: arcbios.h src/sys/arch/mipsco/mipsco: autoconf.c src/sys/arch/news68k/news68k: autoconf.c src/sys/arch/newsmips/newsmips: autoconf.c src/sys/arch/pmax/pmax: kn03.h src/sys/arch/pmax/stand/common: rz.c src/sys/arch/vax/conf: files.vax src/sys/conf: files src/sys/dev/dec: if_le_dec.c src/sys/dev/ic: pdqvar.h src/sys/dev/tc: if_fta.c if_le_tc.c tcdevs tcds.c tcreg.h Log Message: spelling (DEC called it "TURBOchannel") To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/alpha/hardware cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/alpha/install cvs rdiff -u -r1.18 -r1.19 src/distrib/notes/pmax/hardware cvs rdiff -u -r1.41 -r1.42 src/distrib/notes/pmax/install cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/scc.4 cvs rdiff -u -r1.15 -r1.16 src/share/man/man8/man8.pmax/boot.8 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/bus_defs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/include/cfbreg.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/include/tc_machdep.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/tc/tc_3000_300.h \ src/sys/arch/alpha/tc/tc_3000_500.h cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/tc/tc_bus_mem.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/tc/tc_conf.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/tc/tc_dma_3000_500.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/tc/tc_sgmap.h cvs rdiff -u -r1.46 -r1.47 src/sys/arch/alpha/tc/tcasic.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/arc/arcbios.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mipsco/mipsco/autoconf.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/news68k/news68k/autoconf.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/newsmips/newsmips/autoconf.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/pmax/pmax/kn03.h cvs rdiff -u -r1.26 -r1.27 src/sys/arch/pmax/stand/common/rz.c cvs rdiff -u -r1.121 -r1.122 src/sys/arch/vax/conf/files.vax cvs rdiff -u -r1.1178 -r1.1179 src/sys/conf/files cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dec/if_le_dec.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/pdqvar.h cvs rdiff -u -r1.28 -r1.29 src/sys/dev/tc/if_fta.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/tc/if_le_tc.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/tc/tcdevs cvs rdiff -u -r1.25 -r1.26 src/sys/dev/tc/tcds.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/tc/tcreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.vax
Module Name:src Committed By: flxd Date: Tue Jun 20 15:10:03 UTC 2017 Modified Files: src/etc/etc.vax: MAKEDEV.conf Log Message: Add audio for vsaudio(4) and speaker to be on par with other archs. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/etc/etc.vax/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.vax/MAKEDEV.conf diff -u src/etc/etc.vax/MAKEDEV.conf:1.17 src/etc/etc.vax/MAKEDEV.conf:1.18 --- src/etc/etc.vax/MAKEDEV.conf:1.17 Sat Aug 18 00:50:37 2012 +++ src/etc/etc.vax/MAKEDEV.conf Tue Jun 20 15:10:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.17 2012/08/18 00:50:37 abs Exp $ +# $NetBSD: MAKEDEV.conf,v 1.18 2017/06/20 15:10:03 flxd Exp $ all_md) makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0 @@ -6,6 +6,7 @@ all_md) makedev dz0 dl0 dhu0 racd0 racd1 rx0 rx1 makedev scsibus0 scsibus1 scsibus2 scsibus3 makedev ses0 ses1 ses2 ses3 + makedev audio speaker makedev std_vax ;;
CVS commit: src/etc/etc.vax
Module Name:src Committed By: flxd Date: Tue Jun 20 15:10:03 UTC 2017 Modified Files: src/etc/etc.vax: MAKEDEV.conf Log Message: Add audio for vsaudio(4) and speaker to be on par with other archs. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/etc/etc.vax/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: flxd
Date: Thu Jun 15 15:38:18 UTC 2017
Modified Files:
src/sys/dev/pci: pci_subr.c
Log Message:
Fix printf format/argument.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/dev/pci/pci_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.188 src/sys/dev/pci/pci_subr.c:1.189
--- src/sys/dev/pci/pci_subr.c:1.188 Thu Jun 15 06:51:18 2017
+++ src/sys/dev/pci/pci_subr.c Thu Jun 15 15:38:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.188 2017/06/15 06:51:18 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.189 2017/06/15 15:38:18 flxd Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.188 2017/06/15 06:51:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.189 2017/06/15 15:38:18 flxd Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -3505,13 +3505,13 @@ pci_conf_print_ltr_cap(const pcireg_t *r
printf("\n Latency Tolerance Reporting\n");
reg = regs[o2i(extcapoff + PCI_LTR_MAXSNOOPLAT)];
printf("Max Snoop Latency Register: 0x%04x\n", reg & 0x);
- printf(" Max Snoop Latency: %luns\n",
- __SHIFTOUT(reg, PCI_LTR_MAXSNOOPLAT_VAL)
- * PCI_LTR_SCALETONS(__SHIFTOUT(reg, PCI_LTR_MAXSNOOPLAT_SCALE)));
+ printf(" Max Snoop Latency: %juns\n",
+ (uintmax_t)(__SHIFTOUT(reg, PCI_LTR_MAXSNOOPLAT_VAL)
+ * PCI_LTR_SCALETONS(__SHIFTOUT(reg, PCI_LTR_MAXSNOOPLAT_SCALE;
printf("Max No-Snoop Latency Register: 0x%04x\n", reg >> 16);
- printf(" Max No-Snoop Latency: %luns\n",
- __SHIFTOUT(reg, PCI_LTR_MAXNOSNOOPLAT_VAL)
- * PCI_LTR_SCALETONS(__SHIFTOUT(reg, PCI_LTR_MAXNOSNOOPLAT_SCALE)));
+ printf(" Max No-Snoop Latency: %juns\n",
+ (uintmax_t)(__SHIFTOUT(reg, PCI_LTR_MAXNOSNOOPLAT_VAL)
+ * PCI_LTR_SCALETONS(__SHIFTOUT(reg, PCI_LTR_MAXNOSNOOPLAT_SCALE;
}
static void
CVS commit: src/sys/dev/pci
Module Name:src Committed By: flxd Date: Thu Jun 15 15:38:18 UTC 2017 Modified Files: src/sys/dev/pci: pci_subr.c Log Message: Fix printf format/argument. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/dev/pci/pci_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: flxd Date: Thu Jun 15 14:23:42 UTC 2017 Modified Files: src/doc: CHANGES Log Message: Note support for VAXstation 4000 TURBOchannel. To generate a diff of this commit: cvs rdiff -u -r1.2290 -r1.2291 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2290 src/doc/CHANGES:1.2291 --- src/doc/CHANGES:1.2290 Mon Jun 12 11:05:21 2017 +++ src/doc/CHANGES Thu Jun 15 14:23:42 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2290 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2291 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -25,5 +25,6 @@ Changes from NetBSD 8.0 to NetBSD 9.0: byacc: update to 20170430 [christos 20170605] + vax: Add support for VAXstation 4000 TURBOchannel. [flxd 20170609] wsbell(4): added console bell support for all speaker devices, not only those attached at pcppi [nat 20170612]
CVS commit: src/doc
Module Name:src Committed By: flxd Date: Thu Jun 15 14:23:42 UTC 2017 Modified Files: src/doc: CHANGES Log Message: Note support for VAXstation 4000 TURBOchannel. To generate a diff of this commit: cvs rdiff -u -r1.2290 -r1.2291 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/tc
Module Name:src Committed By: flxd Date: Sat Jun 10 12:03:30 UTC 2017 Modified Files: src/sys/dev/tc: tc.c Log Message: Fix missing TC bus speed. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/tc/tc.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/tc
Module Name:src Committed By: flxd Date: Sat Jun 10 12:03:30 UTC 2017 Modified Files: src/sys/dev/tc: tc.c Log Message: Fix missing TC bus speed. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/tc/tc.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/tc/tc.c diff -u src/sys/dev/tc/tc.c:1.55 src/sys/dev/tc/tc.c:1.56 --- src/sys/dev/tc/tc.c:1.55 Fri Jun 9 17:55:18 2017 +++ src/sys/dev/tc/tc.c Sat Jun 10 12:03:30 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: tc.c,v 1.55 2017/06/09 17:55:18 flxd Exp $ */ +/* $NetBSD: tc.c,v 1.56 2017/06/10 12:03:30 flxd Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.55 2017/06/09 17:55:18 flxd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.56 2017/06/10 12:03:30 flxd Exp $"); #include "opt_tcverbose.h" @@ -168,6 +168,7 @@ tcattach(device_t parent, device_t self, ta.ta_offset = 0; ta.ta_addr = tcaddr; ta.ta_cookie = slot->tcs_cookie; + ta.ta_busspeed = sc->sc_speed; /* * Mark the slot as used.
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: flxd Date: Fri Jun 9 18:02:40 UTC 2017 Modified Files: src/sys/arch/vax/vsa: tc_vsbus.c Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vsa/tc_vsbus.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/vax/vsa/tc_vsbus.c diff -u src/sys/arch/vax/vsa/tc_vsbus.c:1.8 src/sys/arch/vax/vsa/tc_vsbus.c:1.9 --- src/sys/arch/vax/vsa/tc_vsbus.c:1.8 Fri Jun 9 17:55:18 2017 +++ src/sys/arch/vax/vsa/tc_vsbus.c Fri Jun 9 18:02:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: tc_vsbus.c,v 1.8 2017/06/09 17:55:18 flxd Exp $ */ +/* $NetBSD: tc_vsbus.c,v 1.9 2017/06/09 18:02:40 flxd Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tc_vsbus.c,v 1.8 2017/06/09 17:55:18 flxd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tc_vsbus.c,v 1.9 2017/06/09 18:02:40 flxd Exp $"); #include #include @@ -156,10 +156,10 @@ tc_vsbus_match(device_t parent, cfdata_t found = ((bus_space_read_4(bst, bsh, 0) & KA46_BWF0_ADP) != 0); bus_space_unmap(bst, bsh, KA46_BWF0_SZ); /* - * On VS4000/60, although interrupting on a real vector, fool + * On VS4000/60, although interrupting on a real vector, fool * vsbus interrupt, as no interrupt bit will be set in * vsbus_softc's sc_intreq for TC adaptor. - */ + */ rc = 20; break; case VAX_BTYP_49:
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: flxd Date: Fri Jun 9 18:02:40 UTC 2017 Modified Files: src/sys/arch/vax/vsa: tc_vsbus.c Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vsa/tc_vsbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: flxd
Date: Fri Jun 9 17:55:18 UTC 2017
Modified Files:
src/sys/arch/alpha/tc: tcasic.c
src/sys/arch/pmax/tc: tcbus.c
src/sys/arch/vax/conf: files.vax
src/sys/arch/vax/vsa: tc_vsbus.c
src/sys/dev/tc: tc.c tcvar.h
Log Message:
Make VAXstation 4000 TURBOchannel adaptor work.
PIO and IRQ tested on VS4000/60 and /96 with TC-USB (slhci) and PMAD-AA (le).
DMA is untested.
vax needs space to be mapped out, so memory space is pre-mapped for TC option
drivers not bus_space'ified yet, also providing custom bus_space methods for
this kludge.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/alpha/tc/tcasic.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/pmax/tc/tcbus.c
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/vsa/tc_vsbus.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/tc/tc.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/tc/tcvar.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/alpha/tc/tcasic.c
diff -u src/sys/arch/alpha/tc/tcasic.c:1.45 src/sys/arch/alpha/tc/tcasic.c:1.46
--- src/sys/arch/alpha/tc/tcasic.c:1.45 Mon Dec 12 17:03:40 2016
+++ src/sys/arch/alpha/tc/tcasic.c Fri Jun 9 17:55:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $ */
+/* $NetBSD: tcasic.c,v 1.46 2017/06/09 17:55:18 flxd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.46 2017/06/09 17:55:18 flxd Exp $");
#include
#include
@@ -222,7 +222,7 @@ tc_fb_cnattach(tc_addr_t tcaddr)
char tcname[TC_ROM_LLEN];
int i;
- if (tc_badaddr(tcaddr) || (tc_checkslot(tcaddr, tcname) == 0))
+ if (tc_badaddr(tcaddr) || (tc_checkslot(tcaddr, tcname, NULL) == 0))
return (EINVAL);
for (i = 0; i < sizeof(cnboards) / sizeof(cnboards[0]); i++)
Index: src/sys/arch/pmax/tc/tcbus.c
diff -u src/sys/arch/pmax/tc/tcbus.c:1.32 src/sys/arch/pmax/tc/tcbus.c:1.33
--- src/sys/arch/pmax/tc/tcbus.c:1.32 Mon Dec 12 17:03:41 2016
+++ src/sys/arch/pmax/tc/tcbus.c Fri Jun 9 17:55:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $ */
+/* $NetBSD: tcbus.c,v 1.33 2017/06/09 17:55:18 flxd Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.33 2017/06/09 17:55:18 flxd Exp $");
#define _PMAX_BUS_DMA_PRIVATE
/*
@@ -221,7 +221,7 @@ tcfb_cnattach(int slotno)
int i;
tcaddr = promcall(callv->_slot_address, slotno);
- if (tc_badaddr(tcaddr) || tc_checkslot(tcaddr, tcname) == 0)
+ if (tc_badaddr(tcaddr) || tc_checkslot(tcaddr, tcname, NULL) == 0)
panic("TC console designated by PROM does not exist!?");
for (i = 0; i < __arraycount(cnboards); i++) {
Index: src/sys/arch/vax/conf/files.vax
diff -u src/sys/arch/vax/conf/files.vax:1.120 src/sys/arch/vax/conf/files.vax:1.121
--- src/sys/arch/vax/conf/files.vax:1.120 Sun Jul 5 03:06:27 2015
+++ src/sys/arch/vax/conf/files.vax Fri Jun 9 17:55:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.vax,v 1.120 2015/07/05 03:06:27 matt Exp $
+# $NetBSD: files.vax,v 1.121 2017/06/09 17:55:18 flxd Exp $
#
# new style config file for vax architecture
#
@@ -110,8 +110,8 @@ include "dev/qbus/files.uba"
# TurboCHANNEL bus support and device drivers
include "dev/tc/files.tc"
-attach tc at vsbus with tcbus
-file arch/vax/vsa/tc_vsbus.c tcbus
+attach tc at vsbus with tc_vsbus
+file arch/vax/vsa/tc_vsbus.c tc_vsbus
attach uba at mainbus with uba_mainbus
file arch/vax/uba/uba_mainbus.c uba_mainbus
Index: src/sys/arch/vax/vsa/tc_vsbus.c
diff -u src/sys/arch/vax/vsa/tc_vsbus.c:1.7 src/sys/arch/vax/vsa/tc_vsbus.c:1.8
--- src/sys/arch/vax/vsa/tc_vsbus.c:1.7 Sun Jun 5 16:12:50 2011
+++ src/sys/arch/vax/vsa/tc_vsbus.c Fri Jun 9 17:55:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_vsbus.c,v 1.7 2011/06/05 16:12:50 christos Exp $ */
+/* $NetBSD: tc_vsbus.c,v 1.8 2017/06/09 17:55:18 flxd Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,120 +28,407 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include
+__KERNEL_RCSID(0, "$NetBSD: tc_vsbus.c,v 1.8 2017/06/09 17:55:18 flxd Exp $");
+
#include
#include
#include
#include
+#include
#include
#include
+#include
#include
+
#include
-static int tcbus_match(device_t, cfdata_t, void *);
-static void tcbus_attach(device_t, device_t, void *);
+#define NSLOTS 1
-struct tcbus_softc {
+struct tc_vsbus_softc {
struct tc_softc sc_tc;
- struct tc_slotdesc sc_slots[1];
+ struct tc_slotdesc sc_slots[NSLOTS];
struct vax_bus_dma_tag
CVS commit: src/sys
Module Name:src Committed By: flxd Date: Fri Jun 9 17:55:18 UTC 2017 Modified Files: src/sys/arch/alpha/tc: tcasic.c src/sys/arch/pmax/tc: tcbus.c src/sys/arch/vax/conf: files.vax src/sys/arch/vax/vsa: tc_vsbus.c src/sys/dev/tc: tc.c tcvar.h Log Message: Make VAXstation 4000 TURBOchannel adaptor work. PIO and IRQ tested on VS4000/60 and /96 with TC-USB (slhci) and PMAD-AA (le). DMA is untested. vax needs space to be mapped out, so memory space is pre-mapped for TC option drivers not bus_space'ified yet, also providing custom bus_space methods for this kludge. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/alpha/tc/tcasic.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/pmax/tc/tcbus.c cvs rdiff -u -r1.120 -r1.121 src/sys/arch/vax/conf/files.vax cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/vsa/tc_vsbus.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/tc/tc.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/tc/tcvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src Committed By: flxd Date: Thu Jun 8 15:28:27 UTC 2017 Modified Files: src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md Log Message: Fix PR port-vax/51761 as suggested by Paul Koning on port-vax list. Installation (install.ram, -Os) on my VS4000 is possible without SCSI timeouts again. Other variable-length bit field instructions should be checked for correct constraints, too! To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md 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/gcc/dist/gcc/config/vax/builtins.md diff -u src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.5 src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.6 --- src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.5 Sun Jan 24 09:43:34 2016 +++ src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md Thu Jun 8 15:28:27 2017 @@ -47,7 +47,7 @@ (define_insn "ctzsi2" [(set (match_operand:SI 0 "nonimmediate_operand" "=rQ") - (ctz:SI (match_operand:SI 1 "general_operand" "nrmT"))) + (ctz:SI (match_operand:SI 1 "general_operand" "nrQT"))) (set (cc0) (match_dup 0))] "" "ffs $0,$32,%1,%0")
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src Committed By: flxd Date: Thu Jun 8 15:28:27 UTC 2017 Modified Files: src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md Log Message: Fix PR port-vax/51761 as suggested by Paul Koning on port-vax list. Installation (install.ram, -Os) on my VS4000 is possible without SCSI timeouts again. Other variable-length bit field instructions should be checked for correct constraints, too! To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/shark/ofw
0x8000UL|tag|offset); - ret = bus_space_read_4(_io_bs_tag, sc->sc_conf_ioh, 4); + bus_space_write_4(_io_bs_tag, sc->sc_conf_ioh, + VLPCI_CFGREG_ADDR_OFF, 0x8000UL|tag|offset); + ret = bus_space_read_4(_io_bs_tag, sc->sc_conf_ioh, + VLPCI_CFGREG_DATA_OFF); mutex_spin_exit(>sc_lock); #if 0 @@ -354,9 +403,10 @@ vlpci_pc_conf_write(void *v, pcitag_t ta #endif mutex_spin_enter(>sc_lock); - bus_space_write_4(_io_bs_tag, sc->sc_conf_ioh, 0, - 0x8000UL|tag|offset); - bus_space_write_4(_io_bs_tag, sc->sc_conf_ioh, 4, val); + bus_space_write_4(_io_bs_tag, sc->sc_conf_ioh, + VLPCI_CFGREG_ADDR_OFF, 0x8000UL|tag|offset); + bus_space_write_4(_io_bs_tag, sc->sc_conf_ioh, + VLPCI_CFGREG_DATA_OFF, val); mutex_spin_exit(>sc_lock); } @@ -372,7 +422,7 @@ vlpci_pc_intr_map(const struct pci_attac case 2: case 3: case 4: - *ih = 10; + *ih = VLPCI_IRQ; return 0; } } Added files: Index: src/sys/arch/shark/ofw/vlpci.h diff -u /dev/null src/sys/arch/shark/ofw/vlpci.h:1.1 --- /dev/null Tue Apr 18 14:11:42 2017 +++ src/sys/arch/shark/ofw/vlpci.h Tue Apr 18 14:11:42 2017 @@ -0,0 +1,280 @@ +/* $NetBSD: vlpci.h,v 1.1 2017/04/18 14:11:42 flxd Exp $ */ + +/*- + * Copyright (c) 2017, Felix Deichmann + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _VLPCI_H +#define _VLPCI_H + +#include +#include +#include + +/* + * VT82C505 register definitions according to: + * + * VIA Technologies, Inc. "Configuration Registers of VT82C505-F", December + * 1994. Application Note AN-025B. + * + * VIA Technologies, Inc. "VIA VT82C505 Pentium/486 VL to PCI BRIDGE", May 1994. + * Datasheet. + */ + +#define VLPCI_INTREG_BASE 0xa8 +#define VLPCI_INTREG_IDX_OFF 0 +#define VLPCI_INTREG_DATA_OFF 1 +#define VLPCI_INTREG_SZ2 + +#define VLPCI_CFGREG_BASE 0xcf8 +#define VLPCI_CFGREG_ADDR_OFF 0 +#define VLPCI_CFGREG_DATA_OFF 4 +#define VLPCI_CFGREG_SZ8 + +#define VLPCI_DIP_SW_REG 0x80 +#define VLPCI_DIP_SW_PCLK_CCLK __BIT(7) +#define VLPCI_DIP_SW_SYNC_CLK __BIT(6) +#define VLPCI_DIP_SW_IRQ14_15_PIN __BIT(5) +#define VLPCI_DIP_SW_BLAST_PIN __BIT(4) +#define VLPCI_DIP_SW_STRAP __BITS(7, 4) +#define VLPCI_DIP_SW_REV_ID __BITS(3, 0) +#define VLPCI_DIP_SW_REV_ID_D 0x1 +#define VLPCI_DIP_SW_REV_ID_E 0x2 +#define VLPCI_DIP_SW_REV_ID_F 0x3 + +#define VLPCI_OBD_MEM_SZ_REG 0x81 + +#define VLPCI_BUF_CTL_REG 0x82 +#define VLPCI_BUF_CTL_CPU2PCI_WR_BUF __BIT(7) +#define VLPCI_BUF_CTL_PCI2CPU_WR_BUF __BIT(6) +#define VLPCI_BUF_CTL_CPU2PCI_PREF_BUF __BIT(5) +#define VLPCI_BUF_CTL_PCI2CPU_PREF_BUF __BIT(4) +#define VLPCI_BUF_CTL_PCI_DYN_ACC_DEC __BIT(3) +#define VLPCI_BUF_CTL_BST_B4_LST_BRDY __BIT(2) +#define VLPCI_BUF_CTL_OBD_MEM_WR_BST __BIT(1) +#define VLPCI_BUF_CTL_OBD_MEM_RD_BST __BIT(0) + +#define VLPCI_VL_TIM_REG 0x83 +#define VLPCI_VL_TIM_CPU2VL_WR_0WS __BIT(7) +#define VLPCI_VL_TIM_LDEV_2ND_T2 __BIT(6) +#define VLPCI_VL_TIM_TRDY2LRDY_BYP __BIT(5) /* AN-025B */ +#define VLPCI_VL_TIM_TRDY2LRDY_RESYNC __BIT(5) /* DS */ +#define VLPCI_VL_TIM_RDYRTN2TRDY_BYP __BIT(4) /* AN-025B */ +#define VLPCI_VL_TIM_RDYRTN2TRDY_RESYNC __BIT(4) /* DS */ +#define VLPCI_VL_TIM_OBD_MEM_1ST_DAT __BIT(3) +#define VLPCI_VL_TIM_CPU2PCI_WR_BST __BIT(2) +#define VLPCI_VL_TIM_PADS_DIS __BIT(1) +#define VLPCI_VL_TIM_TST_MODE __BIT(0) + +#define VLPCI_PCI_TIM_REG 0x84 +#define VLPCI_PCI_TIM_SLV_LOCK __BIT(7) +#define VLPCI_PCI_TIM_RTY_CNT_64 __BIT(6) +#define VLPCI_PCI_TIM_RTY_DEADL_ERR_REP __BIT(5) +#define VLPCI_PCI_TIM_RTY_STS_OCCU __BIT(4) +#define VLPCI_PCI_TIM_CPU2PCI_FAST_B2B __BIT(3) +#define VLPCI_PCI_TIM_FAST_F
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: flxd Date: Tue Apr 18 14:11:42 UTC 2017 Modified Files: src/sys/arch/shark/ofw: vlpci.c Added Files: src/sys/arch/shark/ofw: vlpci.h Log Message: First pass reducing magic numbers adding register defines. No change to register values/writes, except VLPCI_MISC_CTL_HIADDR_DIS added. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/shark/ofw/vlpci.c cvs rdiff -u -r0 -r1.1 src/sys/arch/shark/ofw/vlpci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/shark/ofw
Module Name:src
Committed By: flxd
Date: Tue Apr 18 12:17:12 UTC 2017
Modified Files:
src/sys/arch/shark/ofw: vlpci.c
Log Message:
KNF, whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/shark/ofw/vlpci.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/shark/ofw/vlpci.c
diff -u src/sys/arch/shark/ofw/vlpci.c:1.6 src/sys/arch/shark/ofw/vlpci.c:1.7
--- src/sys/arch/shark/ofw/vlpci.c:1.6 Sun Mar 12 10:19:40 2017
+++ src/sys/arch/shark/ofw/vlpci.c Tue Apr 18 12:17:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vlpci.c,v 1.6 2017/03/12 10:19:40 martin Exp $ */
+/* $NetBSD: vlpci.c,v 1.7 2017/04/18 12:17:12 flxd Exp $ */
/*
* Copyright (c) 2017 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.6 2017/03/12 10:19:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.7 2017/04/18 12:17:12 flxd Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -95,6 +95,7 @@ struct bus_space vlpci_memt;
static void
regwrite_1(struct vlpci_softc * const sc, uint8_t off, uint8_t val)
{
+
mutex_spin_enter(>sc_lock);
bus_space_write_1(_io_bs_tag, sc->sc_reg_ioh, 0, off);
bus_space_write_1(_io_bs_tag, sc->sc_reg_ioh, 1, val);
@@ -124,14 +125,17 @@ vlpci_dump_window(struct vlpci_softc *sc
addr |= regread_1(sc, regaddr + 1) << 16;
attr = regread_1(sc, regaddr + 2);
size = 0x0001 << ((attr & 0x1c) >> 2);
- printf("memory window #%d at %08x size %08x flags %x\n", num, addr, size, attr);
+ printf("memory window #%d at %08x size %08x flags %x\n", num, addr,
+ size, attr);
}
static int
-vlpci_map(void *t, bus_addr_t bpa, bus_size_t size, int cacheable, bus_space_handle_t *bshp)
+vlpci_map(void *t, bus_addr_t bpa, bus_size_t size, int cacheable,
+bus_space_handle_t *bshp)
{
+
*bshp = vlpci_mem_vaddr - 0x0200 + bpa;
-printf("%s: %08lx -> %08lx\n", __func__, bpa, *bshp);
+ printf("%s: %08lx -> %08lx\n", __func__, bpa, *bshp);
return(0);
}
@@ -143,10 +147,10 @@ vlpci_mmap(void *cookie, bus_addr_t addr
ret = vlpci_mem_paddr + addr + off;
- if (flags & BUS_SPACE_MAP_PREFETCHABLE) {
+ if (flags & BUS_SPACE_MAP_PREFETCHABLE)
return (arm_btop(ret) | ARM32_MMAP_WRITECOMBINE);
- } else
- return arm_btop(ret);
+ else
+ return arm_btop(ret);
}
static int
@@ -202,7 +206,7 @@ vlpci_attach(device_t parent, device_t s
regwrite_1(sc, 0x81, 0x1);
regwrite_1(sc, 0x82, 0x08); /* PCI dynamic acceleration decoding enable */
- regwrite_1(sc, 0x83, 0x08);
+ regwrite_1(sc, 0x83, 0x08);
printf("reg 0x83 %02x\n", regread_1(sc, 0x83));
#if 1
@@ -217,7 +221,7 @@ vlpci_attach(device_t parent, device_t s
#endif
vlpci_mem_paddr = 0x0200; /* get from OF! */
-
+
/*
* we map in 1MB at 0x0200, so program window #1 accordingly
*/
@@ -231,7 +235,7 @@ vlpci_attach(device_t parent, device_t s
vlpci_memt.bs_cookie = (void *)vlpci_mem_vaddr;
vlpci_memt.bs_map = vlpci_map;
vlpci_memt.bs_mmap = vlpci_mmap;
-
+
pc->pc_conf_v = sc;
pc->pc_attach_hook = vlpci_pc_attach_hook;
pc->pc_bus_maxdevs = vlpci_pc_bus_maxdevs;
@@ -266,9 +270,9 @@ vlpci_attach(device_t parent, device_t s
pba.pba_pc = >sc_pc;
pba.pba_bus = 0;
-printf("dma %lx %lx, %lx\n", isa_bus_dma_tag._ranges[0].dr_sysbase,
- isa_bus_dma_tag._ranges[0].dr_busbase,
- isa_bus_dma_tag._ranges[0].dr_len);
+ printf("dma %lx %lx, %lx\n", isa_bus_dma_tag._ranges[0].dr_sysbase,
+ isa_bus_dma_tag._ranges[0].dr_busbase,
+ isa_bus_dma_tag._ranges[0].dr_len);
vlpci_dump_window(sc, 0);
vlpci_dump_window(sc, 1);
@@ -286,18 +290,21 @@ vlpci_pc_attach_hook(device_t parent, de
static int
vlpci_pc_bus_maxdevs(void *v, int busno)
{
+
return busno == 0 ? 32 : 0;
}
static pcitag_t
vlpci_pc_make_tag(void *v, int b, int d, int f)
{
+
return (b << 16) | (d << 11) | (f << 8);
}
static void
vlpci_pc_decompose_tag(void *v, pcitag_t tag, int *bp, int *dp, int *fp)
{
+
if (bp)
*bp = (tag >> 16) & 0xff;
if (dp)
@@ -356,6 +363,7 @@ vlpci_pc_conf_write(void *v, pcitag_t ta
static int
vlpci_pc_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ih)
{
+
switch (pa->pa_intrpin) {
default:
case 0:
@@ -375,13 +383,14 @@ vlpci_pc_intr_string(void *v, pci_intr_h
if (ih == PCI_INTERRUPT_PIN_NONE)
return NULL;
- snprintf(buf, len, "irq %2lu", ih);
+ snprintf(buf, len, "irq %lu", ih);
return buf;
}
static const struct evcnt *
vlpci_pc_intr_evcnt(void *v, pci_intr_handle_t ih)
{
+
return NULL;
}
@@ -389,6 +398,7 @@ static void *
vlpci_pc_intr_establish(void *v, pci_intr_handle_t pih, int ipl,
int (*callback)(void *), void *arg)
{
+
if (pih == 0)
return NULL;
@@ -406,6 +416,7 @@ vlpci_pc_intr_disestablish(void *v, void
static int
vlpci_pc_conf_hook(void *v, int b, int d, int f, pcireg_t id)
{
+
return PCI_CONF_DEFAULT /*& ~PCI_CONF_ENABLE_BM*/;
}
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: flxd Date: Tue Apr 18 12:17:12 UTC 2017 Modified Files: src/sys/arch/shark/ofw: vlpci.c Log Message: KNF, whitespace. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/shark/ofw/vlpci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.shark
Module Name:src Committed By: flxd Date: Tue Apr 11 17:27:49 UTC 2017 Modified Files: src/etc/etc.shark: MAKEDEV.conf Log Message: Add PCI devices for vlpci(4). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/etc/etc.shark/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.shark/MAKEDEV.conf diff -u src/etc/etc.shark/MAKEDEV.conf:1.14 src/etc/etc.shark/MAKEDEV.conf:1.15 --- src/etc/etc.shark/MAKEDEV.conf:1.14 Thu Dec 8 11:31:14 2016 +++ src/etc/etc.shark/MAKEDEV.conf Tue Apr 11 17:27:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.14 2016/12/08 11:31:14 nat Exp $ +# $NetBSD: MAKEDEV.conf,v 1.15 2017/04/11 17:27:49 flxd Exp $ all_md) makedev wscons wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 @@ -9,6 +9,7 @@ all_md) makedev openfirm makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 makedev cfs + makedev pci0 pci1 pci2 pci3 ;; ramdisk|floppy)
CVS commit: src/etc/etc.shark
Module Name:src Committed By: flxd Date: Tue Apr 11 17:27:49 UTC 2017 Modified Files: src/etc/etc.shark: MAKEDEV.conf Log Message: Add PCI devices for vlpci(4). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/etc/etc.shark/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: flxd Date: Sat Feb 18 13:56:29 UTC 2017 Modified Files: src/sys/arch/shark/ofw: vlpci.c Log Message: Let vlpci attach instead of ofbus. OK jakllsch@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/shark/ofw/vlpci.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/shark/ofw/vlpci.c diff -u src/sys/arch/shark/ofw/vlpci.c:1.1 src/sys/arch/shark/ofw/vlpci.c:1.2 --- src/sys/arch/shark/ofw/vlpci.c:1.1 Fri Feb 17 18:07:51 2017 +++ src/sys/arch/shark/ofw/vlpci.c Sat Feb 18 13:56:29 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: vlpci.c,v 1.1 2017/02/17 18:07:51 jakllsch Exp $ */ +/* $NetBSD: vlpci.c,v 1.2 2017/02/18 13:56:29 flxd Exp $ */ /* * Copyright (c) 2017 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.1 2017/02/17 18:07:51 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.2 2017/02/18 13:56:29 flxd Exp $"); #include "opt_pci.h" #include "pci.h" @@ -91,7 +91,7 @@ vlpci_match(device_t parent, struct cfda if (of_compatible(oba->oba_phandle, compat_strings) < 0) return 0; - return 1; + return 2; /* beat generic ofbus */ } static void
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: flxd Date: Sat Feb 18 13:56:29 UTC 2017 Modified Files: src/sys/arch/shark/ofw: vlpci.c Log Message: Let vlpci attach instead of ofbus. OK jakllsch@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/shark/ofw/vlpci.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/i386/conf
Module Name:src Committed By: flxd Date: Sat Jan 7 11:21:05 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC_TINY Log Message: Add wsmux so wsconsctl will not fail when -f is not specified (and default control devices are used), as in /etc/rc.d/wscons. Kernel size increase is < 4 kB. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/arch/i386/conf/GENERIC_TINY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: flxd Date: Sat Jan 7 11:21:05 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC_TINY Log Message: Add wsmux so wsconsctl will not fail when -f is not specified (and default control devices are used), as in /etc/rc.d/wscons. Kernel size increase is < 4 kB. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/arch/i386/conf/GENERIC_TINY 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/i386/conf/GENERIC_TINY diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.146 src/sys/arch/i386/conf/GENERIC_TINY:1.147 --- src/sys/arch/i386/conf/GENERIC_TINY:1.146 Tue Dec 13 20:42:18 2016 +++ src/sys/arch/i386/conf/GENERIC_TINY Sat Jan 7 11:21:05 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.146 2016/12/13 20:42:18 christos Exp $ +# $NetBSD: GENERIC_TINY,v 1.147 2017/01/07 11:21:05 flxd Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -555,3 +555,6 @@ pseudo-device tun # network tunneling pseudo-device pty # pseudo-terminals #options RND_COM # use "com" randomness as well (BROKEN) pseudo-device clockctl # user control of clock subsystem + +# wscons pseudo-devices +pseudo-device wsmux # mouse & keyboard multiplexor
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: flxd Date: Tue Dec 27 08:56:00 UTC 2016 Modified Files: src/sys/arch/vax/conf: GENERIC INSTALL VAX780 Log Message: Fix TC adaptor's CSR address. Add "PMAD" LANCE TC Ethernet. To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/sys/arch/vax/conf/GENERIC cvs rdiff -u -r1.71 -r1.72 src/sys/arch/vax/conf/INSTALL cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/conf/VAX780 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/vax/conf/GENERIC diff -u src/sys/arch/vax/conf/GENERIC:1.199 src/sys/arch/vax/conf/GENERIC:1.200 --- src/sys/arch/vax/conf/GENERIC:1.199 Tue Dec 13 20:42:21 2016 +++ src/sys/arch/vax/conf/GENERIC Tue Dec 27 08:56:00 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.199 2016/12/13 20:42:21 christos Exp $ +# $NetBSD: GENERIC,v 1.200 2016/12/27 08:56:00 flxd Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.199 $" +#ident "GENERIC-$Revision: 1.200 $" # Here are all different supported CPU types listed. #options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 @@ -211,11 +211,12 @@ audio* at audiobus? spkr* at audio? # PC speaker (synthesized) -tc0 at vsbus0 csr 0x3600 # VS4000/60 or 90 TC adapter +tc0 at vsbus0 csr 0x3680 # VS4000/60 or 90 TC adapter tcds* at tc0 slot ? offset ? # TC dual SCSI controller asc* at tcds? chip ? # PMAZB/C asc* at tc? slot ? offset ? # PMAZ fta* at tc? slot ? offset ? # TC FDDI controller +le* at tc? slot ? offset ? # PMAD hdc0 at vsbus0 csr 0x200c # HDC9224 MFM/floppy ctlr rd* at hdc0 drive? # RD5x disks Index: src/sys/arch/vax/conf/INSTALL diff -u src/sys/arch/vax/conf/INSTALL:1.71 src/sys/arch/vax/conf/INSTALL:1.72 --- src/sys/arch/vax/conf/INSTALL:1.71 Wed Aug 12 07:53:58 2015 +++ src/sys/arch/vax/conf/INSTALL Tue Dec 27 08:56:00 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.71 2015/08/12 07:53:58 maxv Exp $ +# $NetBSD: INSTALL,v 1.72 2016/12/27 08:56:00 flxd Exp $ # # INSTALL kernel; all supported devices but nothing fancy. # @@ -157,11 +157,12 @@ smg0 at vsbus0 csr 0x200f # Small m #clr0 at vsbus0 csr 0x3000 # 4- or 8-bitplans color graphics spx0 at vsbus0 csr 0x3800 # Low Cost SPX on VS4000/90. #lcg0 at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics -tc0 at vsbus0 csr 0x3600 # VS4000/60 or 90 TC adapter +tc0 at vsbus0 csr 0x3680 # VS4000/60 or 90 TC adapter tcds* at tc0 slot ? offset ? # TC dual SCSI controller asc* at tcds? chip ? # PMAZB/C asc* at tc? slot ? offset ? # PMAZ fta* at tc? slot ? offset ? # TC FDDI controller +le* at tc? slot ? offset ? # PMAD hdc0 at vsbus0 csr 0x200c # HDC9224 MFM/floppy ctlr rd* at hdc0 drive? # RD5x disks Index: src/sys/arch/vax/conf/VAX780 diff -u src/sys/arch/vax/conf/VAX780:1.20 src/sys/arch/vax/conf/VAX780:1.21 --- src/sys/arch/vax/conf/VAX780:1.20 Sat Aug 8 06:36:26 2015 +++ src/sys/arch/vax/conf/VAX780 Tue Dec 27 08:56:00 2016 @@ -1,4 +1,4 @@ -# $NetBSD: VAX780,v 1.20 2015/08/08 06:36:26 maxv Exp $ +# $NetBSD: VAX780,v 1.21 2016/12/27 08:56:00 flxd Exp $ # # 11/780,750,730 machine description file # @@ -188,11 +188,12 @@ ubi0 at mainbus0 # 11/730 direct unibu #clr0 at vsbus0 csr 0x3000 # 4- or 8-bitplans color graphics #spx0 at vsbus0 csr 0x3800 # Low Cost SPX on VS4000/90. #lcg0 at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics -#tc0 at vsbus0 csr 0x3600 # VS4000/60 or 90 TC adapter +#tc0 at vsbus0 csr 0x3680 # VS4000/60 or 90 TC adapter #tcds* at tc0 slot ? offset ? # TC dual SCSI controller #asc* at tcds? chip ? # PMAZB/C #asc* at tc? slot ? offset ? # PMAZ #fta* at tc? slot ? offset ? # TC FDDI controller +#le* at tc? slot ? offset ? # PMAD #hdc0 at vsbus0 csr 0x200c # HDC9224 MFM/floppy ctlr #rd* at hdc0 drive? # RD5x disks
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: flxd Date: Tue Dec 27 08:56:00 UTC 2016 Modified Files: src/sys/arch/vax/conf: GENERIC INSTALL VAX780 Log Message: Fix TC adaptor's CSR address. Add "PMAD" LANCE TC Ethernet. To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/sys/arch/vax/conf/GENERIC cvs rdiff -u -r1.71 -r1.72 src/sys/arch/vax/conf/INSTALL cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/conf/VAX780 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: flxd Date: Mon Dec 26 15:59:26 UTC 2016 Modified Files: src/share/man/man4: tc.4 Log Message: Add tcu(4) for TC-USB. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/tc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/tc.4 diff -u src/share/man/man4/tc.4:1.4 src/share/man/man4/tc.4:1.5 --- src/share/man/man4/tc.4:1.4 Mon Oct 29 18:59:55 2001 +++ src/share/man/man4/tc.4 Mon Dec 26 15:59:26 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: tc.4,v 1.4 2001/10/29 18:59:55 gmcgarry Exp $ +.\" $NetBSD: tc.4,v 1.5 2016/12/26 15:59:26 flxd Exp $ .\" .\" Copyright (c) 1996, 1997 Jonathan Stone. .\" All rights reserved. @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 12, 2001 +.Dd December 26, 2016 .Dt TC 4 .Os .Sh NAME @@ -93,6 +93,8 @@ PMAG-J TX 24-bit colour unaccelerated 2- .Bl -tag -width pcdisplay -offset indent .It ioasic baseboard IO control ASIC for DEC TURBOchannel systems +.It tcu +TC-USB USB host and GPIO option .El .Sh SEE ALSO .Xr asc 4 , @@ -106,6 +108,7 @@ baseboard IO control ASIC for DEC TURBOc .Xr pxg 4 , .Xr sfb 4 , .Xr tcds 4 , +.Xr tcu 4 , .Xr tfb 4 .Sh HISTORY The
CVS commit: src/sys/arch
Module Name:src Committed By: flxd Date: Sat Dec 17 14:36:30 UTC 2016 Modified Files: src/sys/arch/alpha/include: cpu.h src/sys/arch/amiga/include: cpu.h src/sys/arch/arm/arm32: pmap.c src/sys/arch/cesfic/include: cpu.h src/sys/arch/evbcf/include: cpu.h src/sys/arch/hp300/include: cpu.h src/sys/arch/luna68k/include: cpu.h src/sys/arch/mac68k/include: cpu.h src/sys/arch/mvme68k/include: cpu.h src/sys/arch/news68k/include: cpu.h src/sys/arch/next68k/include: cpu.h src/sys/arch/x68k/include: cpu.h Log Message: Fix typo "one the" and architecture where appropriate. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/arch/alpha/include/cpu.h cvs rdiff -u -r1.80 -r1.81 src/sys/arch/amiga/include/cpu.h cvs rdiff -u -r1.340 -r1.341 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cesfic/include/cpu.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbcf/include/cpu.h cvs rdiff -u -r1.68 -r1.69 src/sys/arch/hp300/include/cpu.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/include/cpu.h cvs rdiff -u -r1.98 -r1.99 src/sys/arch/mac68k/include/cpu.h cvs rdiff -u -r1.48 -r1.49 src/sys/arch/mvme68k/include/cpu.h cvs rdiff -u -r1.42 -r1.43 src/sys/arch/news68k/include/cpu.h cvs rdiff -u -r1.47 -r1.48 src/sys/arch/next68k/include/cpu.h cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x68k/include/cpu.h 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: flxd
Date: Sat Dec 17 14:36:30 UTC 2016
Modified Files:
src/sys/arch/alpha/include: cpu.h
src/sys/arch/amiga/include: cpu.h
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/evbcf/include: cpu.h
src/sys/arch/hp300/include: cpu.h
src/sys/arch/luna68k/include: cpu.h
src/sys/arch/mac68k/include: cpu.h
src/sys/arch/mvme68k/include: cpu.h
src/sys/arch/news68k/include: cpu.h
src/sys/arch/next68k/include: cpu.h
src/sys/arch/x68k/include: cpu.h
Log Message:
Fix typo "one the" and architecture where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/alpha/include/cpu.h
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/amiga/include/cpu.h
cvs rdiff -u -r1.340 -r1.341 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbcf/include/cpu.h
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/mac68k/include/cpu.h
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x68k/include/cpu.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/alpha/include/cpu.h
diff -u src/sys/arch/alpha/include/cpu.h:1.82 src/sys/arch/alpha/include/cpu.h:1.83
--- src/sys/arch/alpha/include/cpu.h:1.82 Wed Jan 22 22:52:04 2014
+++ src/sys/arch/alpha/include/cpu.h Sat Dec 17 14:36:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.82 2014/01/22 22:52:04 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.83 2016/12/17 14:36:29 flxd Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -179,7 +179,7 @@ void cpu_pause_resume_all(int);
/*
* Arguments to hardclock and gatherstats encapsulate the previous
- * machine state in an opaque clockframe. One the Alpha, we use
+ * machine state in an opaque clockframe. On the alpha, we use
* what we push on an interrupt (a trapframe).
*/
struct clockframe {
@@ -204,7 +204,7 @@ struct clockframe {
/*
* Give a profiling tick to the current process when the user profiling
- * buffer pages are invalid. On the Alpha, request an AST to send us
+ * buffer pages are invalid. On the alpha, request an AST to send us
* through trap, marking the proc as needing a profiling tick.
*/
#define cpu_need_proftick(l) \
Index: src/sys/arch/amiga/include/cpu.h
diff -u src/sys/arch/amiga/include/cpu.h:1.80 src/sys/arch/amiga/include/cpu.h:1.81
--- src/sys/arch/amiga/include/cpu.h:1.80 Sat Oct 19 19:20:59 2013
+++ src/sys/arch/amiga/include/cpu.h Sat Dec 17 14:36:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.80 2013/10/19 19:20:59 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.81 2016/12/17 14:36:29 flxd Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -59,7 +59,7 @@
extern volatile unsigned int interrupt_depth;
/*
* Arguments to hardclock and gatherstats encapsulate the previous
- * machine state in an opaque clockframe. One the hp300, we use
+ * machine state in an opaque clockframe. On the amiga, we use
* what the hardware pushes on an interrupt (frame format 0).
*/
struct clockframe {
@@ -85,7 +85,7 @@ struct clockframe {
/*
* Give a profiling tick to the current process from the softclock
- * interrupt. On hp300, request an ast to send us through trap(),
+ * interrupt. On the amiga, request an ast to send us through trap(),
* marking the proc as needing a profiling tick.
*/
#define profile_tick(l, framep) ((l)->l_pflag |= LP_OWEUPC, setsoftast())
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.340 src/sys/arch/arm/arm32/pmap.c:1.341
--- src/sys/arch/arm/arm32/pmap.c:1.340 Thu Aug 4 08:46:06 2016
+++ src/sys/arch/arm/arm32/pmap.c Sat Dec 17 14:36:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.340 2016/08/04 08:46:06 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.341 2016/12/17 14:36:29 flxd Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.340 2016/08/04 08:46:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.341 2016/12/17 14:36:29 flxd Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -6522,7 +6522,7 @@ pmap_bootstrap_pv_page_free(struct pool
*
* This routine is called after the vm and kmem subsystems have been
* initialised. This allows the pmap code to perform any initialisation
- * that can only be done one the memory allocation is in place.
+ * that can only be done once the memory allocation is in place.
*/
void
pmap_postinit(void)
Index:
CVS commit: src/sys
Module Name:src Committed By: flxd Date: Mon Dec 12 17:03:41 UTC 2016 Modified Files: src/sys/arch/alpha/tc: tcasic.c src/sys/arch/pmax/tc: tcbus.c src/sys/dev/tc: tc.c Log Message: Clean-up (remove redundant declarations, concentrate checks). To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/tc/tcasic.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/pmax/tc/tcbus.c cvs rdiff -u -r1.53 -r1.54 src/sys/dev/tc/tc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: flxd
Date: Mon Dec 12 17:03:41 UTC 2016
Modified Files:
src/sys/arch/alpha/tc: tcasic.c
src/sys/arch/pmax/tc: tcbus.c
src/sys/dev/tc: tc.c
Log Message:
Clean-up (remove redundant declarations, concentrate checks).
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/tc/tcasic.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/pmax/tc/tcbus.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/tc/tc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/tc/tcasic.c
diff -u src/sys/arch/alpha/tc/tcasic.c:1.44 src/sys/arch/alpha/tc/tcasic.c:1.45
--- src/sys/arch/alpha/tc/tcasic.c:1.44 Mon Feb 6 02:14:16 2012
+++ src/sys/arch/alpha/tc/tcasic.c Mon Dec 12 17:03:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.44 2012/02/06 02:14:16 matt Exp $ */
+/* $NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.44 2012/02/06 02:14:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $");
#include
#include
@@ -179,7 +179,6 @@ extern void mfb_cnattach(tc_addr_t);
extern void tfb_cnattach(tc_addr_t);
extern void px_cnattach(tc_addr_t);
extern void pxg_cnattach(tc_addr_t);
-extern int tc_checkslot(tc_addr_t, char *);
struct cnboards {
const char *cb_tcname;
Index: src/sys/arch/pmax/tc/tcbus.c
diff -u src/sys/arch/pmax/tc/tcbus.c:1.31 src/sys/arch/pmax/tc/tcbus.c:1.32
--- src/sys/arch/pmax/tc/tcbus.c:1.31 Wed Nov 16 19:37:06 2016
+++ src/sys/arch/pmax/tc/tcbus.c Mon Dec 12 17:03:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tcbus.c,v 1.31 2016/11/16 19:37:06 macallan Exp $ */
+/* $NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.31 2016/11/16 19:37:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $");
#define _PMAX_BUS_DMA_PRIVATE
/*
@@ -179,8 +179,6 @@ tc_ds_get_dma_tag(int slot)
#include
#include
-int tc_checkslot(tc_addr_t, char *);
-
struct cnboards {
const char *cb_tcname;
void (*cb_cnattach)(tc_addr_t);
Index: src/sys/dev/tc/tc.c
diff -u src/sys/dev/tc/tc.c:1.53 src/sys/dev/tc/tc.c:1.54
--- src/sys/dev/tc/tc.c:1.53 Tue Jul 19 18:27:27 2016
+++ src/sys/dev/tc/tc.c Mon Dec 12 17:03:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tc.c,v 1.53 2016/07/19 18:27:27 christos Exp $ */
+/* $NetBSD: tc.c,v 1.54 2016/12/12 17:03:41 flxd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.53 2016/07/19 18:27:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.54 2016/12/12 17:03:41 flxd Exp $");
#include "opt_tcverbose.h"
@@ -209,6 +209,17 @@ static const tc_offset_t tc_slot_romoffs
static int
tc_check_romp(const struct tc_rommap *romp)
{
+
+ switch (romp->tcr_width.v) {
+ case 1:
+ case 2:
+ case 4:
+ break;
+
+ default:
+ return 0;
+ }
+
if (romp->tcr_stride.v != 4)
return 0;
@@ -232,16 +243,6 @@ tc_checkslot(tc_addr_t slotbase, char *n
romp = (struct tc_rommap *)
(slotbase + tc_slot_romoffs[i]);
- switch (romp->tcr_width.v) {
- case 1:
- case 2:
- case 4:
- break;
-
- default:
- continue;
- }
-
if (!tc_check_romp(romp))
continue;
CVS commit: src/doc
Module Name:src Committed By: flxd Date: Sun Dec 11 12:51:09 UTC 2016 Modified Files: src/doc: CHANGES Log Message: Note scsictl(8) getrealloc and setrealloc commands. To generate a diff of this commit: cvs rdiff -u -r1.2221 -r1. src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2221 src/doc/CHANGES:1. --- src/doc/CHANGES:1.2221 Sun Dec 11 01:44:32 2016 +++ src/doc/CHANGES Sun Dec 11 12:51:09 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2221 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1. $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -411,6 +411,9 @@ Changes from NetBSD 7.0 to NetBSD 8.0: zoneinfo: Import tzdata2016i. [kre 20161103] libc: Update to tzcode2016i. [christos 20161104] acpi(4): Updated ACPICA to 20160930. [christos 2016] + scsictl(8): Add "getrealloc" and "setrealloc" commands to get/set + automatic reallocation parameters/enables for error recovery. + [flxd 20161119] scsipi(9): Make scsipi framework MPSAFE. [mlelstv 20161120] umass(4): mark MPSAFE. [skrll 20161121] wpa: Import wpa_supplicant and hostapd 2.6. [christos 20161121]
CVS commit: src/doc
Module Name:src Committed By: flxd Date: Sun Dec 11 12:51:09 UTC 2016 Modified Files: src/doc: CHANGES Log Message: Note scsictl(8) getrealloc and setrealloc commands. To generate a diff of this commit: cvs rdiff -u -r1.2221 -r1. src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/tc
Module Name:src Committed By: flxd Date: Sat Dec 3 18:18:12 UTC 2016 Modified Files: src/sys/dev/tc: tcu.c Log Message: newline To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/tc/tcu.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/tc/tcu.c diff -u src/sys/dev/tc/tcu.c:1.3 src/sys/dev/tc/tcu.c:1.4 --- src/sys/dev/tc/tcu.c:1.3 Sat Dec 3 18:12:50 2016 +++ src/sys/dev/tc/tcu.c Sat Dec 3 18:18:12 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcu.c,v 1.3 2016/12/03 18:12:50 flxd Exp $ */ +/* $NetBSD: tcu.c,v 1.4 2016/12/03 18:18:12 flxd Exp $ */ /*- * Copyright (c) 2016, Felix Deichmann @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.3 2016/12/03 18:12:50 flxd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.4 2016/12/03 18:18:12 flxd Exp $"); #include #include @@ -143,7 +143,7 @@ tcu_attach(device_t parent, device_t sel if ((cfg & TCU_CFG_S1_1) != 0 && ta->ta_busspeed != TC_SPEED_12_5_MHZ) aprint_error_dev(self, "warning: switch S1-1 asserted with " - "clock != 12.5 MHz"); + "clock != 12.5 MHz\n"); #if NSLHCI_TCU > 0 /* Attach slhci. */
CVS commit: src/sys/dev/tc
Module Name:src Committed By: flxd Date: Sat Dec 3 18:18:12 UTC 2016 Modified Files: src/sys/dev/tc: tcu.c Log Message: newline To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/tc/tcu.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/tc
Module Name:src Committed By: flxd Date: Sat Dec 3 18:12:50 UTC 2016 Modified Files: src/sys/dev/tc: tcu.c Log Message: Print warning for problematic switch configuration. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/tc/tcu.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/tc
Module Name:src Committed By: flxd Date: Sat Dec 3 18:12:50 UTC 2016 Modified Files: src/sys/dev/tc: tcu.c Log Message: Print warning for problematic switch configuration. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/tc/tcu.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/tc/tcu.c diff -u src/sys/dev/tc/tcu.c:1.2 src/sys/dev/tc/tcu.c:1.3 --- src/sys/dev/tc/tcu.c:1.2 Tue Sep 13 16:54:26 2016 +++ src/sys/dev/tc/tcu.c Sat Dec 3 18:12:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: tcu.c,v 1.2 2016/09/13 16:54:26 christos Exp $ */ +/* $NetBSD: tcu.c,v 1.3 2016/12/03 18:12:50 flxd Exp $ */ /*- * Copyright (c) 2016, Felix Deichmann @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.2 2016/09/13 16:54:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.3 2016/12/03 18:12:50 flxd Exp $"); #include #include @@ -54,6 +54,10 @@ __KERNEL_RCSID(0, "$NetBSD: tcu.c,v 1.2 #define TCU_CFG 0x0 #define TCU_CFG_RUN __BIT(7) /* write-only */ +#define TCU_CFG_S1_1 __BIT(3) /* read-only */ +#define TCU_CFG_S1_2 __BIT(2) /* read-only */ +#define TCU_CFG_S1_3 __BIT(1) /* read-only */ +#define TCU_CFG_S1_4 __BIT(0) /* read-only */ #define TCU_GPIO_DIR 0x4 #define TCU_GPIO_IN 0x8 #define TCU_GPIO_OUT 0xc @@ -137,6 +141,10 @@ tcu_attach(device_t parent, device_t sel "\0", cfg); aprint_normal_dev(self, "config %s\n", buf); + if ((cfg & TCU_CFG_S1_1) != 0 && ta->ta_busspeed != TC_SPEED_12_5_MHZ) + aprint_error_dev(self, "warning: switch S1-1 asserted with " + "clock != 12.5 MHz"); + #if NSLHCI_TCU > 0 /* Attach slhci. */ (void)config_found_ia(self, "tcu", aux, tcu_print);
CVS commit: src
Module Name:src
Committed By: flxd
Date: Sat Nov 19 08:43:40 UTC 2016
Modified Files:
src/sbin/scsictl: scsictl.8 scsictl.c
src/sys/dev/scsipi: scsi_disk.h
Log Message:
Add "getrealloc" and "setrealloc" commands to get/set automatic reallocation
parameters/enables for error recovery, similar to {get,set}cache.
Many old SCSI disks shipped with reallocation disabled, albeit supporting it.
Minor (cosmetic) fixup of scsi_disk_pages while there.
Based upon code in PR bin/29165 by Greg A. Woods.
OK christos@
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sbin/scsictl/scsictl.8
cvs rdiff -u -r1.38 -r1.39 src/sbin/scsictl/scsictl.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/scsipi/scsi_disk.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: flxd
Date: Sat Nov 19 08:43:40 UTC 2016
Modified Files:
src/sbin/scsictl: scsictl.8 scsictl.c
src/sys/dev/scsipi: scsi_disk.h
Log Message:
Add "getrealloc" and "setrealloc" commands to get/set automatic reallocation
parameters/enables for error recovery, similar to {get,set}cache.
Many old SCSI disks shipped with reallocation disabled, albeit supporting it.
Minor (cosmetic) fixup of scsi_disk_pages while there.
Based upon code in PR bin/29165 by Greg A. Woods.
OK christos@
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sbin/scsictl/scsictl.8
cvs rdiff -u -r1.38 -r1.39 src/sbin/scsictl/scsictl.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/scsipi/scsi_disk.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/scsictl/scsictl.8
diff -u src/sbin/scsictl/scsictl.8:1.26 src/sbin/scsictl/scsictl.8:1.27
--- src/sbin/scsictl/scsictl.8:1.26 Fri Mar 29 21:46:32 2013
+++ src/sbin/scsictl/scsictl.8 Sat Nov 19 08:43:40 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: scsictl.8,v 1.26 2013/03/29 21:46:32 christos Exp $
+.\" $NetBSD: scsictl.8,v 1.27 2016/11/19 08:43:40 flxd Exp $
.\"
.\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -224,6 +224,28 @@ Set the highest speed that the optical d
data.
The units are multiples of a single speed CDROM (150 KB/s).
Specify 0 to use the drive's fastest speed.
+.Pp
+.Nm getrealloc
+.Pp
+Returns automatic reallocation parameters for the device.
+.Pp
+.Nm setrealloc
+.Ar none|r|w|rw
+.Op Ar save
+.Pp
+Set automatic reallocation parameters for the device.
+Automatic reallocation may be disabled
+.Pq none ,
+the automatic read reallocation enabled
+.Pq r ,
+the automatic write reallocation enabled
+.Pq w ,
+or both automatic read and write reallocation enabled
+.Pq rw .
+If the drive's automatic reallocation parameters are savable, specifying
+.Ar save
+after the automatic reallocation enable state will cause the parameters to be
+saved in non-volatile storage.
.Sh BUS COMMANDS
The following commands are supported for SCSI busses:
.Pp
Index: src/sbin/scsictl/scsictl.c
diff -u src/sbin/scsictl/scsictl.c:1.38 src/sbin/scsictl/scsictl.c:1.39
--- src/sbin/scsictl/scsictl.c:1.38 Sat Oct 18 08:33:24 2014
+++ src/sbin/scsictl/scsictl.c Sat Nov 19 08:43:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: scsictl.c,v 1.38 2014/10/18 08:33:24 snj Exp $ */
+/* $NetBSD: scsictl.c,v 1.39 2016/11/19 08:43:40 flxd Exp $ */
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: scsictl.c,v 1.38 2014/10/18 08:33:24 snj Exp $");
+__RCSID("$NetBSD: scsictl.c,v 1.39 2016/11/19 08:43:40 flxd Exp $");
#endif
@@ -91,6 +91,8 @@ static void device_getcache(int, char *[
static void device_setcache(int, char *[]);
static void device_flushcache(int, char *[]);
static void device_setspeed(int, char *[]);
+static void device_getrealloc(int, char *[]);
+static void device_setrealloc(int, char *[]);
static struct command device_commands[] = {
{ "defects", "[primary] [grown] [block|byte|physical]",
@@ -111,6 +113,8 @@ static struct command device_commands[]
{ "setcache", "none|r|w|rw [save]", device_setcache },
{ "flushcache", "", device_flushcache },
{ "setspeed", "[speed]", device_setspeed },
+ { "getrealloc", "", device_getrealloc },
+ { "setrealloc", "none|r|w|rw [save]", device_setrealloc },
{ NULL, NULL, NULL },
};
@@ -981,6 +985,93 @@ device_setspeed(int argc, char *argv[])
}
/*
+ * device_getrealloc:
+ *
+ * Get the automatic reallocation parameters for a SCSI disk.
+ */
+static void
+device_getrealloc(int argc, char *argv[])
+{
+ struct {
+ struct scsi_mode_parameter_header_6 header;
+ struct scsi_general_block_descriptor blk_desc;
+ struct page_err_recov err_recov_params;
+ } data;
+ u_int8_t flags;
+
+ /* No arguments. */
+ if (argc != 0)
+ usage();
+
+ scsi_mode_sense(fd, 0x01, 0x00, , sizeof(data));
+
+ flags = data.err_recov_params.flags;
+ if ((flags & (ERR_RECOV_ARRE | ERR_RECOV_AWRE)) == 0)
+ printf("%s: no automatic reallocation enabled\n", dvname);
+ else {
+ printf("%s: automatic read reallocation %senabled\n", dvname,
+ (flags & ERR_RECOV_ARRE) ? "" : "not ");
+ printf("%s: automatic write reallocation %senabled\n", dvname,
+ (flags & ERR_RECOV_AWRE) ? "" : "not ");
+ }
+ printf("%s: error recovery parameters are %ssavable\n", dvname,
+ (data.err_recov_params.pg_code & PGCODE_PS) ? "" : "not ");
+}
+
+/*
+ * device_setrealloc:
+ *
+ * Set the automatic reallocation parameters for a SCSI disk.
+ */
+static void
+device_setrealloc(int argc, char *argv[])
+{
+ struct {
+ struct scsi_mode_parameter_header_6 header;
+ struct scsi_general_block_descriptor blk_desc;
+ struct page_err_recov err_recov_params;
+ } data;
+ int dlen;
+ u_int8_t flags, byte2;
+
+ if (argc > 2 || argc == 0)
+
CVS commit: src
Module Name:src Committed By: flxd Date: Fri Nov 4 19:18:50 UTC 2016 Modified Files: src/etc/etc.pmax: Makefile.inc src/sys/arch/pmax/conf: files.pmax src/usr.sbin/sysinst/arch/pmax: md.h msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl Added Files: src/sys/arch/pmax/conf: GENERIC64_USB GENERIC_USB Log Message: Add new USB-enabled kernel config(s) based upon GENERIC for pmax, include it as kernel set in the build and make it a choice in sysinst. OK simonb@ To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/etc/etc.pmax/Makefile.inc cvs rdiff -u -r0 -r1.1 src/sys/arch/pmax/conf/GENERIC64_USB \ src/sys/arch/pmax/conf/GENERIC_USB cvs rdiff -u -r1.116 -r1.117 src/sys/arch/pmax/conf/files.pmax cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/pmax/md.h \ src/usr.sbin/sysinst/arch/pmax/msg.md.de \ src/usr.sbin/sysinst/arch/pmax/msg.md.en \ src/usr.sbin/sysinst/arch/pmax/msg.md.es \ src/usr.sbin/sysinst/arch/pmax/msg.md.fr \ src/usr.sbin/sysinst/arch/pmax/msg.md.pl 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: flxd
Date: Fri Nov 4 19:18:50 UTC 2016
Modified Files:
src/etc/etc.pmax: Makefile.inc
src/sys/arch/pmax/conf: files.pmax
src/usr.sbin/sysinst/arch/pmax: md.h msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Added Files:
src/sys/arch/pmax/conf: GENERIC64_USB GENERIC_USB
Log Message:
Add new USB-enabled kernel config(s) based upon GENERIC for pmax, include it as
kernel set in the build and make it a choice in sysinst.
OK simonb@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/etc/etc.pmax/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/arch/pmax/conf/GENERIC64_USB \
src/sys/arch/pmax/conf/GENERIC_USB
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/pmax/conf/files.pmax
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/pmax/md.h \
src/usr.sbin/sysinst/arch/pmax/msg.md.de \
src/usr.sbin/sysinst/arch/pmax/msg.md.en \
src/usr.sbin/sysinst/arch/pmax/msg.md.es \
src/usr.sbin/sysinst/arch/pmax/msg.md.fr \
src/usr.sbin/sysinst/arch/pmax/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.pmax/Makefile.inc
diff -u src/etc/etc.pmax/Makefile.inc:1.17 src/etc/etc.pmax/Makefile.inc:1.18
--- src/etc/etc.pmax/Makefile.inc:1.17 Mon Dec 14 01:12:05 2009
+++ src/etc/etc.pmax/Makefile.inc Fri Nov 4 19:18:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2009/12/14 01:12:05 matt Exp $
+# $NetBSD: Makefile.inc,v 1.18 2016/11/04 19:18:50 flxd Exp $
#
# etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets
#
@@ -8,13 +8,13 @@
.if ${MACHINE_ARCH} == "mipsel"
-KERNEL_SETS= GENERIC
+KERNEL_SETS= GENERIC GENERIC_USB
BUILD_KERNELS= INSTALL RAMDISK
.else
-KERNEL_SETS= GENERIC64
+KERNEL_SETS= GENERIC64 GENERIC64_USB
BUILD_KERNELS= INSTALL64 RAMDISK64
Index: src/sys/arch/pmax/conf/files.pmax
diff -u src/sys/arch/pmax/conf/files.pmax:1.116 src/sys/arch/pmax/conf/files.pmax:1.117
--- src/sys/arch/pmax/conf/files.pmax:1.116 Fri Oct 21 18:11:59 2016
+++ src/sys/arch/pmax/conf/files.pmax Fri Nov 4 19:18:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.116 2016/10/21 18:11:59 flxd Exp $
+# $NetBSD: files.pmax,v 1.117 2016/11/04 19:18:50 flxd Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -178,4 +178,6 @@ file dev/tc/xcfb.c x
#
include "dev/usb/files.usb"
+include "dev/bluetooth/files.bluetooth"
+
include "arch/pmax/conf/majors.pmax"
Index: src/usr.sbin/sysinst/arch/pmax/md.h
diff -u src/usr.sbin/sysinst/arch/pmax/md.h:1.1 src/usr.sbin/sysinst/arch/pmax/md.h:1.2
--- src/usr.sbin/sysinst/arch/pmax/md.h:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/pmax/md.h Fri Nov 4 19:18:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: md.h,v 1.2 2016/11/04 19:18:50 flxd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -74,3 +74,4 @@
* base etc comp games man misc tests text xbase xcomp xetc xfont xserver
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
+#define SET_KERNEL_2_NAME "kern-GENERIC_USB"
Index: src/usr.sbin/sysinst/arch/pmax/msg.md.de
diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.de:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.de:1.2
--- src/usr.sbin/sysinst/arch/pmax/msg.md.de:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/pmax/msg.md.de Fri Nov 4 19:18:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.de,v 1.2 2016/11/04 19:18:50 flxd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,3 +50,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (GENERIC_USB)}
Index: src/usr.sbin/sysinst/arch/pmax/msg.md.en
diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.en:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.en:1.2
--- src/usr.sbin/sysinst/arch/pmax/msg.md.en:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/pmax/msg.md.en Fri Nov 4 19:18:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.en,v 1.2 2016/11/04 19:18:50 flxd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,3 +49,6 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+
+message set_kernel_2
+{Kernel (GENERIC_USB)}
Index: src/usr.sbin/sysinst/arch/pmax/msg.md.es
diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.es:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.es:1.2
--- src/usr.sbin/sysinst/arch/pmax/msg.md.es:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/pmax/msg.md.es Fri Nov 4 19:18:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.es,v 1.2 2016/11/04 19:18:50 flxd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@
CVS commit: src/doc
Module Name:src Committed By: flxd Date: Wed Nov 2 17:19:53 UTC 2016 Modified Files: src/doc: CHANGES Log Message: Note tcu(4). To generate a diff of this commit: cvs rdiff -u -r1.2204 -r1.2205 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: flxd Date: Wed Nov 2 17:19:53 UTC 2016 Modified Files: src/doc: CHANGES Log Message: Note tcu(4). To generate a diff of this commit: cvs rdiff -u -r1.2204 -r1.2205 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2204 src/doc/CHANGES:1.2205 --- src/doc/CHANGES:1.2204 Wed Nov 2 00:40:27 2016 +++ src/doc/CHANGES Wed Nov 2 17:19:53 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2204 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2205 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -354,6 +354,8 @@ Changes from NetBSD 7.0 to NetBSD 8.0: ext2fs: Actually fill file type for readdir(4) and friends. [jdolecek 20160615] zoneinfo: Import tzdata2016f. [kre 20160807] + tcu(4): Add support for flxd TC-USB TURBOchannel USB and GPIO option. + [flxd 20160811] ext2fs: Add read-only ext4 extended attribute support. [jdolecek 20160612] dhcpcd(8): Import dhcpcd-6.11.3. [roy 20160815]
CVS commit: src
Module Name:src
Committed By: flxd
Date: Fri Oct 21 18:11:59 UTC 2016
Modified Files:
src/etc/etc.pmax: MAKEDEV.conf
src/sys/arch/pmax/conf: files.pmax majors.pmax
Log Message:
Bless pmax with USB device files/majors and make kernel configs with USB and
typical drivers work.
OK christos@ simonb@
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/etc/etc.pmax/MAKEDEV.conf
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/pmax/conf/files.pmax
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/pmax/conf/majors.pmax
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.pmax/MAKEDEV.conf
diff -u src/etc/etc.pmax/MAKEDEV.conf:1.8 src/etc/etc.pmax/MAKEDEV.conf:1.9
--- src/etc/etc.pmax/MAKEDEV.conf:1.8 Tue Sep 6 14:40:11 2011
+++ src/etc/etc.pmax/MAKEDEV.conf Fri Oct 21 18:11:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:11 apb Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2016/10/21 18:11:59 flxd Exp $
all_md)
makedev minimal
@@ -6,6 +6,7 @@ all_md)
makedev stic0 stic1 stic2
makedev audio
makedev scsibus0 scsibus1 scsibus2 scsibus3
+ makedev usbs
;;
minimal)
Index: src/sys/arch/pmax/conf/files.pmax
diff -u src/sys/arch/pmax/conf/files.pmax:1.115 src/sys/arch/pmax/conf/files.pmax:1.116
--- src/sys/arch/pmax/conf/files.pmax:1.115 Sun Jul 20 10:22:54 2014
+++ src/sys/arch/pmax/conf/files.pmax Fri Oct 21 18:11:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.115 2014/07/20 10:22:54 alnsn Exp $
+# $NetBSD: files.pmax,v 1.116 2016/10/21 18:11:59 flxd Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -95,6 +95,12 @@ file arch/mips/mips/mips_mcclock_loop.S
include "dev/scsipi/files.scsipi"
+#
+# Machine-independent ATA drivers
+#
+include "dev/ata/files.ata"
+
+
# Memory Disk
file dev/md_root.c memory_disk_hooks
@@ -166,4 +172,10 @@ device xcfb: wsemuldisplaydev, rasops8
attach xcfb at tc
file dev/tc/xcfb.c xcfb needs-flag
+# this wants to be probed as late as possible.
+#
+# Machine-independent USB device support
+#
+include "dev/usb/files.usb"
+
include "arch/pmax/conf/majors.pmax"
Index: src/sys/arch/pmax/conf/majors.pmax
diff -u src/sys/arch/pmax/conf/majors.pmax:1.21 src/sys/arch/pmax/conf/majors.pmax:1.22
--- src/sys/arch/pmax/conf/majors.pmax:1.21 Thu Jun 30 20:09:34 2011
+++ src/sys/arch/pmax/conf/majors.pmax Fri Oct 21 18:11:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: majors.pmax,v 1.21 2011/06/30 20:09:34 wiz Exp $
+# $NetBSD: majors.pmax,v 1.22 2016/10/21 18:11:59 flxd Exp $
#
# Device majors for pmax
#
@@ -55,3 +55,5 @@ device-major nsmb char 106 nsmb
# Majors up to 143 are reserved for machine-dependent drivers.
# New machine-independent driver majors are assigned in
# sys/conf/majors.
+
+include "conf/majors.usb"
CVS commit: src
Module Name:src Committed By: flxd Date: Fri Oct 21 18:11:59 UTC 2016 Modified Files: src/etc/etc.pmax: MAKEDEV.conf src/sys/arch/pmax/conf: files.pmax majors.pmax Log Message: Bless pmax with USB device files/majors and make kernel configs with USB and typical drivers work. OK christos@ simonb@ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/etc/etc.pmax/MAKEDEV.conf cvs rdiff -u -r1.115 -r1.116 src/sys/arch/pmax/conf/files.pmax cvs rdiff -u -r1.21 -r1.22 src/sys/arch/pmax/conf/majors.pmax Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: flxd Date: Mon Oct 17 16:02:10 UTC 2016 Modified Files: src/sys/dev/pci: siop_pci_common.c Log Message: Add 53C810AP for FreeAXP's emulation of a DEC KZPAA adapter. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/siop_pci_common.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/pci
Module Name:src
Committed By: flxd
Date: Mon Oct 17 16:02:10 UTC 2016
Modified Files:
src/sys/dev/pci: siop_pci_common.c
Log Message:
Add 53C810AP for FreeAXP's emulation of a DEC KZPAA adapter.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/siop_pci_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/siop_pci_common.c
diff -u src/sys/dev/pci/siop_pci_common.c:1.35 src/sys/dev/pci/siop_pci_common.c:1.36
--- src/sys/dev/pci/siop_pci_common.c:1.35 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/siop_pci_common.c Mon Oct 17 16:02:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_pci_common.c,v 1.35 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: siop_pci_common.c,v 1.36 2016/10/17 16:02:10 flxd Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -27,7 +27,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include
-__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.35 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.36 2016/10/17 16:02:10 flxd Exp $");
#include
#include
@@ -63,6 +63,12 @@ static const struct siop_product_desc si
SF_PCI_RL | SF_PCI_BOF | SF_CHIP_PF | SF_CHIP_LS,
4, 8, 3, 250, 0
},
+ { PCI_PRODUCT_SYMBIOS_810AP,
+ 0x00,
+ "Symbios Logic 53c810ap (fast scsi)",
+ SF_PCI_RL | SF_PCI_BOF | SF_CHIP_PF | SF_CHIP_LS,
+ 4, 8, 3, 250, 0
+ },
{ PCI_PRODUCT_SYMBIOS_815,
0x00,
"Symbios Logic 53c815 (fast scsi)",
CVS commit: src/sys/arch/alpha/conf
Module Name:src Committed By: flxd Date: Sat Oct 15 09:57:51 UTC 2016 Modified Files: src/sys/arch/alpha/conf: GENERIC Log Message: Add tcu and gpio for TC-USB support. OK christos@ To generate a diff of this commit: cvs rdiff -u -r1.368 -r1.369 src/sys/arch/alpha/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/conf/GENERIC diff -u src/sys/arch/alpha/conf/GENERIC:1.368 src/sys/arch/alpha/conf/GENERIC:1.369 --- src/sys/arch/alpha/conf/GENERIC:1.368 Sat Mar 19 23:21:02 2016 +++ src/sys/arch/alpha/conf/GENERIC Sat Oct 15 09:57:51 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.368 2016/03/19 23:21:02 gdt Exp $ +# $NetBSD: GENERIC,v 1.369 2016/10/15 09:57:51 flxd Exp $ # # This machine description file is used to generate the default NetBSD # kernel. @@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "GENERIC-$Revision: 1.368 $" +ident "GENERIC-$Revision: 1.369 $" maxusers 32 @@ -262,6 +262,8 @@ sfb* at tc? slot ? offset ? #sfbp* at tc? slot ? offset ? px* at tc? slot ? offset ? pxg* at tc? slot ? offset ? +tcu* at tc? slot ? offset ? +slhci* at tcu? # TURBOchannel serial attachments zstty0 at zsc0 channel ? # serial port on B channels @@ -400,6 +402,9 @@ ld* at iop? tid ? # block devices # XXX dpti.c wants a processor type that is not assigned for x86-64 #dpti* at iop? tid 0 # DPT/Adaptec control interface +# GPIO devices +gpio* at gpiobus? + # MII/PHY support brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs exphy* at mii? phy ? # 3Com internal PHYs
CVS commit: src/sys/arch/alpha/conf
Module Name:src Committed By: flxd Date: Sat Oct 15 09:57:51 UTC 2016 Modified Files: src/sys/arch/alpha/conf: GENERIC Log Message: Add tcu and gpio for TC-USB support. OK christos@ To generate a diff of this commit: cvs rdiff -u -r1.368 -r1.369 src/sys/arch/alpha/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/tc
Module Name:src Committed By: flxd Date: Fri Oct 14 15:01:39 UTC 2016 Modified Files: src/sys/dev/tc: tcdevs.h tcdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/tc/tcdevs.h \ src/sys/dev/tc/tcdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/tc
Module Name:src
Committed By: flxd
Date: Fri Oct 14 15:01:39 UTC 2016
Modified Files:
src/sys/dev/tc: tcdevs.h tcdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/tc/tcdevs.h \
src/sys/dev/tc/tcdevs_data.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/tc/tcdevs.h
diff -u src/sys/dev/tc/tcdevs.h:1.23 src/sys/dev/tc/tcdevs.h:1.24
--- src/sys/dev/tc/tcdevs.h:1.23 Thu Apr 12 21:39:24 2007
+++ src/sys/dev/tc/tcdevs.h Fri Oct 14 15:01:39 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: tcdevs.h,v 1.23 2007/04/12 21:39:24 matt Exp $ */
+/* $NetBSD: tcdevs.h,v 1.24 2016/10/14 15:01:39 flxd Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: tcdevs,v 1.20 2005/12/11 12:24:00 christos Exp
+ * NetBSD: tcdevs,v 1.22 2016/08/11 09:05:42 christos Exp
*/
/*
@@ -181,3 +181,6 @@
#define TC_DEVICE_T3PKT "tt"
#define TC_DESCRIPTION_T3PKT "DECWRL Turbochannel T3"
+
+#define TC_DEVICE_TC_USB "tcu"
+#define TC_DESCRIPTION_TC_USB "flxd TC-USB"
Index: src/sys/dev/tc/tcdevs_data.h
diff -u src/sys/dev/tc/tcdevs_data.h:1.23 src/sys/dev/tc/tcdevs_data.h:1.24
--- src/sys/dev/tc/tcdevs_data.h:1.23 Thu Apr 12 21:39:24 2007
+++ src/sys/dev/tc/tcdevs_data.h Fri Oct 14 15:01:39 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: tcdevs_data.h,v 1.23 2007/04/12 21:39:24 matt Exp $ */
+/* $NetBSD: tcdevs_data.h,v 1.24 2016/10/14 15:01:39 flxd Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: tcdevs,v 1.20 2005/12/11 12:24:00 christos Exp
+ * NetBSD: tcdevs,v 1.22 2016/08/11 09:05:42 christos Exp
*/
/*
@@ -279,5 +279,10 @@ const struct tc_knowndev tc_knowndevs[]
TC_DEVICE_T3PKT,
TC_DESCRIPTION_T3PKT,
},
+ {
+ "TC-USB ",
+ TC_DEVICE_TC_USB,
+ TC_DESCRIPTION_TC_USB,
+ },
{ NULL, NULL, NULL, }
};
CVS commit: src/sys/arch/alpha
Module Name:src Committed By: flxd Date: Thu Oct 13 16:18:20 UTC 2016 Modified Files: src/sys/arch/alpha/alpha: machdep.c prom.c src/sys/arch/alpha/stand/common: booted_dev.c prom.c Log Message: Match the two prom_getenv() and fix buffer overflow causing wrong host controller SCSI ID for DEC 3000. OK skrll@ To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/sys/arch/alpha/alpha/machdep.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/alpha/alpha/prom.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/stand/common/booted_dev.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/stand/common/prom.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/alpha
Module Name:src Committed By: flxd Date: Thu Oct 13 16:18:20 UTC 2016 Modified Files: src/sys/arch/alpha/alpha: machdep.c prom.c src/sys/arch/alpha/stand/common: booted_dev.c prom.c Log Message: Match the two prom_getenv() and fix buffer overflow causing wrong host controller SCSI ID for DEC 3000. OK skrll@ To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/sys/arch/alpha/alpha/machdep.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/alpha/alpha/prom.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/stand/common/booted_dev.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/stand/common/prom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/machdep.c diff -u src/sys/arch/alpha/alpha/machdep.c:1.346 src/sys/arch/alpha/alpha/machdep.c:1.347 --- src/sys/arch/alpha/alpha/machdep.c:1.346 Fri Oct 17 18:14:42 2014 +++ src/sys/arch/alpha/alpha/machdep.c Thu Oct 13 16:18:20 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.346 2014/10/17 18:14:42 uebayasi Exp $ */ +/* $NetBSD: machdep.c,v 1.347 2016/10/13 16:18:20 flxd Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.346 2014/10/17 18:14:42 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.347 2016/10/13 16:18:20 flxd Exp $"); #include #include @@ -173,7 +173,7 @@ struct bootinfo_kernel bootinfo; /* For built-in TCDS */ #if defined(DEC_3000_300) || defined(DEC_3000_500) -uint8_t dec_3000_scsiid[2], dec_3000_scsifast[2]; +uint8_t dec_3000_scsiid[3], dec_3000_scsifast[3]; #endif struct platform platform; Index: src/sys/arch/alpha/alpha/prom.c diff -u src/sys/arch/alpha/alpha/prom.c:1.48 src/sys/arch/alpha/alpha/prom.c:1.49 --- src/sys/arch/alpha/alpha/prom.c:1.48 Mon Feb 6 02:14:12 2012 +++ src/sys/arch/alpha/alpha/prom.c Thu Oct 13 16:18:20 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: prom.c,v 1.48 2012/02/06 02:14:12 matt Exp $ */ +/* $NetBSD: prom.c,v 1.49 2016/10/13 16:18:20 flxd Exp $ */ /* * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University @@ -27,7 +27,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.48 2012/02/06 02:14:12 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.49 2016/10/13 16:18:20 flxd Exp $"); #include "opt_multiprocessor.h" @@ -95,7 +95,7 @@ init_bootstrap_console(void) init_prom_interface(hwrpb); - prom_getenv(PROM_E_TTY_DEV, buf, 4); + prom_getenv(PROM_E_TTY_DEV, buf, sizeof(buf)); alpha_console = buf[0] - '0'; /* XXX fake out the console routines, for now */ @@ -238,14 +238,14 @@ prom_getenv(int id, char *buf, int len) prom_enter(); ret.bits = prom_getenv_disp(id, to, len); - memcpy(buf, to, len); - prom_leave(); - if (ret.u.status & 0x4) ret.u.retval = 0; - buf[ret.u.retval] = '\0'; + len = min(len - 1, ret.u.retval); + memcpy(buf, to, len); + buf[len] = '\0'; + prom_leave(); - return (ret.bits); + return len; } void Index: src/sys/arch/alpha/stand/common/booted_dev.c diff -u src/sys/arch/alpha/stand/common/booted_dev.c:1.3 src/sys/arch/alpha/stand/common/booted_dev.c:1.4 --- src/sys/arch/alpha/stand/common/booted_dev.c:1.3 Sat Nov 13 21:38:20 1999 +++ src/sys/arch/alpha/stand/common/booted_dev.c Thu Oct 13 16:18:20 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: booted_dev.c,v 1.3 1999/11/13 21:38:20 thorpej Exp $ */ +/* $NetBSD: booted_dev.c,v 1.4 2016/10/13 16:18:20 flxd Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -53,9 +53,8 @@ booted_dev_open(void) * We don't know what device names look like yet, * so we can't change them. */ - ret.bits = prom_getenv(PROM_E_BOOTED_DEV, booted_dev_name, + devlen = prom_getenv(PROM_E_BOOTED_DEV, booted_dev_name, sizeof(booted_dev_name)); - devlen = ret.u.retval; ret.bits = prom_open(booted_dev_name, devlen); Index: src/sys/arch/alpha/stand/common/prom.c diff -u src/sys/arch/alpha/stand/common/prom.c:1.14 src/sys/arch/alpha/stand/common/prom.c:1.15 --- src/sys/arch/alpha/stand/common/prom.c:1.14 Wed Mar 18 10:22:22 2009 +++ src/sys/arch/alpha/stand/common/prom.c Thu Oct 13 16:18:20 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: prom.c,v 1.14 2009/03/18 10:22:22 cegger Exp $ */ +/* $NetBSD: prom.c,v 1.15 2016/10/13 16:18:20 flxd Exp $ */ /* * Mach Operating System @@ -57,7 +57,7 @@ init_prom_calls(void) prom_dispatch_v.routine = c->crb_v_dispatch->entry_va; /* Look for console tty. */ - prom_getenv(PROM_E_TTY_DEV, buf, 4); + prom_getenv(PROM_E_TTY_DEV, buf, sizeof(buf)); console = buf[0] - '0'; }
CVS commit: src/sys/dev
Module Name:src Committed By: flxd Date: Sat Oct 1 15:24:35 UTC 2016 Modified Files: src/sys/dev: DEVNAMES Log Message: Add tcu (MI). OK skrll@ To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/sys/dev/DEVNAMES 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/DEVNAMES diff -u src/sys/dev/DEVNAMES:1.298 src/sys/dev/DEVNAMES:1.299 --- src/sys/dev/DEVNAMES:1.298 Sun May 1 10:21:02 2016 +++ src/sys/dev/DEVNAMES Sat Oct 1 15:24:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: DEVNAMES,v 1.298 2016/05/01 10:21:02 nonaka Exp $ +# $NetBSD: DEVNAMES,v 1.299 2016/10/01 15:24:35 flxd Exp $ # # This file contains all used device names and defined attributes in # alphabetical order. New devices added to the system somewhere should first @@ -1327,6 +1327,7 @@ tcds alpha tcic i386 tcom MI tctrl sparc +tcu MI tcx sparc tcx sparc64 tdvfb MI
CVS commit: src/sys/dev
Module Name:src Committed By: flxd Date: Sat Oct 1 15:24:35 UTC 2016 Modified Files: src/sys/dev: DEVNAMES Log Message: Add tcu (MI). OK skrll@ To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/sys/dev/DEVNAMES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: flxd Date: Sat Oct 1 12:32:36 UTC 2016 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.531 -r1.532 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.531 src/distrib/notes/common/main:1.532 --- src/distrib/notes/common/main:1.531 Mon Aug 1 19:06:32 2016 +++ src/distrib/notes/common/main Sat Oct 1 12:32:35 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.531 2016/08/01 19:06:32 scole Exp $ +.\" $NetBSD: main,v 1.532 2016/10/01 12:32:35 flxd Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1157,6 +1157,7 @@ If you're one of them, and would like to .It Ta Jed Davis Ta Mt j...@netbsd.org .It Ta Matt DeBergalis Ta Mt deb...@netbsd.org .It Ta Arnaud Degroote Ta Mt degro...@netbsd.org +.It Ta Felix Deichmann Ta Mt f...@netbsd.org .It Ta Rob Deker Ta Mt de...@netbsd.org .It Ta Chris G. Demetriou Ta Mt c...@netbsd.org .It Ta Tracy Di Marco White Ta Mt genda...@netbsd.org
CVS commit: src/distrib/notes/common
Module Name:src Committed By: flxd Date: Sat Oct 1 12:32:36 UTC 2016 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.531 -r1.532 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
