Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sgimips Constify
details: https://anonhg.NetBSD.org/src/rev/4f69a684cd0f
branches: trunk
changeset: 581677:4f69a684cd0f
user: martin <martin%NetBSD.org@localhost>
date: Fri Jun 03 18:55:12 2005 +0000
description:
Constify
diffstat:
sys/arch/sgimips/dev/zs.c | 8 ++++----
sys/arch/sgimips/hpc/if_sq.c | 8 ++++----
sys/arch/sgimips/hpc/sbic.c | 10 ++++++----
sys/arch/sgimips/mace/if_mec.c | 6 +++---
sys/arch/sgimips/sgimips/console.c | 20 ++++++++++----------
sys/arch/sgimips/sgimips/disksubr.c | 8 ++++----
sys/arch/sgimips/stand/common/boot.c | 6 +++---
7 files changed, 34 insertions(+), 32 deletions(-)
diffs (261 lines):
diff -r b6c72e4bcd73 -r 4f69a684cd0f sys/arch/sgimips/dev/zs.c
--- a/sys/arch/sgimips/dev/zs.c Fri Jun 03 18:53:50 2005 +0000
+++ b/sys/arch/sgimips/dev/zs.c Fri Jun 03 18:55:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.25 2004/09/29 04:06:51 sekiya Exp $ */
+/* $NetBSD: zs.c,v 1.26 2005/06/03 18:55:12 martin Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.25 2004/09/29 04:06:51 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.26 2005/06/03 18:55:12 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -213,7 +213,7 @@
struct zs_chanstate *cs;
struct zs_channel *ch;
int zs_unit, channel, err, s;
- char *promconsdev;
+ const char *promconsdev;
promconsdev = ARCBIOS->GetEnvironmentVariable("ConsoleOut");
@@ -728,7 +728,7 @@
zscninit(struct consdev *cn)
{
extern const struct cdevsw zstty_cdevsw;
- char* consdev;
+ const char* consdev;
if ((consdev = ARCBIOS->GetEnvironmentVariable("ConsoleOut")) == NULL)
panic("zscninit without valid ARCS ConsoleOut setting!");
diff -r b6c72e4bcd73 -r 4f69a684cd0f sys/arch/sgimips/hpc/if_sq.c
--- a/sys/arch/sgimips/hpc/if_sq.c Fri Jun 03 18:53:50 2005 +0000
+++ b/sys/arch/sgimips/hpc/if_sq.c Fri Jun 03 18:55:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sq.c,v 1.27 2004/12/31 22:32:34 rumble Exp $ */
+/* $NetBSD: if_sq.c,v 1.28 2005/06/03 18:55:12 martin Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.27 2004/12/31 22:32:34 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.28 2005/06/03 18:55:12 martin Exp $");
#include "bpfilter.h"
@@ -152,7 +152,7 @@
sq_attach(struct device *parent, struct device *self, void *aux)
{
int i, err;
- char* macaddr;
+ const char* macaddr;
struct sq_softc *sc = (void *)self;
struct hpc_attach_args *haa = aux;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -818,7 +818,7 @@
sq_trace_dump(struct sq_softc *sc)
{
int i;
- char *act;
+ const char *act;
for (i = 0; i < sc->sq_trace_idx; i++) {
switch (sc->sq_trace[i].action) {
diff -r b6c72e4bcd73 -r 4f69a684cd0f sys/arch/sgimips/hpc/sbic.c
--- a/sys/arch/sgimips/hpc/sbic.c Fri Jun 03 18:53:50 2005 +0000
+++ b/sys/arch/sgimips/hpc/sbic.c Fri Jun 03 18:55:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.17 2004/01/10 02:55:54 sekiya Exp $ */
+/* $NetBSD: sbic.c,v 1.18 2005/06/03 18:55:12 martin Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.17 2004/01/10 02:55:54 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.18 2005/06/03 18:55:12 martin Exp $");
#include "opt_ddb.h"
@@ -128,7 +128,8 @@
int wd33c93_poll (struct wd33c93_softc *, struct wd33c93_acb *);
int wd33c93_nextstate (struct wd33c93_softc *, struct wd33c93_acb *,
u_char, u_char);
-int wd33c93_abort (struct wd33c93_softc *, struct wd33c93_acb *, char *);
+int wd33c93_abort (struct wd33c93_softc *, struct wd33c93_acb *,
+ const char *);
void wd33c93_xferdone (struct wd33c93_softc *);
void wd33c93_error (struct wd33c93_softc *, struct wd33c93_acb *);
void wd33c93_scsidone (struct wd33c93_softc *, struct wd33c93_acb *, int);
@@ -825,7 +826,8 @@
}
int
-wd33c93_abort(struct wd33c93_softc *dev, struct wd33c93_acb *acb, char *where)
+wd33c93_abort(struct wd33c93_softc *dev, struct wd33c93_acb *acb,
+ const char *where)
{
u_char csr, asr;
diff -r b6c72e4bcd73 -r 4f69a684cd0f sys/arch/sgimips/mace/if_mec.c
--- a/sys/arch/sgimips/mace/if_mec.c Fri Jun 03 18:53:50 2005 +0000
+++ b/sys/arch/sgimips/mace/if_mec.c Fri Jun 03 18:55:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mec.c,v 1.5 2005/05/18 14:57:36 tsutsui Exp $ */
+/* $NetBSD: if_mec.c,v 1.6 2005/06/03 18:55:12 martin Exp $ */
/*
* Copyright (c) 2004 Izumi Tsutsui.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.5 2005/05/18 14:57:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.6 2005/06/03 18:55:12 martin Exp $");
#include "opt_ddb.h"
#include "bpfilter.h"
@@ -380,7 +380,7 @@
struct mace_attach_args *maa = aux;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
uint32_t command;
- char *macaddr;
+ const char *macaddr;
struct mii_softc *child;
bus_dma_segment_t seg;
int i, err, rseg;
diff -r b6c72e4bcd73 -r 4f69a684cd0f sys/arch/sgimips/sgimips/console.c
--- a/sys/arch/sgimips/sgimips/console.c Fri Jun 03 18:53:50 2005 +0000
+++ b/sys/arch/sgimips/sgimips/console.c Fri Jun 03 18:55:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.30 2004/12/30 23:18:09 rumble Exp $ */
+/* $NetBSD: console.c,v 1.31 2005/06/03 18:55:12 martin Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.30 2004/12/30 23:18:09 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.31 2005/06/03 18:55:12 martin Exp $");
#include "opt_kgdb.h"
@@ -67,14 +67,14 @@
extern void zs_kgdb_init(void);
void kgdb_port_init(void);
-static int zs_serial_init(char *);
-static int gio_video_init(char *);
-static int mace_serial_init(char *);
+static int zs_serial_init(const char *);
+static int gio_video_init(const char *);
+static int mace_serial_init(const char *);
void
consinit()
{
- char *consdev;
+ const char *consdev;
/* Ask ARCS what it is using for console output. */
consdev = ARCBIOS->GetEnvironmentVariable("ConsoleOut");
@@ -107,7 +107,7 @@
}
static int
-zs_serial_init(char *consdev)
+zs_serial_init(const char *consdev)
{
#if (NZSC > 0)
if ((strlen(consdev) == 9) && (!strncmp(consdev, "serial", 6)) &&
@@ -123,7 +123,7 @@
}
static int
-gio_video_init(char *consdev)
+gio_video_init(const char *consdev)
{
#if (NGIO > 0)
if (strcmp(consdev, "video()") == 0) {
@@ -159,10 +159,10 @@
}
static int
-mace_serial_init(char *consdev)
+mace_serial_init(const char *consdev)
{
#if (NCOM > 0)
- char *dbaud;
+ const char *dbaud;
int speed;
u_int32_t base;
diff -r b6c72e4bcd73 -r 4f69a684cd0f sys/arch/sgimips/sgimips/disksubr.c
--- a/sys/arch/sgimips/sgimips/disksubr.c Fri Jun 03 18:53:50 2005 +0000
+++ b/sys/arch/sgimips/sgimips/disksubr.c Fri Jun 03 18:55:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.14 2004/11/24 21:59:32 jmc Exp $ */
+/* $NetBSD: disksubr.c,v 1.15 2005/06/03 18:55:12 martin Exp $ */
/*
* Copyright (c) 2001 Christopher Sekiya
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.14 2004/11/24 21:59:32 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.15 2005/06/03 18:55:12 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@
static int disklabel_bsd_to_sgimips(struct disklabel *lp,
struct sgi_boot_block *vh);
-static char *disklabel_sgimips_to_bsd(struct sgi_boot_block *vh,
+static const char *disklabel_sgimips_to_bsd(struct sgi_boot_block *vh,
struct disklabel *lp);
int mipsvh_cksum(struct sgi_boot_block *vhp);
@@ -303,7 +303,7 @@
*
* Returns NULL on success, otherwise an error string
*/
-static char *
+static const char *
disklabel_sgimips_to_bsd(struct sgi_boot_block *vh, struct disklabel *lp)
{
int i, bp, mp;
diff -r b6c72e4bcd73 -r 4f69a684cd0f sys/arch/sgimips/stand/common/boot.c
--- a/sys/arch/sgimips/stand/common/boot.c Fri Jun 03 18:53:50 2005 +0000
+++ b/sys/arch/sgimips/stand/common/boot.c Fri Jun 03 18:55:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.10 2004/01/03 10:29:37 sekiya Exp $ */
+/* $NetBSD: boot.c,v 1.11 2005/06/03 18:55:12 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -127,8 +127,8 @@
int
main(int argc, char **argv)
{
- char *kernel = NULL;
- char *bootpath = NULL;
+ const char *kernel = NULL;
+ const char *bootpath = NULL;
char bootfile[PATH_MAX];
void (*entry) (int, char *[], int, void *);
u_long marks[MARK_MAX];
Home |
Main Index |
Thread Index |
Old Index