From 89c9c53da05197f657dfe8e0bdda6941a2e9a0d4 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 16 Jun 2004 09:47:26 +0000 Subject: Do the dreaded s/dev_t/struct cdev */ Bump __FreeBSD_version accordingly. --- sys/dev/ofw/ofw_console.c | 6 +++--- sys/dev/ofw/openfirmio.c | 4 ++-- sys/dev/ofw/openpromio.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sys/dev/ofw') diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c index a16f58da2d8d..5ee59147e593 100644 --- a/sys/dev/ofw/ofw_console.c +++ b/sys/dev/ofw/ofw_console.c @@ -83,7 +83,7 @@ cn_drvinit(void *unused) { phandle_t options; char output[32]; - dev_t dev; + struct cdev *dev; if (ofw_consdev.cn_pri != CN_DEAD && ofw_consdev.cn_name[0] != '\0') { @@ -103,7 +103,7 @@ static int stdin; static int stdout; static int -ofw_dev_open(dev_t dev, int flag, int mode, struct thread *td) +ofw_dev_open(struct cdev *dev, int flag, int mode, struct thread *td) { struct tty *tp; int unit; @@ -150,7 +150,7 @@ ofw_dev_open(dev_t dev, int flag, int mode, struct thread *td) } static int -ofw_dev_close(dev_t dev, int flag, int mode, struct thread *td) +ofw_dev_close(struct cdev *dev, int flag, int mode, struct thread *td) { int unit; struct tty *tp; diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c index adb39296ab71..483942831275 100644 --- a/sys/dev/ofw/openfirmio.c +++ b/sys/dev/ofw/openfirmio.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include -static dev_t openfirm_dev; +static struct cdev *openfirm_dev; static d_ioctl_t openfirm_ioctl; @@ -108,7 +108,7 @@ openfirm_getstr(int len, const char *user, char **cpp) } int -openfirm_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, +openfirm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { struct ofiocdesc *of; diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c index 5bf5e698d1c6..3182bffd3345 100644 --- a/sys/dev/ofw/openpromio.c +++ b/sys/dev/ofw/openpromio.c @@ -67,11 +67,11 @@ static struct cdevsw openprom_cdevsw = { }; static int openprom_is_open; -static dev_t openprom_dev; +static struct cdev *openprom_dev; static phandle_t openprom_node; static int -openprom_open(dev_t dev, int oflags, int devtype, struct thread *td) +openprom_open(struct cdev *dev, int oflags, int devtype, struct thread *td) { if (openprom_is_open != 0) @@ -81,7 +81,7 @@ openprom_open(dev_t dev, int oflags, int devtype, struct thread *td) } static int -openprom_close(dev_t dev, int fflag, int devtype, struct thread *td) +openprom_close(struct cdev *dev, int fflag, int devtype, struct thread *td) { openprom_is_open = 0; @@ -89,7 +89,7 @@ openprom_close(dev_t dev, int fflag, int devtype, struct thread *td) } static int -openprom_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, +openprom_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { struct openpromio *oprom; -- cgit v1.3