[src/trunk]: src/sys Make this compile again.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72995c610492
branches:  trunk
changeset: 472694:72995c610492
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue May 04 23:55:27 1999 +0000

description:
Make this compile again.

diffstat:

 sys/arch/ofppc/ofppc/disksubr.c |   5 +++--
 sys/dev/ofw/ofnet.c             |  10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 17c2da0904e4 -r 72995c610492 sys/arch/ofppc/ofppc/disksubr.c
--- a/sys/arch/ofppc/ofppc/disksubr.c   Tue May 04 23:49:18 1999 +0000
+++ b/sys/arch/ofppc/ofppc/disksubr.c   Tue May 04 23:55:27 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.5 1999/01/27 21:33:19 thorpej Exp $     */
+/*     $NetBSD: disksubr.c,v 1.6 1999/05/04 23:55:27 thorpej Exp $     */
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -36,6 +36,7 @@
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
+#include <sys/disklabel_mbr.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
@@ -169,7 +170,7 @@
        mp = (struct mbr_partition *)(bp->b_data + MBR_PARTOFF);
        for (i = 0; i < NMBRPART; i++, mp++) {
                if (get_long(&mp->mbrp_size)) {
-                       switch (mp->mbrp_type) {
+                       switch (mp->mbrp_typ) {
                        case MBR_PTYPE_EXT:
                                if (*pnpart < MAXPARTITIONS) {
                                        pp = lp->d_partitions + *pnpart;
diff -r 17c2da0904e4 -r 72995c610492 sys/dev/ofw/ofnet.c
--- a/sys/dev/ofw/ofnet.c       Tue May 04 23:49:18 1999 +0000
+++ b/sys/dev/ofw/ofnet.c       Tue May 04 23:55:27 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofnet.c,v 1.15 1998/07/05 00:51:22 jonathan Exp $      */
+/*     $NetBSD: ofnet.c,v 1.16 1999/05/04 23:56:54 thorpej Exp $       */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -86,7 +86,7 @@
 };
 
 static void ofnet_read __P((struct ofnet_softc *));
-static void ofnet_timer __P((struct ofnet_softc *));
+static void ofnet_timer __P((void *));
 static void ofnet_init __P((struct ofnet_softc *));
 static void ofnet_stop __P((struct ofnet_softc *));
 
@@ -269,9 +269,11 @@
 }
 
 static void
-ofnet_timer(of)
-       struct ofnet_softc *of;
+ofnet_timer(arg)
+       void *arg;
 {
+       struct ofnet_softc *of = arg;
+
        ofnet_read(of);
        timeout(ofnet_timer, of, 1);
 }