CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: rin Date: Sat May 8 09:03:30 UTC 2021 Modified Files: src/sys/arch/vax/vsa: tc_vsbus.c Log Message: Catch up with this commit: http://www.nerv.org/netbsd/?q=id:20210507T165558Z.d4aba9e0e053181f2a98ee4ee43012b50949921b by which per slot tcs_used flag was obsoleted. No need to initialize __BIT(0) of sc_slots_used here; it is zero anyway before calling tcattach(). To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/arch/vax/vsa/tc_vsbus.c:1.10 --- src/sys/arch/vax/vsa/tc_vsbus.c:1.9 Fri Jun 9 18:02:40 2017 +++ src/sys/arch/vax/vsa/tc_vsbus.c Sat May 8 09:03:30 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tc_vsbus.c,v 1.9 2017/06/09 18:02:40 flxd Exp $ */ +/* $NetBSD: tc_vsbus.c,v 1.10 2021/05/08 09:03:30 rin 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.9 2017/06/09 18:02:40 flxd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tc_vsbus.c,v 1.10 2021/05/08 09:03:30 rin Exp $"); #include #include @@ -252,7 +252,6 @@ tc_vsbus_attach(device_t parent, device_ /* Pass pre-mapped space for TC drivers not bus_space'ified yet. */ sc->sc_slots[0].tcs_addr = (tc_addr_t)bus_space_vaddr(bst, bsh_slot); sc->sc_slots[0].tcs_cookie = sc; - sc->sc_slots[0].tcs_used = 0; tba.tba_busname = "tc"; /* Tag with custom methods for pre-mapped bus_space. */
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: thorpej
Date: Sat Nov 21 22:37:11 UTC 2020
Modified Files:
src/sys/arch/vax/uba: qv.c qvkbd.c
src/sys/arch/vax/vax: bus_dma.c multicpu.c
src/sys/arch/vax/vsa: lcg.c smg.c spx.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/uba/qv.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/vax/uba/qvkbd.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/vax/bus_dma.c \
src/sys/arch/vax/vax/multicpu.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vsa/lcg.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/vsa/spx.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/uba/qv.c
diff -u src/sys/arch/vax/uba/qv.c:1.35 src/sys/arch/vax/uba/qv.c:1.36
--- src/sys/arch/vax/uba/qv.c:1.35 Sun Jun 14 01:40:06 2020
+++ src/sys/arch/vax/uba/qv.c Sat Nov 21 22:37:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: qv.c,v 1.35 2020/06/14 01:40:06 chs Exp $ */
+/* $NetBSD: qv.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $ */
/*
* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from smg.c
@@ -31,7 +31,7 @@
/*3456789012345678901234567890123456789012345678901234567890123456789012345678*/
#include
-__KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.35 2020/06/14 01:40:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $");
#include
#include
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.35
#include
#include
#include
-#include
+#include
#include /***/
#include
#include
@@ -900,7 +900,7 @@ qv_alloc_screen(void *v, const struct ws
struct qv_softc *sc = device_private(v);
struct qv_screen *ss;
- ss = malloc(sizeof(struct qv_screen), M_DEVBUF, M_WAITOK|M_ZERO);
+ ss = kmem_zalloc(sizeof(struct qv_screen), KM_SLEEP);
ss->ss_sc = sc;
ss->ss_type = type;
*cookiep = ss;
@@ -916,7 +916,7 @@ void
qv_free_screen(void *v, void *cookie)
{
printf("qv_free_screen: %p\n", cookie);
-free(cookie, M_DEVBUF);
+kmem_free(cookie, sizeof(struct qv_screen));
}
/*
Index: src/sys/arch/vax/uba/qvkbd.c
diff -u src/sys/arch/vax/uba/qvkbd.c:1.2 src/sys/arch/vax/uba/qvkbd.c:1.3
--- src/sys/arch/vax/uba/qvkbd.c:1.2 Sun Nov 10 21:16:33 2019
+++ src/sys/arch/vax/uba/qvkbd.c Sat Nov 21 22:37:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: qvkbd.c,v 1.2 2019/11/10 21:16:33 chs Exp $ */
+/* $NetBSD: qvkbd.c,v 1.3 2020/11/21 22:37:11 thorpej Exp $ */
/* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from dzkbd.c
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$$");
#include
#include
#include
-#include
+#include
#include
#include
@@ -171,8 +171,7 @@ qvkbd_attach(device_t parent, device_t s
if (isconsole) {
qvi = _console_internal;
} else {
- qvi = malloc(sizeof(struct qvkbd_internal),
- M_DEVBUF, M_WAITOK);
+ qvi = kmem_alloc(sizeof(struct qvkbd_internal), KM_SLEEP);
qvi->qvi_ks.attmt.sendchar = qvkbd_sendchar;
qvi->qvi_ks.attmt.cookie = ls;
}
Index: src/sys/arch/vax/vax/bus_dma.c
diff -u src/sys/arch/vax/vax/bus_dma.c:1.35 src/sys/arch/vax/vax/bus_dma.c:1.36
--- src/sys/arch/vax/vax/bus_dma.c:1.35 Fri Apr 27 07:53:07 2018
+++ src/sys/arch/vax/vax/bus_dma.c Sat Nov 21 22:37:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.35 2018/04/27 07:53:07 maxv Exp $ */
+/* $NetBSD: bus_dma.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.35 2018/04/27 07:53:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $");
#include
#include
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -66,6 +66,15 @@ int _bus_dmamap_load_buffer(bus_dma_tag_
int _bus_dma_inrange(bus_dma_segment_t *, int, bus_addr_t);
int _bus_dmamem_alloc_range(bus_dma_tag_t, bus_size_t, bus_size_t,
bus_size_t, bus_dma_segment_t*, int, int *, int, vaddr_t, vaddr_t);
+
+static size_t
+_bus_dmamap_mapsize(int const nsegments)
+{
+ KASSERT(nsegments > 0);
+ return sizeof(struct vax_bus_dmamap) +
+ (sizeof(bus_dma_segment_t) * (nsegments - 1));
+}
+
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
@@ -77,7 +86,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct vax_bus_dmamap *map;
void *mapstore;
- size_t mapsize;
#ifdef DEBUG_DMA
printf("dmamap_create: t=%p size=%lx nseg=%x msegsz=%lx boundary=%lx flags=%x\n",
@@ -96,13 +104,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
* The bus_dmamap_t includes one bus_dma_segment_t, hence
* the (nsegments - 1).
*/
- mapsize = sizeof(struct vax_bus_dmamap) +
-
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: mrg
Date: Tue Sep 15 05:08:07 UTC 2020
Modified Files:
src/sys/arch/vax/boot/xxboot: Makefile
src/sys/arch/vax/boot/xxboot_ustarfs: Makefile
src/sys/arch/vax/conf: Makefile.vax
Log Message:
make build (and run) with GCC 9.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/boot/xxboot/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/boot/xxboot_ustarfs/Makefile
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/vax/conf/Makefile.vax
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/boot/xxboot/Makefile
diff -u src/sys/arch/vax/boot/xxboot/Makefile:1.21 src/sys/arch/vax/boot/xxboot/Makefile:1.22
--- src/sys/arch/vax/boot/xxboot/Makefile:1.21 Sun Dec 11 12:19:34 2005
+++ src/sys/arch/vax/boot/xxboot/Makefile Tue Sep 15 05:08:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/11 12:19:34 christos Exp $
+# $NetBSD: Makefile,v 1.22 2020/09/15 05:08:07 mrg Exp $
S= ${.CURDIR}/../../../..
@@ -41,4 +41,6 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
${SIZE} ${PROG}.out
${OBJCOPY} -O binary ${PROG}.out ${PROG}
+COPTS.bootxx.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=array-bounds :}
+
.include
Index: src/sys/arch/vax/boot/xxboot_ustarfs/Makefile
diff -u src/sys/arch/vax/boot/xxboot_ustarfs/Makefile:1.8 src/sys/arch/vax/boot/xxboot_ustarfs/Makefile:1.9
--- src/sys/arch/vax/boot/xxboot_ustarfs/Makefile:1.8 Sun Dec 11 12:19:34 2005
+++ src/sys/arch/vax/boot/xxboot_ustarfs/Makefile Tue Sep 15 05:08:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/11 12:19:34 christos Exp $
+# $NetBSD: Makefile,v 1.9 2020/09/15 05:08:07 mrg Exp $
S= ${.CURDIR}/../../../..
@@ -37,4 +37,6 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
${SIZE} ${PROG}.out
${OBJCOPY} -O binary ${PROG}.out ${PROG}
+COPTS.bootxx.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=array-bounds :}
+
.include
Index: src/sys/arch/vax/conf/Makefile.vax
diff -u src/sys/arch/vax/conf/Makefile.vax:1.84 src/sys/arch/vax/conf/Makefile.vax:1.85
--- src/sys/arch/vax/conf/Makefile.vax:1.84 Sat Sep 22 12:24:03 2018
+++ src/sys/arch/vax/conf/Makefile.vax Tue Sep 15 05:08:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vax,v 1.84 2018/09/22 12:24:03 rin Exp $
+# $NetBSD: Makefile.vax,v 1.85 2020/09/15 05:08:07 mrg Exp $
# Makefile for NetBSD
#
@@ -34,6 +34,8 @@ GENASSYM_CONF= ${VAX}/vax/genassym.cf
CPPFLAGS+= -D_VAX_INLINE_
AFLAGS+= -x assembler-with-cpp -fno-pic
CFLAGS+= -fno-pic
+COPTS.wsmux.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -O1 :}
+
##
## (3) libkern and compat
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: isaki Date: Wed Aug 26 12:59:28 UTC 2020 Modified Files: src/sys/arch/vax/vsa: vsaudio.c Log Message: Fix misuse of device_private(). sc_dev is device_t. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vsa/vsaudio.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/vsaudio.c diff -u src/sys/arch/vax/vsa/vsaudio.c:1.5 src/sys/arch/vax/vsa/vsaudio.c:1.6 --- src/sys/arch/vax/vsa/vsaudio.c:1.5 Wed May 8 13:40:16 2019 +++ src/sys/arch/vax/vsa/vsaudio.c Wed Aug 26 12:59:28 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vsaudio.c,v 1.5 2019/05/08 13:40:16 isaki Exp $ */ +/* $NetBSD: vsaudio.c,v 1.6 2020/08/26 12:59:28 isaki Exp $ */ /* $OpenBSD: vsaudio.c,v 1.4 2013/05/15 21:21:11 ratchov Exp $ */ /* @@ -271,7 +271,7 @@ vsaudio_attach(device_t parent, device_t return; } sc->sc_bt = va->va_memt; - sc->sc_am7930.sc_dev = device_private(self); + sc->sc_am7930.sc_dev = self; sc->sc_am7930.sc_glue = _glue; mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_HIGH); am7930_init(>sc_am7930, AUDIOAMD_POLL_MODE);
CVS commit: src/sys/arch/vax/boot/xxboot
Module Name:src Committed By: snj Date: Mon Apr 6 01:43:26 UTC 2020 Modified Files: src/sys/arch/vax/boot/xxboot: start.S Log Message: fix comment in typo To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/boot/xxboot/start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/boot/xxboot/start.S diff -u src/sys/arch/vax/boot/xxboot/start.S:1.6 src/sys/arch/vax/boot/xxboot/start.S:1.7 --- src/sys/arch/vax/boot/xxboot/start.S:1.6 Mon May 22 17:00:55 2017 +++ src/sys/arch/vax/boot/xxboot/start.S Mon Apr 6 01:43:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: start.S,v 1.6 2017/05/22 17:00:55 ragge Exp $ */ +/* $NetBSD: start.S,v 1.7 2020/04/06 01:43:26 snj Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -52,7 +52,7 @@ _C_LABEL(start): # At offset 0x02 we have a dual used area: VMB.EXE starts execution here, # and uVAX-ROM looks for a pointer to a parameter block. We arrange for -# the parameter block offset to disassmble as a CASEL instructions which +# the parameter block offset to disassemble as a CASEL instructions which # falls through to 0x08. .org 0x02 # information used by uVAX-ROM .byte 0xcf # offset in words to identification area
CVS commit: src/sys/arch/vax/vsa
Module Name:src
Committed By: ragge
Date: Sun Mar 22 20:27:47 UTC 2020
Modified Files:
src/sys/arch/vax/vsa: ncr.c
Log Message:
Do not expect a struct buf to be present if doing DMA to kernel space.
Fixes bug reported by sadness on port-vax.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/vax/vsa/ncr.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/ncr.c
diff -u src/sys/arch/vax/vsa/ncr.c:1.49 src/sys/arch/vax/vsa/ncr.c:1.50
--- src/sys/arch/vax/vsa/ncr.c:1.49 Mon Sep 3 16:29:28 2018
+++ src/sys/arch/vax/vsa/ncr.c Sun Mar 22 20:27:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr.c,v 1.49 2018/09/03 16:29:28 riastradh Exp $ */
+/* $NetBSD: ncr.c,v 1.50 2020/03/22 20:27:47 ragge Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.49 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.50 2020/03/22 20:27:47 ragge Exp $");
#include
#include
@@ -275,7 +275,11 @@ found:
dh->dh_flags = SIDH_BUSY;
dh->dh_addr = ncr_sc->sc_dataptr;
dh->dh_len = xlen;
- dh->dh_proc = xs->bp->b_proc;
+ if (((vaddr_t)ncr_sc->sc_dataptr & KERNBASE) == 0) {
+ if (xs->bp == NULL)
+ panic("si_dma_alloc");
+ dh->dh_proc = xs->bp->b_proc;
+ }
/* Remember dest buffer parameters */
if (xs->xs_control & XS_CTL_DATA_OUT)
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: ad
Date: Sat Mar 21 18:47:54 UTC 2020
Modified Files:
src/sys/arch/vax/include: pmap.h
src/sys/arch/vax/vax: pmap.c
Log Message:
PR port-vax/55094: vax pmap needs locking adjustments
Make the adjustments noted in the PR and don't call uvm_wait() or do
WAITOK ever - UVM takes care of that.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/vax/include/pmap.h
cvs rdiff -u -r1.189 -r1.190 src/sys/arch/vax/vax/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/vax/include/pmap.h
diff -u src/sys/arch/vax/include/pmap.h:1.81 src/sys/arch/vax/include/pmap.h:1.82
--- src/sys/arch/vax/include/pmap.h:1.81 Sat Mar 14 14:05:44 2020
+++ src/sys/arch/vax/include/pmap.h Sat Mar 21 18:47:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.81 2020/03/14 14:05:44 ad Exp $ */
+/* $NetBSD: pmap.h,v 1.82 2020/03/21 18:47:54 ad Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@@ -189,9 +189,6 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
return (false);
}
-bool pmap_clear_modify_long(const struct pv_entry *);
-bool pmap_clear_reference_long(const struct pv_entry *);
-bool pmap_is_modified_long_p(const struct pv_entry *);
void pmap_page_protect_long(struct pv_entry *, vm_prot_t);
void pmap_protect_long(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
@@ -209,38 +206,6 @@ pmap_is_referenced(struct vm_page *pg)
return (pv->pv_attr & PG_V) != 0;
}
-static __inline bool
-pmap_clear_reference(struct vm_page *pg)
-{
- struct pv_entry * const pv = pmap_pg_to_pv(pg);
- bool rv = (pv->pv_attr & PG_V) != 0;
-
- pv->pv_attr &= ~PG_V;
- if (pv->pv_pmap != NULL || pv->pv_next != NULL)
- rv |= pmap_clear_reference_long(pv);
- return rv;
-}
-
-static __inline bool
-pmap_clear_modify(struct vm_page *pg)
-{
- struct pv_entry * const pv = pmap_pg_to_pv(pg);
- bool rv = (pv->pv_attr & PG_M) != 0;
-
- pv->pv_attr &= ~PG_M;
- if (pv->pv_pmap != NULL || pv->pv_next != NULL)
- rv |= pmap_clear_modify_long(pv);
- return rv;
-}
-
-static __inline bool
-pmap_is_modified(struct vm_page *pg)
-{
- const struct pv_entry * const pv = pmap_pg_to_pv(pg);
-
- return (pv->pv_attr & PG_M) != 0 || pmap_is_modified_long_p(pv);
-}
-
static __inline void
pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
{
Index: src/sys/arch/vax/vax/pmap.c
diff -u src/sys/arch/vax/vax/pmap.c:1.189 src/sys/arch/vax/vax/pmap.c:1.190
--- src/sys/arch/vax/vax/pmap.c:1.189 Sat Feb 15 18:12:14 2020
+++ src/sys/arch/vax/vax/pmap.c Sat Mar 21 18:47:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.189 2020/02/15 18:12:14 ad Exp $ */
+/* $NetBSD: pmap.c,v 1.190 2020/03/21 18:47:54 ad Exp $ */
/*
* Copyright (c) 1994, 1998, 1999, 2003 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.189 2020/02/15 18:12:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.190 2020/03/21 18:47:54 ad Exp $");
#include "opt_ddb.h"
#include "opt_cputype.h"
@@ -114,29 +114,9 @@ extern void *msgbufaddr;
static inline void
pmap_decrement_stats(struct pmap *pm, bool wired)
{
-#if defined(MULTIPROCESSOR)
- atomic_dec_ulong(>pm_stats.resident_count);
- if (wired)
- atomic_dec_ulong(>pm_stats.wired_count);
-#else
pm->pm_stats.resident_count--;
if (wired)
pm->pm_stats.wired_count--;
-#endif
-}
-
-static inline void
-pmap_increment_stats(struct pmap *pm, bool wired)
-{
-#if defined(MULTIPROCESSOR)
- atomic_inc_ulong(>pm_stats.resident_count);
- if (wired)
- atomic_inc_ulong(>pm_stats.wired_count);
-#else
- pm->pm_stats.resident_count++;
- if (wired)
- pm->pm_stats.wired_count++;
-#endif
}
/*
@@ -171,27 +151,18 @@ ptpinuse(void *pte)
}
#ifdef PMAPDEBUG
-volatile int recurse;
-#define RECURSESTART { \
- if (recurse) \
- printf("enter at %d, previous %d\n", __LINE__, recurse);\
- recurse = __LINE__; \
-}
-#define RECURSEEND {recurse = 0; }
#define PMDEBUG(x) if (startpmapdebug)printf x
#else
-#define RECURSESTART
-#define RECURSEEND
#define PMDEBUG(x)
#endif
#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
-static kmutex_t pvtable_lock;
-#define PVTABLE_LOCK mutex_spin_enter(_lock);
-#define PVTABLE_UNLOCK mutex_spin_enter(_lock);
+static kmutex_t pmap_lock;
+#define PMAP_LOCK mutex_spin_enter(_lock);
+#define PMAP_UNLOCK mutex_spin_enter(_lock);
#else
-#define PVTABLE_LOCK
-#define PVTABLE_UNLOCK
+#define PMAP_LOCK
+#define PMAP_UNLOCK
#endif
#ifdef PMAPDEBUG
@@ -204,7 +175,7 @@ vaddr_t virtual_avail, virtual_end; /*
struct pv_entry *get_pventry(void);
void free_pventry(struct pv_entry *);
void more_pventries(void);
-vaddr_t get_ptp(bool);
+vaddr_t get_ptp(void);
void free_ptp(paddr_t);
/*
@@ -434,7 +405,7 @@ pmap_bootstrap(void)
SIMPLEQ_FIRST() = ci;
#endif
#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
- mutex_init(_lock,
CVS commit: src/sys/arch/vax/vsa
Module Name:src
Committed By: isaki
Date: Mon Apr 8 14:48:33 UTC 2019
Modified Files:
src/sys/arch/vax/vsa: vsaudio.c
Log Message:
White space -> TAB, fix indent, and add RCS Id.
No functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vsa/vsaudio.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/vsaudio.c
diff -u src/sys/arch/vax/vsa/vsaudio.c:1.3 src/sys/arch/vax/vsa/vsaudio.c:1.4
--- src/sys/arch/vax/vsa/vsaudio.c:1.3 Sat Mar 16 12:09:57 2019
+++ src/sys/arch/vax/vsa/vsaudio.c Mon Apr 8 14:48:33 2019
@@ -1,3 +1,4 @@
+/* $NetBSD: vsaudio.c,v 1.4 2019/04/08 14:48:33 isaki Exp $ */
/* $OpenBSD: vsaudio.c,v 1.4 2013/05/15 21:21:11 ratchov Exp $ */
/*
@@ -83,56 +84,56 @@
#include
#ifdef AUDIO_DEBUG
-#define DPRINTF(x) if (am7930debug) printf x
-#define DPRINTFN(n,x) if (am7930debug>(n)) printf x
+#define DPRINTF(x) if (am7930debug) printf x
+#define DPRINTFN(n,x) if (am7930debug>(n)) printf x
#else
#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif /* AUDIO_DEBUG */
/* physical addresses of the AM79C30 chip */
-#define VSAUDIO_CSR 0x200d
-#define VSAUDIO_CSR_KA490x2680
+#define VSAUDIO_CSR 0x200d
+#define VSAUDIO_CSR_KA49 0x2680
/* pdma state */
struct auio {
-bus_space_tag_t au_bt; /* bus tag */
-bus_space_handle_t au_bh; /* handle to chip registers */
+ bus_space_tag_t au_bt; /* bus tag */
+ bus_space_handle_t au_bh; /* handle to chip registers */
-uint8_t *au_rdata; /* record data */
-uint8_t *au_rend; /* end of record data */
-uint8_t *au_pdata; /* play data */
-uint8_t *au_pend; /* end of play data */
-struct evcntau_intrcnt; /* statistics */
+ uint8_t *au_rdata; /* record data */
+ uint8_t *au_rend; /* end of record data */
+ uint8_t *au_pdata; /* play data */
+ uint8_t *au_pend; /* end of play data */
+ struct evcnt au_intrcnt; /* statistics */
};
struct am7930_intrhand {
-int (*ih_fun)(void *);
-void*ih_arg;
+ int (*ih_fun)(void *);
+ void *ih_arg;
};
struct vsaudio_softc {
- struct am7930_softc sc_am7930; /* glue to MI code */
- bus_space_tag_t sc_bt; /* bus cookie */
- bus_space_handle_t sc_bh; /* device registers */
-
-struct am7930_intrhand sc_ih; /* interrupt vector (hw or sw) */
-void(*sc_rintr)(void*); /* input completion intr handler */
-void*sc_rarg; /* arg for sc_rintr() */
-void(*sc_pintr)(void*); /* output completion intr handler */
-void*sc_parg; /* arg for sc_pintr() */
-
-uint8_t *sc_rdata; /* record data */
-uint8_t *sc_rend; /* end of record data */
-uint8_t *sc_pdata; /* play data */
-uint8_t *sc_pend; /* end of play data */
-
- struct auio sc_au; /* recv and xmit buffers, etc */
-#define sc_intrcnt sc_au.au_intrcnt/* statistics */
-void*sc_sicookie; /* softintr(9) cookie */
-int sc_cvec;
-kmutex_tsc_lock;
+ struct am7930_softc sc_am7930; /* glue to MI code */
+ bus_space_tag_t sc_bt; /* bus cookie */
+ bus_space_handle_t sc_bh; /* device registers */
+
+ struct am7930_intrhand sc_ih; /* interrupt vector (hw or sw) */
+ void (*sc_rintr)(void*); /* input completion intr handler */
+ void *sc_rarg; /* arg for sc_rintr() */
+ void (*sc_pintr)(void*); /* output completion intr handler */
+ void *sc_parg; /* arg for sc_pintr() */
+
+ uint8_t *sc_rdata; /* record data */
+ uint8_t *sc_rend; /* end of record data */
+ uint8_t *sc_pdata; /* play data */
+ uint8_t *sc_pend; /* end of play data */
+
+ struct auio sc_au; /* recv and xmit buffers, etc */
+#define sc_intrcnt sc_au.au_intrcnt /* statistics */
+ void *sc_sicookie; /* softintr(9) cookie */
+ int sc_cvec;
+ kmutex_t sc_lock;
};
static int vsaudio_match(struct device *parent, struct cfdata *match, void *);
@@ -144,14 +145,14 @@ CFATTACH_DECL_NEW(vsaudio, sizeof(struct
/*
* Hardware access routines for the MI code
*/
-uint8_t vsaudio_codec_iread(struct am7930_softc *, int);
-uint16_tvsaudio_codec_iread16(struct am7930_softc *, int);
-uint8_t vsaudio_codec_dread(struct vsaudio_softc *, int);
-voidvsaudio_codec_iwrite(struct am7930_softc *, int, uint8_t);
-voidvsaudio_codec_iwrite16(struct am7930_softc *, int, uint16_t);
-voidvsaudio_codec_dwrite(struct vsaudio_softc *, int, uint8_t);
-voidvsaudio_onopen(struct am7930_softc *);
-voidvsaudio_onclose(struct am7930_softc *);
+uint8_t vsaudio_codec_iread(struct am7930_softc *, int);
+uint16_t vsaudio_codec_iread16(struct am7930_softc *,
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: thorpej
Date: Thu Mar 14 23:49:38 UTC 2019
Modified Files:
src/sys/arch/vax/uba: qv.c
src/sys/arch/vax/vsa: smg.c
Log Message:
Use copyin(), not fusword().
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/uba/qv.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/vax/vsa/smg.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/uba/qv.c
diff -u src/sys/arch/vax/uba/qv.c:1.33 src/sys/arch/vax/uba/qv.c:1.34
--- src/sys/arch/vax/uba/qv.c:1.33 Mon May 22 17:15:45 2017
+++ src/sys/arch/vax/uba/qv.c Thu Mar 14 23:49:38 2019
@@ -1,4 +1,4 @@
-/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.33 2017/05/22 17:15:45 ragge Exp $*/
+/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.34 2019/03/14 23:49:38 thorpej Exp $*/
/*
* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from smg.c
@@ -31,7 +31,7 @@
/*3456789012345678901234567890123456789012345678901234567890123456789012345678*/
#include
-__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.33 2017/05/22 17:15:45 ragge Exp $");
+__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.34 2019/03/14 23:49:38 thorpej Exp $");
#include
#include
@@ -785,16 +785,18 @@ qv_setcursor(struct qv_softc *sc, struct
}
if (v->which & WSDISPLAY_CURSOR_DOCMAP) {
/* First background */
- red = fusword(v->cmap.red);
- green = fusword(v->cmap.green);
- blue = fusword(v->cmap.blue);
- bgmask = (((30L * red + 59L * green + 11L * blue) >> 8) >=
- (((1<<8)-1)*50)) ? ~0 : 0;
- red = fusword(v->cmap.red+2);
- green = fusword(v->cmap.green+2);
- blue = fusword(v->cmap.blue+2);
- fgmask = (((30L * red + 59L * green + 11L * blue) >> 8) >=
- (((1<<8)-1)*50)) ? ~0 : 0;
+ if (copyin(v->cmap.red, , sizeof(red)) == 0 &&
+ copyin(v->cmap.green, , sizeof(green)) == 0 &&
+ copyin(v->cmap.blue, , sizeof(blue)) == 0) {
+ bgmask = (((30L * red + 59L * green + 11L * blue) >> 8)
+ >= (((1<<8)-1)*50)) ? ~0 : 0;
+ }
+ if (copyin(v->cmap.red + 2, , sizeof(red)) == 0 &&
+ copyin(v->cmap.green + 2, , sizeof(green)) == 0 &&
+ copyin(v->cmap.blue + 2, , sizeof(blue)) == 0) {
+ fgmask = (((30L * red + 59L * green + 11L * blue) >> 8)
+ >= (((1<<8)-1)*50)) ? ~0 : 0;
+ }
}
if (v->which & WSDISPLAY_CURSOR_DOSHAPE) {
copyin(v->image, curfg, sizeof(curfg));
Index: src/sys/arch/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.57 src/sys/arch/vax/vsa/smg.c:1.58
--- src/sys/arch/vax/vsa/smg.c:1.57 Mon May 22 17:17:25 2017
+++ src/sys/arch/vax/vsa/smg.c Thu Mar 14 23:49:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smg.c,v 1.57 2017/05/22 17:17:25 ragge Exp $ */
+/* $NetBSD: smg.c,v 1.58 2019/03/14 23:49:38 thorpej Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.57 2017/05/22 17:17:25 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.58 2019/03/14 23:49:38 thorpej Exp $");
#include
#include
@@ -430,16 +430,18 @@ setcursor(struct wsdisplay_cursor *v)
}
if (v->which & WSDISPLAY_CURSOR_DOCMAP) {
/* First background */
- red = fusword(v->cmap.red);
- green = fusword(v->cmap.green);
- blue = fusword(v->cmap.blue);
- bgmask = (((30L * red + 59L * green + 11L * blue) >> 8) >=
- (((1<<8)-1)*50)) ? ~0 : 0;
- red = fusword(v->cmap.red+2);
- green = fusword(v->cmap.green+2);
- blue = fusword(v->cmap.blue+2);
- fgmask = (((30L * red + 59L * green + 11L * blue) >> 8) >=
- (((1<<8)-1)*50)) ? ~0 : 0;
+ if (copyin(v->cmap.red, , sizeof(red)) == 0 &&
+ copyin(v->cmap.green, , sizeof(green)) == 0 &&
+ copyin(v->cmap.blue, , sizeof(blue)) == 0) {
+ bgmask = (((30L * red + 59L * green + 11L * blue) >> 8)
+ >= (((1<<8)-1)*50)) ? ~0 : 0;
+ }
+ if (copyin(v->cmap.red + 2, , sizeof(red)) == 0 &&
+ copyin(v->cmap.green + 2, , sizeof(green)) == 0 &&
+ copyin(v->cmap.blue + 2, , sizeof(blue)) == 0) {
+ fgmask = (((30L * red + 59L * green + 11L * blue) >> 8)
+ >= (((1<<8)-1)*50)) ? ~0 : 0;
+ }
}
if (v->which & WSDISPLAY_CURSOR_DOSHAPE) {
WRITECUR(CUR_CMD, curcmd | CUR_CMD_LODSA);
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: maxv Date: Sat Dec 29 09:48:54 UTC 2018 Modified Files: src/sys/arch/vax/conf: GENERIC Log Message: Disable compat_ibcs2, it is being retired. To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 src/sys/arch/vax/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/vax/conf/GENERIC diff -u src/sys/arch/vax/conf/GENERIC:1.206 src/sys/arch/vax/conf/GENERIC:1.207 --- src/sys/arch/vax/conf/GENERIC:1.206 Wed Aug 1 20:04:14 2018 +++ src/sys/arch/vax/conf/GENERIC Sat Dec 29 09:48:54 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.206 2018/08/01 20:04:14 maxv Exp $ +# $NetBSD: GENERIC,v 1.207 2018/12/29 09:48:54 maxv 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.206 $" +#ident "GENERIC-$Revision: 1.207 $" # Here are all different supported CPU types listed. #options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 @@ -132,7 +132,7 @@ options SYSVSHM include "conf/compat_netbsd09.config" options COMPAT_VAX1K # Must be present to run pre-1.4 binaries. options COMPAT_ULTRIX -options COMPAT_IBCS2 # DEC SVR.3 compatibility +#options COMPAT_IBCS2 # DEC SVR.3 compatibility #options NO_INSN_EMULATE # CPU does not lack some hardware instructions.
CVS commit: src/sys/arch/vax/boot
Module Name:src
Committed By: ragge
Date: Tue May 1 07:03:48 UTC 2018
Modified Files:
src/sys/arch/vax/boot/boot: conf.c
src/sys/arch/vax/boot/xxboot: bootxx.c
Log Message:
Enable ffsv2 in boot.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/boot/boot/conf.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/vax/boot/xxboot/bootxx.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/boot/boot/conf.c
diff -u src/sys/arch/vax/boot/boot/conf.c:1.17 src/sys/arch/vax/boot/boot/conf.c:1.18
--- src/sys/arch/vax/boot/boot/conf.c:1.17 Mon May 22 16:59:32 2017
+++ src/sys/arch/vax/boot/boot/conf.c Tue May 1 07:03:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.17 2017/05/22 16:59:32 ragge Exp $ */
+/* $NetBSD: conf.c,v 1.18 2018/05/01 07:03:47 ragge Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -84,7 +84,7 @@ int ndevs = (sizeof(devsw)/sizeof(de
struct fs_ops file_system[] = {
FS_OPS(ffsv1),
- //FS_OPS(ffsv2),
+ FS_OPS(ffsv2),
FS_OPS(nfs),
FS_OPS(cd9660),
FS_OPS(ustarfs),
Index: src/sys/arch/vax/boot/xxboot/bootxx.c
diff -u src/sys/arch/vax/boot/xxboot/bootxx.c:1.37 src/sys/arch/vax/boot/xxboot/bootxx.c:1.38
--- src/sys/arch/vax/boot/xxboot/bootxx.c:1.37 Fri Jun 28 01:13:40 2013
+++ src/sys/arch/vax/boot/xxboot/bootxx.c Tue May 1 07:03:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.37 2013/06/28 01:13:40 matt Exp $ */
+/* $NetBSD: bootxx.c,v 1.38 2018/05/01 07:03:47 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -187,7 +187,7 @@ die:
struct fs_ops file_system[] = {
#ifdef NEED_UFS
{ ffsv1_open, 0, ffsv1_read, 0, 0, ffsv1_stat },
- //{ ffsv2_open, 0, ffsv2_read, 0, 0, ffsv2_stat },
+ { ffsv2_open, 0, ffsv2_read, 0, 0, ffsv2_stat },
#endif
#ifdef NEED_CD9660
{ cd9660_open, 0, cd9660_read, 0, 0, cd9660_stat },
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: ragge
Date: Mon Apr 30 06:46:12 UTC 2018
Added Files:
src/sys/arch/vax/vax: kobj_machdep.c
Log Message:
Kernel linker support for vax. Now modules can be loaded again.
XXX - should keep modules on physical segment instead of in KVM.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/vax/kobj_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/vax/vax/kobj_machdep.c
diff -u /dev/null src/sys/arch/vax/vax/kobj_machdep.c:1.1
--- /dev/null Mon Apr 30 06:46:12 2018
+++ src/sys/arch/vax/vax/kobj_machdep.c Mon Apr 30 06:46:12 2018
@@ -0,0 +1,76 @@
+/* $NetBSD: kobj_machdep.c,v 1.1 2018/04/30 06:46:12 ragge Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Anders Magnusson.
+ *
+ * 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 NETBSD FOUNDATION, INC. 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.
+ */
+
+#include
+#include
+#include
+#include
+
+/*
+ * VAX kernel uses two relocations;
+ * - R_VAX_PC32 which is PC relative offset
+ * - R_VAX_32 which is an absolute symbol offset
+ */
+int
+kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data,
+ bool isrela, bool local)
+{
+ const Elf_Rela *rela = (const Elf_Rela *)data;
+ Elf_Word rtype = ELF_R_TYPE(rela->r_info);
+ Elf_Word symidx = ELF_R_SYM(rela->r_info);
+ Elf_Addr *where = (Elf_Addr *)(relocbase + rela->r_offset);
+ Elf_Addr addr, addend = rela->r_addend;
+ int error;
+
+ if (!isrela) {
+ printf("Elf_Rel not supported");
+ return -1;
+ }
+ if (rtype != R_VAX_PC32 && rtype != R_VAX_32) {
+ printf("Bad relocation %d", rtype);
+ return -1;
+ }
+
+ if ((error = kobj_sym_lookup(ko, symidx, )))
+ return -1;
+ addr += addend;
+ if (rtype == R_VAX_PC32)
+ addr -= (Elf_Addr)where + 4;
+
+ *where = addr;
+ return 0;
+}
+
+int
+kobj_machdep(kobj_t ko, void *base, size_t size, bool load)
+{
+ return 0;
+}
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: ragge
Date: Sun Apr 29 19:01:16 UTC 2018
Modified Files:
src/sys/arch/vax/vax: db_disasm.c
Log Message:
Fix bug causing small constants not to be printed out.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/vax/vax/db_disasm.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/vax/db_disasm.c
diff -u src/sys/arch/vax/vax/db_disasm.c:1.22 src/sys/arch/vax/vax/db_disasm.c:1.23
--- src/sys/arch/vax/vax/db_disasm.c:1.22 Mon May 22 16:39:41 2017
+++ src/sys/arch/vax/vax/db_disasm.c Sun Apr 29 19:01:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.22 2017/05/22 16:39:41 ragge Exp $ */
+/* $NetBSD: db_disasm.c,v 1.23 2018/04/29 19:01:15 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.22 2017/05/22 16:39:41 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.23 2018/04/29 19:01:15 ragge Exp $");
#include
#include
@@ -471,7 +471,7 @@ add_int(inst_buffer *ib, int i)
{
char buf[32];
if (i < 100 && i > -100)
- snprintf(ib->curp, sizeof(buf), "%d", i);
+ snprintf(buf, sizeof(buf), "%d", i);
else
snprintf(buf, sizeof(buf), "0x%x", i);
add_str(ib, buf);
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: ragge Date: Fri Apr 27 06:36:32 UTC 2018 Removed Files: src/sys/arch/vax/vax: in4_cksum.c in_cksum.c yyyin_cksum.c Log Message: Remove the old unneccessary cksum files. To generate a diff of this commit: cvs rdiff -u -r1.12 -r0 src/sys/arch/vax/vax/in4_cksum.c cvs rdiff -u -r1.11 -r0 src/sys/arch/vax/vax/in_cksum.c cvs rdiff -u -r1.9 -r0 src/sys/arch/vax/vax/yyyin_cksum.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/vax/conf
Module Name:src Committed By: ragge Date: Wed Apr 25 11:12:55 UTC 2018 Modified Files: src/sys/arch/vax/conf: GENERIC INSTALL VAX780 Log Message: Enable CPU_IN_CKSUM. To generate a diff of this commit: cvs rdiff -u -r1.204 -r1.205 src/sys/arch/vax/conf/GENERIC cvs rdiff -u -r1.73 -r1.74 src/sys/arch/vax/conf/INSTALL cvs rdiff -u -r1.25 -r1.26 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.204 src/sys/arch/vax/conf/GENERIC:1.205 --- src/sys/arch/vax/conf/GENERIC:1.204 Tue Jan 23 14:47:56 2018 +++ src/sys/arch/vax/conf/GENERIC Wed Apr 25 11:12:55 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.204 2018/01/23 14:47:56 sevan Exp $ +# $NetBSD: GENERIC,v 1.205 2018/04/25 11:12:55 ragge 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.204 $" +#ident "GENERIC-$Revision: 1.205 $" # Here are all different supported CPU types listed. #options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 @@ -75,6 +75,7 @@ options PPP_FILTER # Active filter supp #options IPFILTER_LOOKUP # ippool(8) support options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default +options CPU_IN_CKSUM # optimized checksum routine #options ALTQ # Manipulate network interfaces' output queues #options ALTQ_BLUE # Stochastic Fair Blue Index: src/sys/arch/vax/conf/INSTALL diff -u src/sys/arch/vax/conf/INSTALL:1.73 src/sys/arch/vax/conf/INSTALL:1.74 --- src/sys/arch/vax/conf/INSTALL:1.73 Thu Sep 14 07:58:44 2017 +++ src/sys/arch/vax/conf/INSTALL Wed Apr 25 11:12:55 2018 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.73 2017/09/14 07:58:44 mrg Exp $ +# $NetBSD: INSTALL,v 1.74 2018/04/25 11:12:55 ragge Exp $ # # INSTALL kernel; all supported devices but nothing fancy. # @@ -47,6 +47,7 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # # Networking options #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP +options CPU_IN_CKSUM # optimized checksum routine # File systems file-system FFS Index: src/sys/arch/vax/conf/VAX780 diff -u src/sys/arch/vax/conf/VAX780:1.25 src/sys/arch/vax/conf/VAX780:1.26 --- src/sys/arch/vax/conf/VAX780:1.25 Tue Jan 23 14:47:56 2018 +++ src/sys/arch/vax/conf/VAX780 Wed Apr 25 11:12:55 2018 @@ -1,4 +1,4 @@ -# $NetBSD: VAX780,v 1.25 2018/01/23 14:47:56 sevan Exp $ +# $NetBSD: VAX780,v 1.26 2018/04/25 11:12:55 ragge Exp $ # # 11/780,750,730 machine description file # @@ -60,6 +60,7 @@ options INET # IP + ICMP + TCP + UDP #options IPFILTER_LOG # ipmon(8) log support #options IPFILTER_LOOKUP # ippool(8) support #options IPFILTER_DEFAULT_BLOCK # block all packets by default +options CPU_IN_CKSUM # optimized checksum routine #options ALTQ # Manipulate network interfaces' output queues #options ALTQ_BLUE # Stochastic Fair Blue
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: ragge Date: Wed Apr 25 11:08:21 UTC 2018 Modified Files: src/sys/arch/vax/conf: files.vax Log Message: Add cpu_in_cksum.S. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sys/arch/vax/conf/files.vax 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/files.vax diff -u src/sys/arch/vax/conf/files.vax:1.123 src/sys/arch/vax/conf/files.vax:1.124 --- src/sys/arch/vax/conf/files.vax:1.123 Thu Jun 22 17:51:22 2017 +++ src/sys/arch/vax/conf/files.vax Wed Apr 25 11:08:21 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.vax,v 1.123 2017/06/22 17:51:22 flxd Exp $ +# $NetBSD: files.vax,v 1.124 2018/04/25 11:08:21 ragge Exp $ # # new style config file for vax architecture # @@ -385,6 +385,7 @@ file arch/vax/vax/db_machdep.c ddb file arch/vax/vax/db_disasm.c ddb file arch/vax/uba/uba_dma.c uba file arch/vax/vax/multicpu.c multiprocessor +file arch/vax/vax/cpu_in_cksum.S (inet | inet6) & cpu_in_cksum # Binary compatibility with previous NetBSD releases (COMPAT_XX) file arch/vax/vax/compat_13_machdep.c compat_13 | compat_ultrix |
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: ragge
Date: Wed Apr 25 11:06:49 UTC 2018
Added Files:
src/sys/arch/vax/vax: cpu_in_cksum.S
Log Message:
VAX version of cpu_in_checksum(). Increases network performance significantly.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/vax/cpu_in_cksum.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/vax/vax/cpu_in_cksum.S
diff -u /dev/null src/sys/arch/vax/vax/cpu_in_cksum.S:1.1
--- /dev/null Wed Apr 25 11:06:49 2018
+++ src/sys/arch/vax/vax/cpu_in_cksum.S Wed Apr 25 11:06:49 2018
@@ -0,0 +1,222 @@
+/* $NetBSD: cpu_in_cksum.S,v 1.1 2018/04/25 11:06:49 ragge Exp $ */
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Anders Magnusson.
+ *
+ * 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 NETBSD FOUNDATION, INC. 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.
+ */
+/*
+ * Copyright (c) 1988, 1992, 1993
+ * The Regents of the University of California. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93
+ */
+
+/*
+ * Assembly version of cpu_in_cksum() for vax, following the structure
+ * in the C version of the file but using vax instructions for speed.
+ * Increases network traffic speed with almost 50% (NFS tests).
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: cpu_in_cksum.S,v 1.1 2018/04/25 11:06:49 ragge Exp $");
+
+#include "assym.h"
+
+#define off %r0
+#define mlen %r1
+#define m %r2
+#define data %r3
+#define sum %r4
+#define len %r5
+#define byte_swapped %r6
+#define tmp %r7
+#
+# int cpu_in_cksum(struct mbuf *m, int len, int off, uint32_t initial_sum)
+#
+ENTRY(cpu_in_cksum, R7|R6)
+
+ subl2 $4,%sp
+
+ movl 4(%ap),m
+ movl 8(%ap),len
+ movl 12(%ap),off
+ movl 16(%ap),sum
+
+ clrl byte_swapped
+
+.Lfirstloop:# for (;;) {
+ tstl m# if (__predict_false(m == NULL)) {
+ jeql .Lout_of_data
+
+ movl M_LEN(m),mlen # mlen = m->m_len;
+ cmpl off,mlen # if (mlen > off) {
+ jgeq 1f
+ subl2 off,mlen # mlen -= off;
+ addl3 M_DATA(m),off,data # data = mtod(m, uint8_t *) + off;
+ jbr .Lpost_initial_offset # goto
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: ragge Date: Wed Apr 25 09:28:42 UTC 2018 Modified Files: src/sys/arch/vax/vax: genassym.cf Log Message: Extract M_DATA, M_LEN, M_NEXT. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/vax/vax/genassym.cf 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/vax/genassym.cf diff -u src/sys/arch/vax/vax/genassym.cf:1.52 src/sys/arch/vax/vax/genassym.cf:1.53 --- src/sys/arch/vax/vax/genassym.cf:1.52 Mon May 22 16:39:41 2017 +++ src/sys/arch/vax/vax/genassym.cf Wed Apr 25 09:28:42 2018 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.52 2017/05/22 16:39:41 ragge Exp $ +# $NetBSD: genassym.cf,v 1.53 2018/04/25 09:28:42 ragge Exp $ # # Copyright (c) 1997 Ludd, University of Lule}, Sweden. # All rights reserved. @@ -33,6 +33,7 @@ include include include include +include include @@ -83,6 +84,11 @@ define MCHK offsetof(struct cpu_dep, cp define MEMERR offsetof(struct cpu_dep, cpu_memerr) define BADADDR offsetof(struct cpu_dep, cpu_badaddr) +define M_DATA offsetof(struct mbuf, m_data) +define M_LEN offsetof(struct mbuf, m_len) +define M_NEXT offsetof(struct mbuf, m_next) + + define KERNBASE KERNBASE ifdef MULTIPROCESSOR
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: ragge Date: Wed Apr 25 09:23:01 UTC 2018 Modified Files: src/sys/arch/vax/include: asm.h Log Message: Add __KERNEL_RCSID() macro. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/vax/include/asm.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/vax/include/asm.h diff -u src/sys/arch/vax/include/asm.h:1.26 src/sys/arch/vax/include/asm.h:1.27 --- src/sys/arch/vax/include/asm.h:1.26 Fri Jun 1 06:26:38 2012 +++ src/sys/arch/vax/include/asm.h Wed Apr 25 09:23:00 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.26 2012/06/01 06:26:38 matt Exp $ */ +/* $NetBSD: asm.h,v 1.27 2018/04/25 09:23:00 ragge Exp $ */ /* * Copyright (c) 1982, 1993 * The Regents of the University of California. All rights reserved. @@ -81,6 +81,11 @@ #define ALTENTRY(x) .globl _C_LABEL(x); _C_LABEL(x): #define RCSID(name) .pushsection ".ident"; .asciz name; .popsection +#ifdef NO_KERNEL_RCSIDS +#define __KERNEL_RCSID(_n, _s) /* nothing */ +#else +#define __KERNEL_RCSID(_n, _s) RCSID(_s) +#endif #define WEAK_ALIAS(alias,sym) \ .weak alias; \
CVS commit: src/sys/arch/vax/vsa
Module Name:src
Committed By: ragge
Date: Thu Apr 12 18:45:57 UTC 2018
Modified Files:
src/sys/arch/vax/vsa: vsbus.c
Log Message:
Fix bug causing DMA to/from user space fail. Fixes PR#49517.
This bug has been around since 2003.
Thanks to Martin Husemann for providing hardware to debug on!
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/vax/vsa/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/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.63 src/sys/arch/vax/vsa/vsbus.c:1.64
--- src/sys/arch/vax/vsa/vsbus.c:1.63 Mon May 22 17:17:25 2017
+++ src/sys/arch/vax/vsa/vsbus.c Thu Apr 12 18:45:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.c,v 1.63 2017/05/22 17:17:25 ragge Exp $ */
+/* $NetBSD: vsbus.c,v 1.64 2018/04/12 18:45:57 ragge Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.63 2017/05/22 17:17:25 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.64 2018/04/12 18:45:57 ragge Exp $");
#include "opt_cputype.h"
@@ -261,6 +261,11 @@ vsbus_clrintr(int mask)
*sc->sc_intclr = mask;
}
+#define puvtopte(va, pmap) \
+ (((vaddr_t)va < 0x4000) ? \
+ &(((pmap)->pm_p0br)[PG_PFNUM(va)]) : \
+ &(((pmap)->pm_p1br)[PG_PFNUM(va)]))
+
/*
* Copy data from/to a user process' space from the DMA area.
* Use the physical memory directly.
@@ -269,6 +274,7 @@ void
vsbus_copytoproc(struct proc *p, void *fromv, void *tov, int len)
{
char *from = fromv, *to = tov;
+ struct pmap *pm;
struct pte *pte;
paddr_t pa;
@@ -282,10 +288,8 @@ vsbus_copytoproc(struct proc *p, void *f
panic("vsbus_copytoproc: no proc");
#endif
- if ((vaddr_t)to & 0x4000)
- pte = >p_vmspace->vm_map.pmap->pm_p1br[vax_btop((vaddr_t)to & ~0x4000)];
- else
- pte = >p_vmspace->vm_map.pmap->pm_p0br[vax_btop((vaddr_t)to)];
+ pm = p->p_vmspace->vm_map.pmap;
+ pte = puvtopte(trunc_page((vaddr_t)to), pm);
if ((vaddr_t)to & PGOFSET) {
int cz = round_page((vaddr_t)to) - (vaddr_t)to;
@@ -310,6 +314,7 @@ void
vsbus_copyfromproc(struct proc *p, void *fromv, void *tov, int len)
{
char *from = fromv, *to = tov;
+ struct pmap *pm;
struct pte *pte;
paddr_t pa;
@@ -323,10 +328,8 @@ vsbus_copyfromproc(struct proc *p, void
panic("vsbus_copyfromproc: no proc");
#endif
- if ((vaddr_t)from & 0x4000)
- pte = >p_vmspace->vm_map.pmap->pm_p1br[vax_btop((vaddr_t)from & ~0x4000)];
- else
- pte = >p_vmspace->vm_map.pmap->pm_p0br[vax_btop((vaddr_t)from)];
+ pm = p->p_vmspace->vm_map.pmap;
+ pte = puvtopte(trunc_page((vaddr_t)from), pm);
if ((vaddr_t)from & PGOFSET) {
int cz = round_page((vaddr_t)from) - (vaddr_t)from;
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: mrg
Date: Mon Apr 2 22:49:48 UTC 2018
Modified Files:
src/sys/arch/vax/vax: ctu.c
Log Message:
convert some spaces into new lines and tabs to make the gcc 6
indent checker happy.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/vax/ctu.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/vax/ctu.c
diff -u src/sys/arch/vax/vax/ctu.c:1.36 src/sys/arch/vax/vax/ctu.c:1.37
--- src/sys/arch/vax/vax/ctu.c:1.36 Mon May 22 16:39:41 2017
+++ src/sys/arch/vax/vax/ctu.c Mon Apr 2 22:49:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ctu.c,v 1.36 2017/05/22 16:39:41 ragge Exp $ */
+/* $NetBSD: ctu.c,v 1.37 2018/04/02 22:49:48 mrg Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.36 2017/05/22 16:39:41 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.37 2018/04/02 22:49:48 mrg Exp $");
#include
#include
@@ -376,16 +376,20 @@ cturintr(void *arg)
#ifdef TUDEBUG
printf("Writing byte %d\n", tu_sc.sc_xbytes);
#endif
- WAIT; mtpr(RSP_TYP_DATA, PR_CSTD);
- WAIT; mtpr(128, PR_CSTD);
+ WAIT;
+ mtpr(RSP_TYP_DATA, PR_CSTD);
+ WAIT;
+ mtpr(128, PR_CSTD);
for (i = 0; i < 128; i++) {
WAIT;
mtpr(buf[tu_sc.sc_xbytes++], PR_CSTD);
}
tck = ctu_cksum((void *)[tu_sc.sc_xbytes-128], 64);
tck += 0x8001; if (tck > 0x) tck -= 0x;
- WAIT; mtpr(tck & 0xff, PR_CSTD);
- WAIT; mtpr((tck >> 8) & 0xff, PR_CSTD);
+ WAIT;
+ mtpr(tck & 0xff, PR_CSTD);
+ WAIT;
+ mtpr((tck >> 8) & 0xff, PR_CSTD);
bp->b_resid = 0;
if (tu_sc.sc_xbytes == bp->b_bcount)
tu_sc.sc_state = TU_ENDPACKET;
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: ragge Date: Sat Mar 31 06:34:51 UTC 2018 Modified Files: src/sys/arch/vax/include: vmparam.h Log Message: Shrink MAXDSIZ to 512MB. XXX this should be depending of amount of physical memory. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/include/vmparam.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/vax/include/vmparam.h diff -u src/sys/arch/vax/include/vmparam.h:1.50 src/sys/arch/vax/include/vmparam.h:1.51 --- src/sys/arch/vax/include/vmparam.h:1.50 Sun Jan 26 03:18:39 2014 +++ src/sys/arch/vax/include/vmparam.h Sat Mar 31 06:34:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.50 2014/01/26 03:18:39 christos Exp $ */ +/* $NetBSD: vmparam.h,v 1.51 2018/03/31 06:34:51 ragge Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -68,7 +68,7 @@ #define DFLDSIZ (128*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (1024*1024*1024) /* max data size */ +#define MAXDSIZ (512*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (512*1024) /* initial stack size limit */
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: ragge
Date: Sat Mar 31 06:32:48 UTC 2018
Modified Files:
src/sys/arch/vax/vax: machdep.c
Log Message:
Set max/dfl size for vm a process may have to the same as for data.
This avoids a problem where mmap may lock processes in the system,
and solves PR port-vax/28379.
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/vax/vax/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/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.191 src/sys/arch/vax/vax/machdep.c:1.192
--- src/sys/arch/vax/vax/machdep.c:1.191 Tue Dec 16 11:23:11 2014
+++ src/sys/arch/vax/vax/machdep.c Sat Mar 31 06:32:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.191 2014/12/16 11:23:11 jklos Exp $ */
+/* $NetBSD: machdep.c,v 1.192 2018/03/31 06:32:47 ragge Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.191 2014/12/16 11:23:11 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.192 2018/03/31 06:32:47 ragge Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -765,3 +765,14 @@ mm_md_readwrite(dev_t dev, struct uio *u
return ENXIO;
}
}
+
+/*
+ * Set max virtual size a process may allocate.
+ * This could be tuned based on amount of physical memory.
+ */
+void
+machdep_init(void)
+{
+ proc0.p_rlimit[RLIMIT_AS].rlim_cur = DFLDSIZ;
+ proc0.p_rlimit[RLIMIT_AS].rlim_max = MAXDSIZ;
+}
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: ragge
Date: Fri Mar 30 08:34:35 UTC 2018
Modified Files:
src/sys/arch/vax/vax: pmap.c
Log Message:
Allow allocation of PTE space to fail in pmap_enter if PMAP_CANFAIL is set.
This fixes the panic part of PR port-vax/28379.
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/sys/arch/vax/vax/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/vax/vax/pmap.c
diff -u src/sys/arch/vax/vax/pmap.c:1.185 src/sys/arch/vax/vax/pmap.c:1.186
--- src/sys/arch/vax/vax/pmap.c:1.185 Mon May 22 16:53:05 2017
+++ src/sys/arch/vax/vax/pmap.c Fri Mar 30 08:34:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.185 2017/05/22 16:53:05 ragge Exp $ */
+/* $NetBSD: pmap.c,v 1.186 2018/03/30 08:34:35 ragge Exp $ */
/*
* Copyright (c) 1994, 1998, 1999, 2003 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.185 2017/05/22 16:53:05 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.186 2018/03/30 08:34:35 ragge Exp $");
#include "opt_ddb.h"
#include "opt_cputype.h"
@@ -765,10 +765,8 @@ pmap_rmproc(struct pmap *pm)
/*
* Allocate space for user page tables, from ptemap.
- * This routine should never fail; use the same algorithm as when processes
- * are swapped.
* Argument is needed space, in bytes.
- * Returns a pointer to the newly allocated space.
+ * Returns a pointer to the newly allocated space, or 0 if failed.
*/
static vaddr_t
pmap_getusrptes(pmap_t pm, vsize_t nsize)
@@ -781,9 +779,7 @@ pmap_getusrptes(pmap_t pm, vsize_t nsize
#endif
while (((rv = pmap_extwrap(nsize)) == 0) && (pmap_rmproc(pm) != 0))
;
- if (rv)
- return rv;
- panic("usrptmap space leakage");
+ return rv;
}
/*
@@ -804,7 +800,7 @@ rmptep(struct pte *pte)
*ptpp = 0;
}
-static void
+static int
grow_p0(struct pmap *pm, int reqlen)
{
vaddr_t nptespc;
@@ -823,6 +819,8 @@ grow_p0(struct pmap *pm, int reqlen)
nptespc = pmap_getusrptes(pm, len);
RECURSESTART;
+ if (nptespc == 0)
+ return 0;
/*
* Copy the old ptes to the new space.
* Done by moving on system page table.
@@ -846,10 +844,11 @@ grow_p0(struct pmap *pm, int reqlen)
/* Remove the old after update_pcbs() (for multi-CPU propagation) */
if (inuse)
extent_free(ptemap, p0br, p0lr*PPTESZ, EX_WAITOK);
+ return 1;
}
-static void
+static int
grow_p1(struct pmap *pm, int len)
{
vaddr_t nptespc, optespc;
@@ -862,6 +861,9 @@ grow_p1(struct pmap *pm, int len)
RECURSEEND;
nptespc = pmap_getusrptes(pm, nlen);
RECURSESTART;
+ if (nptespc == 0)
+ return 0;
+
olen = (NPTEPERREG*PPTESZ) - (pm->pm_p1lr * PPTESZ);
optespc = (vaddr_t)pm->pm_p1ap;
@@ -881,6 +883,7 @@ grow_p1(struct pmap *pm, int len)
if (optespc)
extent_free(ptemap, optespc, olen, EX_WAITOK);
+ return 1;
}
/*
@@ -1096,14 +1099,16 @@ pmap_enter(pmap_t pmap, vaddr_t v, paddr
case P0SEG:
if (vax_btop(v) >= pmap->pm_p0lr)
- grow_p0(pmap, vax_btop(v));
+ if (grow_p0(pmap, vax_btop(v)) == 0)
+goto growfail;
pteptr = (int *)pmap->pm_p0br + vax_btop(v);
newpte = (prot & VM_PROT_WRITE ? PG_RW : PG_RO);
break;
case P1SEG:
if (vax_btop(v - 0x4000) < pmap->pm_p1lr)
- grow_p1(pmap, vax_btop(v - 0x4000));
+ if (grow_p1(pmap, vax_btop(v - 0x4000)) == 0)
+goto growfail;
pteptr = (int *)pmap->pm_p1br + vax_btop(v - 0x4000);
newpte = (prot & VM_PROT_WRITE ? PG_RW : PG_RO);
break;
@@ -1214,6 +1219,11 @@ pmap_enter(pmap_t pmap, vaddr_t v, paddr
mtpr(0, PR_TBIA); /* Always; safety belt */
return 0;
+
+growfail:
+ if (flags & PMAP_CANFAIL)
+ return ENOMEM;
+ panic("usrptmap space leakage");
}
vaddr_t
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: ragge Date: Thu Mar 29 15:45:15 UTC 2018 Modified Files: src/sys/arch/vax/conf: majors.vax Log Message: Use same major for rx floppies for both b and c devices. Works around a bug in the mscp disk driver, and solves PR port-vax/26138. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 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/sys/arch/vax/conf/majors.vax diff -u src/sys/arch/vax/conf/majors.vax:1.27 src/sys/arch/vax/conf/majors.vax:1.28 --- src/sys/arch/vax/conf/majors.vax:1.27 Thu Jun 22 17:51:22 2017 +++ src/sys/arch/vax/conf/majors.vax Thu Mar 29 15:45:15 2018 @@ -1,4 +1,4 @@ -# $NetBSD: majors.vax,v 1.27 2017/06/22 17:51:22 flxd Exp $ +# $NetBSD: majors.vax,v 1.28 2018/03/29 15:45:15 ragge Exp $ # # Device majors for vax # @@ -38,7 +38,7 @@ device-major lpa char 26 lpa device-major ps char 27 ps device-major racd char 28 block 28 racd device-major ad char 29 ad -device-major rx char 30 block 12 rx +device-major rx char 30 block 30 rx device-major ik char 31 ik device-major rl char 32 block 14 rl device-major log char 33
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: ragge
Date: Sun Mar 25 08:13:20 UTC 2018
Modified Files:
src/sys/arch/vax/vax: ka780.c
Log Message:
Fix cpu type printout error.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/vax/ka780.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/vax/ka780.c
diff -u src/sys/arch/vax/vax/ka780.c:1.32 src/sys/arch/vax/vax/ka780.c:1.33
--- src/sys/arch/vax/vax/ka780.c:1.32 Thu Jul 7 06:55:39 2016
+++ src/sys/arch/vax/vax/ka780.c Sun Mar 25 08:13:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ka780.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $ */
+/* $NetBSD: ka780.c,v 1.33 2018/03/25 08:13:20 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.33 2018/03/25 08:13:20 ragge Exp $");
#include
#include
@@ -365,8 +365,8 @@ ka780_attach_cpu(device_t self)
struct ka78x * const ka78 = (void *)_cpudata;
aprint_normal(": KA%s, S/N %d(%d), hardware ECO level %d(%d)\n",
- cpu_getmodel() + 8, ka78->snr, ka78->plant, ka78->eco >> 4, ka78->eco);
- aprint_normal_dev(self, "4KB L1 cachen");
+ cpu_getmodel() + 7, ka78->snr, ka78->plant, ka78->eco >> 4, ka78->eco);
+ aprint_normal_dev(self, "4KB L1 cache");
if (mfpr(PR_ACCS) & 255) {
aprint_normal(", FPA present\n");
mtpr(0x8000, PR_ACCS);
CVS commit: src/sys/arch/vax/boot
Module Name:src
Committed By: ragge
Date: Thu Mar 22 08:58:56 UTC 2018
Modified Files:
src/sys/arch/vax/boot: Makefile.inc
Log Message:
Let boot relocate to just below 8MB. This solves the problem with
booting a kernel larger than below 4MB.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/boot/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/sys/arch/vax/boot/Makefile.inc
diff -u src/sys/arch/vax/boot/Makefile.inc:1.17 src/sys/arch/vax/boot/Makefile.inc:1.18
--- src/sys/arch/vax/boot/Makefile.inc:1.17 Sun Mar 13 17:48:53 2016
+++ src/sys/arch/vax/boot/Makefile.inc Thu Mar 22 08:58:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2016/03/13 17:48:53 christos Exp $
+# $NetBSD: Makefile.inc,v 1.18 2018/03/22 08:58:56 ragge Exp $
NOSSP=
NOFORTIFY=
@@ -7,7 +7,7 @@ NODEBUG=
.include
-RELOC=0x3f
+RELOC=0x7f
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
CPPFLAGS+=-I.
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: ragge
Date: Wed Mar 21 18:27:27 UTC 2018
Modified Files:
src/sys/arch/vax/boot/boot: devopen.c ra.c
Log Message:
Fix bug causing autoboot on 750/780 not to work. Cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/boot/boot/devopen.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/boot/boot/ra.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/boot/boot/devopen.c
diff -u src/sys/arch/vax/boot/boot/devopen.c:1.19 src/sys/arch/vax/boot/boot/devopen.c:1.20
--- src/sys/arch/vax/boot/boot/devopen.c:1.19 Mon Mar 19 15:43:45 2018
+++ src/sys/arch/vax/boot/boot/devopen.c Wed Mar 21 18:27:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.19 2018/03/19 15:43:45 ragge Exp $ */
+/* $NetBSD: devopen.c,v 1.20 2018/03/21 18:27:27 ragge Exp $ */
/*
* Copyright (c) 1997 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -49,7 +49,6 @@ int
devopen(struct open_file *f, const char *fname, char **file)
{
int dev, unit, ctlr, part, adapt, i, a[4], x;
- int *mapregs;
struct devsw *dp;
extern int cnvtab[];
char *s, *c;
@@ -130,19 +129,19 @@ devopen(struct open_file *f, const char
switch (vax_boardtype) {
case VAX_BTYP_750:
csrbase = (nexaddr == 0xf3 ? 0xffe000 : 0xfbe000);
+ mapaddr = (int *)nexaddr + VAX_NBPG;
if (adapt < 0)
break;
nexaddr = (NEX750 + NEXSIZE * adapt);
- mapaddr = (int *)nexaddr + VAX_NBPG;
csrbase = (adapt == 8 ? 0xffe000 : 0xfbe000);
break;
case VAX_BTYP_780:
case VAX_BTYP_790:
csrbase = 0x2007e000 + 0x4 * ((nexaddr & 0x1e000) >> 13);
+ mapaddr = (int *)nexaddr + VAX_NBPG;
if (adapt < 0)
break;
nexaddr = ((int)NEX780 + NEXSIZE * adapt);
- mapaddr = (int *)nexaddr + VAX_NBPG;
csrbase = 0x2007e000 + 0x4 * adapt;
break;
case VAX_BTYP_9CC: /* 6000/200 */
@@ -180,13 +179,9 @@ devopen(struct open_file *f, const char
default:
nexaddr = 0; /* No map regs */
csrbase = 0x2000;
- /* Always map in the lowest 4M on qbus-based machines */
- mapregs = (void *)0x20088000;
if (bootrpb.adpphy == 0x20087800) {
nexaddr = bootrpb.adpphy;
mapaddr = (int *)nexaddr + VAX_NBPG;
- for (i = 0; i < 8192; i++)
-mapregs[i] = PG_V | i;
}
break;
}
Index: src/sys/arch/vax/boot/boot/ra.c
diff -u src/sys/arch/vax/boot/boot/ra.c:1.21 src/sys/arch/vax/boot/boot/ra.c:1.22
--- src/sys/arch/vax/boot/boot/ra.c:1.21 Mon Mar 19 15:43:45 2018
+++ src/sys/arch/vax/boot/boot/ra.c Wed Mar 21 18:27:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ra.c,v 1.21 2018/03/19 15:43:45 ragge Exp $ */
+/* $NetBSD: ra.c,v 1.22 2018/03/21 18:27:27 ragge Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -65,7 +65,7 @@ static volatile struct uda {
static struct disklabel ralabel;
static char io_buf[DEV_BSIZE];
-static int dpart, dunit, remap, is_tmscp, curblock;
+static int dpart, dunit, is_tmscp, curblock;
static volatile u_short *ra_ip, *ra_sa, *ra_sw;
int
@@ -90,7 +90,6 @@ raopen(struct open_file *f, int adapt, i
dpart = part;
if (ctlr < 0)
ctlr = 0;
- remap = csrbase && nexaddr;
curblock = 0;
if (csrbase) { /* On a uda-alike adapter */
if (askname == 0) {
@@ -254,8 +253,8 @@ rastrategy(void *f, int func, daddr_t db
{
#ifdef DEV_DEBUG
- printf("rastrategy: buf %p remap %d is_tmscp %d\n",
- buf, remap, is_tmscp);
+ printf("rastrategy: buf %p is_tmscp %d\n",
+ buf, is_tmscp);
#endif
uda.uda_cmd.mscp_seq.seq_buffer = ubmap(0, (int)buf, size);
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: ragge
Date: Tue Mar 20 13:30:40 UTC 2018
Modified Files:
src/sys/arch/vax/boot/boot: if_qe.c
Log Message:
Change the driver to map the data structures onto the qbus.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/boot/boot/if_qe.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/boot/boot/if_qe.c
diff -u src/sys/arch/vax/boot/boot/if_qe.c:1.9 src/sys/arch/vax/boot/boot/if_qe.c:1.10
--- src/sys/arch/vax/boot/boot/if_qe.c:1.9 Mon Oct 26 19:16:58 2009
+++ src/sys/arch/vax/boot/boot/if_qe.c Tue Mar 20 13:30:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.9 2009/10/26 19:16:58 cegger Exp $ */
+/* $NetBSD: if_qe.c,v 1.10 2018/03/20 13:30:40 ragge Exp $ */
/*
* Copyright (c) 1998 Roar Thronæs. All rights reserved.
@@ -69,8 +69,8 @@ static struct qe_softc {
char qein[2048], qeout[2048];/* Packet buffers */
} qe_softc;
-static struct qe_softc *sc = _softc;
-static int addr;
+static struct qe_softc *sc = _softc, *psc;
+static int addr, ubaddr;
#define QE_WCSR(csr, val) \
(*((volatile u_short *)(addr + (csr))) = (val))
@@ -111,6 +111,9 @@ qe_init(u_char *eaddr)
QE_WCSR(QE_CSR_CSR, QE_RESET);
QE_WCSR(QE_CSR_CSR, QE_RCSR(QE_CSR_CSR) & ~QE_RESET);
+ ubaddr = ubmap(0, (int)sc, sizeof(struct qe_softc));
+ psc = (struct qe_softc *)ubaddr;
+
for (i = 0; i < 6; i++) {
sc->setup_pkt[i][1] = QE_RCSR(i * 2);
sc->setup_pkt[i+8][1] = QE_RCSR(i * 2);
@@ -125,13 +128,13 @@ qe_init(u_char *eaddr)
memset((void *)sc->rring, 0, sizeof(struct qe_ring));
sc->rring->qe_buf_len = -64;
- sc->rring->qe_addr_lo = (short)((int)sc->setup_pkt);
- sc->rring->qe_addr_hi = (short)((int)sc->setup_pkt >> 16);
+ sc->rring->qe_addr_lo = LOWORD(psc->setup_pkt);
+ sc->rring->qe_addr_hi = HIWORD(psc->setup_pkt);
memset((void *)sc->tring, 0, sizeof(struct qe_ring));
sc->tring->qe_buf_len = -64;
- sc->tring->qe_addr_lo = (short)((int)sc->setup_pkt);
- sc->tring->qe_addr_hi = (short)((int)sc->setup_pkt >> 16);
+ sc->tring->qe_addr_lo = LOWORD(psc->setup_pkt);
+ sc->tring->qe_addr_hi = HIWORD(psc->setup_pkt);
sc->rring[0].qe_flag = sc->rring[0].qe_status1 = QE_NOTYET;
sc->rring->qe_addr_hi |= QE_VALID;
@@ -141,10 +144,10 @@ qe_init(u_char *eaddr)
QE_WCSR(QE_CSR_CSR, QE_XMIT_INT | QE_RCV_INT);
- QE_WCSR(QE_CSR_RCLL, LOWORD(sc->rring));
- QE_WCSR(QE_CSR_RCLH, HIWORD(sc->rring));
- QE_WCSR(QE_CSR_XMTL, LOWORD(sc->tring));
- QE_WCSR(QE_CSR_XMTH, HIWORD(sc->tring));
+ QE_WCSR(QE_CSR_RCLL, LOWORD(psc->rring));
+ QE_WCSR(QE_CSR_RCLH, HIWORD(psc->rring));
+ QE_WCSR(QE_CSR_XMTL, LOWORD(psc->tring));
+ QE_WCSR(QE_CSR_XMTH, HIWORD(psc->tring));
while ((QE_RCSR(QE_CSR_CSR) & QE_INTS) != QE_INTS)
;
@@ -152,31 +155,31 @@ qe_init(u_char *eaddr)
QE_WCSR(QE_CSR_CSR, QE_RCSR(QE_CSR_CSR) & ~(QE_INT_ENABLE|QE_ELOOP));
QE_WCSR(QE_CSR_CSR, QE_RCSR(QE_CSR_CSR) | QE_ILOOP);
- sc->rring[0].qe_addr_lo = (short)((int)sc->qein & 0x);
- sc->rring[0].qe_addr_hi = (short)((int)sc->qein >> 16);
- sc->rring[0].qe_buf_len=-MAXPACKETSIZE/2;
+ sc->rring[0].qe_addr_lo = LOWORD(psc->qein);
+ sc->rring[0].qe_addr_hi = HIWORD(psc->qein);
+ sc->rring[0].qe_buf_len = -MAXPACKETSIZE/2;
sc->rring[0].qe_addr_hi |= QE_VALID;
- sc->rring[0].qe_flag=sc->rring[0].qe_status1=QE_NOTYET;
- sc->rring[0].qe_status2=1;
+ sc->rring[0].qe_flag = sc->rring[0].qe_status1 = QE_NOTYET;
+ sc->rring[0].qe_status2 = 1;
sc->rring[1].qe_addr_lo = 0;
sc->rring[1].qe_addr_hi = 0;
sc->rring[1].qe_flag=sc->rring[1].qe_status1=QE_NOTYET;
sc->rring[1].qe_status2=1;
- sc->tring[0].qe_addr_lo = (short)((int)sc->qeout & 0x);
- sc->tring[0].qe_addr_hi = (short)((int)sc->qeout >> 16);
- sc->tring[0].qe_buf_len=0;
- sc->tring[0].qe_flag=sc->tring[0].qe_status1=QE_NOTYET;
+ sc->tring[0].qe_addr_lo = LOWORD(psc->qeout);
+ sc->tring[0].qe_addr_hi = HIWORD(psc->qeout);
+ sc->tring[0].qe_buf_len = 0;
+ sc->tring[0].qe_flag = sc->tring[0].qe_status1 = QE_NOTYET;
sc->tring[0].qe_addr_hi |= QE_EOMSG|QE_VALID;
- sc->tring[1].qe_flag=sc->tring[1].qe_status1=QE_NOTYET;
+ sc->tring[1].qe_flag = sc->tring[1].qe_status1 = QE_NOTYET;
sc->tring[1].qe_addr_lo = 0;
sc->tring[1].qe_addr_hi = 0;
QE_WCSR(QE_CSR_CSR, QE_RCSR(QE_CSR_CSR) | QE_RCV_ENABLE);
- QE_WCSR(QE_CSR_RCLL, LOWORD(sc->rring));
- QE_WCSR(QE_CSR_RCLH, HIWORD(sc->rring));
+ QE_WCSR(QE_CSR_RCLL, LOWORD(psc->rring));
+ QE_WCSR(QE_CSR_RCLH, HIWORD(psc->rring));
}
int
@@ -206,12 +209,12 @@ retry:
end:
sc->rring[0].qe_status2 = sc->rring[1].qe_status2 = 1;
- sc->rring[0].qe_flag=sc->rring[0].qe_status1=QE_NOTYET;
- sc->rring[1].qe_flag=sc->rring[1].qe_status1=QE_NOTYET;
+ sc->rring[0].qe_flag = sc->rring[0].qe_status1 = QE_NOTYET;
+ sc->rring[1].qe_flag = sc->rring[1].qe_status1 = QE_NOTYET;
QE_WCSR(QE_CSR_CSR, QE_RCSR(QE_CSR_CSR) | QE_RCV_ENABLE);
- QE_WCSR(QE_CSR_RCLL,
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: ragge
Date: Mon Mar 19 17:29:09 UTC 2018
Modified Files:
src/sys/arch/vax/boot/boot: Makefile
Log Message:
gcc 5.5 has no problem with -O2 on boot.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/vax/boot/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.45 src/sys/arch/vax/boot/boot/Makefile:1.46
--- src/sys/arch/vax/boot/boot/Makefile:1.45 Sat Apr 8 19:53:23 2017
+++ src/sys/arch/vax/boot/boot/Makefile Mon Mar 19 17:29:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/04/08 19:53:23 christos Exp $
+# $NetBSD: Makefile,v 1.46 2018/03/19 17:29:08 ragge Exp $
S= ${.CURDIR}/../../../..
@@ -17,8 +17,6 @@ LIBCRTBEGIN=
LIBCRTEND=
CLEANFILES+=${PROG} ${PROG}.sym
-# XXX - hack, doesn't work with -O2 and gcc 4.8
-CFLAGS+=-O1
CPPFLAGS+=-DSUPPORT_BOOTPARAMS -DSUPPORT_BOOTP -DSUPPORT_DHCP -D_STANDALONE \
-DNO_MID_CHECK
CPPFLAGS+=-DLIBSA_CREAD_NOCRC
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: ragge
Date: Mon Mar 19 15:43:45 UTC 2018
Modified Files:
src/sys/arch/vax/boot/boot: devopen.c hp.c if_de.c ra.c vaxstand.h
Log Message:
Use a common routine ubmap() that setup the map registers as needed,
not expecting everything to be below 4M. This solves the problem
that large kernels cannot be loaded reported on port-vax.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/boot/boot/devopen.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/boot/boot/hp.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/boot/boot/if_de.c \
src/sys/arch/vax/boot/boot/vaxstand.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/boot/boot/ra.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/boot/boot/devopen.c
diff -u src/sys/arch/vax/boot/boot/devopen.c:1.18 src/sys/arch/vax/boot/boot/devopen.c:1.19
--- src/sys/arch/vax/boot/boot/devopen.c:1.18 Mon May 22 16:59:32 2017
+++ src/sys/arch/vax/boot/boot/devopen.c Mon Mar 19 15:43:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.18 2017/05/22 16:59:32 ragge Exp $ */
+/* $NetBSD: devopen.c,v 1.19 2018/03/19 15:43:45 ragge Exp $ */
/*
* Copyright (c) 1997 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -27,6 +27,7 @@
#include
#include
+#include
#include
#include
#include
@@ -38,7 +39,12 @@
#include "vaxstand.h"
int nexaddr, csrbase;
+static int *mapaddr;
+/*
+ * Boot device syntax:
+ * device(adapter, controller, unit, partition)file
+ */
int
devopen(struct open_file *f, const char *fname, char **file)
{
@@ -127,6 +133,7 @@ devopen(struct open_file *f, const char
if (adapt < 0)
break;
nexaddr = (NEX750 + NEXSIZE * adapt);
+ mapaddr = (int *)nexaddr + VAX_NBPG;
csrbase = (adapt == 8 ? 0xffe000 : 0xfbe000);
break;
case VAX_BTYP_780:
@@ -135,6 +142,7 @@ devopen(struct open_file *f, const char
if (adapt < 0)
break;
nexaddr = ((int)NEX780 + NEXSIZE * adapt);
+ mapaddr = (int *)nexaddr + VAX_NBPG;
csrbase = 0x2007e000 + 0x4 * adapt;
break;
case VAX_BTYP_9CC: /* 6000/200 */
@@ -176,6 +184,7 @@ devopen(struct open_file *f, const char
mapregs = (void *)0x20088000;
if (bootrpb.adpphy == 0x20087800) {
nexaddr = bootrpb.adpphy;
+ mapaddr = (int *)nexaddr + VAX_NBPG;
for (i = 0; i < 8192; i++)
mapregs[i] = PG_V | i;
}
@@ -195,3 +204,24 @@ usage:
printf("usage: dev(adapter,controller,unit,partition)file -asd\n");
return -1;
}
+
+/*
+ * Map in virtual address vaddr of size vsize starting with map mapno.
+ * Returns the unibus address of the mapped area.
+ */
+int
+ubmap(int mapno, int vaddr, int size)
+{
+ int voff = (vaddr & VAX_PGOFSET);
+ int rv = (mapno << VAX_PGSHIFT) + voff;
+ int vpag, npag;
+
+ if (mapaddr == 0)
+ return vaddr; /* no map, phys == virt */
+
+ npag = (voff + size) / VAX_NBPG;
+ vpag = vaddr >> VAX_PGSHIFT;
+ while (npag-- >= 0)
+ mapaddr[mapno++] = vpag++ | PG_V;
+ return rv;
+}
Index: src/sys/arch/vax/boot/boot/hp.c
diff -u src/sys/arch/vax/boot/boot/hp.c:1.10 src/sys/arch/vax/boot/boot/hp.c:1.11
--- src/sys/arch/vax/boot/boot/hp.c:1.10 Mon May 22 16:59:32 2017
+++ src/sys/arch/vax/boot/boot/hp.c Mon Mar 19 15:43:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hp.c,v 1.10 2017/05/22 16:59:32 ragge Exp $ */
+/* $NetBSD: hp.c,v 1.11 2018/03/19 15:43:45 ragge Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -108,13 +108,9 @@ int
hpstrategy(void *f, int func, daddr_t dblk,
size_t size, void *buf, size_t *rsize)
{
- unsigned int pfnum, mapnr, nsize, bn, cn, sn, tn;
+ unsigned int bn, cn, sn, tn;
- pfnum = (u_int)buf >> VAX_PGSHIFT;
-
- for(mapnr = 0, nsize = size; (nsize + VAX_NBPG) > 0;
- nsize -= VAX_NBPG, mapnr++, pfnum++)
- MBA_WCSR(MAPREG(mapnr), PG_V | pfnum);
+ (void)ubmap(0, (int)buf, size);
MBA_WCSR(MBA_VAR, ((u_int)buf & VAX_PGOFSET));
MBA_WCSR(MBA_BC, (~size) + 1);
Index: src/sys/arch/vax/boot/boot/if_de.c
diff -u src/sys/arch/vax/boot/boot/if_de.c:1.9 src/sys/arch/vax/boot/boot/if_de.c:1.10
--- src/sys/arch/vax/boot/boot/if_de.c:1.9 Mon May 22 16:59:32 2017
+++ src/sys/arch/vax/boot/boot/if_de.c Mon Mar 19 15:43:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.9 2017/05/22 16:59:32 ragge Exp $ */
+/* $NetBSD: if_de.c,v 1.10 2018/03/19 15:43:45 ragge Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -86,7 +86,7 @@ static int crx, ctx;
int
deopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
{
- int i, cdata, *map, npgs;
+ int i;
u_char eaddr[6];
/* point to the device in memory */
@@ -108,14 +108,8 @@ deopen(struct open_file *f, int adapt, i
/* Map in the control structures and buffers */
dc = alloc(sizeof(struct de_cdata));
- pdc = (struct de_cdata *)((int)dc & VAX_PGOFSET);
- map = (int *)nexaddr + 512;
- npgs = (sizeof(struct
CVS commit: src/sys/arch/vax/boot/common
Module Name:src Committed By: ragge Date: Mon Mar 19 15:37:56 UTC 2018 Modified Files: src/sys/arch/vax/boot/common: srt0.S Log Message: Do not use movc3 to copy boot program, it may be larger than 64k. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/boot/common/srt0.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/boot/common/srt0.S diff -u src/sys/arch/vax/boot/common/srt0.S:1.5 src/sys/arch/vax/boot/common/srt0.S:1.6 --- src/sys/arch/vax/boot/common/srt0.S:1.5 Mon May 22 17:00:19 2017 +++ src/sys/arch/vax/boot/common/srt0.S Mon Mar 19 15:37:56 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.5 2017/05/22 17:00:19 ragge Exp $ */ +/* $NetBSD: srt0.S,v 1.6 2018/03/19 15:37:56 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -49,7 +49,9 @@ ALTENTRY(start) movl $_C_LABEL(start), %r3 # get where we want to be cmpl %r1,%r3 # are we where we want to be? beql relocated # already relocated, skip copy - movc3 %r0,(%r1),(%r3) # copy +1: movb (%r1)+,(%r3)+ # copy + sobgtr %r0,1b + subl3 $_C_LABEL(edata), $_C_LABEL(end), %r2 movc5 $0,(%r3),$0,%r2,(%r3) # Zero bss
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: christos Date: Wed Nov 29 17:54:55 UTC 2017 Modified Files: src/sys/arch/vax/include: signal.h Log Message: include for sigset_t To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/include/signal.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/vax/include/signal.h diff -u src/sys/arch/vax/include/signal.h:1.15 src/sys/arch/vax/include/signal.h:1.16 --- src/sys/arch/vax/include/signal.h:1.15 Tue Jan 13 18:56:13 2009 +++ src/sys/arch/vax/include/signal.h Wed Nov 29 12:54:55 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: signal.h,v 1.15 2009/01/13 23:56:13 mjf Exp $ */ +/* $NetBSD: signal.h,v 1.16 2017/11/29 17:54:55 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California. @@ -43,6 +43,7 @@ typedef int sig_atomic_t; #if defined(_NETBSD_SOURCE) +#include /* * Information pushed on stack when a signal is delivered. * This is used by the kernel to restore state following
CVS commit: src/sys/arch/vax/include
Module Name:src
Committed By: martin
Date: Thu Jul 27 12:15:59 UTC 2017
Modified Files:
src/sys/arch/vax/include: math.h
Log Message:
Some stupid pkgsrc stuff insists on -std=c89, duh!
Use __inline instead of inline.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/include/math.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/vax/include/math.h
diff -u src/sys/arch/vax/include/math.h:1.7 src/sys/arch/vax/include/math.h:1.8
--- src/sys/arch/vax/include/math.h:1.7 Mon Sep 16 15:56:24 2013
+++ src/sys/arch/vax/include/math.h Thu Jul 27 12:15:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: math.h,v 1.7 2013/09/16 15:56:24 martin Exp $ */
+/* $NetBSD: math.h,v 1.8 2017/07/27 12:15:59 martin Exp $ */
#ifndef _VAX_MATH_H_
#define _VAX_MATH_H_
@@ -11,8 +11,8 @@
#define __INFINITY 1.0E+39F
#endif
-static inline int __isinf(double __x) { return 0; }
-static inline int __isnan(double __x) { return 0; }
+static __inline int __isinf(double __x) { return 0; }
+static __inline int __isnan(double __x) { return 0; }
#define __HAVE_INLINE___ISINF
#define __HAVE_INLINE___ISNAN
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: ragge Date: Mon May 22 17:17:25 UTC 2017 Modified Files: src/sys/arch/vax/vsa: dz_vsbus.c hdc9224.c hdc9224.h smg.c vsbus.c Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/vax/vsa/dz_vsbus.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/vax/vsa/hdc9224.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/vsa/hdc9224.h cvs rdiff -u -r1.56 -r1.57 src/sys/arch/vax/vsa/smg.c cvs rdiff -u -r1.62 -r1.63 src/sys/arch/vax/vsa/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/dz_vsbus.c diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.43 src/sys/arch/vax/vsa/dz_vsbus.c:1.44 --- src/sys/arch/vax/vsa/dz_vsbus.c:1.43 Thu Jun 28 13:58:21 2012 +++ src/sys/arch/vax/vsa/dz_vsbus.c Mon May 22 17:17:25 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $ */ +/* $NetBSD: dz_vsbus.c,v 1.44 2017/05/22 17:17:25 ragge Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.44 2017/05/22 17:17:25 ragge Exp $"); #include #include Index: src/sys/arch/vax/vsa/hdc9224.c diff -u src/sys/arch/vax/vsa/hdc9224.c:1.57 src/sys/arch/vax/vsa/hdc9224.c:1.58 --- src/sys/arch/vax/vsa/hdc9224.c:1.57 Fri Jan 2 19:42:06 2015 +++ src/sys/arch/vax/vsa/hdc9224.c Mon May 22 17:17:25 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: hdc9224.c,v 1.57 2015/01/02 19:42:06 christos Exp $ */ +/* $NetBSD: hdc9224.c,v 1.58 2017/05/22 17:17:25 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -13,12 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -51,7 +45,7 @@ #undef RDDEBUG #include -__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.57 2015/01/02 19:42:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.58 2017/05/22 17:17:25 ragge Exp $"); #include #include Index: src/sys/arch/vax/vsa/hdc9224.h diff -u src/sys/arch/vax/vsa/hdc9224.h:1.6 src/sys/arch/vax/vsa/hdc9224.h:1.7 --- src/sys/arch/vax/vsa/hdc9224.h:1.6 Sun Dec 11 12:19:37 2005 +++ src/sys/arch/vax/vsa/hdc9224.h Mon May 22 17:17:25 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: hdc9224.h,v 1.6 2005/12/11 12:19:37 christos Exp $ */ +/* $NetBSD: hdc9224.h,v 1.7 2017/05/22 17:17:25 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -13,12 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index:
CVS commit: src/sys/arch/vax/uba
Module Name:src Committed By: ragge Date: Mon May 22 17:15:45 UTC 2017 Modified Files: src/sys/arch/vax/uba: qv.c uba_cmi.c uba_mainbus.c uba_sbi.c uba_ubi.c Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/uba/qv.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/uba/uba_cmi.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/uba/uba_mainbus.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/uba/uba_sbi.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/uba/uba_ubi.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/uba/qv.c diff -u src/sys/arch/vax/uba/qv.c:1.32 src/sys/arch/vax/uba/qv.c:1.33 --- src/sys/arch/vax/uba/qv.c:1.32 Thu Jul 7 06:55:39 2016 +++ src/sys/arch/vax/uba/qv.c Mon May 22 17:15:45 2017 @@ -1,4 +1,4 @@ -/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $*/ +/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.33 2017/05/22 17:15:45 ragge Exp $*/ /* * Copyright (c) 2015 Charles H. Dickman. All rights reserved. * Derived from smg.c @@ -13,11 +13,7 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products + * 3. The name of the author may not be used to endorse or promote products *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR @@ -35,7 +31,7 @@ /*3456789012345678901234567890123456789012345678901234567890123456789012345678*/ #include -__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.32 2016/07/07 06:55:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.33 2017/05/22 17:15:45 ragge Exp $"); #include #include Index: src/sys/arch/vax/uba/uba_cmi.c diff -u src/sys/arch/vax/uba/uba_cmi.c:1.15 src/sys/arch/vax/uba/uba_cmi.c:1.16 --- src/sys/arch/vax/uba/uba_cmi.c:1.15 Tue Dec 14 23:38:30 2010 +++ src/sys/arch/vax/uba/uba_cmi.c Mon May 22 17:15:45 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $ */ +/* $NetBSD: uba_cmi.c,v 1.16 2017/05/22 17:15:45 ragge Exp $ */ /* * Copyright (c) 1982, 1986 The Regents of the University of California. * All rights reserved. @@ -43,13 +43,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -68,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.16 2017/05/22 17:15:45 ragge Exp $"); #define _VAX_BUS_DMA_PRIVATE Index: src/sys/arch/vax/uba/uba_mainbus.c diff -u src/sys/arch/vax/uba/uba_mainbus.c:1.13 src/sys/arch/vax/uba/uba_mainbus.c:1.14 --- src/sys/arch/vax/uba/uba_mainbus.c:1.13 Fri Apr 22 18:12:47 2016 +++ src/sys/arch/vax/uba/uba_mainbus.c Mon May 22 17:15:45 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: uba_mainbus.c,v 1.13 2016/04/22 18:12:47 christos Exp $ */ +/* $NetBSD: uba_mainbus.c,v 1.14 2017/05/22 17:15:45 ragge Exp $ */ /* * Copyright (c) 1982, 1986 The Regents of the University of California. * All rights reserved. @@ -43,13 +43,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its
CVS commit: src/sys/arch/vax/mba
Module Name:src Committed By: ragge Date: Mon May 22 17:13:09 UTC 2017 Modified Files: src/sys/arch/vax/mba: hp.c hpreg.h mba.c mbareg.h mbavar.h Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/vax/mba/hp.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/mba/hpreg.h \ src/sys/arch/vax/mba/mbareg.h cvs rdiff -u -r1.39 -r1.40 src/sys/arch/vax/mba/mba.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/mba/mbavar.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/vax/mba/hp.c diff -u src/sys/arch/vax/mba/hp.c:1.53 src/sys/arch/vax/mba/hp.c:1.54 --- src/sys/arch/vax/mba/hp.c:1.53 Thu Jul 7 06:55:39 2016 +++ src/sys/arch/vax/mba/hp.c Mon May 22 17:13:09 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: hp.c,v 1.53 2016/07/07 06:55:39 msaitoh Exp $ */ +/* $NetBSD: hp.c,v 1.54 2017/05/22 17:13:09 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -42,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.53 2016/07/07 06:55:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.54 2017/05/22 17:13:09 ragge Exp $"); #include #include Index: src/sys/arch/vax/mba/hpreg.h diff -u src/sys/arch/vax/mba/hpreg.h:1.5 src/sys/arch/vax/mba/hpreg.h:1.6 --- src/sys/arch/vax/mba/hpreg.h:1.5 Sun Jun 4 18:04:39 2000 +++ src/sys/arch/vax/mba/hpreg.h Mon May 22 17:13:09 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: hpreg.h,v 1.5 2000/06/04 18:04:39 ragge Exp $ */ +/* $NetBSD: hpreg.h,v 1.6 2017/05/22 17:13:09 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/mba/mbareg.h diff -u src/sys/arch/vax/mba/mbareg.h:1.5 src/sys/arch/vax/mba/mbareg.h:1.6 --- src/sys/arch/vax/mba/mbareg.h:1.5 Thu Oct 16 12:47:22 2008 +++ src/sys/arch/vax/mba/mbareg.h Mon May 22 17:13:09 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: mbareg.h,v 1.5 2008/10/16 12:47:22 hans Exp $ */ +/* $NetBSD: mbareg.h,v 1.6 2017/05/22 17:13:09 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden * All rights reserved. @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/mba/mba.c diff -u src/sys/arch/vax/mba/mba.c:1.39 src/sys/arch/vax/mba/mba.c:1.40 --- src/sys/arch/vax/mba/mba.c:1.39 Tue Dec 14 23:38:30 2010 +++ src/sys/arch/vax/mba/mba.c Mon May 22 17:13:09 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: mba.c,v 1.39 2010/12/14 23:38:30 matt Exp $ */ +/* $NetBSD: mba.c,v 1.40 2017/05/22 17:13:09 ragge Exp $ */ /* * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden. * All rights
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: ragge Date: Mon May 22 17:12:11 UTC 2017 Modified Files: src/sys/arch/vax/include: cca.h clock.h cpu.h frame.h ka410.h ka420.h ka43.h ka46.h ka48.h ka670.h ka680.h ka730.h ka750.h ka88.h lock.h macros.h mtpr.h pcb.h pte.h ptrace.h reg.h rpb.h rsp.h scb.h sid.h userret.h uvax.h vsbus.h Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/vax/include/cca.h \ src/sys/arch/vax/include/frame.h src/sys/arch/vax/include/ka680.h \ src/sys/arch/vax/include/rsp.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/include/clock.h \ src/sys/arch/vax/include/ptrace.h src/sys/arch/vax/include/rpb.h cvs rdiff -u -r1.99 -r1.100 src/sys/arch/vax/include/cpu.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/include/ka410.h \ src/sys/arch/vax/include/ka88.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/include/ka420.h \ src/sys/arch/vax/include/ka46.h src/sys/arch/vax/include/ka48.h \ src/sys/arch/vax/include/ka670.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/include/ka43.h \ src/sys/arch/vax/include/uvax.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/include/ka730.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/include/ka750.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/include/lock.h cvs rdiff -u -r1.45 -r1.46 src/sys/arch/vax/include/macros.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/vax/include/mtpr.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/include/pcb.h \ src/sys/arch/vax/include/userret.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/include/pte.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/reg.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/include/scb.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/include/sid.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/include/vsbus.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/vax/include/cca.h diff -u src/sys/arch/vax/include/cca.h:1.2 src/sys/arch/vax/include/cca.h:1.3 --- src/sys/arch/vax/include/cca.h:1.2 Tue Mar 11 05:34:02 2008 +++ src/sys/arch/vax/include/cca.h Mon May 22 17:12:11 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: cca.h,v 1.2 2008/03/11 05:34:02 matt Exp $ */ +/* $NetBSD: cca.h,v 1.3 2017/05/22 17:12:11 ragge Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/include/frame.h diff -u src/sys/arch/vax/include/frame.h:1.2 src/sys/arch/vax/include/frame.h:1.3 --- src/sys/arch/vax/include/frame.h:1.2 Sun Jun 4 19:30:15 2000 +++ src/sys/arch/vax/include/frame.h Mon May 22 17:12:11 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: frame.h,v 1.2 2000/06/04 19:30:15 matt Exp $ */ +/* $NetBSD: frame.h,v 1.3 2017/05/22 17:12:11 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/include/ka680.h diff -u src/sys/arch/vax/include/ka680.h:1.2 src/sys/arch/vax/include/ka680.h:1.3 --- src/sys/arch/vax/include/ka680.h:1.2 Sun Dec 1 21:21:45 2002 +++ src/sys/arch/vax/include/ka680.h Mon May 22 17:12:11 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ka680.h,v 1.2 2002/12/01 21:21:45 matt Exp $ */ +/* $NetBSD: ka680.h,v 1.3 2017/05/22 17:12:11 ragge Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. *
CVS commit: src/sys/arch/vax/if
Module Name:src Committed By: ragge Date: Mon May 22 17:02:41 UTC 2017 Modified Files: src/sys/arch/vax/if: if_ze.c Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/if/if_ze.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/if/if_ze.c diff -u src/sys/arch/vax/if/if_ze.c:1.17 src/sys/arch/vax/if/if_ze.c:1.18 --- src/sys/arch/vax/if/if_ze.c:1.17 Tue Dec 14 23:38:30 2010 +++ src/sys/arch/vax/if/if_ze.c Mon May 22 17:02:41 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $ */ +/* $NetBSD: if_ze.c,v 1.18 2017/05/22 17:02:41 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. * @@ -10,12 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.18 2017/05/22 17:02:41 ragge Exp $"); #include "opt_cputype.h"
CVS commit: src/sys/arch/vax/boot/xxboot
Module Name:src Committed By: ragge Date: Mon May 22 17:00:55 UTC 2017 Modified Files: src/sys/arch/vax/boot/xxboot: start.S Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/boot/xxboot/start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/boot/xxboot/start.S diff -u src/sys/arch/vax/boot/xxboot/start.S:1.5 src/sys/arch/vax/boot/xxboot/start.S:1.6 --- src/sys/arch/vax/boot/xxboot/start.S:1.5 Thu Apr 4 12:48:07 2013 +++ src/sys/arch/vax/boot/xxboot/start.S Mon May 22 17:00:55 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: start.S,v 1.5 2013/04/04 12:48:07 martin Exp $ */ +/* $NetBSD: start.S,v 1.6 2017/05/22 17:00:55 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -14,12 +14,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
CVS commit: src/sys/arch/vax/boot/common
Module Name:src Committed By: ragge Date: Mon May 22 17:00:19 UTC 2017 Modified Files: src/sys/arch/vax/boot/common: romread.S srt0.S str.S Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/boot/common/romread.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/boot/common/srt0.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/boot/common/str.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/boot/common/romread.S diff -u src/sys/arch/vax/boot/common/romread.S:1.1 src/sys/arch/vax/boot/common/romread.S:1.2 --- src/sys/arch/vax/boot/common/romread.S:1.1 Sun Feb 24 01:04:25 2002 +++ src/sys/arch/vax/boot/common/romread.S Mon May 22 17:00:19 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: romread.S,v 1.1 2002/02/24 01:04:25 matt Exp $ */ +/* $NetBSD: romread.S,v 1.2 2017/05/22 17:00:19 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -14,12 +14,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/boot/common/srt0.S diff -u src/sys/arch/vax/boot/common/srt0.S:1.4 src/sys/arch/vax/boot/common/srt0.S:1.5 --- src/sys/arch/vax/boot/common/srt0.S:1.4 Mon Dec 2 20:23:32 2002 +++ src/sys/arch/vax/boot/common/srt0.S Mon May 22 17:00:19 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.4 2002/12/02 20:23:32 ragge Exp $ */ +/* $NetBSD: srt0.S,v 1.5 2017/05/22 17:00:19 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/boot/common/str.S diff -u src/sys/arch/vax/boot/common/str.S:1.5 src/sys/arch/vax/boot/common/str.S:1.6 --- src/sys/arch/vax/boot/common/str.S:1.5 Sun Dec 11 12:19:34 2005 +++ src/sys/arch/vax/boot/common/str.S Mon May 22 17:00:19 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: str.S,v 1.5 2005/12/11 12:19:34 christos Exp $ */ +/* $NetBSD: str.S,v 1.6 2017/05/22 17:00:19 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src Committed By: ragge Date: Mon May 22 16:59:32 UTC 2017 Modified Files: src/sys/arch/vax/boot/boot: autoconf.c conf.c consio.c consio2.S ctu.c data.h devopen.c hp.c if_de.c if_le.c if_ni.c mfm.c ra.c rom.c tmscp.c vaxstand.h Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/vax/boot/boot/autoconf.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/boot/boot/conf.c \ src/sys/arch/vax/boot/boot/consio.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/boot/boot/consio2.S cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/boot/boot/ctu.c \ src/sys/arch/vax/boot/boot/if_de.c src/sys/arch/vax/boot/boot/tmscp.c \ src/sys/arch/vax/boot/boot/vaxstand.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/boot/boot/data.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/boot/boot/devopen.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/boot/boot/hp.c \ src/sys/arch/vax/boot/boot/rom.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/boot/boot/if_le.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/boot/boot/if_ni.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/boot/boot/mfm.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/boot/boot/ra.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/boot/boot/autoconf.c diff -u src/sys/arch/vax/boot/boot/autoconf.c:1.28 src/sys/arch/vax/boot/boot/autoconf.c:1.29 --- src/sys/arch/vax/boot/boot/autoconf.c:1.28 Wed Mar 18 10:22:37 2009 +++ src/sys/arch/vax/boot/boot/autoconf.c Mon May 22 16:59:32 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.28 2009/03/18 10:22:37 cegger Exp $ */ +/* $NetBSD: autoconf.c,v 1.29 2017/05/22 16:59:32 ragge Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/boot/boot/conf.c diff -u src/sys/arch/vax/boot/boot/conf.c:1.16 src/sys/arch/vax/boot/boot/conf.c:1.17 --- src/sys/arch/vax/boot/boot/conf.c:1.16 Fri Jun 28 01:13:40 2013 +++ src/sys/arch/vax/boot/boot/conf.c Mon May 22 16:59:32 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.16 2013/06/28 01:13:40 matt Exp $ */ +/* $NetBSD: conf.c,v 1.17 2017/05/22 16:59:32 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/boot/boot/consio.c diff -u src/sys/arch/vax/boot/boot/consio.c:1.16 src/sys/arch/vax/boot/boot/consio.c:1.17 --- src/sys/arch/vax/boot/boot/consio.c:1.16 Thu Jul 7 06:55:39 2016 +++ src/sys/arch/vax/boot/boot/consio.c Mon May 22 16:59:32 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: consio.c,v 1.16 2016/07/07 06:55:39 msaitoh Exp $ */ +/* $NetBSD: consio.c,v 1.17 2017/05/22 16:59:32 ragge Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,11 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without
CVS commit: src/sys/arch/vax/bi
Module Name:src Committed By: ragge Date: Mon May 22 16:53:59 UTC 2017 Modified Files: src/sys/arch/vax/bi: bi_mainbus.c bi_nmi.c Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/bi/bi_mainbus.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/bi/bi_nmi.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/bi/bi_mainbus.c diff -u src/sys/arch/vax/bi/bi_mainbus.c:1.11 src/sys/arch/vax/bi/bi_mainbus.c:1.12 --- src/sys/arch/vax/bi/bi_mainbus.c:1.11 Tue Dec 14 23:38:30 2010 +++ src/sys/arch/vax/bi/bi_mainbus.c Mon May 22 16:53:59 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $ */ +/* $NetBSD: bi_mainbus.c,v 1.12 2017/05/22 16:53:59 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.12 2017/05/22 16:53:59 ragge Exp $"); #define _VAX_BUS_DMA_PRIVATE Index: src/sys/arch/vax/bi/bi_nmi.c diff -u src/sys/arch/vax/bi/bi_nmi.c:1.8 src/sys/arch/vax/bi/bi_nmi.c:1.9 --- src/sys/arch/vax/bi/bi_nmi.c:1.8 Tue Dec 14 23:38:30 2010 +++ src/sys/arch/vax/bi/bi_nmi.c Mon May 22 16:53:59 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $ */ +/* $NetBSD: bi_nmi.c,v 1.9 2017/05/22 16:53:59 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.9 2017/05/22 16:53:59 ragge Exp $"); #define _VAX_BUS_DMA_PRIVATE
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: ragge Date: Mon May 22 16:53:05 UTC 2017 Modified Files: src/sys/arch/vax/vax: ka88.c locore.c multicpu.c nmi_mainbus.c opcodes.c pmap.c sbi.c scb.c sig_machdep.c subr.S syscall.c trap.c ubi.c unimpl_emul.S vm_machdep.c xmi_mainbus.c Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/ka88.c \ src/sys/arch/vax/vax/scb.c cvs rdiff -u -r1.83 -r1.84 src/sys/arch/vax/vax/locore.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/multicpu.c \ src/sys/arch/vax/vax/subr.S cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/vax/nmi_mainbus.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/vax/vax/opcodes.c cvs rdiff -u -r1.184 -r1.185 src/sys/arch/vax/vax/pmap.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/vax/vax/sbi.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/sig_machdep.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/vax/syscall.c cvs rdiff -u -r1.134 -r1.135 src/sys/arch/vax/vax/trap.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vax/ubi.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vax/unimpl_emul.S cvs rdiff -u -r1.117 -r1.118 src/sys/arch/vax/vax/vm_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vax/xmi_mainbus.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/vax/ka88.c diff -u src/sys/arch/vax/vax/ka88.c:1.18 src/sys/arch/vax/vax/ka88.c:1.19 --- src/sys/arch/vax/vax/ka88.c:1.18 Wed Mar 26 08:01:21 2014 +++ src/sys/arch/vax/vax/ka88.c Mon May 22 16:53:05 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ka88.c,v 1.18 2014/03/26 08:01:21 christos Exp $ */ +/* $NetBSD: ka88.c,v 1.19 2017/05/22 16:53:05 ragge Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -39,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.18 2014/03/26 08:01:21 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.19 2017/05/22 16:53:05 ragge Exp $"); #include "opt_multiprocessor.h" Index: src/sys/arch/vax/vax/scb.c diff -u src/sys/arch/vax/vax/scb.c:1.18 src/sys/arch/vax/vax/scb.c:1.19 --- src/sys/arch/vax/vax/scb.c:1.18 Tue Dec 14 23:44:49 2010 +++ src/sys/arch/vax/vax/scb.c Mon May 22 16:53:05 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: scb.c,v 1.18 2010/12/14 23:44:49 matt Exp $ */ +/* $NetBSD: scb.c,v 1.19 2017/05/22 16:53:05 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -34,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: scb.c,v 1.18 2010/12/14 23:44:49 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scb.c,v 1.19 2017/05/22 16:53:05 ragge Exp $"); #include #include Index: src/sys/arch/vax/vax/locore.c diff -u src/sys/arch/vax/vax/locore.c:1.83 src/sys/arch/vax/vax/locore.c:1.84 --- src/sys/arch/vax/vax/locore.c:1.83 Thu Aug 27 17:18:58 2015 +++ src/sys/arch/vax/vax/locore.c Mon May 22 16:53:05 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.c,v 1.83 2015/08/27 17:18:58 jklos Exp $ */ +/* $NetBSD: locore.c,v 1.84 2017/05/22 16:53:05 ragge Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,11 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: ragge Date: Mon May 22 16:46:15 UTC 2017 Modified Files: src/sys/arch/vax/vax: gencons.c gencons.h intvec.S ka410.c ka43.c ka46.c ka48.c ka49.c ka53.c ka610.c ka6400.c ka660.c ka670.c ka680.c ka730.c ka750.c Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/vax/vax/gencons.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vax/gencons.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/intvec.S \ src/sys/arch/vax/vax/ka48.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/ka410.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/vax/ka43.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/vax/vax/ka46.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/vax/ka49.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/vax/ka53.c \ src/sys/arch/vax/vax/ka670.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vax/ka610.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/ka6400.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/vax/ka660.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vax/ka680.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vax/ka730.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/vax/vax/ka750.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/vax/gencons.c diff -u src/sys/arch/vax/vax/gencons.c:1.55 src/sys/arch/vax/vax/gencons.c:1.56 --- src/sys/arch/vax/vax/gencons.c:1.55 Thu Jul 7 06:55:39 2016 +++ src/sys/arch/vax/vax/gencons.c Mon May 22 16:46:15 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gencons.c,v 1.55 2016/07/07 06:55:39 msaitoh Exp $ */ +/* $NetBSD: gencons.c,v 1.56 2017/05/22 16:46:15 ragge Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -13,9 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. * 4. The name of the author may not be used to endorse or promote products *derived from this software without specific prior written permission * @@ -36,7 +33,7 @@ /* All bugs are subject to removal without further notice */ #include -__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.55 2016/07/07 06:55:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.56 2017/05/22 16:46:15 ragge Exp $"); #include "opt_ddb.h" #include "opt_cputype.h" Index: src/sys/arch/vax/vax/gencons.h diff -u src/sys/arch/vax/vax/gencons.h:1.10 src/sys/arch/vax/vax/gencons.h:1.11 --- src/sys/arch/vax/vax/gencons.h:1.10 Sun Jun 3 15:07:20 2001 +++ src/sys/arch/vax/vax/gencons.h Mon May 22 16:46:15 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gencons.h,v 1.10 2001/06/03 15:07:20 ragge Exp $ */ +/* $NetBSD: gencons.h,v 1.11 2017/05/22 16:46:15 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -12,11 +12,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/vax/vax/intvec.S diff -u src/sys/arch/vax/vax/intvec.S:1.21 src/sys/arch/vax/vax/intvec.S:1.22 --- src/sys/arch/vax/vax/intvec.S:1.21 Thu Feb 2 18:31:41 2012 +++ src/sys/arch/vax/vax/intvec.S Mon May 22 16:46:15 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: intvec.S,v 1.21 2012/02/02 18:31:41 matt Exp $ */ +/* $NetBSD: intvec.S,v 1.22 2017/05/22 16:46:15 ragge Exp $ */ /* * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden. @@ -12,11 +12,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission *
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: ragge Date: Mon May 22 16:39:41 UTC 2017 Modified Files: src/sys/arch/vax/vax: autoconf.c bus_mem.c cfl.c clock.c cmi.c core_machdep.c ctu.c db_disasm.c db_disasm.h findcpu.c genassym.cf Log Message: Update copyright notice for Ludd (remove clause 3 & 4). To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/vax/vax/autoconf.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/vax/bus_mem.c \ src/sys/arch/vax/vax/cmi.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/vax/cfl.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/vax/vax/clock.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/vax/core_machdep.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/vax/ctu.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/vax/vax/db_disasm.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/vax/db_disasm.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/vax/findcpu.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/vax/genassym.cf 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/vax/autoconf.c diff -u src/sys/arch/vax/vax/autoconf.c:1.96 src/sys/arch/vax/vax/autoconf.c:1.97 --- src/sys/arch/vax/vax/autoconf.c:1.96 Tue May 20 16:02:37 2014 +++ src/sys/arch/vax/vax/autoconf.c Mon May 22 16:39:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $ */ +/* $NetBSD: autoconf.c,v 1.97 2017/05/22 16:39:40 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -12,11 +12,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of Lule}. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.97 2017/05/22 16:39:40 ragge Exp $"); #include "opt_compat_netbsd.h" #include "opt_cputype.h" Index: src/sys/arch/vax/vax/bus_mem.c diff -u src/sys/arch/vax/vax/bus_mem.c:1.13 src/sys/arch/vax/vax/bus_mem.c:1.14 --- src/sys/arch/vax/vax/bus_mem.c:1.13 Tue Dec 14 23:44:49 2010 +++ src/sys/arch/vax/vax/bus_mem.c Mon May 22 16:39:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_mem.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */ +/* $NetBSD: bus_mem.c,v 1.14 2017/05/22 16:39:40 ragge Exp $ */ /* * Copyright (c) 1998 Matt Thomas * All rights reserved. @@ -13,12 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -33,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bus_mem.c,v 1.13 2010/12/14 23:44:49 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_mem.c,v 1.14 2017/05/22 16:39:40 ragge Exp $"); #include #include Index: src/sys/arch/vax/vax/cmi.c diff -u src/sys/arch/vax/vax/cmi.c:1.13 src/sys/arch/vax/vax/cmi.c:1.14 --- src/sys/arch/vax/vax/cmi.c:1.13 Tue Dec 14 23:44:49 2010 +++ src/sys/arch/vax/vax/cmi.c Mon May 22 16:39:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: cmi.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */ +/* $NetBSD: cmi.c,v 1.14 2017/05/22 16:39:40 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -11,12 +11,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed at Ludd, University of - * Lule}, Sweden and its contributors. - * 4. The name of the
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: skrll Date: Tue Apr 11 07:45:37 UTC 2017 Modified Files: src/sys/arch/vax/include: ptrace.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/include/ptrace.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/vax/include/ptrace.h diff -u src/sys/arch/vax/include/ptrace.h:1.7 src/sys/arch/vax/include/ptrace.h:1.8 --- src/sys/arch/vax/include/ptrace.h:1.7 Sat Apr 8 00:25:49 2017 +++ src/sys/arch/vax/include/ptrace.h Tue Apr 11 07:45:36 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.h,v 1.7 2017/04/08 00:25:49 kamil Exp $ */ +/* $NetBSD: ptrace.h,v 1.8 2017/04/11 07:45:36 skrll Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -31,7 +31,7 @@ */ /* All bugs are subject to removal without further notice */ - + #define PT_STEP (PT_FIRSTMACH + 0) #define PT_GETREGS (PT_FIRSTMACH + 1)
CVS commit: src/sys/arch/vax/include
Module Name:src
Committed By: christos
Date: Sat Jan 14 16:21:28 UTC 2017
Modified Files:
src/sys/arch/vax/include: byte_swap.h
Log Message:
cast return value
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/include/byte_swap.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/vax/include/byte_swap.h
diff -u src/sys/arch/vax/include/byte_swap.h:1.11 src/sys/arch/vax/include/byte_swap.h:1.12
--- src/sys/arch/vax/include/byte_swap.h:1.11 Fri Feb 17 03:41:31 2006
+++ src/sys/arch/vax/include/byte_swap.h Sat Jan 14 11:21:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap.h,v 1.11 2006/02/17 08:41:31 skrll Exp $ */
+/* $NetBSD: byte_swap.h,v 1.12 2017/01/14 16:21:28 christos Exp $ */
/*
* Copyright (c) 1987, 1991 Regents of the University of California.
@@ -61,7 +61,7 @@ static __inline uint16_t __attribute__((
__byte_swap_u16_variable(uint16_t x)
{
- return (x << 8 | x >> 8);
+ return (uint16_t)(x << 8 | x >> 8);
}
__END_DECLS
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/boot/boot
Module Name:src
Committed By: dholland
Date: Sat Jun 11 06:42:27 UTC 2016
Modified Files:
src/sys/arch/vax/boot/boot: boot.c
Log Message:
PR 51200 gets in libsa considered harmful: use kgets
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/boot/boot/boot.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/boot/boot/boot.c
diff -u src/sys/arch/vax/boot/boot/boot.c:1.33 src/sys/arch/vax/boot/boot/boot.c:1.34
--- src/sys/arch/vax/boot/boot/boot.c:1.33 Fri Jun 5 16:01:55 2015
+++ src/sys/arch/vax/boot/boot/boot.c Sat Jun 11 06:42:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.33 2015/06/05 16:01:55 martin Exp $ */
+/* $NetBSD: boot.c,v 1.34 2016/06/11 06:42:27 dholland Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -163,7 +163,7 @@ Xmain(void)
char *c, *d;
printf("> ");
- gets(line);
+ kgets(line, sizeof(line));
c = line;
while (*c == ' ')
CVS commit: src/sys/arch/vax/uba
Module Name:src
Committed By: christos
Date: Fri Apr 22 18:12:47 UTC 2016
Modified Files:
src/sys/arch/vax/uba: uba_mainbus.c
Log Message:
Use the right variable (Felix Deichmann)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/uba/uba_mainbus.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/uba/uba_mainbus.c
diff -u src/sys/arch/vax/uba/uba_mainbus.c:1.12 src/sys/arch/vax/uba/uba_mainbus.c:1.13
--- src/sys/arch/vax/uba/uba_mainbus.c:1.12 Sun Jul 5 00:53:26 2015
+++ src/sys/arch/vax/uba/uba_mainbus.c Fri Apr 22 14:12:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_mainbus.c,v 1.12 2015/07/05 04:53:26 matt Exp $ */
+/* $NetBSD: uba_mainbus.c,v 1.13 2016/04/22 18:12:47 christos Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uba_mainbus.c,v 1.12 2015/07/05 04:53:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_mainbus.c,v 1.13 2016/04/22 18:12:47 christos Exp $");
#define _VAX_BUS_DMA_PRIVATE
@@ -193,7 +193,7 @@ qba_beforescan(struct uba_softc *sc)
{
#define QIPCR 0x1f40
#define Q_LMEAE 0x20
- bus_space_write_2(sc->uh_tag, sc->uh_ioh, QIPCR, Q_LMEAE);
+ bus_space_write_2(sc->uh_iot, sc->uh_ioh, QIPCR, Q_LMEAE);
}
void
CVS commit: src/sys/arch/vax/boot
Module Name:src Committed By: christos Date: Sun Mar 13 17:48:53 UTC 2016 Modified Files: src/sys/arch/vax/boot: Makefile.inc Log Message: Add NO variables for the things that boot block does not support (SSP/PIE/DEBUG/FORTIFY) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/boot/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/sys/arch/vax/boot/Makefile.inc diff -u src/sys/arch/vax/boot/Makefile.inc:1.16 src/sys/arch/vax/boot/Makefile.inc:1.17 --- src/sys/arch/vax/boot/Makefile.inc:1.16 Wed Aug 21 02:15:41 2013 +++ src/sys/arch/vax/boot/Makefile.inc Sun Mar 13 13:48:53 2016 @@ -1,4 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.16 2013/08/21 06:15:41 matt Exp $ +# $NetBSD: Makefile.inc,v 1.17 2016/03/13 17:48:53 christos Exp $ + +NOSSP= +NOFORTIFY= +NOPIE= +NODEBUG= .include
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: tsutsui
Date: Sun Jan 17 03:08:39 UTC 2016
Modified Files:
src/sys/arch/vax/boot/boot: Makefile
Log Message:
Make this build without installed DESTDIR files.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/vax/boot/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.42 src/sys/arch/vax/boot/boot/Makefile:1.43
--- src/sys/arch/vax/boot/boot/Makefile:1.42 Sat May 24 07:38:42 2014
+++ src/sys/arch/vax/boot/boot/Makefile Sun Jan 17 03:08:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2014/05/24 07:38:42 martin Exp $
+# $NetBSD: Makefile,v 1.43 2016/01/17 03:08:39 tsutsui Exp $
S= ${.CURDIR}/../../../..
@@ -8,7 +8,13 @@ PROG= boot
DEVS= hp.c ctu.c ra.c mfm.c if_qe.c if_le.c if_ze.c if_de.c if_ni.c
SRCS= srt0.S boot.c devopen.c conf.c autoconf.c netio.c rom.c romread.S \
consio.c consio2.S str.S ${DEVS} findcpu.c vers.c
+
+# XXX SHOULD NOT NEED TO DEFINE THESE!
LIBC=
+LIBCRT0=
+LIBCRTI=
+LIBCRTBEGIN=
+LIBCRTEND=
CLEANFILES+=${PROG} ${PROG}.sym vers.c
# XXX - hack, doesn't work with -O2 and gcc 4.8
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: tsutsui
Date: Sun Jan 17 04:53:16 UTC 2016
Modified Files:
src/sys/arch/vax/boot/boot: Makefile version
Log Message:
Enable LIBSA_CREAD_NOCRC. PR/50638
Bump version to denote user visible change.
Tested on simh 4.0-Beta1 emulationg MicroVAX 3900.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/vax/boot/boot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/boot/boot/version
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/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.43 src/sys/arch/vax/boot/boot/Makefile:1.44
--- src/sys/arch/vax/boot/boot/Makefile:1.43 Sun Jan 17 03:08:39 2016
+++ src/sys/arch/vax/boot/boot/Makefile Sun Jan 17 04:53:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/01/17 03:08:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.44 2016/01/17 04:53:16 tsutsui Exp $
S= ${.CURDIR}/../../../..
@@ -21,6 +21,7 @@ CLEANFILES+=${PROG} ${PROG}.sym vers.c
CFLAGS+=-O1
CPPFLAGS+=-DSUPPORT_BOOTPARAMS -DSUPPORT_BOOTP -DSUPPORT_DHCP -D_STANDALONE \
-DNO_MID_CHECK
+CPPFLAGS+=-DLIBSA_CREAD_NOCRC
#CPPFLAGS+=-DBOOTP_DEBUG -DNETIF_DEBUG -DETHER_DEBUG -DNFS_DEBUG -DDEV_DEBUG \
# -DRPC_DEBUG -DRARP_DEBUG -DPARANOID
BINDIR=
Index: src/sys/arch/vax/boot/boot/version
diff -u src/sys/arch/vax/boot/boot/version:1.7 src/sys/arch/vax/boot/boot/version:1.8
--- src/sys/arch/vax/boot/boot/version:1.7 Sat Oct 18 08:33:27 2014
+++ src/sys/arch/vax/boot/boot/version Sun Jan 17 04:53:16 2016
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.7 2014/10/18 08:33:27 snj Exp $
+$NetBSD: version,v 1.8 2016/01/17 04:53:16 tsutsui Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@@ -28,3 +28,4 @@ is taken as the current.
1.9: Support verbose/quiet boot.
1.10: loadfile() update: ELF symbols no longer need backward seeks.
1.11: loadfile() update to avoid backwards seeks for ELF Program Headers.
+1.12: Disable slow gunzip CRC32 calculation.
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: jklos
Date: Thu Aug 27 17:18:58 UTC 2015
Modified Files:
src/sys/arch/vax/vax: locore.c
Log Message:
Cosmetic fix for VAXstation 4000/90, 90a, 96 dmesg output from Felix
Deichmann.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/vax/vax/locore.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/vax/locore.c
diff -u src/sys/arch/vax/vax/locore.c:1.82 src/sys/arch/vax/vax/locore.c:1.83
--- src/sys/arch/vax/vax/locore.c:1.82 Fri May 23 19:05:35 2014
+++ src/sys/arch/vax/vax/locore.c Thu Aug 27 17:18:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.c,v 1.82 2014/05/23 19:05:35 martin Exp $ */
+/* $NetBSD: locore.c,v 1.83 2015/08/27 17:18:58 jklos Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -32,7 +32,7 @@
/* All bugs are subject to removal without further notice */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: locore.c,v 1.82 2014/05/23 19:05:35 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore.c,v 1.83 2015/08/27 17:18:58 jklos Exp $);
#include opt_compat_netbsd.h
@@ -190,7 +190,7 @@ _start(struct rpb *prpb)
#if VAX49 || VAXANY
case VAX_BTYP_49:
dep_call = ka49_calls;
- cpu_setmodel(%s 4000/90, mv);
+ cpu_setmodel(%s 4000/{90,90A,96}, mv);
mv = NULL;
break;
#endif
CVS commit: src/sys/arch/vax/uba
Module Name:src Committed By: matt Date: Sun Jul 5 03:07:21 UTC 2015 Modified Files: src/sys/arch/vax/uba: qv.c Added Files: src/sys/arch/vax/uba: qv_ic.h qvareg.h qvaux.c qvavar.h qvkbd.c qvkbdvar.h qvms.c Log Message: Revamped QVSS (VCB01) support. (from Charles Dickman) To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/vax/uba/qv.c cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/uba/qv_ic.h \ src/sys/arch/vax/uba/qvareg.h src/sys/arch/vax/uba/qvaux.c \ src/sys/arch/vax/uba/qvavar.h src/sys/arch/vax/uba/qvkbd.c \ src/sys/arch/vax/uba/qvkbdvar.h src/sys/arch/vax/uba/qvms.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/uba/qv.c diff -u src/sys/arch/vax/uba/qv.c:1.30 src/sys/arch/vax/uba/qv.c:1.31 --- src/sys/arch/vax/uba/qv.c:1.30 Fri Jul 25 08:10:35 2014 +++ src/sys/arch/vax/uba/qv.c Sun Jul 5 03:07:21 2015 @@ -1,13 +1,9 @@ -/* $NetBSD: qv.c,v 1.30 2014/07/25 08:10:35 dholland Exp $ */ - -/*- - * Copyright (c) 1988 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. +/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.31 2015/07/05 03:07:21 matt Exp $*/ +/* + * Copyright (c) 2015 Charles H. Dickman. All rights reserved. + * Derived from smg.c + * Copyright (c) 1998 Ludd, University of Lule}, Sweden. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -17,1316 +13,1023 @@ * 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. - * 3. Neither the name of the University nor the names of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + * This product includes software developed at Ludd, University of + * Lule}, Sweden and its contributors. + * 4. The name of the author may not be used to endorse or promote products + *derived from this software without specific prior written permission * - * @(#)qv.c 7.2 (Berkeley) 1/21/94 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. */ +/* 1 2 3 4 5 6 7*/ +/*3456789012345678901234567890123456789012345678901234567890123456789012345678*/ -/* - * derived from: @(#)qv.c 1.8 (ULTRIX) 8/21/85 - */ +#include sys/cdefs.h +__KERNEL_RCSID(0, $Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.31 2015/07/05 03:07:21 matt Exp $); -/ - * * - * Copyright (c) 1985 by* - * Digital Equipment Corporation, Maynard, MA * - * All rights reserved.* - * * - * This software is furnished under a license and may be used and * - * copied only in accordance
CVS commit: src/sys/arch/vax/conf
Module Name:src
Committed By: matt
Date: Sun Jul 5 03:06:28 UTC 2015
Modified Files:
src/sys/arch/vax/conf: files.vax majors.vax
Log Message:
Configury support for QVSS (from Charles Dickman)
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.25 -r1.26 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/sys/arch/vax/conf/files.vax
diff -u src/sys/arch/vax/conf/files.vax:1.119 src/sys/arch/vax/conf/files.vax:1.120
--- src/sys/arch/vax/conf/files.vax:1.119 Fri Dec 19 04:44:13 2014
+++ src/sys/arch/vax/conf/files.vax Sun Jul 5 03:06:27 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.vax,v 1.119 2014/12/19 04:44:13 jklos Exp $
+# $NetBSD: files.vax,v 1.120 2015/07/05 03:06:27 matt Exp $
#
# new style config file for vax architecture
#
@@ -185,6 +185,22 @@ device smg: displaydev, wsemuldisplaydev
attach smg at vsbus
file arch/vax/vsa/smg.c smg needs-flag
+# Monochrome QVSS framebuffer on qbus (VCB01)
+device qv {}: displaydev, wsemuldisplaydev
+attach qv at uba
+attach genfb at qv with genfb_qv
+file arch/vax/uba/qv.c qv|genfb_qv needs-flag
+
+device qvaux { line=-1 }: tty
+attach qvaux at qv
+file arch/vax/uba/qvaux.c qvaux needs-flag
+
+attach lkkbd at qvaux with qvkbd
+file arch/vax/uba/qvkbd.c qvkbd needs-flag
+
+attach lkms at qvaux with qvms
+file arch/vax/uba/qvms.c qvms needs-flag
+
# Color framebuffer on VS4000/60.
device lcg: displaydev, wsemuldisplaydev
attach lcg at vsbus
@@ -290,11 +306,6 @@ device vp
attach vp at uba
file arch/vax/uba/vp.c vp needs-flag
-# QVSS at UBA
-device qv
-attach qv at uba
-file arch/vax/uba/qv.c qv needs-flag
-
# ACC LH/DH IMP on UBA
device acc: ifnet
attach acc at uba
Index: src/sys/arch/vax/conf/majors.vax
diff -u src/sys/arch/vax/conf/majors.vax:1.25 src/sys/arch/vax/conf/majors.vax:1.26
--- src/sys/arch/vax/conf/majors.vax:1.25 Fri Dec 19 04:44:13 2014
+++ src/sys/arch/vax/conf/majors.vax Sun Jul 5 03:06:27 2015
@@ -1,4 +1,4 @@
-# $NetBSD: majors.vax,v 1.25 2014/12/19 04:44:13 jklos Exp $
+# $NetBSD: majors.vax,v 1.26 2015/07/05 03:06:27 matt Exp $
#
# Device majors for vax
#
@@ -51,6 +51,7 @@ device-major mt char 38 block 15 mt
device-major qd char 41 qd
device-major ipl char 42 ipfilter
device-major ii char 43 ingres
+device-major qvaux char 44 qvaux
device-major crx char 51 vax8200 | vaxany
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: matt
Date: Sun Jul 5 02:03:36 UTC 2015
Modified Files:
src/sys/arch/vax/include: bus.h sgmap.h
src/sys/arch/vax/vax: sgmap.c
Log Message:
Hooks needed for QVSS support
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/vax/include/bus.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/sgmap.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vax/sgmap.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/include/bus.h
diff -u src/sys/arch/vax/include/bus.h:1.31 src/sys/arch/vax/include/bus.h:1.32
--- src/sys/arch/vax/include/bus.h:1.31 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/include/bus.h Sun Jul 5 02:03:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.31 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: bus.h,v 1.32 2015/07/05 02:03:36 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -184,7 +184,11 @@ struct vax_bus_space {
#define bus_space_free(t, h, s) \
(*(t)-vbs_free)((t)-vbs_cookie, (h), (s))
-
+/*
+ * Get kernel virtual address for ranges mapped BUS_SPACE_MAP_LINEAR.
+ */
+#define bus_space_vaddr(t, h) \
+ ((void *) (h))
/*
* Mmap bus space for a user application.
*/
Index: src/sys/arch/vax/include/sgmap.h
diff -u src/sys/arch/vax/include/sgmap.h:1.6 src/sys/arch/vax/include/sgmap.h:1.7
--- src/sys/arch/vax/include/sgmap.h:1.6 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/include/sgmap.h Sun Jul 5 02:03:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap.h,v 1.6 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: sgmap.h,v 1.7 2015/07/05 02:03:36 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -63,6 +63,8 @@ void vax_sgmap_init(bus_dma_tag_t, struc
int vax_sgmap_alloc(bus_dmamap_t, bus_size_t, struct vax_sgmap *, int);
void vax_sgmap_free(bus_dmamap_t, struct vax_sgmap *);
+int vax_sgmap_reserve(bus_addr_t, bus_size_t, struct vax_sgmap *);
+
int vax_sgmap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t,
struct proc *, int, struct vax_sgmap *);
Index: src/sys/arch/vax/vax/sgmap.c
diff -u src/sys/arch/vax/vax/sgmap.c:1.17 src/sys/arch/vax/vax/sgmap.c:1.18
--- src/sys/arch/vax/vax/sgmap.c:1.17 Fri Jan 27 18:53:06 2012
+++ src/sys/arch/vax/vax/sgmap.c Sun Jul 5 02:03:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap.c,v 1.17 2012/01/27 18:53:06 para Exp $ */
+/* $NetBSD: sgmap.c,v 1.18 2015/07/05 02:03:36 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sgmap.c,v 1.17 2012/01/27 18:53:06 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: sgmap.c,v 1.18 2015/07/05 02:03:36 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -124,16 +124,18 @@ vax_sgmap_alloc(bus_dmamap_t map, bus_si
}
map-_dm_sgvalen = vax_round_page(len);
-#if 0
+#define DEBUG_SGMAP 0
+#if DEBUG_SGMAP
printf(len %x - %x, _dm_sgvalen %x _dm_boundary %x boundary %x - ,
- origlen, len, map-_dm_sgvalen, map-_dm_boundary, boundary);
+ //origlen, len, map-_dm_sgvalen, map-_dm_boundary, boundary);
+ (unsigned int)origlen, (unsigned int)len, (unsigned int)map-_dm_sgvalen, (unsigned int)map-_dm_boundary, 1);
#endif
error = extent_alloc(sgmap-aps_ex, map-_dm_sgvalen, VAX_NBPG,
0, (flags BUS_DMA_NOWAIT) ? EX_NOWAIT : EX_WAITOK,
map-_dm_sgva);
-#if 0
- printf(error %d _dm_sgva %x\n, error, map-_dm_sgva);
+#if DEBUG_SGMAP
+ printf(error %d _dm_sgva %lx\n, error, map-_dm_sgva);
#endif
if (error == 0)
@@ -161,6 +163,12 @@ vax_sgmap_free(bus_dmamap_t map, struct
}
int
+vax_sgmap_reserve(bus_addr_t ba, bus_size_t len, struct vax_sgmap *sgmap)
+{
+ return extent_alloc_region(sgmap-aps_ex, ba, len, EX_NOWAIT);
+}
+
+int
vax_sgmap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen,
struct proc *p, int flags, struct vax_sgmap *sgmap)
{
CVS commit: src/sys/arch/vax/uba
Module Name:src
Committed By: matt
Date: Sun Jul 5 04:53:26 UTC 2015
Modified Files:
src/sys/arch/vax/uba: uba_mainbus.c
Log Message:
Typo fxi.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/uba/uba_mainbus.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/uba/uba_mainbus.c
diff -u src/sys/arch/vax/uba/uba_mainbus.c:1.11 src/sys/arch/vax/uba/uba_mainbus.c:1.12
--- src/sys/arch/vax/uba/uba_mainbus.c:1.11 Sun Jul 5 03:03:00 2015
+++ src/sys/arch/vax/uba/uba_mainbus.c Sun Jul 5 04:53:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_mainbus.c,v 1.11 2015/07/05 03:03:00 matt Exp $ */
+/* $NetBSD: uba_mainbus.c,v 1.12 2015/07/05 04:53:26 matt Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uba_mainbus.c,v 1.11 2015/07/05 03:03:00 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uba_mainbus.c,v 1.12 2015/07/05 04:53:26 matt Exp $);
#define _VAX_BUS_DMA_PRIVATE
@@ -163,7 +163,7 @@ qba_attach(device_t parent, device_t sel
} else if (start = 0) {
aprint_normal(sgmap exclusion at %#x - %#x\n,
start*VAX_NBPG, pgnum*VAX_NBPG - 1);
- vax_sgmap_resserve(start*VAX_NBPG,
+ vax_sgmap_reserve(start*VAX_NBPG,
(pgnum - start)*VAX_NBPG, sc-uv_sgmap);
start = -1;
}
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: matt
Date: Sun Jul 5 02:10:53 UTC 2015
Modified Files:
src/sys/arch/vax/vax: conf.c
Log Message:
Reorganize a bit. Add QVSS (from Charles Dickman).
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/vax/vax/conf.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/vax/conf.c
diff -u src/sys/arch/vax/vax/conf.c:1.67 src/sys/arch/vax/vax/conf.c:1.68
--- src/sys/arch/vax/vax/conf.c:1.67 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/conf.c Sun Jul 5 02:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.67 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: conf.c,v 1.68 2015/07/05 02:10:53 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: conf.c,v 1.67 2010/12/14 23:44:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: conf.c,v 1.68 2015/07/05 02:10:53 matt Exp $);
#include opt_cputype.h
@@ -45,10 +45,40 @@ __KERNEL_RCSID(0, $NetBSD: conf.c,v 1.6
*/
#include dev/cons.h
+#include lcg.h
+#include qv.h
#include smg.h
#include spx.h
-#include lcg.h
#include wskbd.h
+
+#if NLCG 0
+#if NWSKBD 0
+#define lcgcngetc wskbd_cngetc
+#else
+static int
+lcgcngetc(dev_t dev)
+{
+ return 0;
+}
+#endif
+
+#define lcgcnputc wsdisplay_cnputc
+#define lcgcnpollc nullcnpollc
+#endif /* NLCG 0 */
+#if NQV 0
+#if NWSKBD 0
+#define qvcngetc wskbd_cngetc
+#else
+static int
+qvcngetc(dev_t dev)
+{
+ return 0;
+}
+#endif
+
+#define qvcnputc wsdisplay_cnputc
+#define qvcnpollc nullcnpollc
+#endif /* NQV 0 */
#if NSMG 0
#if NWSKBD 0
#define smgcngetc wskbd_cngetc
@@ -62,7 +92,7 @@ smgcngetc(dev_t dev)
#define smgcnputc wsdisplay_cnputc
#define smgcnpollc nullcnpollc
-#endif
+#endif /* NSMG 0 */
#if NSPX 0
#if NWSKBD 0
#define spxcngetc wskbd_cngetc
@@ -76,29 +106,15 @@ spxcngetc(dev_t dev)
#define spxcnputc wsdisplay_cnputc
#define spxcnpollc nullcnpollc
-#endif
-#if NLCG 0
-#if NWSKBD 0
-#define lcgcngetc wskbd_cngetc
-#else
-static int
-lcgcngetc(dev_t dev)
-{
- return 0;
-}
-#endif
-
-#define lcgcnputc wsdisplay_cnputc
-#define lcgcnpollc nullcnpollc
-#endif
+#endif /* NSPX 0 */
cons_decl(gen);
cons_decl(dz);
cons_decl(qd);
-cons_decl(smg);
-cons_decl(spx);
cons_decl(lcg);
-#include qv.h
+cons_decl(qv);
+cons_decl(spx);
+cons_decl(smg);
#include qd.h
struct consdev constab[]={
@@ -111,21 +127,21 @@ struct consdev constab[]={
#endif
#if VAX650 || VAX630 || VAXANY
#if NQV
- cons_init(qv), /* QVSS/QDSS bit-mapped console driver */
+ cons_init(qv), /* QVSS bit-mapped console driver */
#endif
#if NQD
cons_init(qd),
#endif
#endif
+#if NLCG
+ cons_init(lcg),
+#endif
#if NSMG
cons_init(smg),
#endif
#if NSPX
cons_init(spx),
#endif
-#if NLCG
- cons_init(lcg),
-#endif
#ifdef notyet
/* We may not always use builtin console, sometimes RD */
CVS commit: src/sys/arch/vax/uba
Module Name:src
Committed By: matt
Date: Sun Jul 5 03:03:00 UTC 2015
Modified Files:
src/sys/arch/vax/uba: uba_mainbus.c
Log Message:
Add code to probe the Q-bus/Unibus for memory. (From Charles Dickman)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/uba/uba_mainbus.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/uba/uba_mainbus.c
diff -u src/sys/arch/vax/uba/uba_mainbus.c:1.10 src/sys/arch/vax/uba/uba_mainbus.c:1.11
--- src/sys/arch/vax/uba/uba_mainbus.c:1.10 Tue Dec 14 23:38:30 2010
+++ src/sys/arch/vax/uba/uba_mainbus.c Sun Jul 5 03:03:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_mainbus.c,v 1.10 2010/12/14 23:38:30 matt Exp $ */
+/* $NetBSD: uba_mainbus.c,v 1.11 2015/07/05 03:03:00 matt Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uba_mainbus.c,v 1.10 2010/12/14 23:38:30 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uba_mainbus.c,v 1.11 2015/07/05 03:03:00 matt Exp $);
#define _VAX_BUS_DMA_PRIVATE
@@ -91,6 +91,7 @@ __KERNEL_RCSID(0, $NetBSD: uba_mainbus.
/* Some Qbus-specific defines */
#define QBASIZE (8192 * VAX_NBPG)
#define QBAMAP 0x20088000
+#define QBAMEM 0x3000
#define QIOPAGE 0x2000
/*
@@ -121,6 +122,12 @@ qba_attach(device_t parent, device_t sel
{
struct mainbus_attach_args * const ma = aux;
struct uba_vsoftc * const sc = device_private(self);
+ paddr_t paddr;
+ vaddr_t vaddr;
+ int *mapp;
+ int pgnum;
+ //int val;
+ int start;
aprint_normal(: Q22\n);
@@ -140,6 +147,40 @@ qba_attach(device_t parent, device_t sel
sc-uv_addr = QBAMAP; /* Physical address of map registers */
uba_dma_init(sc);
+
+ mapp = (int *)vax_map_physmem(QBAMAP, QBASIZE/VAX_NBPG);
+ //val = 0;
+
+ for (paddr = QBAMEM, pgnum = 0, start = -1;
+ paddr QBAMEM + QBASIZE - 8192;
+ paddr += VAX_NBPG, pgnum += 1) {
+ //val = mapp[pgnum];
+ mapp[pgnum] = 0;
+ vaddr = vax_map_physmem(paddr, 1);
+ if (badaddr((void *)vaddr, 2) == 0) {
+ if (start 0)
+start = pgnum;
+ } else if (start = 0) {
+ aprint_normal(sgmap exclusion at %#x - %#x\n,
+ start*VAX_NBPG, pgnum*VAX_NBPG - 1);
+ vax_sgmap_resserve(start*VAX_NBPG,
+ (pgnum - start)*VAX_NBPG, sc-uv_sgmap);
+ start = -1;
+ }
+ vax_unmap_physmem(vaddr, 1);
+ //mapp[pgnum] = val;
+ }
+ vax_unmap_physmem((vaddr_t)mapp, QBASIZE/VAX_NBPG);
+ if (start = 0) {
+ aprint_normal(sgmap exclusion at %#x - %#x\n,
+ start*VAX_NBPG, pgnum*VAX_NBPG - 1);
+ vax_sgmap_reserve(start*VAX_NBPG, (pgnum - start)*VAX_NBPG,
+ sc-uv_sgmap);
+ }
+
+ /* reserve I/O space within Qbus */
+ vax_sgmap_reserve(0x3fe000, 0x40 - 0x3fe000, sc-uv_sgmap);
+
uba_attach(sc-uv_sc, QIOPAGE);
}
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: martin
Date: Fri Jun 5 16:01:55 UTC 2015
Modified Files:
src/sys/arch/vax/boot/boot: boot.c
Log Message:
Close the file descriptor used for loading before jumping to the kernel.
Pointed out by Felix Deichmann on port-vax.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/boot/boot/boot.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/boot/boot/boot.c
diff -u src/sys/arch/vax/boot/boot/boot.c:1.32 src/sys/arch/vax/boot/boot/boot.c:1.33
--- src/sys/arch/vax/boot/boot/boot.c:1.32 Sat Nov 9 18:31:53 2013
+++ src/sys/arch/vax/boot/boot/boot.c Fri Jun 5 16:01:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.32 2013/11/09 18:31:53 christos Exp $ */
+/* $NetBSD: boot.c,v 1.33 2015/06/05 16:01:55 martin Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -93,7 +93,7 @@ struct rpb bootrpb;
void
Xmain(void)
{
- int j, nu;
+ int j, nu, fd;
u_long marks[MARK_MAX];
extern const char bootprog_rev[];
@@ -133,14 +133,14 @@ Xmain(void)
int fileindex;
for (fileindex = 0; filelist[fileindex].name[0] != '\0';
fileindex++) {
- int err;
errno = 0;
if (!filelist[fileindex].quiet)
printf( boot %s\n, filelist[fileindex].name);
marks[MARK_START] = 0;
- err = loadfile(filelist[fileindex].name, marks,
+ fd = loadfile(filelist[fileindex].name, marks,
LOAD_KERNEL|COUNT_KERNEL);
- if (err == 0) {
+ if (fd = 0) {
+close(fd);
machdep_start((char *)marks[MARK_ENTRY],
marks[MARK_NSYM],
(void *)marks[MARK_START],
@@ -197,7 +197,7 @@ void
boot(char *arg)
{
char *fn = netbsd;
- int howto, fl, err;
+ int howto, fl, fd;
u_long marks[MARK_MAX];
if (arg) {
@@ -230,8 +230,9 @@ fail: printf(usage: boot [filename] [
}
load:
marks[MARK_START] = 0;
- err = loadfile(fn, marks, LOAD_KERNEL|COUNT_KERNEL);
- if (err == 0) {
+ fd = loadfile(fn, marks, LOAD_KERNEL|COUNT_KERNEL);
+ if (fd = 0) {
+ close(fd);
machdep_start((char *)marks[MARK_ENTRY],
marks[MARK_NSYM],
(void *)marks[MARK_START],
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: abs Date: Sun May 31 07:04:18 UTC 2015 Modified Files: src/sys/arch/vax/vsa: vsbus.c Log Message: Add missing break - from Felix Deichmann in PR port-vax/49935 To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/vsa/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/vsbus.c diff -u src/sys/arch/vax/vsa/vsbus.c:1.60 src/sys/arch/vax/vsa/vsbus.c:1.61 --- src/sys/arch/vax/vsa/vsbus.c:1.60 Thu Jun 28 13:58:21 2012 +++ src/sys/arch/vax/vsa/vsbus.c Sun May 31 07:04:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */ +/* $NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $); +__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $); #include opt_cputype.h @@ -138,6 +138,7 @@ vsbus_attach(device_t parent, device_t s sc-sc_intclr = (char *)sc-sc_vsregs + 15; sc-sc_intmsk = (char *)sc-sc_vsregs + 12; vsbus_dma_init(sc, 32768); + break; #endif default:
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: ragge
Date: Sat May 9 13:43:45 UTC 2015
Modified Files:
src/sys/arch/vax/vax: ka660.c
Log Message:
PR port-vax/49884
Fixes bug introduced in earlier cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vax/ka660.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/vax/ka660.c
diff -u src/sys/arch/vax/vax/ka660.c:1.10 src/sys/arch/vax/vax/ka660.c:1.11
--- src/sys/arch/vax/vax/ka660.c:1.10 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/ka660.c Sat May 9 13:43:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: ka660.c,v 1.11 2015/05/09 13:43:45 ragge Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ka660.c,v 1.11 2015/05/09 13:43:45 ragge Exp $);
#include sys/param.h
#include sys/systm.h
@@ -61,7 +61,7 @@ static void ka660_cache_enable(void);
static void ka660_attach_cpu(device_t);
static int ka660_mchk(void *);
-static const char * const ka660_devs[] = { cpu, sgec, vsbus, NULL };
+static const char * const ka660_devs[] = { cpu, sgec, shac, uba, NULL };
/*
* Declaration of 660-specific calls.
@@ -92,7 +92,7 @@ void
ka660_attach_cpu(device_t self)
{
aprint_normal(
- : %s, Rigel (ucode rev. %d), 2KB L1 cache, 128KB L2 cache\n,
+ : %s, SOC (ucode rev. %d), 6KB L1 cache\n,
KA660,
vax_cpudata 0377);
}
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: martin
Date: Tue Mar 3 13:23:49 UTC 2015
Modified Files:
src/sys/arch/vax/vax: trap.c
Log Message:
Handle EINVAL in the fault path and send SIGBUS on mmap'd access past EOF
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/vax/vax/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/vax/vax/trap.c
diff -u src/sys/arch/vax/vax/trap.c:1.132 src/sys/arch/vax/vax/trap.c:1.133
--- src/sys/arch/vax/vax/trap.c:1.132 Fri Oct 25 16:30:52 2013
+++ src/sys/arch/vax/vax/trap.c Tue Mar 3 13:23:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.132 2013/10/25 16:30:52 martin Exp $ */
+/* $NetBSD: trap.c,v 1.133 2015/03/03 13:23:48 martin Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -33,7 +33,7 @@
/* All bugs are subject to removal without further notice */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.132 2013/10/25 16:30:52 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.133 2015/03/03 13:23:48 martin Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -244,18 +244,28 @@ if(faultdebug)printf(trap accflt type %
panic(SEGV in kernel mode: pc %#lx addr %#lx,
tf-tf_pc, tf-tf_code);
}
- code = SEGV_ACCERR;
- if (rv == ENOMEM) {
+ switch (rv) {
+ case ENOMEM:
printf(UVM: pid %d (%s), uid %d killed:
out of swap\n,
p-p_pid, p-p_comm,
l-l_cred ?
kauth_cred_geteuid(l-l_cred) : -1);
sig = SIGKILL;
- } else {
+code = SI_NOINFO;
+break;
+ case EINVAL:
+code = BUS_ADRERR;
+sig = SIGBUS;
+break;
+ case EACCES:
+code = SEGV_ACCERR;
sig = SIGSEGV;
-if (rv != EACCES)
- code = SEGV_MAPERR;
+break;
+ default:
+code = SEGV_MAPERR;
+sig = SIGSEGV;
+break;
}
} else {
trapsig = false;
CVS commit: src/sys/arch/vax/vsa
Module Name:src
Committed By: christos
Date: Wed Dec 31 20:37:10 UTC 2014
Modified Files:
src/sys/arch/vax/vsa: hdc9224.c
Log Message:
declare error
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/vax/vsa/hdc9224.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/hdc9224.c
diff -u src/sys/arch/vax/vsa/hdc9224.c:1.55 src/sys/arch/vax/vsa/hdc9224.c:1.56
--- src/sys/arch/vax/vsa/hdc9224.c:1.55 Wed Dec 31 14:52:05 2014
+++ src/sys/arch/vax/vsa/hdc9224.c Wed Dec 31 15:37:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hdc9224.c,v 1.55 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: hdc9224.c,v 1.56 2014/12/31 20:37:10 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -51,7 +51,7 @@
#undef RDDEBUG
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdc9224.c,v 1.55 2014/12/31 19:52:05 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdc9224.c,v 1.56 2014/12/31 20:37:10 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -688,6 +688,7 @@ rdioctl(dev_t dev, u_long cmd, void *add
{
struct rdsoftc * const rd = device_lookup_private(rd_cd, DISKUNIT(dev));
struct disklabel * const lp = rd-sc_disk.dk_label;
+ int error;
error = disk_ioctl(rd-sc_disk, dev, cmd, addr, flag, l);
if (error != EPASSTHROUGH)
CVS commit: src/sys/arch/vax/mba
Module Name:src
Committed By: christos
Date: Wed Dec 31 20:37:53 UTC 2014
Modified Files:
src/sys/arch/vax/mba: hp.c
Log Message:
return error
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/mba/hp.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/mba/hp.c
diff -u src/sys/arch/vax/mba/hp.c:1.51 src/sys/arch/vax/mba/hp.c:1.52
--- src/sys/arch/vax/mba/hp.c:1.51 Wed Dec 31 14:52:05 2014
+++ src/sys/arch/vax/mba/hp.c Wed Dec 31 15:37:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hp.c,v 1.51 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: hp.c,v 1.52 2014/12/31 20:37:52 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hp.c,v 1.51 2014/12/31 19:52:05 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: hp.c,v 1.52 2014/12/31 20:37:52 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -326,7 +326,7 @@ hpioctl(dev_t dev, u_long cmd, void *add
error = disk_ioctl(sc-sc_disk, dev, cmd, addr, flag, l);
if (error != EPASSTHROUGH)
- goto out;
+ return error;
switch (cmd) {
case DIOCSDINFO:
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: jklos Date: Sat Dec 20 13:13:58 UTC 2014 Added Files: src/sys/arch/vax/include: autoconf.h Log Message: Added as a placeholder so kernels compile until a better fix is found. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/include/autoconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files:
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: jklos Date: Sat Dec 20 13:16:04 UTC 2014 Modified Files: src/sys/arch/vax/conf: GENERIC Log Message: Enable lcg0 framebuffer support for VAXstation 4000/30, 60, 90 and friends. To generate a diff of this commit: cvs rdiff -u -r1.194 -r1.195 src/sys/arch/vax/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/vax/conf/GENERIC diff -u src/sys/arch/vax/conf/GENERIC:1.194 src/sys/arch/vax/conf/GENERIC:1.195 --- src/sys/arch/vax/conf/GENERIC:1.194 Fri Dec 19 04:44:13 2014 +++ src/sys/arch/vax/conf/GENERIC Sat Dec 20 13:16:04 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.194 2014/12/19 04:44:13 jklos Exp $ +# $NetBSD: GENERIC,v 1.195 2014/12/20 13:16:04 jklos 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.194 $ +#ident GENERIC-$Revision: 1.195 $ # Here are all different supported CPU types listed. #options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 @@ -205,7 +205,7 @@ asc0 at vsbus0 csr 0x2680 # VS4000/ smg0 at vsbus0 csr 0x200f # Small monochrome display ctlr. #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 +lcg0 at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics vsaudio0 at vsbus0 csr 0x200d # VS4000/60 (or VLC) audio vsaudio0 at vsbus0 csr 0x2680 # VS4000/90 audio audio* at audiobus? @@ -286,7 +286,7 @@ uk* at scsibus? target? lun? # VAXstation graphics support wsdisplay* at smg0 wsdisplay* at spx0 -#wsdisplay* at lcg0 +wsdisplay* at lcg0 #wsdisplay* at clr0 #wsdisplay* at qd0 #wsdisplay* at qv0
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: jklos Date: Thu Dec 18 22:46:53 UTC 2014 Modified Files: src/sys/arch/vax/vsa: lcg.c Log Message: Add small fix from Björn Johannessonwhich makes framebuffer woth with X11. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/vsa/lcg.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/lcg.c diff -u src/sys/arch/vax/vsa/lcg.c:1.1 src/sys/arch/vax/vsa/lcg.c:1.2 --- src/sys/arch/vax/vsa/lcg.c:1.1 Tue Dec 16 11:34:17 2014 +++ src/sys/arch/vax/vsa/lcg.c Thu Dec 18 22:46:53 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lcg.c,v 1.1 2014/12/16 11:34:17 jklos Exp $ */ +/* $NetBSD: lcg.c,v 1.2 2014/12/18 22:46:53 jklos Exp $ */ /* * LCG accelerated framebuffer driver * Copyright (c) 2003, 2004 Blaz Antonic @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lcg.c,v 1.1 2014/12/16 11:34:17 jklos Exp $); +__KERNEL_RCSID(0, $NetBSD: lcg.c,v 1.2 2014/12/18 22:46:53 jklos Exp $); #define LCG_NO_ACCEL @@ -710,6 +710,10 @@ lcg_ioctl(void *v, void *vs, u_long cmd, fb-cmsize = 1 lcg_depth; break; + case WSDISPLAYIO_LINEBYTES: + *(u_int *)data = lcg_xsize; + break; + case WSDISPLAYIO_GETCMAP: return lcg_get_cmap((struct wsdisplay_cmap *)data);
CVS commit: src/sys/arch/vax
Module Name:src Committed By: jklos Date: Fri Dec 19 04:44:13 UTC 2014 Modified Files: src/sys/arch/vax/conf: GENERIC files.vax majors.vax Added Files: src/sys/arch/vax/vsa: vsaudio.c Log Message: Add audio support for VAXstation VLC, 60 and 90 machines. Originally rom Blaz Antonic and ported from OpenBSD by Björn Johannesso. Tested on VLC and 4000/60. To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/sys/arch/vax/conf/GENERIC cvs rdiff -u -r1.118 -r1.119 src/sys/arch/vax/conf/files.vax cvs rdiff -u -r1.24 -r1.25 src/sys/arch/vax/conf/majors.vax cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/vsa/vsaudio.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/conf/GENERIC diff -u src/sys/arch/vax/conf/GENERIC:1.193 src/sys/arch/vax/conf/GENERIC:1.194 --- src/sys/arch/vax/conf/GENERIC:1.193 Sun Nov 16 16:01:43 2014 +++ src/sys/arch/vax/conf/GENERIC Fri Dec 19 04:44:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.193 2014/11/16 16:01:43 manu Exp $ +# $NetBSD: GENERIC,v 1.194 2014/12/19 04:44:13 jklos 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.193 $ +#ident GENERIC-$Revision: 1.194 $ # Here are all different supported CPU types listed. #options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 @@ -206,6 +206,9 @@ 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 +vsaudio0 at vsbus0 csr 0x200d # VS4000/60 (or VLC) audio +vsaudio0 at vsbus0 csr 0x2680 # VS4000/90 audio +audio* at audiobus? tc0 at vsbus0 csr 0x3600 # VS4000/60 or 90 TC adapter tcds* at tc0 slot ? offset ? # TC dual SCSI controller asc* at tcds? chip ? # PMAZB/C Index: src/sys/arch/vax/conf/files.vax diff -u src/sys/arch/vax/conf/files.vax:1.118 src/sys/arch/vax/conf/files.vax:1.119 --- src/sys/arch/vax/conf/files.vax:1.118 Sun Jun 12 03:35:49 2011 +++ src/sys/arch/vax/conf/files.vax Fri Dec 19 04:44:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.vax,v 1.118 2011/06/12 03:35:49 rmind Exp $ +# $NetBSD: files.vax,v 1.119 2014/12/19 04:44:13 jklos Exp $ # # new style config file for vax architecture # @@ -315,6 +315,11 @@ device dh # XXX? attach dh at uba file arch/vax/uba/dh.c dh needs-flag +# Vaxstation 4000 audio +device vsaudio: audiobus, am7930 +attach vsaudio at vsbus +file arch/vax/vsa/vsaudio.c vsaudio needs-flag + # These are general files needed for compilation. file dev/cons.c file dev/cninit.c Index: src/sys/arch/vax/conf/majors.vax diff -u src/sys/arch/vax/conf/majors.vax:1.24 src/sys/arch/vax/conf/majors.vax:1.25 --- src/sys/arch/vax/conf/majors.vax:1.24 Fri Jun 22 20:42:23 2012 +++ src/sys/arch/vax/conf/majors.vax Fri Dec 19 04:44:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: majors.vax,v 1.24 2012/06/22 20:42:23 abs Exp $ +# $NetBSD: majors.vax,v 1.25 2014/12/19 04:44:13 jklos Exp $ # # Device majors for vax # @@ -84,6 +84,7 @@ device-major wsfont char 80 wsfont device-major ses char 81 ses device-major nsmb char 98 nsmb +device-major audio char 99 audio # # block-device-only devices Added files: Index: src/sys/arch/vax/vsa/vsaudio.c diff -u /dev/null src/sys/arch/vax/vsa/vsaudio.c:1.1 --- /dev/null Fri Dec 19 04:44:13 2014 +++ src/sys/arch/vax/vsa/vsaudio.c Fri Dec 19 04:44:13 2014 @@ -0,0 +1,587 @@ +/* $OpenBSD: vsaudio.c,v 1.4 2013/05/15 21:21:11 ratchov Exp $ */ + +/* + * Copyright (c) 2011 Miodrag Vallat. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * Copyright (c) 1995 Rolf Grossmann + * 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
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: jklos Date: Tue Dec 16 11:23:11 UTC 2014 Modified Files: src/sys/arch/vax/vax: machdep.c Log Message: Fix leds.h include. To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/sys/arch/vax/vax/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/vax/vax/machdep.c diff -u src/sys/arch/vax/vax/machdep.c:1.190 src/sys/arch/vax/vax/machdep.c:1.191 --- src/sys/arch/vax/vax/machdep.c:1.190 Mon Mar 24 20:06:33 2014 +++ src/sys/arch/vax/vax/machdep.c Tue Dec 16 11:23:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.190 2014/03/24 20:06:33 christos Exp $ */ +/* $NetBSD: machdep.c,v 1.191 2014/12/16 11:23:11 jklos Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -83,7 +83,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.190 2014/03/24 20:06:33 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.191 2014/12/16 11:23:11 jklos Exp $); #include opt_ddb.h #include opt_compat_netbsd.h @@ -122,6 +122,7 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v #include machine/nexus.h #include machine/reg.h #include machine/scb.h +#include machine/leds.h #include vax/vax/gencons.h #ifdef DDB @@ -132,7 +133,6 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v #include smg.h #include ksyms.h -#include leds.h #define DEV_LEDS 13 /* minor device 13 is leds */
CVS commit: src/sys/arch/vax/vsa
Module Name:src
Committed By: jklos
Date: Tue Dec 16 11:34:17 UTC 2014
Added Files:
src/sys/arch/vax/vsa: lcg.c
Log Message:
Adds VAXstation VLC and 4000/60 framebuffer support. From Blaz Antonic
and updated by BjörnJohannesson.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/vax/vsa/lcg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/vax/vsa/lcg.c
diff -u /dev/null src/sys/arch/vax/vsa/lcg.c:1.1
--- /dev/null Tue Dec 16 11:34:17 2014
+++ src/sys/arch/vax/vsa/lcg.c Tue Dec 16 11:34:17 2014
@@ -0,0 +1,1289 @@
+/* $NetBSD: lcg.c,v 1.1 2014/12/16 11:34:17 jklos Exp $ */
+/*
+ * LCG accelerated framebuffer driver
+ * Copyright (c) 2003, 2004 Blaz Antonic
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the abovementioned copyrights
+ * 4. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+/*
+ * Resurrection and dumb framebuffer mode by Björn Johannesson
+ * rherdw...@yahoo.com in December 2014
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: lcg.c,v 1.1 2014/12/16 11:34:17 jklos Exp $);
+
+#define LCG_NO_ACCEL
+
+#include sys/param.h
+#include sys/device.h
+#include sys/systm.h
+#include sys/callout.h
+#include sys/time.h
+#include sys/malloc.h
+#include sys/conf.h
+#include sys/kernel.h
+#include sys/systm.h
+
+#include machine/vsbus.h
+#include machine/sid.h
+#include machine/cpu.h
+#include machine/lcgreg.h
+
+#include dev/cons.h
+
+#include dev/dec/dzreg.h
+#include dev/dec/dzvar.h
+#include dev/dec/dzkbdvar.h
+
+#include dev/wscons/wsdisplayvar.h
+#include dev/wscons/wsconsio.h
+#include dev/wscons/wscons_callbacks.h
+#include dev/wsfont/wsfont.h
+
+#include machine/scb.h
+
+#include dzkbd.h
+
+/* Screen hardware defs */
+
+#define LCG_FB_ADDR 0x21801000 /* Frame buffer */
+
+/* FIFO defines */
+#define LCG_FIFO_SIZE 0x1 /* 64 KB */
+#define LCG_FIFO_WIN_ADDR 0x2018
+#define LCG_FIFO_WIN_SIZE VAX_NBPG
+#define LCG_FIFO_ALIGN 0x1
+
+/* font rendering defines */
+#define LCG_FONT_ADDR (LCG_FB_ADDR + lcg_fb_size)
+#define LCG_FONT_STORAGE_SIZE 0x4 /* 16 KB, enough to accomodate 16x32 font bitmaps */
+
+/* register space defines */
+#define LCG_REG_ADDR 0x2010 /* LCG registers */
+#define LCG_REG_SIZE 0x4000 /* 16384 bytes */
+#define LCG_REG(reg) regaddr[(reg / 4)]
+
+/* LUT defines */
+#define LCG_LUT_ADDR 0x21800800 /* LUT right before onscreen FB */
+#define LCG_LUT_OFFSET 0x0800
+#define LCG_LUT_SIZE 0x800 /* 2048 bytes */
+
+#define LCG_BG_COLOR WSCOL_BLACK
+#define LCG_FG_COLOR WSCOL_WHITE
+
+#define LCG_CONFIG 0x200f0010 /* LCG model information */
+
+/* implement sanity checks at certain points to ensure safer operation */
+#define LCG_SAFE
+//#define LCG_DEBUG
+
+static int lcg_match(struct device *, struct cfdata *, void *);
+static void lcg_attach(struct device *, struct device *, void *);
+
+struct lcg_softc {
+ struct device ss_dev;
+ bus_dmamap_t sc_dm;
+};
+
+CFATTACH_DECL_NEW(lcg, sizeof(struct lcg_softc),
+lcg_match, lcg_attach, NULL, NULL);
+
+static void lcg_cursor(void *, int, int, int);
+static int lcg_mapchar(void *, int, unsigned int *);
+static void lcg_putchar(void *, int, int, u_int, long);
+static void lcg_copycols(void *, int, int, int,int);
+static void lcg_erasecols(void *, int, int, int, long);
+static void lcg_copyrows(void *, int, int, int);
+static void lcg_eraserows(void *, int, int, long);
+static int lcg_allocattr(void *, int, int, int, long *);
+static int
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: matt Date: Thu Aug 21 06:48:04 UTC 2014 Modified Files: src/sys/arch/vax/include: int_fmtio.h Log Message: Revert back to 1.7. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/include/int_fmtio.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/vax/include/int_fmtio.h diff -u src/sys/arch/vax/include/int_fmtio.h:1.8 src/sys/arch/vax/include/int_fmtio.h:1.9 --- src/sys/arch/vax/include/int_fmtio.h:1.8 Thu Aug 14 14:21:03 2014 +++ src/sys/arch/vax/include/int_fmtio.h Thu Aug 21 06:48:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.8 2014/08/14 14:21:03 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.9 2014/08/21 06:48:04 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -143,8 +143,8 @@ #define SCNdLEAST16 hd /* int_least16_t */ #define SCNdLEAST32 d /* int_least32_t */ #define SCNdLEAST64 lld /* int_least64_t */ -#define SCNdFAST8 d /* int_fast8_t */ -#define SCNdFAST16 d /* int_fast16_t */ +#define SCNdFAST8 hhd /* int_fast8_t */ +#define SCNdFAST16 hd /* int_fast16_t */ #define SCNdFAST32 d /* int_fast32_t */ #define SCNdFAST64 lld /* int_fast64_t */ #define SCNdMAX lld /* intmax_t */ @@ -158,8 +158,8 @@ #define SCNiLEAST16 hi /* int_least16_t */ #define SCNiLEAST32 i /* int_least32_t */ #define SCNiLEAST64 lli /* int_least64_t */ -#define SCNiFAST8 i /* int_fast8_t */ -#define SCNiFAST16 i /* int_fast16_t */ +#define SCNiFAST8 hhi /* int_fast8_t */ +#define SCNiFAST16 hi /* int_fast16_t */ #define SCNiFAST32 i /* int_fast32_t */ #define SCNiFAST64 lli /* int_fast64_t */ #define SCNiMAX lli /* intmax_t */ @@ -175,8 +175,8 @@ #define SCNoLEAST16 ho /* uint_least16_t */ #define SCNoLEAST32 o /* uint_least32_t */ #define SCNoLEAST64 llo /* uint_least64_t */ -#define SCNoFAST8 o /* uint_fast8_t */ -#define SCNoFAST16 o /* uint_fast16_t */ +#define SCNoFAST8 hho /* uint_fast8_t */ +#define SCNoFAST16 ho /* uint_fast16_t */ #define SCNoFAST32 o /* uint_fast32_t */ #define SCNoFAST64 llo /* uint_fast64_t */ #define SCNoMAX llo /* uintmax_t */ @@ -190,8 +190,8 @@ #define SCNuLEAST16 hu /* uint_least16_t */ #define SCNuLEAST32 u /* uint_least32_t */ #define SCNuLEAST64 llu /* uint_least64_t */ -#define SCNuFAST8 u /* uint_fast8_t */ -#define SCNuFAST16 u /* uint_fast16_t */ +#define SCNuFAST8 hhu /* uint_fast8_t */ +#define SCNuFAST16 hu /* uint_fast16_t */ #define SCNuFAST32 u /* uint_fast32_t */ #define SCNuFAST64 llu /* uint_fast64_t */ #define SCNuMAX llu /* uintmax_t */ @@ -205,8 +205,8 @@ #define SCNxLEAST16 hx /* uint_least16_t */ #define SCNxLEAST32 x /* uint_least32_t */ #define SCNxLEAST64 llx /* uint_least64_t */ -#define SCNxFAST8 x /* uint_fast8_t */ -#define SCNxFAST16 x /* uint_fast16_t */ +#define SCNxFAST8 hhx /* uint_fast8_t */ +#define SCNxFAST16 hx /* uint_fast16_t */ #define SCNxFAST32 x /* uint_fast32_t */ #define SCNxFAST64 llx /* uint_fast64_t */ #define SCNxMAX llx /* uintmax_t */
CVS commit: src/sys/arch/vax/include
Module Name:src
Committed By: martin
Date: Thu Aug 14 09:02:18 UTC 2014
Modified Files:
src/sys/arch/vax/include: mutex.h
Log Message:
Previously we used unsigned long int as __uintptr_t, but gcc prefers
__UINTPTR_TYPE__ as unsigned int, and now we use that for __uintptr_t
as well, so adapt MUTEX_CAS() accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/include/mutex.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/vax/include/mutex.h
diff -u src/sys/arch/vax/include/mutex.h:1.12 src/sys/arch/vax/include/mutex.h:1.13
--- src/sys/arch/vax/include/mutex.h:1.12 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/include/mutex.h Thu Aug 14 09:02:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.12 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.13 2014/08/14 09:02:18 martin Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@ struct kmutex {
*/
#define MUTEX_GIVE(mtx) /* nothing */
-#define MUTEX_CAS(p, o, n) (atomic_cas_ulong((p), (o), (n)) == (o))
+#define MUTEX_CAS(p, o, n) (atomic_cas_uint((p), (o), (n)) == (o))
#endif /* __MUTEX_PRIVATE */
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: martin Date: Thu Aug 14 09:17:32 UTC 2014 Modified Files: src/sys/arch/vax/include: int_fmtio.h Log Message: intptr_t and uintptr_t are not long any more. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/include/int_fmtio.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/vax/include/int_fmtio.h diff -u src/sys/arch/vax/include/int_fmtio.h:1.5 src/sys/arch/vax/include/int_fmtio.h:1.6 --- src/sys/arch/vax/include/int_fmtio.h:1.5 Wed Aug 13 19:48:17 2014 +++ src/sys/arch/vax/include/int_fmtio.h Thu Aug 14 09:17:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.6 2014/08/14 09:17:32 martin Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ #define PRIiFAST32 i /* int_fast32_t */ #define PRIiFAST64 lli /* int_fast64_t */ #define PRIiMAX lli /* intmax_t */ -#define PRIiPTR li /* intptr_t */ +#define PRIiPTR i /* intptr_t */ /* fprintf macros for unsigned integers */ @@ -101,7 +101,7 @@ #define PRIuFAST32 u /* uint_fast32_t */ #define PRIuFAST64 llu /* uint_fast64_t */ #define PRIuMAX llu /* uintmax_t */ -#define PRIuPTR lu /* uintptr_t */ +#define PRIuPTR u /* uintptr_t */ #define PRIx8 x /* uint8_t */ #define PRIx16 x /* uint16_t */
CVS commit: src/sys/arch/vax/include
Module Name:src
Committed By: martin
Date: Thu Aug 14 11:28:13 UTC 2014
Modified Files:
src/sys/arch/vax/include: int_fmtio.h mutex.h
Log Message:
Revert previous changes, gcc configuration will be adapted instead.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/int_fmtio.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/include/mutex.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/vax/include/int_fmtio.h
diff -u src/sys/arch/vax/include/int_fmtio.h:1.6 src/sys/arch/vax/include/int_fmtio.h:1.7
--- src/sys/arch/vax/include/int_fmtio.h:1.6 Thu Aug 14 09:17:32 2014
+++ src/sys/arch/vax/include/int_fmtio.h Thu Aug 14 11:28:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.6 2014/08/14 09:17:32 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.7 2014/08/14 11:28:13 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
#define PRIiFAST32 i /* int_fast32_t */
#define PRIiFAST64 lli /* int_fast64_t */
#define PRIiMAX lli /* intmax_t */
-#define PRIiPTR i /* intptr_t */
+#define PRIiPTR li /* intptr_t */
/* fprintf macros for unsigned integers */
@@ -101,7 +101,7 @@
#define PRIuFAST32 u /* uint_fast32_t */
#define PRIuFAST64 llu /* uint_fast64_t */
#define PRIuMAX llu /* uintmax_t */
-#define PRIuPTR u /* uintptr_t */
+#define PRIuPTR lu /* uintptr_t */
#define PRIx8 x /* uint8_t */
#define PRIx16 x /* uint16_t */
Index: src/sys/arch/vax/include/mutex.h
diff -u src/sys/arch/vax/include/mutex.h:1.13 src/sys/arch/vax/include/mutex.h:1.14
--- src/sys/arch/vax/include/mutex.h:1.13 Thu Aug 14 09:02:18 2014
+++ src/sys/arch/vax/include/mutex.h Thu Aug 14 11:28:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.13 2014/08/14 09:02:18 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.14 2014/08/14 11:28:13 martin Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@ struct kmutex {
*/
#define MUTEX_GIVE(mtx) /* nothing */
-#define MUTEX_CAS(p, o, n) (atomic_cas_uint((p), (o), (n)) == (o))
+#define MUTEX_CAS(p, o, n) (atomic_cas_ulong((p), (o), (n)) == (o))
#endif /* __MUTEX_PRIVATE */
CVS commit: src/sys/arch/vax/include
Module Name:src
Committed By: matt
Date: Thu Aug 14 14:21:03 UTC 2014
Modified Files:
src/sys/arch/vax/include: int_fmtio.h
Log Message:
Fix SCN?FAST{8,16} formats to match reality (int) in gcc4.8.3
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/include/int_fmtio.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/vax/include/int_fmtio.h
diff -u src/sys/arch/vax/include/int_fmtio.h:1.7 src/sys/arch/vax/include/int_fmtio.h:1.8
--- src/sys/arch/vax/include/int_fmtio.h:1.7 Thu Aug 14 11:28:13 2014
+++ src/sys/arch/vax/include/int_fmtio.h Thu Aug 14 14:21:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.7 2014/08/14 11:28:13 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.8 2014/08/14 14:21:03 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -143,8 +143,8 @@
#define SCNdLEAST16 hd /* int_least16_t */
#define SCNdLEAST32 d /* int_least32_t */
#define SCNdLEAST64 lld /* int_least64_t */
-#define SCNdFAST8 hhd /* int_fast8_t */
-#define SCNdFAST16 hd /* int_fast16_t */
+#define SCNdFAST8 d /* int_fast8_t */
+#define SCNdFAST16 d /* int_fast16_t */
#define SCNdFAST32 d /* int_fast32_t */
#define SCNdFAST64 lld /* int_fast64_t */
#define SCNdMAX lld /* intmax_t */
@@ -158,8 +158,8 @@
#define SCNiLEAST16 hi /* int_least16_t */
#define SCNiLEAST32 i /* int_least32_t */
#define SCNiLEAST64 lli /* int_least64_t */
-#define SCNiFAST8 hhi /* int_fast8_t */
-#define SCNiFAST16 hi /* int_fast16_t */
+#define SCNiFAST8 i /* int_fast8_t */
+#define SCNiFAST16 i /* int_fast16_t */
#define SCNiFAST32 i /* int_fast32_t */
#define SCNiFAST64 lli /* int_fast64_t */
#define SCNiMAX lli /* intmax_t */
@@ -175,8 +175,8 @@
#define SCNoLEAST16 ho /* uint_least16_t */
#define SCNoLEAST32 o /* uint_least32_t */
#define SCNoLEAST64 llo /* uint_least64_t */
-#define SCNoFAST8 hho /* uint_fast8_t */
-#define SCNoFAST16 ho /* uint_fast16_t */
+#define SCNoFAST8 o /* uint_fast8_t */
+#define SCNoFAST16 o /* uint_fast16_t */
#define SCNoFAST32 o /* uint_fast32_t */
#define SCNoFAST64 llo /* uint_fast64_t */
#define SCNoMAX llo /* uintmax_t */
@@ -190,8 +190,8 @@
#define SCNuLEAST16 hu /* uint_least16_t */
#define SCNuLEAST32 u /* uint_least32_t */
#define SCNuLEAST64 llu /* uint_least64_t */
-#define SCNuFAST8 hhu /* uint_fast8_t */
-#define SCNuFAST16 hu /* uint_fast16_t */
+#define SCNuFAST8 u /* uint_fast8_t */
+#define SCNuFAST16 u /* uint_fast16_t */
#define SCNuFAST32 u /* uint_fast32_t */
#define SCNuFAST64 llu /* uint_fast64_t */
#define SCNuMAX llu /* uintmax_t */
@@ -205,8 +205,8 @@
#define SCNxLEAST16 hx /* uint_least16_t */
#define SCNxLEAST32 x /* uint_least32_t */
#define SCNxLEAST64 llx /* uint_least64_t */
-#define SCNxFAST8 hhx /* uint_fast8_t */
-#define SCNxFAST16 hx /* uint_fast16_t */
+#define SCNxFAST8 x /* uint_fast8_t */
+#define SCNxFAST16 x /* uint_fast16_t */
#define SCNxFAST32 x /* uint_fast32_t */
#define SCNxFAST64 llx /* uint_fast64_t */
#define SCNxMAX llx /* uintmax_t */
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src Committed By: martin Date: Sun Aug 10 16:53:22 UTC 2014 Modified Files: src/sys/arch/vax/boot/boot: devopen.c Log Message: Remove atoi() prototype To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/boot/boot/devopen.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/boot/boot/devopen.c diff -u src/sys/arch/vax/boot/boot/devopen.c:1.16 src/sys/arch/vax/boot/boot/devopen.c:1.17 --- src/sys/arch/vax/boot/boot/devopen.c:1.16 Sat Mar 14 21:04:16 2009 +++ src/sys/arch/vax/boot/boot/devopen.c Sun Aug 10 16:53:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: devopen.c,v 1.16 2009/03/14 21:04:16 dsl Exp $ */ +/* $NetBSD: devopen.c,v 1.17 2014/08/10 16:53:22 martin Exp $ */ /* * Copyright (c) 1997 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -43,7 +43,6 @@ #include vaxstand.h -int atoi(char *); int nexaddr, csrbase; int
CVS commit: src/sys/arch/vax/conf
Module Name:src
Committed By: matt
Date: Wed Jun 4 21:24:55 UTC 2014
Modified Files:
src/sys/arch/vax/conf: Makefile.vax
Log Message:
Modify compiler HACK to be for GCC 4.1 only
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/vax/conf/Makefile.vax
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/Makefile.vax
diff -u src/sys/arch/vax/conf/Makefile.vax:1.81 src/sys/arch/vax/conf/Makefile.vax:1.82
--- src/sys/arch/vax/conf/Makefile.vax:1.81 Fri Jan 21 15:59:10 2011
+++ src/sys/arch/vax/conf/Makefile.vax Wed Jun 4 21:24:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vax,v 1.81 2011/01/21 15:59:10 joerg Exp $
+# $NetBSD: Makefile.vax,v 1.82 2014/06/04 21:24:54 matt Exp $
# Makefile for NetBSD
#
@@ -76,7 +76,9 @@ lock_stubs.o unimpl_emul.o: assym.h
##
# XXX recent gcc4 gets ICE on this one
+.if ${HAVE_GCC} == 4
COPTS.db_command.c+= -fno-tree-ter
+.endif
##
## (8) config(8) generated machinery
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: martin
Date: Sat May 24 07:38:42 UTC 2014
Modified Files:
src/sys/arch/vax/boot/boot: Makefile
Log Message:
Force -O1 when compiling this, it doesn't work with -O2 (need to investigate
later)
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/vax/boot/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.41 src/sys/arch/vax/boot/boot/Makefile:1.42
--- src/sys/arch/vax/boot/boot/Makefile:1.41 Wed Aug 21 06:15:41 2013
+++ src/sys/arch/vax/boot/boot/Makefile Sat May 24 07:38:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2013/08/21 06:15:41 matt Exp $
+# $NetBSD: Makefile,v 1.42 2014/05/24 07:38:42 martin Exp $
S= ${.CURDIR}/../../../..
@@ -11,6 +11,8 @@ SRCS= srt0.S boot.c devopen.c conf.c aut
LIBC=
CLEANFILES+=${PROG} ${PROG}.sym vers.c
+# XXX - hack, doesn't work with -O2 and gcc 4.8
+CFLAGS+=-O1
CPPFLAGS+=-DSUPPORT_BOOTPARAMS -DSUPPORT_BOOTP -DSUPPORT_DHCP -D_STANDALONE \
-DNO_MID_CHECK
#CPPFLAGS+=-DBOOTP_DEBUG -DNETIF_DEBUG -DETHER_DEBUG -DNFS_DEBUG -DDEV_DEBUG \
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: martin Date: Fri May 23 19:05:35 UTC 2014 Modified Files: src/sys/arch/vax/vax: locore.c Log Message: #ifdef a variable like its only use To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/arch/vax/vax/locore.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/vax/locore.c diff -u src/sys/arch/vax/vax/locore.c:1.81 src/sys/arch/vax/vax/locore.c:1.82 --- src/sys/arch/vax/vax/locore.c:1.81 Mon Mar 24 20:06:33 2014 +++ src/sys/arch/vax/vax/locore.c Fri May 23 19:05:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.c,v 1.81 2014/03/24 20:06:33 christos Exp $ */ +/* $NetBSD: locore.c,v 1.82 2014/05/23 19:05:35 martin Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -32,7 +32,7 @@ /* All bugs are subject to removal without further notice */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: locore.c,v 1.81 2014/03/24 20:06:33 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: locore.c,v 1.82 2014/05/23 19:05:35 martin Exp $); #include opt_compat_netbsd.h @@ -94,7 +94,10 @@ _start(struct rpb *prpb) extern uintptr_t scratch; struct pte *pt; vaddr_t uv; - const char *mv, *md; + const char *mv; +#if VAX410 || VAXANY + const char *md; +#endif mtpr(AST_NO, PR_ASTLVL); /* Turn off ASTs */
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: martin Date: Tue May 20 16:02:37 UTC 2014 Modified Files: src/sys/arch/vax/vax: autoconf.c Log Message: Recognize racd* as boot device. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/vax/vax/autoconf.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/vax/autoconf.c diff -u src/sys/arch/vax/vax/autoconf.c:1.95 src/sys/arch/vax/vax/autoconf.c:1.96 --- src/sys/arch/vax/vax/autoconf.c:1.95 Sat Oct 27 17:18:13 2012 +++ src/sys/arch/vax/vax/autoconf.c Tue May 20 16:02:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.95 2012/10/27 17:18:13 chs Exp $ */ +/* $NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.95 2012/10/27 17:18:13 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $); #include opt_compat_netbsd.h #include opt_cputype.h @@ -217,7 +217,7 @@ static int booted_sd(device_t, void *); #if NRL 0 static int booted_rl(device_t, void *); #endif -#if NRA +#if NRA 0 || NRACD 0 static int booted_ra(device_t, void *); #endif #if NHP @@ -411,7 +411,7 @@ booted_rl(device_t dev, void *aux) } #endif -#if NRA +#if NRA 0 || NRACD 0 #include dev/mscp/mscp.h #include dev/mscp/mscpreg.h #include dev/mscp/mscpvar.h @@ -422,7 +422,7 @@ booted_ra(device_t dev, void *aux) struct mscp_softc *pdev = device_private(device_parent(dev)); paddr_t ioaddr; - if (jmfr(ra, dev, BDEV_UDA)) + if (jmfr(ra, dev, BDEV_UDA) jmfr(racd, dev, BDEV_UDA)) return 0; if (da-da_mp-mscp_unit != rpb.unit) @@ -435,6 +435,7 @@ booted_ra(device_t dev, void *aux) return 0; } #endif + #if NHP #include vax/mba/mbavar.h int
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: ozaki-r Date: Fri Mar 28 13:26:24 UTC 2014 Modified Files: src/sys/arch/vax/vsa: spx.c Log Message: Use snprintf instead of sprintf To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/vsa/spx.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/spx.c diff -u src/sys/arch/vax/vsa/spx.c:1.7 src/sys/arch/vax/vsa/spx.c:1.8 --- src/sys/arch/vax/vsa/spx.c:1.7 Thu Oct 24 13:16:33 2013 +++ src/sys/arch/vax/vsa/spx.c Fri Mar 28 13:26:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: spx.c,v 1.7 2013/10/24 13:16:33 martin Exp $ */ +/* $NetBSD: spx.c,v 1.8 2014/03/28 13:26:24 ozaki-r Exp $ */ /* * SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX * Copyright (c) 2005 Blaz Antonic @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.7 2013/10/24 13:16:33 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.8 2014/03/28 13:26:24 ozaki-r Exp $); #include sys/param.h #include sys/systm.h @@ -1512,7 +1512,8 @@ spx_init_common(device_t self, struct vs spx_stdscreen.nrows = spx_rows; spx_stdscreen.fontwidth = spx_font.fontwidth; spx_stdscreen.fontheight = spx_font.fontheight; - sprintf(spx_stdscreen_name, %dx%d, spx_cols, spx_rows); + snprintf(spx_stdscreen_name, sizeof(spx_stdscreen_name), +%dx%d, spx_cols, spx_rows); /* for SPXg spx_fb_size represents FB window size, not FB length */ if (fb_type == FB_IS_SPXg)
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: christos
Date: Wed Mar 26 08:01:21 UTC 2014
Modified Files:
src/sys/arch/vax/vax: db_disasm.c ka6400.c ka820.c ka88.c
Log Message:
fix printf issues
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/vax/db_disasm.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vax/ka6400.c \
src/sys/arch/vax/vax/ka88.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/vax/vax/ka820.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/vax/db_disasm.c
diff -u src/sys/arch/vax/vax/db_disasm.c:1.20 src/sys/arch/vax/vax/db_disasm.c:1.21
--- src/sys/arch/vax/vax/db_disasm.c:1.20 Thu Feb 2 09:29:25 2012
+++ src/sys/arch/vax/vax/db_disasm.c Wed Mar 26 04:01:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.20 2012/02/02 14:29:25 matt Exp $ */
+/* $NetBSD: db_disasm.c,v 1.21 2014/03/26 08:01:21 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.20 2012/02/02 14:29:25 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.21 2014/03/26 08:01:21 christos Exp $);
#include sys/param.h
#include sys/proc.h
@@ -321,7 +321,7 @@ get_operand(inst_buffer *ib, int size)
break;
case 4: /* indexed */
- sprintf(buf, [%s], my_db_regs[reg].name);
+ snprintf(buf, sizeof(buf), [%s], my_db_regs[reg].name);
get_operand(ib, 0);
add_str(ib, buf);
break;
@@ -477,9 +477,9 @@ add_int(inst_buffer *ib, int i)
{
char buf[32];
if (i 100 i -100)
- sprintf(ib-curp, %d, i);
+ snprintf(ib-curp, sizeof(buf), %d, i);
else
- sprintf(buf, 0x%x, i);
+ snprintf(buf, sizeof(buf), 0x%x, i);
add_str(ib, buf);
}
@@ -487,7 +487,7 @@ void
add_xint(inst_buffer *ib, int val)
{
char buf[32];
- sprintf(buf, 0x%x, val);
+ snprintf(buf, sizeof(buf), 0x%x, val);
add_str(ib, buf);
}
Index: src/sys/arch/vax/vax/ka6400.c
diff -u src/sys/arch/vax/vax/ka6400.c:1.17 src/sys/arch/vax/vax/ka6400.c:1.18
--- src/sys/arch/vax/vax/ka6400.c:1.17 Mon Mar 24 16:06:33 2014
+++ src/sys/arch/vax/vax/ka6400.c Wed Mar 26 04:01:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ka6400.c,v 1.17 2014/03/24 20:06:33 christos Exp $ */
+/* $NetBSD: ka6400.c,v 1.18 2014/03/26 08:01:21 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ka6400.c,v 1.17 2014/03/24 20:06:33 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ka6400.c,v 1.18 2014/03/26 08:01:21 christos Exp $);
#include opt_multiprocessor.h
@@ -92,7 +92,7 @@ const struct cpu_dep ka6400_calls = {
#if defined(MULTIPROCESSOR)
static void ka6400_startslave(struct cpu_info *);
-static void ka6400_txrx(int, const char *, int);
+static void ka6400_txrx(int, const char *, ...) __printflike(2, 3);
static void ka6400_sendstr(int, const char *);
static void ka6400_sergeant(int);
static int rxchar(void);
@@ -345,8 +345,8 @@ ka6400_startslave(struct cpu_info *ci)
for (i = 0; i 1; i++)
if (rxchar())
i = 0;
- ka6400_txrx(id, \020, 0); /* Send ^P to get attention */
- ka6400_txrx(id, I\r, 0); /* Init other end */
+ ka6400_txrx(id, \020); /* Send ^P to get attention */
+ ka6400_txrx(id, I\r); /* Init other end */
ka6400_txrx(id, D/I 4 %x\r, ci-ci_istack); /* Interrupt stack */
ka6400_txrx(id, D/I C %x\r, mfpr(PR_SBR)); /* SBR */
ka6400_txrx(id, D/I D %x\r, mfpr(PR_SLR)); /* SLR */
@@ -363,11 +363,15 @@ ka6400_startslave(struct cpu_info *ci)
}
void
-ka6400_txrx(int id, const char *fmt, int arg)
+ka6400_txrx(int id, const char *fmt, ...)
{
char buf[20];
+ va_list ap;
+
+ va_start(ap, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
- sprintf(buf, fmt, arg);
ka6400_sendstr(id, buf);
ka6400_sergeant(id);
}
Index: src/sys/arch/vax/vax/ka88.c
diff -u src/sys/arch/vax/vax/ka88.c:1.17 src/sys/arch/vax/vax/ka88.c:1.18
--- src/sys/arch/vax/vax/ka88.c:1.17 Mon Mar 24 16:06:33 2014
+++ src/sys/arch/vax/vax/ka88.c Wed Mar 26 04:01:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ka88.c,v 1.17 2014/03/24 20:06:33 christos Exp $ */
+/* $NetBSD: ka88.c,v 1.18 2014/03/26 08:01:21 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ka88.c,v 1.17 2014/03/24 20:06:33 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ka88.c,v 1.18 2014/03/26 08:01:21 christos Exp $);
#include opt_multiprocessor.h
@@ -93,7 +93,7 @@ const struct cpu_dep ka88_calls = {
#if defined(MULTIPROCESSOR)
static void ka88_startslave(struct cpu_info *);
-static void ka88_txrx(int, const char *, int);
+static void ka88_txrx(int, const char *, ...) __printflike(2, 3);
static void ka88_sendstr(int, const char *);
static void ka88_sergeant(int);
static
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: christos Date: Sun Jan 26 03:18:39 UTC 2014 Modified Files: src/sys/arch/vax/include: vmparam.h Log Message: don't re-specify the defaults To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/vax/include/vmparam.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/vax/include/vmparam.h diff -u src/sys/arch/vax/include/vmparam.h:1.49 src/sys/arch/vax/include/vmparam.h:1.50 --- src/sys/arch/vax/include/vmparam.h:1.49 Sat Jan 25 10:16:50 2014 +++ src/sys/arch/vax/include/vmparam.h Sat Jan 25 22:18:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.49 2014/01/25 15:16:50 christos Exp $ */ +/* $NetBSD: vmparam.h,v 1.50 2014/01/26 03:18:39 christos Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -98,14 +98,7 @@ #define VM_MIN_KERNEL_ADDRESS ((vaddr_t)KERNBASE) #define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(0xC000)) -/* - * The address to which unspecified mapping requests default - */ #define __USE_TOPDOWN_VM -#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \ -trunc_page(VM_MAXUSER_ADDRESS - MAXSSIZ - (sz)) -#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \ -round_page((vaddr_t)(da) + (vsize_t)maxdmap) #define USRIOSIZE (8 * VAX_NPTEPG) /* 512MB */ #define VM_PHYS_SIZE (USRIOSIZE*VAX_NBPG)
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: jklos Date: Thu Jan 23 21:37:09 UTC 2014 Modified Files: src/sys/arch/vax/include: param.h Log Message: Removed MAXBSIZE. Cleared with Anders Magnusson and tested myself. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/include/param.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/vax/include/param.h diff -u src/sys/arch/vax/include/param.h:1.60 src/sys/arch/vax/include/param.h:1.61 --- src/sys/arch/vax/include/param.h:1.60 Tue Jan 24 20:03:38 2012 +++ src/sys/arch/vax/include/param.h Thu Jan 23 21:37:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.60 2012/01/24 20:03:38 christos Exp $*/ +/* $NetBSD: param.h,v 1.61 2014/01/23 21:37:09 jklos Exp $*/ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -62,7 +62,6 @@ #define BLKDEV_IOSIZE 2048 #define MAXPHYS (64 * 1024) /* max raw I/O transfer size */ -#define MAXBSIZE 0x4000 /* max FS block size - XXX */ #define UPAGES 2 /* pages of u-area */ #define USPACE (NBPG*UPAGES)
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src
Committed By: christos
Date: Sat Nov 9 18:31:53 UTC 2013
Modified Files:
src/sys/arch/vax/boot/boot: boot.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/vax/boot/boot/boot.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/boot/boot/boot.c
diff -u src/sys/arch/vax/boot/boot/boot.c:1.31 src/sys/arch/vax/boot/boot/boot.c:1.32
--- src/sys/arch/vax/boot/boot/boot.c:1.31 Sat Jan 22 14:19:24 2011
+++ src/sys/arch/vax/boot/boot/boot.c Sat Nov 9 13:31:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.31 2011/01/22 19:19:24 joerg Exp $ */
+/* $NetBSD: boot.c,v 1.32 2013/11/09 18:31:53 christos Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -93,12 +93,10 @@ struct rpb bootrpb;
void
Xmain(void)
{
- int io;
int j, nu;
u_long marks[MARK_MAX];
extern const char bootprog_rev[];
- io = 0;
skip = 1;
autoconf();
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: christos Date: Sat Nov 9 20:32:59 UTC 2013 Modified Files: src/sys/arch/vax/include: cpu.h Log Message: __USE cii To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/vax/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/vax/include/cpu.h diff -u src/sys/arch/vax/include/cpu.h:1.96 src/sys/arch/vax/include/cpu.h:1.97 --- src/sys/arch/vax/include/cpu.h:1.96 Sat Oct 19 15:21:00 2013 +++ src/sys/arch/vax/include/cpu.h Sat Nov 9 15:32:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.96 2013/10/19 19:21:00 christos Exp $ */ +/* $NetBSD: cpu.h,v 1.97 2013/11/09 20:32:59 christos Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden @@ -186,7 +186,8 @@ cpu_intr_p(void) #define CPU_IS_PRIMARY(ci) ((ci)-ci_flags CI_MASTERCPU) #define CPU_INFO_ITERATOR int -#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = SIMPLEQ_FIRST(cpus); \ +#define CPU_INFO_FOREACH(cii, ci) cii = 0, __USE(cii), \ + ci = SIMPLEQ_FIRST(cpus); \ ci != NULL; \ ci = SIMPLEQ_NEXT(ci, ci_next)
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: martin Date: Fri Oct 25 14:44:25 UTC 2013 Modified Files: src/sys/arch/vax/vsa: hdc9224.c Log Message: Simplify (and remove now unused variable) To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/vsa/hdc9224.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/hdc9224.c diff -u src/sys/arch/vax/vsa/hdc9224.c:1.51 src/sys/arch/vax/vsa/hdc9224.c:1.52 --- src/sys/arch/vax/vsa/hdc9224.c:1.51 Tue Dec 14 23:31:16 2010 +++ src/sys/arch/vax/vsa/hdc9224.c Fri Oct 25 14:44:25 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $ */ +/* $NetBSD: hdc9224.c,v 1.52 2013/10/25 14:44:25 martin Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -51,7 +51,7 @@ #undef RDDEBUG #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: hdc9224.c,v 1.52 2013/10/25 14:44:25 martin Exp $); #include sys/param.h #include sys/systm.h @@ -502,7 +502,6 @@ hdcstart(struct hdcsoftc *sc, struct buf struct rdsoftc *rd; struct buf *bp; int cn, sn, tn, bn, blks; - volatile char ch; if (sc-sc_active) return; /* Already doing something */ @@ -559,7 +558,7 @@ hdcstart(struct hdcsoftc *sc, struct buf /* Count up vars */ sc-sc_xfer = blks * DEV_BSIZE; - ch = HDC_RSTAT; /* Avoid pending interrupts */ + (void)HDC_RSTAT; /* Avoid pending interrupts */ WAIT; vsbus_clrintr(sc-sc_intbit); /* Clear pending int's */
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: martin
Date: Fri Oct 25 16:30:52 UTC 2013
Modified Files:
src/sys/arch/vax/vax: trap.c
Log Message:
Mark a diagnostic-only variable
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/vax/vax/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/vax/vax/trap.c
diff -u src/sys/arch/vax/vax/trap.c:1.131 src/sys/arch/vax/vax/trap.c:1.132
--- src/sys/arch/vax/vax/trap.c:1.131 Thu Aug 2 14:03:22 2012
+++ src/sys/arch/vax/vax/trap.c Fri Oct 25 16:30:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.131 2012/08/02 14:03:22 matt Exp $ */
+/* $NetBSD: trap.c,v 1.132 2013/10/25 16:30:52 martin Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -33,7 +33,7 @@
/* All bugs are subject to removal without further notice */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.131 2012/08/02 14:03:22 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.132 2013/10/25 16:30:52 martin Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -385,7 +385,7 @@ startlwp(void *arg)
{
ucontext_t * const uc = arg;
lwp_t * const l = curlwp;
- int error;
+ int error __diagused;
error = cpu_setmcontext(l, uc-uc_mcontext, uc-uc_flags);
KASSERT(error == 0);
CVS commit: src/sys/arch/vax/vsa
Module Name:src
Committed By: martin
Date: Thu Oct 24 13:16:33 UTC 2013
Modified Files:
src/sys/arch/vax/vsa: spx.c
Log Message:
Mark a potentially unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/vsa/spx.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/spx.c
diff -u src/sys/arch/vax/vsa/spx.c:1.6 src/sys/arch/vax/vsa/spx.c:1.7
--- src/sys/arch/vax/vsa/spx.c:1.6 Mon May 14 08:44:13 2012
+++ src/sys/arch/vax/vsa/spx.c Thu Oct 24 13:16:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: spx.c,v 1.6 2012/05/14 08:44:13 abs Exp $ */
+/* $NetBSD: spx.c,v 1.7 2013/10/24 13:16:33 martin Exp $ */
/*
* SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
* Copyright (c) 2005 Blaz Antonic
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.6 2012/05/14 08:44:13 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.7 2013/10/24 13:16:33 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -677,7 +677,7 @@ static void
spx_cursor(void *id, int on, int row, int col)
{
struct spx_screen *ss = id;
- int attr, data;
+ int attr, data __unused;
attr = ss-ss_image[row * spx_cols + col].attr;
data = ss-ss_image[row * spx_cols + col].data;
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: martin Date: Wed Sep 18 13:31:39 UTC 2013 Modified Files: src/sys/arch/vax/include: vmparam.h Log Message: Bump MAXTSIZ to 32 MB (it is an arbitrary limit anyway) To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/vax/include/vmparam.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/vax/include/vmparam.h diff -u src/sys/arch/vax/include/vmparam.h:1.47 src/sys/arch/vax/include/vmparam.h:1.48 --- src/sys/arch/vax/include/vmparam.h:1.47 Sun Nov 14 13:33:23 2010 +++ src/sys/arch/vax/include/vmparam.h Wed Sep 18 13:31:39 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.47 2010/11/14 13:33:23 uebayasi Exp $ */ +/* $NetBSD: vmparam.h,v 1.48 2013/09/18 13:31:39 martin Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -62,7 +62,7 @@ */ #ifndef MAXTSIZ -#define MAXTSIZ (8*1024*1024) /* max text size */ +#define MAXTSIZ (32*1024*1024) /* max text size */ #endif #ifndef DFLDSIZ #define DFLDSIZ (128*1024*1024) /* initial data size limit */
CVS commit: src/sys/arch/vax/include
Module Name:src
Committed By: martin
Date: Mon Sep 16 15:56:24 UTC 2013
Modified Files:
src/sys/arch/vax/include: math.h
Log Message:
Change __isinf and __isnan from macros to inline functions. The macros do
collide with newer gcc libstdc++.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/math.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/vax/include/math.h
diff -u src/sys/arch/vax/include/math.h:1.6 src/sys/arch/vax/include/math.h:1.7
--- src/sys/arch/vax/include/math.h:1.6 Sun Feb 5 17:45:38 2012
+++ src/sys/arch/vax/include/math.h Mon Sep 16 15:56:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: math.h,v 1.6 2012/02/05 17:45:38 matt Exp $ */
+/* $NetBSD: math.h,v 1.7 2013/09/16 15:56:24 martin Exp $ */
#ifndef _VAX_MATH_H_
#define _VAX_MATH_H_
@@ -11,8 +11,10 @@
#define __INFINITY 1.0E+39F
#endif
-#define __isinf(__x) (0)
-#define __isnan(__x) (0)
+static inline int __isinf(double __x) { return 0; }
+static inline int __isnan(double __x) { return 0; }
+#define __HAVE_INLINE___ISINF
+#define __HAVE_INLINE___ISNAN
#if !defined(_ANSI_SOURCE) !defined(_POSIX_C_SOURCE) \
!defined(_XOPEN_SOURCE) || \
CVS commit: src/sys/arch/vax/boot
Module Name:src
Committed By: matt
Date: Wed Aug 21 06:15:41 UTC 2013
Modified Files:
src/sys/arch/vax/boot: Makefile.inc
src/sys/arch/vax/boot/boot: Makefile
Log Message:
Use bsd.klinks.mk
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/boot/Makefile.inc
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/vax/boot/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/boot/Makefile.inc
diff -u src/sys/arch/vax/boot/Makefile.inc:1.15 src/sys/arch/vax/boot/Makefile.inc:1.16
--- src/sys/arch/vax/boot/Makefile.inc:1.15 Thu Jul 18 12:15:16 2013
+++ src/sys/arch/vax/boot/Makefile.inc Wed Aug 21 06:15:41 2013
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.15 2013/07/18 12:15:16 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.16 2013/08/21 06:15:41 matt Exp $
+
+.include bsd.klinks.mk
RELOC=0x3f
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
@@ -9,6 +11,7 @@ CPPFLAGS+=-I${.CURDIR}/../../
CPPFLAGS+=-I${.CURDIR}/../common
CPPFLAGS+=-I${.CURDIR}/../../include
CPPFLAGS+=-DRELOC=${RELOC}
+CPPFLAGS+=-D_STANDALONE
WARNS?= 1
CFLAGS+=-ffreestanding -fno-pic -fno-unwind-tables
@@ -18,13 +21,3 @@ MKMAN=no
LIBCRTBEGIN=
LIBCRTEND=
-
-.if ${MACHINE} == vax
-.PHONY: machine-links
-beforedepend: machine-links
-machine-links:
- @rm -f machine ln -s ${S}/arch/${MACHINE}/include machine
- @rm -f ${MACHINE_ARCH} ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.NOPATH: machine ${MACHINE_ARCH}
-CLEANFILES+= machine ${MACHINE_ARCH}
-.endif
Index: src/sys/arch/vax/boot/boot/Makefile
diff -u src/sys/arch/vax/boot/boot/Makefile:1.40 src/sys/arch/vax/boot/boot/Makefile:1.41
--- src/sys/arch/vax/boot/boot/Makefile:1.40 Mon May 14 10:05:50 2012
+++ src/sys/arch/vax/boot/boot/Makefile Wed Aug 21 06:15:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2012/05/14 10:05:50 abs Exp $
+# $NetBSD: Makefile,v 1.41 2013/08/21 06:15:41 matt Exp $
S= ${.CURDIR}/../../../..
@@ -36,7 +36,7 @@ vers.c: ${.CURDIR}/version
${HOST_SH} ${S}/conf/newvers_stand.sh -N ${${MKREPRO} == yes :?:-D} \
${.CURDIR}/version ${MACHINE}
-${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${_MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -e nisse -o ${PROG}.sym ${OBJS} \
${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
CVS commit: src/sys/arch/vax/boot
Module Name:src
Committed By: matt
Date: Fri Jun 28 01:13:40 UTC 2013
Modified Files:
src/sys/arch/vax/boot/boot: conf.c
src/sys/arch/vax/boot/xxboot: bootxx.c
Log Message:
ufs - ffsv1 (ffsv2 is commentout due to size limitations)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/boot/boot/conf.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/boot/xxboot/bootxx.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/boot/boot/conf.c
diff -u src/sys/arch/vax/boot/boot/conf.c:1.15 src/sys/arch/vax/boot/boot/conf.c:1.16
--- src/sys/arch/vax/boot/boot/conf.c:1.15 Wed Mar 18 16:00:15 2009
+++ src/sys/arch/vax/boot/boot/conf.c Fri Jun 28 01:13:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.15 2009/03/18 16:00:15 cegger Exp $ */
+/* $NetBSD: conf.c,v 1.16 2013/06/28 01:13:40 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -88,13 +88,14 @@ int cnvtab[] = {
int ndevs = (sizeof(devsw)/sizeof(devsw[0]));
struct fs_ops file_system[] = {
- FS_OPS(ufs),
+ FS_OPS(ffsv1),
+ //FS_OPS(ffsv2),
FS_OPS(nfs),
FS_OPS(cd9660),
FS_OPS(ustarfs),
};
-int nfsys = (sizeof(file_system) / sizeof(struct fs_ops));
+int nfsys = __arraycount(file_system);
int
nostrategy(void *f, int func, daddr_t dblk,
Index: src/sys/arch/vax/boot/xxboot/bootxx.c
diff -u src/sys/arch/vax/boot/xxboot/bootxx.c:1.36 src/sys/arch/vax/boot/xxboot/bootxx.c:1.37
--- src/sys/arch/vax/boot/xxboot/bootxx.c:1.36 Fri Sep 18 21:40:09 2009
+++ src/sys/arch/vax/boot/xxboot/bootxx.c Fri Jun 28 01:13:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.36 2009/09/18 21:40:09 mhitch Exp $ */
+/* $NetBSD: bootxx.c,v 1.37 2013/06/28 01:13:40 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -186,7 +186,8 @@ die:
*/
struct fs_ops file_system[] = {
#ifdef NEED_UFS
- { ufs_open, 0, ufs_read, 0, 0, ufs_stat },
+ { ffsv1_open, 0, ffsv1_read, 0, 0, ffsv1_stat },
+ //{ ffsv2_open, 0, ffsv2_read, 0, 0, ffsv2_stat },
#endif
#ifdef NEED_CD9660
{ cd9660_open, 0, cd9660_read, 0, 0, cd9660_stat },
@@ -196,7 +197,7 @@ struct fs_ops file_system[] = {
#endif
};
-int nfsys = (sizeof(file_system) / sizeof(struct fs_ops));
+int nfsys = __arraycount(file_system);
#if 0
int tar_open(char *path, struct open_file *f);
CVS commit: src/sys/arch/vax/boot/xxboot
Module Name:src Committed By: martin Date: Thu Apr 4 12:48:08 UTC 2013 Modified Files: src/sys/arch/vax/boot/xxboot: start.S Log Message: Rearrange primary bootstrap slightly to free up all space between the disk label and the uVAX rom boot parameter block. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/boot/xxboot/start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/boot/xxboot/start.S diff -u src/sys/arch/vax/boot/xxboot/start.S:1.4 src/sys/arch/vax/boot/xxboot/start.S:1.5 --- src/sys/arch/vax/boot/xxboot/start.S:1.4 Sun Dec 11 12:19:34 2005 +++ src/sys/arch/vax/boot/xxboot/start.S Thu Apr 4 12:48:07 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: start.S,v 1.4 2005/12/11 12:19:34 christos Exp $ */ +/* $NetBSD: start.S,v 1.5 2013/04/04 12:48:07 martin Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -38,6 +38,7 @@ #define _LOCORE +#define __HAVE_OLD_DISKLABEL /* not automatically added due to _LOCORE */ #define OMIT_DKTYPENUMS #define OMIT_FSTYPENUMS #include sys/disklabel.h @@ -55,8 +56,12 @@ _C_LABEL(start): .org 0x00 # uVAX booted from TK50 starts here brb from_0x00 # continue behind dispatch-block +# At offset 0x02 we have a dual used area: VMB.EXE starts execution here, +# and uVAX-ROM looks for a pointer to a parameter block. We arrange for +# the parameter block offset to disassmble as a CASEL instructions which +# falls through to 0x08. .org 0x02 # information used by uVAX-ROM - .byte 0xcf # offset in words to identification area + .byte 0xcf # offset in words to identification area .byte 1 # this byte must be 1 .word 0 # logical block number (word swapped) .word 0 # of the secondary image @@ -74,20 +79,6 @@ from_0x00: # uVAX from TK50 from_0x08: # Any machine from VMB movzbl $4,_C_LABEL(from) # Booted from full VMB - brw start_vmb - -# the complete area reserved for label -# must be empty (i.e. filled with zeroes). -# disklabel(8) checks that before installing -# the bootblocks over existing label. - -.org LABELOFFSET - .globl _C_LABEL(romlabel) -_C_LABEL(romlabel): - .long 0 - -.org LABELOFFSET + d_end_ -start_vmb: /* * Read in block 1-15. */ @@ -102,6 +93,20 @@ start_vmb: calls $6, (%r6) # call the qio-routine brw start_uvax +# the complete area reserved for label +# must be empty (i.e. filled with zeroes). +# disklabel(8) checks that before installing +# the bootblocks over existing label. + +.org LABELOFFSET + .globl _C_LABEL(romlabel) +_C_LABEL(romlabel): + .long 0 + +.org LABELOFFSET + d_end_ +# Make sure the parameter block is past the disklabel. +# If not, the next .org would try to move backwards. + /* * Parameter block for uVAX boot. */ @@ -110,7 +115,7 @@ start_vmb: #define SILOAD 0 /* load offset (usually 0) from the default */ #define SIOFF 0x200 /* byte offset into secondary image */ -.org 0x19e +.org 0x19e # do not move, see comment earlier about CASEL .byte 0x18 # must be 0x18 .byte 0x00 # must be 0x00 (MBZ) .byte 0x00 # any value
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: martin Date: Thu Apr 4 12:50:03 UTC 2013 Modified Files: src/sys/arch/vax/include: disklabel.h Log Message: Drop MAXPARTITIONS down to 12 - we do not have more space to store a larger disklabel in the bootblocks at least on some supported machines. Keep the extended major/minor sheme compatible with the 6.0 release and note that we had a bigger MAXPARTITIONS in between. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/disklabel.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/vax/include/disklabel.h diff -u src/sys/arch/vax/include/disklabel.h:1.6 src/sys/arch/vax/include/disklabel.h:1.7 --- src/sys/arch/vax/include/disklabel.h:1.6 Mon Jul 2 22:42:18 2012 +++ src/sys/arch/vax/include/disklabel.h Thu Apr 4 12:50:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.h,v 1.6 2012/07/02 22:42:18 abs Exp $ */ +/* $NetBSD: disklabel.h,v 1.7 2013/04/04 12:50:03 martin Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -36,16 +36,24 @@ #define LABELUSESMBR 0 /* no MBR partitionning */ #define LABELSECTOR 0 /* sector containing label */ #define LABELOFFSET 64 /* offset of label in sector */ -#define MAXPARTITIONS 16 /* number of partitions */ +#define MAXPARTITIONS 12 /* number of partitions */ #define OLDMAXPARTITIONS 8 /* number of partitions before nb-6 */ #define RAW_PART 2 /* raw partition: xx?c */ +/* + * In NetBSD 6 we eroneously used a too large MAXPARTITIONS value (disklabel + * overlapped with important parts of the bootblocks and made some machines + * unbootable). + */ +#define __TMPBIGMAXPARTITIONS 16 /* compatibility with 6.0 installs */ /* * We use the highest bit of the minor number for the partition number. * This maintains backward compatibility with device nodes created before * MAXPARTITIONS was increased. + * Temporarily MAXPARTITIONS was 16, so we use that to keep compatibility + * with existing installations. */ -#define __VAX_MAXDISKS ((1 20) / MAXPARTITIONS) +#define __VAX_MAXDISKS ((1 20) / __TMPBIGMAXPARTITIONS) #define DISKUNIT(dev) ((minor(dev) / OLDMAXPARTITIONS) % __VAX_MAXDISKS) #define DISKPART(dev) ((minor(dev) % OLDMAXPARTITIONS) + \ ((minor(dev) / (__VAX_MAXDISKS * OLDMAXPARTITIONS)) * OLDMAXPARTITIONS))
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: martin
Date: Tue Mar 26 20:52:30 UTC 2013
Modified Files:
src/sys/arch/vax/vax: ka730.c ka750.c ka780.c
Log Message:
Minor cosmetic tweaks for cpu attach messages
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/ka730.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/vax/vax/ka750.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/vax/ka780.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/vax/ka730.c
diff -u src/sys/arch/vax/vax/ka730.c:1.4 src/sys/arch/vax/vax/ka730.c:1.5
--- src/sys/arch/vax/vax/ka730.c:1.4 Mon Oct 29 12:55:41 2012
+++ src/sys/arch/vax/vax/ka730.c Tue Mar 26 20:52:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ka730.c,v 1.4 2012/10/29 12:55:41 chs Exp $ */
+/* $NetBSD: ka730.c,v 1.5 2013/03/26 20:52:29 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ka730.c,v 1.4 2012/10/29 12:55:41 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: ka730.c,v 1.5 2013/03/26 20:52:29 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -117,7 +117,7 @@ ka730_conf(void)
void
ka730_attach_cpu(device_t self)
{
- aprint_normal(KA730, ucode rev %d\n, V730UCODE(vax_cpudata));
+ aprint_normal(: KA730, ucode rev %d\n, V730UCODE(vax_cpudata));
}
static void ka730_memenable(device_t, device_t, void *);
Index: src/sys/arch/vax/vax/ka750.c
diff -u src/sys/arch/vax/vax/ka750.c:1.44 src/sys/arch/vax/vax/ka750.c:1.45
--- src/sys/arch/vax/vax/ka750.c:1.44 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/ka750.c Tue Mar 26 20:52:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ka750.c,v 1.44 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: ka750.c,v 1.45 2013/03/26 20:52:29 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ka750.c,v 1.44 2010/12/14 23:44:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ka750.c,v 1.45 2013/03/26 20:52:29 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -123,7 +123,7 @@ ka750_conf(void)
void
ka750_attach_cpu(device_t self)
{
- aprint_normal(KA750, 4KB L1 cache, hardware/ucode rev %d/%d, ,
+ aprint_normal(: KA750, 4KB L1 cache, hardware/ucode rev %d/%d, ,
V750HARDW(vax_cpudata), V750UCODE(vax_cpudata));
if (mfpr(PR_ACCS) 255) {
aprint_normal(FPA present\n);
Index: src/sys/arch/vax/vax/ka780.c
diff -u src/sys/arch/vax/vax/ka780.c:1.29 src/sys/arch/vax/vax/ka780.c:1.30
--- src/sys/arch/vax/vax/ka780.c:1.29 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/ka780.c Tue Mar 26 20:52:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ka780.c,v 1.29 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: ka780.c,v 1.30 2013/03/26 20:52:30 martin Exp $ */
/*-
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ka780.c,v 1.29 2010/12/14 23:44:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ka780.c,v 1.30 2013/03/26 20:52:30 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -364,7 +364,7 @@ ka780_attach_cpu(device_t self)
{
struct ka78x * const ka78 = (void *)vax_cpudata;
- aprint_normal(KA%s, serial number %d(%d), hardware ECO level %d(%d)\n,
+ aprint_normal(: KA%s, S/N %d(%d), hardware ECO level %d(%d)\n,
cpu_model[8], ka78-snr, ka78-plant, ka78-eco 4, ka78-eco);
aprint_normal_dev(self, 4KB L1 cachen);
if (mfpr(PR_ACCS) 255) {
