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/amd64 | |
| 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/amd64')
| -rw-r--r-- | sys/amd64/amd64/mem.c | 12 | ||||
| -rw-r--r-- | sys/amd64/include/cpu.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index d4cf782..739ae6d 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <vm/vm_extern.h> -static dev_t memdev, kmemdev, iodev; +static struct cdev *memdev, *kmemdev, *iodev; static d_open_t mmopen; static d_close_t mmclose; @@ -95,7 +95,7 @@ MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); struct mem_range_softc mem_range_softc; 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)) { case 14: @@ -105,7 +105,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; @@ -133,7 +133,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) { int o; u_long c = 0, v; @@ -214,7 +214,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) { switch (minor(dev)) { @@ -242,7 +242,7 @@ memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) * and mem_range_attr_set. */ static int -mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td) +mmioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { int nd, error = 0; struct mem_range_op *mo = (struct mem_range_op *)data; diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h index f8a2ee3..2aeda85 100644 --- a/sys/amd64/include/cpu.h +++ b/sys/amd64/include/cpu.h @@ -65,7 +65,7 @@ /* * 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 5 /* int: indicates wall CMOS clock */ |
