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/dev/drm | |
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/dev/drm')
-rw-r--r-- | sys/dev/drm/drmP.h | 2 | ||||
-rw-r--r-- | sys/dev/drm/drm_drv.h | 6 | ||||
-rw-r--r-- | sys/dev/drm/drm_fops.h | 6 | ||||
-rw-r--r-- | sys/dev/drm/drm_os_freebsd.h | 4 | ||||
-rw-r--r-- | sys/dev/drm/drm_vm.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h index 7753b19..e45bad4 100644 --- a/sys/dev/drm/drmP.h +++ b/sys/dev/drm/drmP.h @@ -313,7 +313,7 @@ struct drm_device { #ifdef __FreeBSD__ device_t device; /* Device instance from newbus */ #endif - dev_t devnode; /* Device number for mknod */ + struct cdev *devnode; /* Device number for mknod */ int if_version; /* Highest interface version set */ int flags; /* Flags to open(2) */ diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h index d005ec4..642cc74 100644 --- a/sys/dev/drm/drm_drv.h +++ b/sys/dev/drm/drm_drv.h @@ -808,7 +808,7 @@ int DRM(version)( DRM_IOCTL_ARGS ) return 0; } -int DRM(open)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) +int DRM(open)(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p) { drm_device_t *dev = NULL; int retcode = 0; @@ -833,7 +833,7 @@ int DRM(open)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) return retcode; } -int DRM(close)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) +int DRM(close)(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p) { drm_file_t *priv; DRM_DEVICE; @@ -951,7 +951,7 @@ int DRM(close)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p) /* DRM(ioctl) is called whenever a process performs an ioctl on /dev/drm. */ -int DRM(ioctl)(dev_t kdev, u_long cmd, caddr_t data, int flags, +int DRM(ioctl)(struct cdev *kdev, u_long cmd, caddr_t data, int flags, DRM_STRUCTPROC *p) { DRM_DEVICE; diff --git a/sys/dev/drm/drm_fops.h b/sys/dev/drm/drm_fops.h index 190b708..4c79fe1 100644 --- a/sys/dev/drm/drm_fops.h +++ b/sys/dev/drm/drm_fops.h @@ -54,7 +54,7 @@ drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_STRUCTPROC *p) } /* DRM(open_helper) is called whenever a process opens /dev/drm. */ -int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p, +int DRM(open_helper)(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p, drm_device_t *dev) { int m = minor(kdev); @@ -106,12 +106,12 @@ int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p, /* The DRM(read) and DRM(poll) are stubs to prevent spurious errors * on older X Servers (4.3.0 and earlier) */ -int DRM(read)(dev_t kdev, struct uio *uio, int ioflag) +int DRM(read)(struct cdev *kdev, struct uio *uio, int ioflag) { return 0; } -int DRM(poll)(dev_t kdev, int events, DRM_STRUCTPROC *p) +int DRM(poll)(struct cdev *kdev, int events, DRM_STRUCTPROC *p) { return 0; } diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index 24dcd10..750e6ec 100644 --- a/sys/dev/drm/drm_os_freebsd.h +++ b/sys/dev/drm/drm_os_freebsd.h @@ -151,7 +151,7 @@ * of the current process. It should be a per-open unique pointer, but * code for that is not yet written */ #define DRMFILE void * -#define DRM_IOCTL_ARGS dev_t kdev, u_long cmd, caddr_t data, int flags, DRM_STRUCTPROC *p, DRMFILE filp +#define DRM_IOCTL_ARGS struct cdev *kdev, u_long cmd, caddr_t data, int flags, DRM_STRUCTPROC *p, DRMFILE filp #define DRM_SUSER(p) suser(p) #define DRM_TASKQUEUE_ARGS void *arg, int pending #define DRM_IRQ_ARGS void *arg @@ -473,7 +473,7 @@ extern d_close_t DRM(close); extern d_read_t DRM(read); extern d_poll_t DRM(poll); extern d_mmap_t DRM(mmap); -extern int DRM(open_helper)(dev_t kdev, int flags, int fmt, +extern int DRM(open_helper)(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p, drm_device_t *dev); extern drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_STRUCTPROC *p); diff --git a/sys/dev/drm/drm_vm.h b/sys/dev/drm/drm_vm.h index ab79d03..2637a83 100644 --- a/sys/dev/drm/drm_vm.h +++ b/sys/dev/drm/drm_vm.h @@ -26,7 +26,7 @@ */ #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, +static int DRM(dma_mmap)(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) #elif defined(__FreeBSD__) static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot) @@ -55,7 +55,7 @@ static paddr_t DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, int prot) } #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -int DRM(mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, +int DRM(mmap)(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) #elif defined(__FreeBSD__) int DRM(mmap)(dev_t kdev, vm_offset_t offset, int prot) |