summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bsd-core/drmP.h2
-rw-r--r--bsd-core/drm_drv.c6
-rw-r--r--bsd-core/drm_fops.c6
-rw-r--r--bsd-core/drm_os_freebsd.h5
-rw-r--r--bsd-core/drm_vm.c6
-rw-r--r--bsd/drmP.h2
-rw-r--r--bsd/drm_drv.h6
-rw-r--r--bsd/drm_fops.h6
-rw-r--r--bsd/drm_os_freebsd.h5
-rw-r--r--bsd/drm_vm.h6
10 files changed, 26 insertions, 24 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 3bf178ed..e6b1bea9 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -312,7 +312,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/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index 8ad130a3..af69029b 100644
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -807,7 +807,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;
@@ -832,7 +832,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;
@@ -950,7 +950,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/bsd-core/drm_fops.c b/bsd-core/drm_fops.c
index e9c5d7a0..a3678730 100644
--- a/bsd-core/drm_fops.c
+++ b/bsd-core/drm_fops.c
@@ -53,7 +53,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);
@@ -105,12 +105,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/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index 073ceb37..74d13511 100644
--- a/bsd-core/drm_os_freebsd.h
+++ b/bsd-core/drm_os_freebsd.h
@@ -149,7 +149,8 @@
* 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
@@ -471,7 +472,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/bsd-core/drm_vm.c b/bsd-core/drm_vm.c
index 6f0c01ea..e0d710fa 100644
--- a/bsd-core/drm_vm.c
+++ b/bsd-core/drm_vm.c
@@ -23,8 +23,8 @@
*/
#if defined(__FreeBSD__) && __FreeBSD_version >= 500102
-static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr,
- int prot)
+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)
#elif defined(__NetBSD__)
@@ -52,7 +52,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)
diff --git a/bsd/drmP.h b/bsd/drmP.h
index 3bf178ed..e6b1bea9 100644
--- a/bsd/drmP.h
+++ b/bsd/drmP.h
@@ -312,7 +312,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/bsd/drm_drv.h b/bsd/drm_drv.h
index 8ad130a3..af69029b 100644
--- a/bsd/drm_drv.h
+++ b/bsd/drm_drv.h
@@ -807,7 +807,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;
@@ -832,7 +832,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;
@@ -950,7 +950,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/bsd/drm_fops.h b/bsd/drm_fops.h
index e9c5d7a0..a3678730 100644
--- a/bsd/drm_fops.h
+++ b/bsd/drm_fops.h
@@ -53,7 +53,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);
@@ -105,12 +105,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/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h
index 073ceb37..74d13511 100644
--- a/bsd/drm_os_freebsd.h
+++ b/bsd/drm_os_freebsd.h
@@ -149,7 +149,8 @@
* 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
@@ -471,7 +472,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/bsd/drm_vm.h b/bsd/drm_vm.h
index 6f0c01ea..e0d710fa 100644
--- a/bsd/drm_vm.h
+++ b/bsd/drm_vm.h
@@ -23,8 +23,8 @@
*/
#if defined(__FreeBSD__) && __FreeBSD_version >= 500102
-static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr,
- int prot)
+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)
#elif defined(__NetBSD__)
@@ -52,7 +52,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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:56:24 +0000