[FreeBSD] Replace typedefs on bsd.

Signed-off-by: Robert Noland <rnoland@2hip.net>

diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 74487e5..25f71f0 100644 (file)
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -523,7 +523,7 @@ struct drm_file {
 };
 
 typedef struct drm_lock_data {
-       drm_hw_lock_t     *hw_lock;     /* Hardware lock                   */
+       struct drm_hw_lock      *hw_lock;       /* Hardware lock                   */
        struct drm_file   *file_priv;   /* Unique identifier of holding process (NULL is kernel)*/
        int               lock_queue;   /* Queue of blocked processes      */
        unsigned long     lock_time;    /* Time of last lock in jiffies    */
@@ -586,8 +586,8 @@ typedef TAILQ_HEAD(drm_map_list, drm_local_map) drm_map_list_t;
 typedef struct drm_local_map {
        unsigned long   offset;  /* Physical address (0 for SAREA)*/
        unsigned long   size;    /* Physical size (bytes)           */
-       drm_map_type_t  type;    /* Type of memory mapped                   */
-       drm_map_flags_t flags;   /* Flags                                   */
+       enum drm_map_type       type;    /* Type of memory mapped                   */
+       enum drm_map_flags      flags;   /* Flags                                   */
        void            *handle; /* User-space: "Handle" to pass to mmap    */
                                 /* Kernel-space: kernel-virtual address    */
        int             mtrr;    /* Boolean: MTRR used */
@@ -662,9 +662,9 @@ struct drm_driver_info {
        void    (*dma_ready)(struct drm_device *);
        int     (*dma_quiescent)(struct drm_device *);
        int     (*dma_flush_block_and_flush)(struct drm_device *, int context,
-                                            drm_lock_flags_t flags);
+                                            enum drm_lock_flags flags);
        int     (*dma_flush_unblock)(struct drm_device *, int context,
-                                    drm_lock_flags_t flags);
+                                    enum drm_lock_flags flags);
        int     (*context_ctor)(struct drm_device *dev, int context);
        int     (*context_dtor)(struct drm_device *dev, int context);
        int     (*kernel_context_switch)(struct drm_device *dev, int old,
@@ -760,7 +760,7 @@ struct drm_device {
 
                                /* Performance counters */
        unsigned long     counters;
-       drm_stat_type_t   types[15];
+       enum drm_stat_type      types[15];
        atomic_t          counts[15];
 
                                /* Authentication */
@@ -912,11 +912,11 @@ void      drm_rmmap(struct drm_device *dev, drm_local_map_t *map);
 int    drm_order(unsigned long size);
 int    drm_addmap(struct drm_device *dev, unsigned long offset,
                   unsigned long size,
-                  drm_map_type_t type, drm_map_flags_t flags,
+                  enum drm_map_type type, enum drm_map_flags flags,
                   drm_local_map_t **map_ptr);
-int    drm_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request);
-int    drm_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request);
-int    drm_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request);
+int    drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request);
+int    drm_addbufs_sg(struct drm_device *dev, struct drm_buf_desc *request);
+int    drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc *request);
 
 /* DMA support (drm_dma.c) */
 int    drm_dma_setup(struct drm_device *dev);
@@ -948,20 +948,20 @@ int       drm_device_is_pcie(struct drm_device *dev);
 drm_agp_head_t *drm_agp_init(void);
 int    drm_agp_acquire(struct drm_device *dev);
 int    drm_agp_release(struct drm_device *dev);
-int    drm_agp_info(struct drm_device * dev, drm_agp_info_t *info);
-int    drm_agp_enable(struct drm_device *dev, drm_agp_mode_t mode);
+int    drm_agp_info(struct drm_device * dev, struct drm_agp_info *info);
+int    drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);
 void   *drm_agp_allocate_memory(size_t pages, u32 type);
 int    drm_agp_free_memory(void *handle);
 int    drm_agp_bind_memory(void *handle, off_t start);
 int    drm_agp_unbind_memory(void *handle);
-int    drm_agp_alloc(struct drm_device *dev, drm_agp_buffer_t *request);
-int    drm_agp_free(struct drm_device *dev, drm_agp_buffer_t *request);
-int    drm_agp_bind(struct drm_device *dev, drm_agp_binding_t *request);
-int    drm_agp_unbind(struct drm_device *dev, drm_agp_binding_t *request);
+int    drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);
+int    drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
+int    drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
+int    drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
 
 /* Scatter Gather Support (drm_scatter.c) */
 void   drm_sg_cleanup(drm_sg_mem_t *entry);
-int    drm_sg_alloc(struct drm_device *dev, drm_scatter_gather_t * request);
+int    drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request);
 
 #ifdef __FreeBSD__
 /* sysctl support (drm_sysctl.h) */

diff --git a/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c
index 97613d2..927e5ee 100644 (file)
--- a/bsd-core/drm_agpsupport.c
+++ b/bsd-core/drm_agpsupport.c
@@ -109,7 +109,7 @@ int drm_device_is_pcie(struct drm_device *dev)
        return (drm_device_find_capability(dev, PCIY_EXPRESS));
 }
 
-int drm_agp_info(struct drm_device * dev, drm_agp_info_t *info)
+int drm_agp_info(struct drm_device * dev, struct drm_agp_info *info)
 {
        struct agp_info *kern;
 
@@ -135,13 +135,13 @@ int drm_agp_info_ioctl(struct drm_device *dev, void *data,
                       struct drm_file *file_priv)
 {
        int err;
-       drm_agp_info_t info;
+       struct drm_agp_info info;
 
        err = drm_agp_info(dev, &info);
        if (err != 0)
                return err;
 
-       *(drm_agp_info_t *) data = info;
+       *(struct drm_agp_info *) data = info;
        return 0;
 }
 
@@ -183,7 +183,7 @@ int drm_agp_release(struct drm_device * dev)
        return 0;
 }
 
-int drm_agp_enable(struct drm_device *dev, drm_agp_mode_t mode)
+int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)
 {
 
        if (!dev->agp || !dev->agp->acquired)
@@ -198,14 +198,14 @@ int drm_agp_enable(struct drm_device *dev, drm_agp_mode_t mode)
 int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
 {
-       drm_agp_mode_t mode;
+       struct drm_agp_mode mode;
 
-       mode = *(drm_agp_mode_t *) data;
+       mode = *(struct drm_agp_mode *) data;
 
        return drm_agp_enable(dev, mode);
 }
 
-int drm_agp_alloc(struct drm_device *dev, drm_agp_buffer_t *request)
+int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
 {
        drm_agp_mem_t    *entry;
        void             *handle;
@@ -251,16 +251,16 @@ int drm_agp_alloc(struct drm_device *dev, drm_agp_buffer_t *request)
 int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
                        struct drm_file *file_priv)
 {
-       drm_agp_buffer_t request;
+       struct drm_agp_buffer request;
        int retcode;
 
-       request = *(drm_agp_buffer_t *) data;
+       request = *(struct drm_agp_buffer *) data;
 
        DRM_LOCK();
        retcode = drm_agp_alloc(dev, &request);
        DRM_UNLOCK();
 
-       *(drm_agp_buffer_t *) data = request;
+       *(struct drm_agp_buffer *) data = request;
 
        return retcode;
 }
@@ -276,7 +276,7 @@ static drm_agp_mem_t * drm_agp_lookup_entry(struct drm_device *dev,
        return NULL;
 }
 
-int drm_agp_unbind(struct drm_device *dev, drm_agp_binding_t *request)
+int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)
 {
        drm_agp_mem_t     *entry;
        int retcode;
@@ -301,10 +301,10 @@ int drm_agp_unbind(struct drm_device *dev, drm_agp_binding_t *request)
 int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
 {
-       drm_agp_binding_t request;
+       struct drm_agp_binding request;
        int retcode;
 
-       request = *(drm_agp_binding_t *) data;
+       request = *(struct drm_agp_binding *) data;
 
        DRM_LOCK();
        retcode = drm_agp_unbind(dev, &request);
@@ -313,7 +313,7 @@ int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
        return retcode;
 }
 
-int drm_agp_bind(struct drm_device *dev, drm_agp_binding_t *request)
+int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
 {
        drm_agp_mem_t     *entry;
        int               retcode;
@@ -342,10 +342,10 @@ int drm_agp_bind(struct drm_device *dev, drm_agp_binding_t *request)
 int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
                       struct drm_file *file_priv)
 {
-       drm_agp_binding_t request;
+       struct drm_agp_binding request;
        int retcode;
 
-       request = *(drm_agp_binding_t *) data;
+       request = *(struct drm_agp_binding *) data;
 
        DRM_LOCK();
        retcode = drm_agp_bind(dev, &request);
@@ -354,7 +354,7 @@ int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
        return retcode;
 }
 
-int drm_agp_free(struct drm_device *dev, drm_agp_buffer_t *request)
+int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
 {
        drm_agp_mem_t    *entry;
        
@@ -387,10 +387,10 @@ int drm_agp_free(struct drm_device *dev, drm_agp_buffer_t *request)
 int drm_agp_free_ioctl(struct drm_device *dev, void *data,
                       struct drm_file *file_priv)
 {
-       drm_agp_buffer_t request;
+       struct drm_agp_buffer request;
        int retcode;
 
-       request = *(drm_agp_buffer_t *) data;
+       request = *(struct drm_agp_buffer *) data;
 
        DRM_LOCK();
        retcode = drm_agp_free(dev, &request);

diff --git a/bsd-core/drm_auth.c b/bsd-core/drm_auth.c
index 60af16c..c11c887 100644 (file)
--- a/bsd-core/drm_auth.c
+++ b/bsd-core/drm_auth.c
@@ -136,7 +136,7 @@ static int drm_remove_magic(struct drm_device *dev, drm_magic_t magic)
 int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        static drm_magic_t sequence = 0;
-       drm_auth_t *auth = data;
+       struct drm_auth *auth = data;
 
                                /* Find unique magic */
        if (file_priv->magic) {
@@ -167,7 +167,7 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int drm_authmagic(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
 {
-       drm_auth_t *auth = data;
+       struct drm_auth *auth = data;
        drm_file_t *priv;
 
        DRM_DEBUG("%u\n", auth->magic);

diff --git a/bsd-core/drm_bufs.c b/bsd-core/drm_bufs.c
index c793634..2d13087 100644 (file)
--- a/bsd-core/drm_bufs.c
+++ b/bsd-core/drm_bufs.c
@@ -102,7 +102,7 @@ unsigned long drm_get_resource_len(struct drm_device *dev,
 
 int drm_addmap(struct drm_device * dev, unsigned long offset,
               unsigned long size,
-    drm_map_type_t type, drm_map_flags_t flags, drm_local_map_t **map_ptr)
+    enum drm_map_type type, enum drm_map_flags flags, drm_local_map_t **map_ptr)
 {
        drm_local_map_t *map;
        int align;
@@ -274,7 +274,7 @@ done:
 int drm_addmap_ioctl(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {
-       drm_map_t *request = data;
+       struct drm_map *request = data;
        drm_local_map_t *map;
        int err;
 
@@ -355,7 +355,7 @@ int drm_rmmap_ioctl(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {
        drm_local_map_t *map;
-       drm_map_t *request = data;
+       struct drm_map *request = data;
 
        DRM_LOCK();
        TAILQ_FOREACH(map, &dev->maplist, link) {
@@ -402,7 +402,7 @@ static void drm_cleanup_buf_error(struct drm_device *dev,
        }
 }
 
-static int drm_do_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
+static int drm_do_addbufs_agp(struct drm_device *dev, struct drm_buf_desc *request)
 {
        drm_device_dma_t *dma = dev->dma;
        drm_buf_entry_t *entry;
@@ -533,7 +533,7 @@ static int drm_do_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
        return 0;
 }
 
-static int drm_do_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request)
+static int drm_do_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request)
 {
        drm_device_dma_t *dma = dev->dma;
        int count;
@@ -680,7 +680,7 @@ static int drm_do_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request)
 
 }
 
-static int drm_do_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
+static int drm_do_addbufs_sg(struct drm_device *dev, struct drm_buf_desc *request)
 {
        drm_device_dma_t *dma = dev->dma;
        drm_buf_entry_t *entry;
@@ -791,7 +791,7 @@ static int drm_do_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
        return 0;
 }
 
-int drm_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
+int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc *request)
 {
        int order, ret;
 
@@ -822,7 +822,7 @@ int drm_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
        return ret;
 }
 
-int drm_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
+int drm_addbufs_sg(struct drm_device *dev, struct drm_buf_desc *request)
 {
        int order, ret;
 
@@ -856,7 +856,7 @@ int drm_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
        return ret;
 }
 
-int drm_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request)
+int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request)
 {
        int order, ret;
 
@@ -893,7 +893,7 @@ int drm_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request)
 int drm_addbufs_ioctl(struct drm_device *dev, void *data,
                      struct drm_file *file_priv)
 {
-       drm_buf_desc_t *request = data;
+       struct drm_buf_desc *request = data;
        int err;
 
        if (request->flags & _DRM_AGP_BUFFER)
@@ -909,7 +909,7 @@ int drm_addbufs_ioctl(struct drm_device *dev, void *data,
 int drm_infobufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_info_t *request = data;
+       struct drm_buf_info *request = data;
        int i;
        int count;
        int retcode = 0;
@@ -927,7 +927,7 @@ int drm_infobufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
        if ( request->count >= count ) {
                for ( i = 0, count = 0 ; i < DRM_MAX_ORDER + 1 ; i++ ) {
                        if ( dma->bufs[i].buf_count ) {
-                               drm_buf_desc_t from;
+                               struct drm_buf_desc from;
 
                                from.count = dma->bufs[i].buf_count;
                                from.size = dma->bufs[i].buf_size;
@@ -935,7 +935,7 @@ int drm_infobufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
                                from.high_mark = dma->bufs[i].freelist.high_mark;
 
                                if (DRM_COPY_TO_USER(&request->list[count], &from,
-                                   sizeof(drm_buf_desc_t)) != 0) {
+                                   sizeof(struct drm_buf_desc)) != 0) {
                                        retcode = EFAULT;
                                        break;
                                }
@@ -958,7 +958,7 @@ int drm_infobufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int drm_markbufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_desc_t *request = data;
+       struct drm_buf_desc *request = data;
        int order;
 
        DRM_DEBUG( "%d, %d, %d\n",
@@ -988,7 +988,7 @@ int drm_markbufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int drm_freebufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_free_t *request = data;
+       struct drm_buf_free *request = data;
        int i;
        int idx;
        drm_buf_t *buf;
@@ -1040,7 +1040,7 @@ int drm_mapbufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
        vaddr_t vaddr;
 #endif /* __NetBSD__ || __OpenBSD__ */
 
-       drm_buf_map_t *request = data;
+       struct drm_buf_map *request = data;
        int i;
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)

diff --git a/bsd-core/drm_context.c b/bsd-core/drm_context.c
index 6d44fbe..a621ca5 100644 (file)
--- a/bsd-core/drm_context.c
+++ b/bsd-core/drm_context.c
@@ -140,7 +140,7 @@ void drm_ctxbitmap_cleanup(struct drm_device *dev)
 int drm_getsareactx(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {
-       drm_ctx_priv_map_t *request = data;
+       struct drm_ctx_priv_map *request = data;
        drm_local_map_t *map;
 
        DRM_LOCK();
@@ -161,7 +161,7 @@ int drm_getsareactx(struct drm_device *dev, void *data,
 int drm_setsareactx(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {
-       drm_ctx_priv_map_t *request = data;
+       struct drm_ctx_priv_map *request = data;
        drm_local_map_t *map = NULL;
 
        DRM_LOCK();
@@ -221,8 +221,8 @@ int drm_context_switch_complete(struct drm_device *dev, int new)
 
 int drm_resctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_ctx_res_t *res = data;
-       drm_ctx_t ctx;
+       struct drm_ctx_res *res = data;
+       struct drm_ctx ctx;
        int i;
 
        if ( res->count >= DRM_RESERVED_CONTEXTS ) {
@@ -241,7 +241,7 @@ int drm_resctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 int drm_addctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_ctx_t *ctx = data;
+       struct drm_ctx *ctx = data;
 
        ctx->handle = drm_ctxbitmap_next(dev);
        if ( ctx->handle == DRM_KERNEL_CONTEXT ) {
@@ -272,7 +272,7 @@ int drm_modctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 int drm_getctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_ctx_t *ctx = data;
+       struct drm_ctx *ctx = data;
 
        /* This is 0, because we don't handle any context flags */
        ctx->flags = 0;
@@ -283,7 +283,7 @@ int drm_getctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int drm_switchctx(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
 {
-       drm_ctx_t *ctx = data;
+       struct drm_ctx *ctx = data;
 
        DRM_DEBUG( "%d\n", ctx->handle );
        return drm_context_switch(dev, dev->last_context, ctx->handle);
@@ -291,7 +291,7 @@ int drm_switchctx(struct drm_device *dev, void *data,
 
 int drm_newctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_ctx_t *ctx = data;
+       struct drm_ctx *ctx = data;
 
        DRM_DEBUG( "%d\n", ctx->handle );
        drm_context_switch_complete(dev, ctx->handle);
@@ -301,7 +301,7 @@ int drm_newctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 int drm_rmctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_ctx_t *ctx = data;
+       struct drm_ctx *ctx = data;
 
        DRM_DEBUG( "%d\n", ctx->handle );
        if ( ctx->handle != DRM_KERNEL_CONTEXT ) {

diff --git a/bsd-core/drm_drawable.c b/bsd-core/drm_drawable.c
index 1d85cb4..018db57 100644 (file)
--- a/bsd-core/drm_drawable.c
+++ b/bsd-core/drm_drawable.c
@@ -68,7 +68,7 @@ drm_get_drawable_info(struct drm_device *dev, int handle)
 
 int drm_adddraw(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_draw_t *draw = data;
+       struct drm_draw *draw = data;
        struct bsd_drm_drawable_info *info;
 
        info = drm_calloc(1, sizeof(struct bsd_drm_drawable_info),
@@ -89,7 +89,7 @@ int drm_adddraw(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_draw_t *draw = (drm_draw_t *)data;
+       struct drm_draw *draw = (struct drm_draw *)data;
        struct drm_drawable_info *info;
 
        DRM_SPINLOCK(&dev->drw_lock);

diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index 47c212e..4c03b01 100644 (file)
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -682,7 +682,7 @@ static void drm_unload(struct drm_device *dev)
 
 int drm_version(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_version_t *version = data;
+       struct drm_version *version = data;
        int len;
 
 #define DRM_COPY( name, value )                                                \

diff --git a/bsd-core/drm_ioctl.c b/bsd-core/drm_ioctl.c
index c00e63c..5784be9 100644 (file)
--- a/bsd-core/drm_ioctl.c
+++ b/bsd-core/drm_ioctl.c
@@ -44,7 +44,7 @@
 int drm_getunique(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
 {
-       drm_unique_t     *u = data;
+       struct drm_unique *u = data;
 
        if (u->unique_len >= dev->unique_len) {
                if (DRM_COPY_TO_USER(u->unique, dev->unique, dev->unique_len))
@@ -61,7 +61,7 @@ int drm_getunique(struct drm_device *dev, void *data,
 int drm_setunique(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
 {
-       drm_unique_t *u = data;
+       struct drm_unique *u = data;
        int domain, bus, slot, func, ret;
        char *busid;
 
@@ -141,7 +141,7 @@ drm_set_busid(struct drm_device *dev)
 
 int drm_getmap(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_map_t    *map = data;
+       struct drm_map     *map = data;
        drm_local_map_t    *mapinlist;
        int          idx;
        int          i = 0;
@@ -178,7 +178,7 @@ int drm_getmap(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int drm_getclient(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
 {
-       drm_client_t *client = data;
+       struct drm_client *client = data;
        drm_file_t   *pt;
        int          idx;
        int          i = 0;
@@ -205,10 +205,10 @@ int drm_getclient(struct drm_device *dev, void *data,
 
 int drm_getstats(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_stats_t  *stats = data;
+       struct drm_stats *stats = data;
        int          i;
 
-       memset(stats, 0, sizeof(drm_stats_t));
+       memset(stats, 0, sizeof(struct drm_stats));
        
        DRM_LOCK();
 
@@ -235,8 +235,8 @@ int drm_getstats(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int drm_setversion(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
 {
-       drm_set_version_t *sv = data;
-       drm_set_version_t ver;
+       struct drm_set_version *sv = data;
+       struct drm_set_version ver;
        int if_version;
 
        /* Save the incoming data, and set the response before continuing

diff --git a/bsd-core/drm_irq.c b/bsd-core/drm_irq.c
index e1c50bb..3d0cfef 100644 (file)
--- a/bsd-core/drm_irq.c
+++ b/bsd-core/drm_irq.c
@@ -38,7 +38,7 @@ static void drm_locked_task(void *context, int pending __unused);
 int drm_irq_by_busid(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {
-       drm_irq_busid_t *irq = data;
+       struct drm_irq_busid *irq = data;
 
        if ((irq->busnum >> 8) != dev->pci_domain ||
            (irq->busnum & 0xff) != dev->pci_bus ||
@@ -264,7 +264,7 @@ int drm_irq_uninstall(struct drm_device *dev)
 
 int drm_control(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_control_t *ctl = data;
+       struct drm_control *ctl = data;
        int err;
 
        switch ( ctl->func ) {
@@ -412,7 +412,7 @@ out:
 
 int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_wait_vblank_t *vblwait = data;
+       union drm_wait_vblank *vblwait = data;
        int ret = 0;
        int flags, seq, crtc;
 

diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c
index 80ebb71..0302ca0 100644 (file)
--- a/bsd-core/drm_lock.c
+++ b/bsd-core/drm_lock.c
@@ -113,7 +113,7 @@ int drm_lock_free(struct drm_device *dev,
 
 int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-        drm_lock_t *lock = data;
+        struct drm_lock *lock = data;
         int ret = 0;
 
         if (lock->context == DRM_KERNEL_CONTEXT) {
@@ -166,7 +166,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_lock_t *lock = data;
+       struct drm_lock *lock = data;
 
        if (lock->context == DRM_KERNEL_CONTEXT) {
                DRM_ERROR("Process %d using kernel context %d\n",

diff --git a/bsd-core/drm_scatter.c b/bsd-core/drm_scatter.c
index 3ebd462..e26befc 100644 (file)
--- a/bsd-core/drm_scatter.c
+++ b/bsd-core/drm_scatter.c
@@ -45,7 +45,7 @@ void drm_sg_cleanup(drm_sg_mem_t *entry)
        free(entry, M_DRM);
 }
 
-int drm_sg_alloc(struct drm_device * dev, drm_scatter_gather_t * request)
+int drm_sg_alloc(struct drm_device * dev, struct drm_scatter_gather * request)
 {
        drm_sg_mem_t *entry;
        unsigned long pages;
@@ -101,7 +101,7 @@ int drm_sg_alloc(struct drm_device * dev, drm_scatter_gather_t * request)
 int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
                       struct drm_file *file_priv)
 {
-       drm_scatter_gather_t *request = data;
+       struct drm_scatter_gather *request = data;
        int ret;
 
        DRM_DEBUG( "%s\n", __FUNCTION__ );
@@ -112,7 +112,7 @@ int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
 
 int drm_sg_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_scatter_gather_t *request = data;
+       struct drm_scatter_gather *request = data;
        drm_sg_mem_t *entry;
 
        DRM_LOCK();

diff --git a/bsd-core/drm_vm.c b/bsd-core/drm_vm.c
index 9950c37..e9c8702 100644 (file)
--- a/bsd-core/drm_vm.c
+++ b/bsd-core/drm_vm.c
@@ -40,7 +40,7 @@ paddr_t drm_mmap(dev_t kdev, off_t offset, int prot)
        struct drm_device *dev = drm_get_device_from_kdev(kdev);
        drm_local_map_t *map;
        drm_file_t *priv;
-       drm_map_type_t type;
+       enum drm_map_type type;
 #ifdef __FreeBSD__
        vm_paddr_t phys;
 #else

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 94755e4..bb33282 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -1095,7 +1095,7 @@ struct drm_gem_open {
 #define DRM_COMMAND_END                 0xA0
 
 /* typedef area */
-#if !defined(__KERNEL__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#ifndef __KERNEL__
 typedef struct drm_clip_rect drm_clip_rect_t;
 typedef struct drm_tex_region drm_tex_region_t;
 typedef struct drm_hw_lock drm_hw_lock_t;