diff options
| author |   miod <miod@openbsd.org> | 2004-07-02 17:37:16 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2004-07-02 17:37:16 +0000 |
| commit | 3794d591b0891a0ece50c4899a4370b30598254b (patch) | |
| tree | 8ec5b1db2444fd7e25f82a05db74adf6cb925f9c | |
| parent | Remove unused getdevunit(). (diff) | |
| download | wireguard-openbsd-3794d591b0891a0ece50c4899a4370b30598254b.tar.xz wireguard-openbsd-3794d591b0891a0ece50c4899a4370b30598254b.zip | |
Merge *ramread() and *ramwrite(), as done on mvme88k.
| -rw-r--r-- | sys/arch/mvme68k/dev/nvram.c | 17 | ||||
| -rw-r--r-- | sys/arch/mvme68k/dev/sram.c | 17 | ||||
| -rw-r--r-- | sys/arch/mvme68k/include/conf.h | 8 |
3 files changed, 11 insertions, 31 deletions
diff --git a/sys/arch/mvme68k/dev/nvram.c b/sys/arch/mvme68k/dev/nvram.c index 98edfbb22cb..2cae7e8cdf4 100644 --- a/sys/arch/mvme68k/dev/nvram.c +++ b/sys/arch/mvme68k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.12 2004/01/14 20:50:48 miod Exp $ */ +/* $OpenBSD: nvram.c,v 1.13 2004/07/02 17:37:16 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -386,20 +386,7 @@ nvramioctl(dev, cmd, data, flag, p) /*ARGSUSED*/ int -nvramread(dev, uio, flags) - dev_t dev; - struct uio *uio; - int flags; -{ - int unit = minor(dev); - struct nvramsoftc *sc = (struct nvramsoftc *) nvram_cd.cd_devs[unit]; - - return (memdevrw(sc->sc_vaddr, sc->sc_len, uio, flags)); -} - -/*ARGSUSED*/ -int -nvramwrite(dev, uio, flags) +nvramrw(dev, uio, flags) dev_t dev; struct uio *uio; int flags; diff --git a/sys/arch/mvme68k/dev/sram.c b/sys/arch/mvme68k/dev/sram.c index a00f1141be1..f5b6fe70650 100644 --- a/sys/arch/mvme68k/dev/sram.c +++ b/sys/arch/mvme68k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.12 2004/01/14 20:50:48 miod Exp $ */ +/* $OpenBSD: sram.c,v 1.13 2004/07/02 17:37:16 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -192,20 +192,7 @@ sramioctl(dev, cmd, data, flag, p) /*ARGSUSED*/ int -sramread(dev, uio, flags) - dev_t dev; - struct uio *uio; - int flags; -{ - int unit = minor(dev); - struct sramsoftc *sc = (struct sramsoftc *) sram_cd.cd_devs[unit]; - - return (memdevrw(sc->sc_vaddr, sc->sc_len, uio, flags)); -} - -/*ARGSUSED*/ -int -sramwrite(dev, uio, flags) +sramrw(dev, uio, flags) dev_t dev; struct uio *uio; int flags; diff --git a/sys/arch/mvme68k/include/conf.h b/sys/arch/mvme68k/include/conf.h index 6e590f11616..3d8beea3336 100644 --- a/sys/arch/mvme68k/include/conf.h +++ b/sys/arch/mvme68k/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.2 2003/04/16 17:34:48 miod Exp $ */ +/* $OpenBSD: conf.h,v 1.3 2004/07/02 17:37:18 miod Exp $ */ /* * Copyright (c) 2002, Miodrag Vallat. * All rights reserved. @@ -37,7 +37,13 @@ cdev_decl(vmel); cdev_decl(vmes); cdev_decl(flash); + +#define nvramread nvramrw +#define nvramwrite nvramrw cdev_decl(nvram); + +#define sramread sramrw +#define sramwrite sramrw cdev_decl(sram); cdev_decl(bugtty); |