Module Name: src
Committed By: rin
Date: Sun Jan 24 05:20:23 UTC 2021
Modified Files:
src/sys/arch/mac68k/dev: if_mc.c if_mcvar.h
src/sys/arch/mac68k/obio: if_mc_obio.c
Log Message:
Add rnd(9) support.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mac68k/dev/if_mcvar.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mac68k/obio/if_mc_obio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/dev/if_mc.c
diff -u src/sys/arch/mac68k/dev/if_mc.c:1.56 src/sys/arch/mac68k/dev/if_mc.c:1.57
--- src/sys/arch/mac68k/dev/if_mc.c:1.56 Tue Oct 20 18:17:58 2020
+++ src/sys/arch/mac68k/dev/if_mc.c Sun Jan 24 05:20:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.56 2020/10/20 18:17:58 roy Exp $ */
+/* $NetBSD: if_mc.c,v 1.57 2021/01/24 05:20:23 rin Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@azeotrope.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.56 2020/10/20 18:17:58 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.57 2021/01/24 05:20:23 rin Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -51,6 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.
#include <sys/errno.h>
#include <sys/device.h>
+#include <sys/rndsource.h>
+
#include <uvm/uvm_extern.h>
#include <net/if.h>
@@ -158,6 +160,9 @@ mcsetup(struct mc_softc *sc, uint8_t *ll
if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, lladdr);
+ rnd_attach_source(&sc->rnd_source, ifp->if_xname, RND_TYPE_NET,
+ RND_FLAG_DEFAULT);
+
return 0;
}
@@ -516,6 +521,8 @@ mc_tint(struct mc_softc *sc)
sc->sc_if.if_flags &= ~IFF_OACTIVE;
sc->sc_if.if_timer = 0;
if_schedule_deferred_start(&sc->sc_if);
+
+ rnd_add_uint32(&sc->rnd_source, xmtfs);
}
void
@@ -559,6 +566,8 @@ mc_rint(struct mc_softc *sc)
}
mace_read(sc, rxf.rx_frame, len);
+
+ rnd_add_uint32(&sc->rnd_source, rxf.rx_rcvsts);
#undef rxf
}
Index: src/sys/arch/mac68k/dev/if_mcvar.h
diff -u src/sys/arch/mac68k/dev/if_mcvar.h:1.16 src/sys/arch/mac68k/dev/if_mcvar.h:1.17
--- src/sys/arch/mac68k/dev/if_mcvar.h:1.16 Sat Oct 27 17:17:59 2012
+++ src/sys/arch/mac68k/dev/if_mcvar.h Sun Jan 24 05:20:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcvar.h,v 1.16 2012/10/27 17:17:59 chs Exp $ */
+/* $NetBSD: if_mcvar.h,v 1.17 2021/01/24 05:20:23 rin Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@azeotrope.org>
@@ -87,6 +87,8 @@ struct mc_softc {
int sc_tail;
int sc_rxset;
int sc_txset, sc_txseti;
+
+ krndsource_t rnd_source;
};
int mcsetup(struct mc_softc *, u_int8_t *);
Index: src/sys/arch/mac68k/obio/if_mc_obio.c
diff -u src/sys/arch/mac68k/obio/if_mc_obio.c:1.18 src/sys/arch/mac68k/obio/if_mc_obio.c:1.19
--- src/sys/arch/mac68k/obio/if_mc_obio.c:1.18 Sat Oct 27 17:18:00 2012
+++ src/sys/arch/mac68k/obio/if_mc_obio.c Sun Jan 24 05:20:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc_obio.c,v 1.18 2012/10/27 17:18:00 chs Exp $ */
+/* $NetBSD: if_mc_obio.c,v 1.19 2021/01/24 05:20:23 rin Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@azeotrope.org>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc_obio.c,v 1.18 2012/10/27 17:18:00 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc_obio.c,v 1.19 2021/01/24 05:20:23 rin Exp $");
#include "opt_ddb.h"
@@ -46,6 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc_obio.c
#include <sys/socket.h>
#include <sys/systm.h>
+#include <sys/rndsource.h>
+
#include <net/if.h>
#include <net/if_ether.h>
