Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-devvp]: src/sys/arch/arm32 Fix some conversion mistakes.
details: https://anonhg.NetBSD.org/src/rev/3fd493af304b
branches: thorpej-devvp
changeset: 514633:3fd493af304b
user: fvdl <fvdl%NetBSD.org@localhost>
date: Sat Oct 13 23:25:55 2001 +0000
description:
Fix some conversion mistakes.
diffstat:
sys/arch/arm32/isa/joy.c | 12 ++++++++----
sys/arch/arm32/ofw/ofrom.c | 6 ++++--
sys/arch/arm32/shark/scr.c | 4 ++--
3 files changed, 14 insertions(+), 8 deletions(-)
diffs (96 lines):
diff -r 127530964174 -r 3fd493af304b sys/arch/arm32/isa/joy.c
--- a/sys/arch/arm32/isa/joy.c Sat Oct 13 18:01:29 2001 +0000
+++ b/sys/arch/arm32/isa/joy.c Sat Oct 13 23:25:55 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: joy.c,v 1.3.4.1 2001/10/10 11:55:56 fvdl Exp $ */
+/* $NetBSD: joy.c,v 1.3.4.2 2001/10/13 23:25:55 fvdl Exp $ */
/*
* XXX This _really_ should be rewritten such that it doesn't
@@ -83,8 +83,6 @@
#define JOY_TIMEOUT 2000 /* 2 milliseconds */
#endif
-int joyopen __P((dev_t, int, int, struct proc *));
-int joyclose __P((dev_t, int, int, struct proc *));
static int get_tick __P((void));
extern struct cfdriver joy_cd;
@@ -135,8 +133,12 @@
struct proc *p;
{
struct joy_softc *sc;
+ dev_t dev;
+ int i;
sc = vdev_privdata(devvp);
+ dev = vdev_rdev(devvp);
+ i = JOYPART(dev);
sc->timeout[i] = 0;
return 0;
@@ -155,8 +157,10 @@
bus_space_tag_t iot;
bus_space_handle_t ioh;
int s;
+ dev_t dev;
sc = vdev_privdata(devvp);
+ dev = vdev_rdev(devvp);
iot = sc->sc_iot;
ioh = sc->sc_ioh;
@@ -190,7 +194,7 @@
int
joyioctl(devvp, cmd, data, flag, p)
- dev_t dev;
+ struct vnode *devvp;
u_long cmd;
caddr_t data;
int flag;
diff -r 127530964174 -r 3fd493af304b sys/arch/arm32/ofw/ofrom.c
--- a/sys/arch/arm32/ofw/ofrom.c Sat Oct 13 18:01:29 2001 +0000
+++ b/sys/arch/arm32/ofw/ofrom.c Sat Oct 13 23:25:55 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofrom.c,v 1.10.4.2 2001/10/10 11:55:57 fvdl Exp $ */
+/* $NetBSD: ofrom.c,v 1.10.4.3 2001/10/13 23:25:55 fvdl Exp $ */
/*
* Copyright 1998
@@ -102,7 +102,8 @@
sc->size = of_decode_int(®buf[4]);
sc->enabled = 1;
- printf(": %#lx-%#lx\n", sc->base, sc->base + sc->size - 1);
+ printf(": %#lx-%#lx\n", (u_long)sc->base,
+ (u_long)(sc->base + sc->size - 1));
}
int
@@ -211,6 +212,7 @@
int prot;
{
struct ofrom_softc *sc;
+ dev_t dev = vdev_rdev(devvp);
int unit = minor(dev);
if (unit >= ofrom_cd.cd_ndevs)
diff -r 127530964174 -r 3fd493af304b sys/arch/arm32/shark/scr.c
--- a/sys/arch/arm32/shark/scr.c Sat Oct 13 18:01:29 2001 +0000
+++ b/sys/arch/arm32/shark/scr.c Sat Oct 13 23:25:55 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scr.c,v 1.10.4.1 2001/10/10 11:55:58 fvdl Exp $ */
+/* $NetBSD: scr.c,v 1.10.4.2 2001/10/13 23:25:56 fvdl Exp $ */
/*
* Copyright 1997
@@ -1277,7 +1277,7 @@
int flag;
struct proc *p;
{
- struct scr_softc*;
+ struct scr_softc *sc;
int error = 0; /* error value returned */
int masterDoneRetries= 0; /* nuber of times we looked at masterDone */
Home |
Main Index |
Thread Index |
Old Index