Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/vax Update according to cast-qual addition.
details: https://anonhg.NetBSD.org/src/rev/0cd67d93f8db
branches: trunk
changeset: 582436:0cd67d93f8db
user: ragge <ragge%NetBSD.org@localhost>
date: Mon Jun 27 11:03:25 2005 +0000
description:
Update according to cast-qual addition.
diffstat:
sys/arch/vax/include/mtpr.h | 8 ++++----
sys/arch/vax/include/nexus.h | 4 ++--
sys/arch/vax/vax/autoconf.c | 8 ++++----
sys/arch/vax/vax/clock.c | 6 +++---
sys/arch/vax/vax/db_disasm.c | 20 ++++++++++----------
sys/arch/vax/vax/db_disasm.h | 6 +++---
sys/arch/vax/vax/db_machdep.c | 6 +++---
sys/arch/vax/vax/disksubr.c | 10 +++++-----
sys/arch/vax/vax/ka410.c | 6 +++---
sys/arch/vax/vax/ka43.c | 12 ++++++------
sys/arch/vax/vax/ka46.c | 8 ++++----
sys/arch/vax/vax/ka48.c | 6 +++---
sys/arch/vax/vax/ka49.c | 6 +++---
sys/arch/vax/vax/ka53.c | 6 +++---
sys/arch/vax/vax/ka630.c | 14 +++++++-------
sys/arch/vax/vax/ka650.c | 6 +++---
sys/arch/vax/vax/ka680.c | 6 +++---
sys/arch/vax/vax/ka750.c | 6 +++---
sys/arch/vax/vax/ka780.c | 6 +++---
sys/arch/vax/vax/ka820.c | 8 ++++----
sys/arch/vax/vax/ka860.c | 8 ++++----
sys/arch/vax/vax/sgmap.c | 6 +++---
22 files changed, 86 insertions(+), 86 deletions(-)
diffs (truncated from 737 to 300 lines):
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/include/mtpr.h
--- a/sys/arch/vax/include/mtpr.h Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/include/mtpr.h Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mtpr.h,v 1.15 2004/02/13 11:36:20 wiz Exp $ */
+/* $NetBSD: mtpr.h,v 1.16 2005/06/27 11:03:25 ragge Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -175,11 +175,11 @@
#define mfpr(reg) \
({ \
- register int val; \
+ register int __val; \
__asm__ __volatile ("mfpr %1,%0" \
- : "=g" (val) \
+ : "=g" (__val) \
: "g" (reg)); \
- val; \
+ __val; \
})
#endif /* _LOCORE */
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/include/nexus.h
--- a/sys/arch/vax/include/nexus.h Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/include/nexus.h Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nexus.h,v 1.21 2003/08/07 16:30:11 agc Exp $ */
+/* $NetBSD: nexus.h,v 1.22 2005/06/27 11:03:25 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -114,7 +114,7 @@
};
struct bp_conf {
- char *type;
+ const char *type;
int num;
int partyp;
int bp_addr;
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/vax/autoconf.c
--- a/sys/arch/vax/vax/autoconf.c Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/vax/autoconf.c Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.83 2004/12/14 02:32:03 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.84 2005/06/27 11:03:25 ragge 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.83 2004/12/14 02:32:03 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.84 2005/06/27 11:03:25 ragge Exp $");
#include "opt_compat_netbsd.h"
@@ -181,7 +181,7 @@
#include "ry.h"
static int ubtest(void *);
-static int jmfr(char *, struct device *, int);
+static int jmfr(const char *, struct device *, int);
static int booted_qe(struct device *, void *);
static int booted_qt(struct device *, void *);
static int booted_le(struct device *, void *);
@@ -253,7 +253,7 @@
* Simple checks. Return 1 on fail.
*/
int
-jmfr(char *n, struct device *dev, int nr)
+jmfr(const char *n, struct device *dev, int nr)
{
if (rpb.devtyp != nr)
return 1;
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/vax/clock.c
--- a/sys/arch/vax/vax/clock.c Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/vax/clock.c Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.41 2003/07/15 02:15:03 lukem Exp $ */
+/* $NetBSD: clock.c,v 1.42 2005/06/27 11:03:25 ragge Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41 2003/07/15 02:15:03 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.42 2005/06/27 11:03:25 ragge Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -63,7 +63,7 @@
static struct timeval lasttime;
s = splhigh();
- bcopy((caddr_t)&time, tvp, sizeof(struct timeval));
+ *tvp = time;
switch (vax_boardtype) {
#if VAX46 || VAXANY
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/vax/db_disasm.c
--- a/sys/arch/vax/vax/db_disasm.c Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/vax/db_disasm.c Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.14 2005/05/31 00:40:17 chs Exp $ */
+/* $NetBSD: db_disasm.c,v 1.15 2005/06/27 11:03:25 ragge 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.14 2005/05/31 00:40:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.15 2005/06/27 11:03:25 ragge Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -105,7 +105,7 @@
char *curp; /* pointer into result */
char *ppc; /* pseudo PC */
int opc; /* op-code */
- char *argp; /* pointer into argument-list */
+ const char *argp; /* pointer into argument-list */
int itype; /* instruction-type, eg. branch, call, unspec */
int atype; /* argument-type, eg. byte, long, address */
int off; /* offset specified by last argument */
@@ -331,19 +331,19 @@
break;
case 5: /* register */
- add_str(ib, (char *)my_db_regs[reg].name);
+ add_str(ib, my_db_regs[reg].name);
break;
case 6: /* register deferred */
add_char(ib, '(');
- add_str(ib, (char *)my_db_regs[reg].name);
+ add_str(ib, my_db_regs[reg].name);
add_char(ib, ')');
break;
case 7: /* autodecrement */
add_char(ib, '-');
add_char(ib, '(');
- add_str(ib, (char *)my_db_regs[reg].name);
+ add_str(ib, my_db_regs[reg].name);
add_char(ib, ')');
if (reg == 0x0F) { /* pc is not allowed in this mode */
err_print("autodecrement not allowd for PC.\n");
@@ -383,7 +383,7 @@
break;
}
add_char(ib, '(');
- add_str(ib, (char *)my_db_regs[reg].name);
+ add_str(ib, my_db_regs[reg].name);
add_char(ib, ')');
add_char(ib, '+');
break;
@@ -399,7 +399,7 @@
/* add_str (ib, "b^"); */
add_int(ib, tmp);
add_char(ib, '(');
- add_str(ib, (char *)my_db_regs[reg].name);
+ add_str(ib, my_db_regs[reg].name);
add_char(ib, ')');
break;
@@ -414,7 +414,7 @@
/* add_str (ib, "w^"); */
add_int(ib, tmp);
add_char(ib, '(');
- add_str(ib, (char *)my_db_regs[reg].name);
+ add_str(ib, my_db_regs[reg].name);
add_char(ib, ')');
break;
@@ -429,7 +429,7 @@
/* add_str (ib, "l^"); */
add_int(ib, tmp);
add_char(ib, '(');
- add_str(ib, (char *)my_db_regs[reg].name);
+ add_str(ib, my_db_regs[reg].name);
add_char(ib, ')');
break;
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/vax/db_disasm.h
--- a/sys/arch/vax/vax/db_disasm.h Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/vax/db_disasm.h Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.h,v 1.2 2003/11/10 08:51:52 wiz Exp $ */
+/* $NetBSD: db_disasm.h,v 1.3 2005/06/27 11:03:25 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -53,8 +53,8 @@
*/
struct {
- char *mnemonic;
- char *argdesc;
+ const char *mnemonic;
+ const char *argdesc;
} vax_inst[256] = {
/*
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/vax/db_machdep.c
--- a/sys/arch/vax/vax/db_machdep.c Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/vax/db_machdep.c Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.38 2005/05/31 00:40:17 chs Exp $ */
+/* $NetBSD: db_machdep.c,v 1.39 2005/06/27 11:03:25 ragge Exp $ */
/*
* :set tabs=4
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.38 2005/05/31 00:40:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.39 2005/06/27 11:03:25 ragge Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -265,7 +265,7 @@
db_write_bytes(addr, size, data)
vaddr_t addr;
register size_t size;
- register char *data;
+ register const char *data;
{
memcpy((caddr_t)addr, data, size);
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/vax/disksubr.c
--- a/sys/arch/vax/vax/disksubr.c Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/vax/disksubr.c Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.37 2003/08/07 16:30:18 agc Exp $ */
+/* $NetBSD: disksubr.c,v 1.38 2005/06/27 11:03:25 ragge Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.37 2003/08/07 16:30:18 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.38 2005/06/27 11:03:25 ragge Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@
{
struct buf *bp;
struct disklabel *dlp;
- char *msg = NULL;
+ const char *msg = NULL;
if (lp->d_npartitions == 0) { /* Assume no label */
lp->d_secperunit = 0x1fffffff;
@@ -374,8 +374,8 @@
if (pfnum == 0)
panic("mapin zero entry");
pte++;
- *(int *)io++ = pfnum | flag;
+ *(volatile int *)io++ = pfnum | flag;
}
- *(int *)io = 0;
+ *(volatile int *)io = 0;
}
}
diff -r 49623219db91 -r 0cd67d93f8db sys/arch/vax/vax/ka410.c
--- a/sys/arch/vax/vax/ka410.c Mon Jun 27 09:51:09 2005 +0000
+++ b/sys/arch/vax/vax/ka410.c Mon Jun 27 11:03:25 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka410.c,v 1.25 2003/07/15 02:15:03 lukem Exp $ */
+/* $NetBSD: ka410.c,v 1.26 2005/06/27 11:03:25 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka410.c,v 1.25 2003/07/15 02:15:03 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka410.c,v 1.26 2005/06/27 11:03:25 ragge Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -164,7 +164,7 @@
static void
ka410_clrf()
{
- struct ka410_clock *clk = (void *)clk_page;
+ volatile struct ka410_clock *clk = (volatile void *)clk_page;
Home |
Main Index |
Thread Index |
Old Index