diff options
author | phk <phk@FreeBSD.org> | 2004-06-16 09:47:26 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-06-16 09:47:26 +0000 |
commit | dfd1f7fd50fffaf75541921fcf86454cd8eb3614 (patch) | |
tree | 624c885995e84df6decddd3291c60a15e50e3c85 /sys/ia64 | |
parent | cafb94bcea1cdf048e81b7eb2d24808e1a8c5280 (diff) | |
download | FreeBSD-src-dfd1f7fd50fffaf75541921fcf86454cd8eb3614.zip FreeBSD-src-dfd1f7fd50fffaf75541921fcf86454cd8eb3614.tar.gz |
Do the dreaded s/dev_t/struct cdev */
Bump __FreeBSD_version accordingly.
Diffstat (limited to 'sys/ia64')
-rw-r--r-- | sys/ia64/ia64/mem.c | 14 | ||||
-rw-r--r-- | sys/ia64/ia64/ssc.c | 4 | ||||
-rw-r--r-- | sys/ia64/ia64/sscdisk.c | 2 | ||||
-rw-r--r-- | sys/ia64/include/cpu.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c index 3d48bfd..d03051f 100644 --- a/sys/ia64/ia64/mem.c +++ b/sys/ia64/ia64/mem.c @@ -66,9 +66,9 @@ #include <vm/pmap.h> #include <vm/vm_extern.h> -static dev_t memdev, kmemdev; +static struct cdev *memdev, *kmemdev; #ifdef PERFMON -static dev_t perfdev; +static struct cdev *perfdev; #endif /* PERFMON */ static d_open_t mmopen; @@ -100,7 +100,7 @@ ia64_pa_access(vm_offset_t pa) } static int -mmclose(dev_t dev, int flags, int fmt, struct thread *td) +mmclose(struct cdev *dev, int flags, int fmt, struct thread *td) { switch (minor(dev)) { #ifdef PERFMON @@ -114,7 +114,7 @@ mmclose(dev_t dev, int flags, int fmt, struct thread *td) } static int -mmopen(dev_t dev, int flags, int fmt, struct thread *td) +mmopen(struct cdev *dev, int flags, int fmt, struct thread *td) { int error; @@ -141,7 +141,7 @@ mmopen(dev_t dev, int flags, int fmt, struct thread *td) /*ARGSUSED*/ static int -mmrw(dev_t dev, struct uio *uio, int flags) +mmrw(struct cdev *dev, struct uio *uio, int flags) { struct iovec *iov; vm_offset_t addr, eaddr, o, v; @@ -225,7 +225,7 @@ kmemphys: * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* * /dev/mem is the only one that makes sense through this @@ -246,7 +246,7 @@ memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) } static int -mmioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td) +mmioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td) { switch(minor(dev)) { #ifdef PERFMON diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c index d87aa76..eb03592 100644 --- a/sys/ia64/ia64/ssc.c +++ b/sys/ia64/ia64/ssc.c @@ -133,7 +133,7 @@ ssccncheckc(struct consdev *cp) } static int -sscopen(dev_t dev, int flag, int mode, struct thread *td) +sscopen(struct cdev *dev, int flag, int mode, struct thread *td) { struct tty *tp; int s; @@ -176,7 +176,7 @@ sscopen(dev_t dev, int flag, int mode, struct thread *td) } static int -sscclose(dev_t dev, int flag, int mode, struct thread *td) +sscclose(struct cdev *dev, int flag, int mode, struct thread *td) { int unit = minor(dev); struct tty *tp = ssc_tp; diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c index d831ab9..726fec4 100644 --- a/sys/ia64/ia64/sscdisk.c +++ b/sys/ia64/ia64/sscdisk.c @@ -85,7 +85,7 @@ struct ssc_s { LIST_ENTRY(ssc_s) list; struct bio_queue_head bio_queue; struct disk *disk; - dev_t dev; + struct cdev *dev; int busy; int fd; }; diff --git a/sys/ia64/include/cpu.h b/sys/ia64/include/cpu.h index f6f6b5c..b2bffe8 100644 --- a/sys/ia64/include/cpu.h +++ b/sys/ia64/include/cpu.h @@ -62,7 +62,7 @@ struct clockframe { /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ +#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ #define CPU_WALLCLOCK 4 /* int: indicates wall CMOS clock */ |