CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Fri Apr 21 22:44:27 UTC 2023
Modified Files:
src/sys/arch/hp300/stand/common: apci.c dca.c dcm.c ite.c
Log Message:
Remove ancient /* ARGSUSED */ lint comments.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/apci.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/stand/common/dca.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/common/dcm.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp300/stand/common/ite.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/apci.c
diff -u src/sys/arch/hp300/stand/common/apci.c:1.13 src/sys/arch/hp300/stand/common/apci.c:1.14
--- src/sys/arch/hp300/stand/common/apci.c:1.13 Thu Apr 17 12:35:24 2014
+++ src/sys/arch/hp300/stand/common/apci.c Fri Apr 21 22:44:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: apci.c,v 1.13 2014/04/17 12:35:24 tsutsui Exp $ */
+/* $NetBSD: apci.c,v 1.14 2023/04/21 22:44:27 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -141,7 +141,6 @@ apciinit(struct consdev *cp)
apci->ap_mcr = MCR_DTR | MCR_RTS;
}
-/* ARGSUSED */
#ifndef SMALL
int
apcigetchar(dev_t dev)
@@ -164,7 +163,6 @@ apcigetchar(dev_t dev)
}
#endif
-/* ARGSUSED */
void
apciputchar(dev_t dev, int c)
{
Index: src/sys/arch/hp300/stand/common/dca.c
diff -u src/sys/arch/hp300/stand/common/dca.c:1.7 src/sys/arch/hp300/stand/common/dca.c:1.8
--- src/sys/arch/hp300/stand/common/dca.c:1.7 Tue Feb 8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/dca.c Fri Apr 21 22:44:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dca.c,v 1.7 2011/02/08 20:20:14 rmind Exp $ */
+/* $NetBSD: dca.c,v 1.8 2023/04/21 22:44:27 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -103,7 +103,6 @@ dcainit(struct consdev *cp)
dca->dca_mcr = MCR_DTR | MCR_RTS;
}
-/* ARGSUSED */
#ifndef SMALL
int
dcagetchar(dev_t dev)
@@ -126,7 +125,6 @@ dcagetchar(dev_t dev)
}
#endif
-/* ARGSUSED */
void
dcaputchar(dev_t dev, int c)
{
Index: src/sys/arch/hp300/stand/common/dcm.c
diff -u src/sys/arch/hp300/stand/common/dcm.c:1.9 src/sys/arch/hp300/stand/common/dcm.c:1.10
--- src/sys/arch/hp300/stand/common/dcm.c:1.9 Sat Jun 21 02:02:40 2014
+++ src/sys/arch/hp300/stand/common/dcm.c Fri Apr 21 22:44:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dcm.c,v 1.9 2014/06/21 02:02:40 tsutsui Exp $ */
+/* $NetBSD: dcm.c,v 1.10 2023/04/21 22:44:27 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -103,7 +103,6 @@ dcminit(struct consdev *cp)
DELAY(15000);
}
-/* ARGSUSED */
#ifndef SMALL
int
dcmgetchar(dev_t dev)
@@ -137,7 +136,6 @@ dcmgetchar(dev_t dev)
}
#endif
-/* ARGSUSED */
void
dcmputchar(dev_t dev, int c)
{
Index: src/sys/arch/hp300/stand/common/ite.c
diff -u src/sys/arch/hp300/stand/common/ite.c:1.19 src/sys/arch/hp300/stand/common/ite.c:1.20
--- src/sys/arch/hp300/stand/common/ite.c:1.19 Mon Jul 5 13:41:08 2021
+++ src/sys/arch/hp300/stand/common/ite.c Fri Apr 21 22:44:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.19 2021/07/05 13:41:08 tsutsui Exp $ */
+/* $NetBSD: ite.c,v 1.20 2023/04/21 22:44:27 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -289,7 +289,6 @@ iteinit(struct consdev *cp)
kbdinit();
}
-/* ARGSUSED */
void
iteputchar(dev_t dev, int c)
{
@@ -354,7 +353,6 @@ ite_clrtoeol(struct ite_data *ip, struct
(*sp->ite_cursor)(ip, DRAW_CURSOR);
}
-/* ARGSUSED */
int
itegetchar(dev_t dev)
{
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Fri Apr 21 22:44:27 UTC 2023 Modified Files: src/sys/arch/hp300/stand/common: apci.c dca.c dcm.c ite.c Log Message: Remove ancient /* ARGSUSED */ lint comments. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/apci.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/stand/common/dca.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/common/dcm.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp300/stand/common/ite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Fri Apr 21 22:43:11 UTC 2023
Modified Files:
src/sys/arch/hp300/stand/common: if_le.c
Log Message:
Avoid an extern declaration in .c file. Just declare it as static.
Suggested on tech-userlevel@.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/if_le.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/if_le.c
diff -u src/sys/arch/hp300/stand/common/if_le.c:1.14 src/sys/arch/hp300/stand/common/if_le.c:1.15
--- src/sys/arch/hp300/stand/common/if_le.c:1.14 Mon Nov 21 15:36:29 2022
+++ src/sys/arch/hp300/stand/common/if_le.c Fri Apr 21 22:43:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.14 2022/11/21 15:36:29 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.15 2023/04/21 22:43:11 tsutsui Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -98,7 +98,7 @@ static struct le_sel le0conf[] = {
};
#define NLE0CONF (sizeof(le0conf) / sizeof(le0conf[0]))
-extern struct netif_stats le_stats[];
+static struct netif_stats le_stats[];
static struct netif_dif le_ifs[] = {
/* dif_unit dif_nsel dif_stats dif_private */
@@ -106,7 +106,7 @@ static struct netif_dif le_ifs[] = {
};
#define NLE_IFS (sizeof(le_ifs) / sizeof(le_ifs[0]))
-struct netif_stats le_stats[NLE_IFS];
+static struct netif_stats le_stats[NLE_IFS];
struct netif_driver le_driver = {
"le", /* netif_bname */
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Fri Apr 21 22:43:11 UTC 2023 Modified Files: src/sys/arch/hp300/stand/common: if_le.c Log Message: Avoid an extern declaration in .c file. Just declare it as static. Suggested on tech-userlevel@. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/if_le.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Sun Dec 11 07:39:30 UTC 2022
Modified Files:
src/sys/arch/hp300/stand/common: conf.c conf.h devopen.c samachdep.h
Log Message:
Make hp300 bootloaders UFS2 ready.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/conf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/stand/common/conf.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/devopen.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp300/stand/common/samachdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/conf.c
diff -u src/sys/arch/hp300/stand/common/conf.c:1.13 src/sys/arch/hp300/stand/common/conf.c:1.14
--- src/sys/arch/hp300/stand/common/conf.c:1.13 Sun Dec 11 06:27:35 2022
+++ src/sys/arch/hp300/stand/common/conf.c Sun Dec 11 07:39:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.13 2022/12/11 06:27:35 tsutsui Exp $ */
+/* $NetBSD: conf.c,v 1.14 2022/12/11 07:39:30 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -137,9 +137,14 @@ int npunit = __arraycount(punitsw);
/*
* Filesystem configuration
*/
-struct fs_ops file_system_rawfs[] = { FS_OPS(rawfs) };
-struct fs_ops file_system_ufs[] = { FS_OPS(ufs) };
-struct fs_ops file_system_nfs[] = { FS_OPS(nfs) };
+struct fs_ops file_system_rawfs[1] = { FS_OPS(rawfs) };
+struct fs_ops file_system_ufs[NFSYS_UFS] = {
+ FS_OPS(ffsv1),
+#ifdef SUPPORT_UFS2
+ FS_OPS(ffsv2),
+#endif
+};
+struct fs_ops file_system_nfs[1] = { FS_OPS(nfs) };
-struct fs_ops file_system[1];
-int nfsys = 1; /* we always know which one we want */
+struct fs_ops file_system[NFSYS_UFS];
+int nfsys = 1; /* default value; should be overrieded */
Index: src/sys/arch/hp300/stand/common/conf.h
diff -u src/sys/arch/hp300/stand/common/conf.h:1.2 src/sys/arch/hp300/stand/common/conf.h:1.3
--- src/sys/arch/hp300/stand/common/conf.h:1.2 Sun Dec 11 12:17:19 2005
+++ src/sys/arch/hp300/stand/common/conf.h Sun Dec 11 07:39:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.h,v 1.2 2005/12/11 12:17:19 christos Exp $ */
+/* $NetBSD: conf.h,v 1.3 2022/12/11 07:39:30 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -52,7 +52,25 @@ int sdstrategy(void *, int, daddr_t, siz
int sdopen(struct open_file *, ...);
int sdclose(struct open_file *);
#endif
+#ifdef SUPPORT_UFS2
+#define NFSYS_UFS 2
+#else
+#define NFSYS_UFS 1
+#endif
#ifdef SUPPORT_ETHERNET
extern struct netif_driver le_driver;
#endif
+
+/*
+ * Switch we use to set punit in devopen.
+ */
+struct punitsw {
+ int (*p_punit)(int, int, int *);
+};
+extern struct punitsw punitsw[];
+extern int npunit;
+
+extern struct fs_ops file_system_rawfs[1];
+extern struct fs_ops file_system_ufs[NFSYS_UFS];
+extern struct fs_ops file_system_nfs[1];
Index: src/sys/arch/hp300/stand/common/devopen.c
diff -u src/sys/arch/hp300/stand/common/devopen.c:1.12 src/sys/arch/hp300/stand/common/devopen.c:1.13
--- src/sys/arch/hp300/stand/common/devopen.c:1.12 Thu Mar 8 03:12:01 2018
+++ src/sys/arch/hp300/stand/common/devopen.c Sun Dec 11 07:39:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.12 2018/03/08 03:12:01 mrg Exp $ */
+/* $NetBSD: devopen.c,v 1.13 2022/12/11 07:39:30 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -63,6 +63,7 @@
#include
#include
+#include
#include
u_int opendev;
@@ -96,18 +97,21 @@ devlookup(const char *d, int len)
switch (i) {
case 0: /* ct */
memcpy(file_system, file_system_rawfs,
-sizeof(struct fs_ops));
+sizeof(file_system_rawfs));
+nfsys = 1;
break;
case 2: /* rd */
case 4: /* sd */
memcpy(file_system, file_system_ufs,
-sizeof(struct fs_ops));
+sizeof(file_system_ufs));
+nfsys = NFSYS_UFS;
break;
case 6: /* le */
memcpy(file_system, file_system_nfs,
-sizeof(struct fs_ops));
+sizeof(file_system_nfs));
+nfsys = 1;
break;
default:
@@ -250,16 +254,22 @@ devopen(struct open_file *f, const char
*/
switch (dev) {
case 0: /* ct */
- memcpy(file_system, file_system_rawfs, sizeof(struct fs_ops));
+ memcpy(file_system, file_system_rawfs,
+ sizeof(file_system_rawfs));
+ nfsys = 1;
break;
case 2: /* rd */
case 4: /* sd */
- memcpy(file_system, file_system_ufs, sizeof(struct fs_ops));
+ memcpy(file_system, file_system_ufs,
+ sizeof(file_system_ufs));
+ nfsys = NFSYS_UFS;
break;
case 6: /* le */
- memcpy(file_system, file_system_nfs, sizeof(struct fs_ops));
+ memcpy(file_system, file_system_nfs,
+ sizeof(file_system_nfs));
+ nfsys = 1;
break;
default:
Index: src/sys/arch/hp300/stand/common/samachdep.h
diff -u src/sys/arch/hp300/stand/common/samachdep.h:1.21 src/sys/arch/hp300/stand/common/samachdep.h:1.22
--- src/sys/arch/hp300/stand/common/samachdep.h:1.21 Sun Dec 11 06:20:07 2022
+++
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Sun Dec 11 07:39:30 UTC 2022 Modified Files: src/sys/arch/hp300/stand/common: conf.c conf.h devopen.c samachdep.h Log Message: Make hp300 bootloaders UFS2 ready. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/conf.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/stand/common/conf.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/devopen.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp300/stand/common/samachdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Sun Dec 11 06:27:35 UTC 2022
Modified Files:
src/sys/arch/hp300/stand/common: conf.c
Log Message:
Remove a #if 0'ed out unused function.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/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/hp300/stand/common/conf.c
diff -u src/sys/arch/hp300/stand/common/conf.c:1.12 src/sys/arch/hp300/stand/common/conf.c:1.13
--- src/sys/arch/hp300/stand/common/conf.c:1.12 Sun Dec 23 03:11:32 2007
+++ src/sys/arch/hp300/stand/common/conf.c Sun Dec 11 06:27:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.12 2007/12/23 03:11:32 tsutsui Exp $ */
+/* $NetBSD: conf.c,v 1.13 2022/12/11 06:27:35 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -143,21 +143,3 @@ struct fs_ops file_system_nfs[] = { FS_O
struct fs_ops file_system[1];
int nfsys = 1; /* we always know which one we want */
-
-#if 0
-/*
- * Inititalize controllers
- *
- * XXX this should be a table
- */
-void ctlrinit(void)
-{
-#ifdef SUPPORT_ETHERNET
- leinit();
-#endif
-#if defined(SUPPORT_DISK) || defined(SUPPORT_TAPE)
- hpibinit();
- scsiinit();
-#endif
-}
-#endif
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Sun Dec 11 06:27:35 UTC 2022 Modified Files: src/sys/arch/hp300/stand/common: conf.c Log Message: Remove a #if 0'ed out unused function. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/conf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Fri Nov 25 13:06:27 UTC 2022
Modified Files:
src/sys/arch/hp300/stand/common: rd.c
Log Message:
Sync with rdreg.h integer type changes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/rd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/rd.c
diff -u src/sys/arch/hp300/stand/common/rd.c:1.14 src/sys/arch/hp300/stand/common/rd.c:1.15
--- src/sys/arch/hp300/stand/common/rd.c:1.14 Mon Nov 21 16:22:37 2022
+++ src/sys/arch/hp300/stand/common/rd.c Fri Nov 25 13:06:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.14 2022/11/21 16:22:37 tsutsui Exp $ */
+/* $NetBSD: rd.c,v 1.15 2022/11/25 13:06:27 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -370,7 +370,7 @@ rderror(int ctlr, int unit, int part)
printf("rd(%d,%d,0,%d) err: vu 0x%x",
ctlr, unit, part, rd_stat.c_vu);
if ((rd_stat.c_aef & AEF_UD) || (rd_stat.c_ief & (IEF_MD|IEF_RD)))
- printf(", block %ld", rd_stat.c_blk);
+ printf(", block %d", rd_stat.c_blk);
printf(", R0x%x F0x%x A0x%x I0x%x\n",
rd_stat.c_ref, rd_stat.c_fef, rd_stat.c_aef, rd_stat.c_ief);
return 1;
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Fri Nov 25 13:06:27 UTC 2022 Modified Files: src/sys/arch/hp300/stand/common: rd.c Log Message: Sync with rdreg.h integer type changes. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/rd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Mon Nov 21 15:36:29 UTC 2022
Modified Files:
src/sys/arch/hp300/stand/common: if_le.c
Log Message:
Make local functions and variables static.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/if_le.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/if_le.c
diff -u src/sys/arch/hp300/stand/common/if_le.c:1.13 src/sys/arch/hp300/stand/common/if_le.c:1.14
--- src/sys/arch/hp300/stand/common/if_le.c:1.13 Sat Jun 21 02:02:40 2014
+++ src/sys/arch/hp300/stand/common/if_le.c Mon Nov 21 15:36:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.13 2014/06/21 02:02:40 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.14 2022/11/21 15:36:29 tsutsui Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -72,12 +72,12 @@ struct le_sel {
int le_bonus;
};
-int le_probe(struct netif *, void *);
-int le_match(struct netif *, void *);
-void le_init(struct iodesc *, void *);
-int le_get(struct iodesc *, void *, size_t, saseconds_t);
-int le_put(struct iodesc *, void *, size_t);
-void le_end(struct netif *);
+static int le_probe(struct netif *, void *);
+static int le_match(struct netif *, void *);
+static void le_init(struct iodesc *, void *);
+static int le_get(struct iodesc *, void *, size_t, saseconds_t);
+static int le_put(struct iodesc *, void *, size_t);
+static void le_end(struct netif *);
static inline void lewrcsr(struct le_softc *, uint16_t, uint16_t);
static inline uint16_t lerdcsr(struct le_softc *, uint16_t);
@@ -92,7 +92,7 @@ static int le_poll(struct iodesc *, void
int le_debug = 0;
#endif
-struct le_sel le0conf[] = {
+static struct le_sel le0conf[] = {
/* offsets for: ID REGS MEM NVRAM le_heat le_bonus*/
{ 0, 0x4000, 0x8000, 0xC008, 1, 10 }
};
@@ -100,7 +100,7 @@ struct le_sel le0conf[] = {
extern struct netif_stats le_stats[];
-struct netif_dif le_ifs[] = {
+static struct netif_dif le_ifs[] = {
/* dif_unit dif_nsel dif_stats dif_private */
{ 0, NLE0CONF, _stats[0], le0conf, },
};
@@ -120,7 +120,7 @@ struct netif_driver le_driver = {
NLE_IFS /* netif_nifs */
};
-struct le_softc le_softc[NLE];
+static struct le_softc le_softc[NLE];
static inline void
lewrcsr(struct le_softc *sc, uint16_t port, uint16_t val)
@@ -211,7 +211,7 @@ leinit(void)
}
}
-int
+static int
le_match(struct netif *nif, void *machdep_hint)
{
struct le_sel *sels;
@@ -232,7 +232,7 @@ le_match(struct netif *nif, void *machde
return rv;
}
-int
+static int
le_probe(struct netif *nif, void *machdep_hint)
{
#if 0
@@ -307,7 +307,7 @@ le_mem_summary(int unit)
#define le_mem_summary(u)
#endif
-void
+static void
le_error(int unit, char *str, uint16_t stat)
{
@@ -328,7 +328,7 @@ le_error(int unit, char *str, uint16_t s
((u_long)(a) - (u_long)sc->sc_mem)
/* LANCE initialization block set up. */
-void
+static void
lememinit(struct le_softc *sc)
{
int i;
@@ -388,7 +388,7 @@ lememinit(struct le_softc *sc)
}
}
-void
+static void
le_reset(int unit, u_char *myea)
{
struct le_softc *sc = _softc[unit];
@@ -450,7 +450,7 @@ le_reset(int unit, u_char *myea)
le_mem_summary(unit);
}
-int
+static int
le_poll(struct iodesc *desc, void *pkt, int len)
{
int unit = /*nif->nif_unit*/0;
@@ -525,7 +525,7 @@ cleanup:
return length;
}
-int
+static int
le_put(struct iodesc *desc, void *pkt, size_t len)
{
int unit = /*nif->nif_unit*/0;
@@ -627,7 +627,7 @@ le_put(struct iodesc *desc, void *pkt, s
}
-int
+static int
le_get(struct iodesc *desc, void *pkt, size_t len, saseconds_t timeout)
{
satime_t t;
@@ -640,7 +640,7 @@ le_get(struct iodesc *desc, void *pkt, s
return cc;
}
-void
+static void
le_init(struct iodesc *desc, void *machdep_hint)
{
struct netif *nif = desc->io_netif;
@@ -658,7 +658,7 @@ le_init(struct iodesc *desc, void *machd
le_reset(unit, desc->myea);
}
-void
+static void
le_end(struct netif *nif)
{
int unit = nif->nif_unit;
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Mon Nov 21 15:36:29 UTC 2022 Modified Files: src/sys/arch/hp300/stand/common: if_le.c Log Message: Make local functions and variables static. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/if_le.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Mon Nov 21 15:05:44 UTC 2022
Modified Files:
src/sys/arch/hp300/stand/common: rd.c
Log Message:
Make local variables static and read only ones const.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/rd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/rd.c
diff -u src/sys/arch/hp300/stand/common/rd.c:1.12 src/sys/arch/hp300/stand/common/rd.c:1.13
--- src/sys/arch/hp300/stand/common/rd.c:1.12 Mon Nov 21 14:55:08 2022
+++ src/sys/arch/hp300/stand/common/rd.c Mon Nov 21 15:05:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.12 2022/11/21 14:55:08 tsutsui Exp $ */
+/* $NetBSD: rd.c,v 1.13 2022/11/21 15:05:44 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -52,12 +52,12 @@
#include
#include
-struct rd_iocmd rd_ioc;
-struct rd_rscmd rd_rsc;
-struct rd_stat rd_stat;
-struct rd_ssmcmd rd_ssmc;
+static struct rd_iocmd rd_ioc;
+static struct rd_rscmd rd_rsc;
+static struct rd_stat rd_stat;
+static struct rd_ssmcmd rd_ssmc;
-struct disklabel rdlabel;
+static struct disklabel rdlabel;
struct rdminilabel {
u_short npart;
@@ -88,9 +88,9 @@ static void rdreset(int, int);
static int rdgetinfo(struct rd_softc *);
static int rderror(int, int, int);
-struct rd_softc rd_softc[NHPIB][NRD];
+static struct rd_softc rd_softc[NHPIB][NRD];
-struct rdidentinfo rdidentinfo[] = {
+static const struct rdidentinfo rdidentinfo[] = {
[RD7945A] = { RD7946AID, 0, 108416 },
[RD9134D] = { RD9134DID, 1, 29088 },
[RD9122S] = { RD9134LID, 1, 1232 },
@@ -115,9 +115,9 @@ struct rdidentinfo rdidentinfo[] = {
[RD7911A] = { RD7911AID, 0, 54912 },
[RD7941A] = { RD7946AID, 0, 46464 }
};
-int numrdidentinfo = sizeof(rdidentinfo) / sizeof(rdidentinfo[0]);
+static const int numrdidentinfo = sizeof(rdidentinfo) / sizeof(rdidentinfo[0]);
-int
+static int
rdinit(int ctlr, int unit)
{
struct rd_softc *rs = _softc[ctlr][unit];
@@ -210,7 +210,7 @@ rdident(int ctlr, int unit)
return id;
}
-char io_buf[MAXBSIZE];
+static char io_buf[MAXBSIZE];
static int
rdgetinfo(struct rd_softc *rs)
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Mon Nov 21 15:05:44 UTC 2022 Modified Files: src/sys/arch/hp300/stand/common: rd.c Log Message: Make local variables static and read only ones const. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/rd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src Committed By: tsutsui Date: Mon Nov 21 14:55:08 UTC 2022 Modified Files: src/sys/arch/hp300/stand/common: rd.c Log Message: Sync a list of HP-IB disk IDs with kernel's one. Now bootloader can boot from 2202A, 7908A, 7911A, and 7941A. Tested on 425t and HPDisk. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp300/stand/common/rd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
