detypedef some more. No functional change.

diff --git a/sys/dev/pci/drm/drm.h b/sys/dev/pci/drm/drm.h
index ae1da17..9efe63a 100644 (file)
--- a/sys/dev/pci/drm/drm.h
+++ b/sys/dev/pci/drm/drm.h
@@ -1066,7 +1066,7 @@ struct drm_mm_info_arg {
 #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;

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 11de10e..26b52e2 100644 (file)
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -374,11 +374,11 @@ struct drm_file {
 };
 
 struct drm_lock_data {
-       drm_hw_lock_t   *hw_lock;       /* Hardware lock */
+       struct drm_hw_lock      *hw_lock;       /* Hardware lock */
        /* Unique identifier of holding process (NULL is kernel) */
-       struct drm_file *file_priv;
-       int              lock_queue;    /* Queue of blocked processes */
-       unsigned long    lock_time;     /* Time of last lock in jiffies */
+       struct drm_file         *file_priv;
+       int                      lock_queue;    /* Queue of blocked processes */
+       unsigned long            lock_time;     /* Time of last lock */
 };
 
 /* This structure, in the struct drm_device, is always initialized while
@@ -451,11 +451,11 @@ typedef struct drm_local_map {
        bus_space_tag_t                  bst;   /* Tag for mapped pci mem */
        bus_space_handle_t               bsh;   /* Handle to mapped pci mem */
        u_long                           ext;   /* extent for mmap */
-       drm_map_flags_t                  flags; /* Flags */
+       enum drm_map_flags               flags; /* Flags */
        int                              mtrr;  /* Boolean: MTRR used */
        unsigned long                    offset;/* Physical address */
        unsigned long                    size;  /* Physical size (bytes) */
-       drm_map_type_t                   type;  /* Type of memory mapped */
+       enum drm_map_type                type;  /* Type of memory mapped */
 } drm_local_map_t;
 
 struct drm_vblank {
@@ -581,7 +581,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 */
@@ -696,10 +696,10 @@ int       drm_order(unsigned long);
 drm_local_map_t
        *drm_find_matching_map(struct drm_device *, drm_local_map_t *);
 int    drm_addmap(struct drm_device *, unsigned long, unsigned long,
-           drm_map_type_t, drm_map_flags_t, drm_local_map_t **);
-int    drm_addbufs_pci(struct drm_device *, drm_buf_desc_t *);
-int    drm_addbufs_sg(struct drm_device *, drm_buf_desc_t *);
-int    drm_addbufs_agp(struct drm_device *, drm_buf_desc_t *);
+           enum drm_map_type, enum drm_lock_flags, drm_local_map_t **);
+int    drm_addbufs_pci(struct drm_device *, struct drm_buf_desc *);
+int    drm_addbufs_sg(struct drm_device *, struct drm_buf_desc *);
+int    drm_addbufs_agp(struct drm_device *, struct drm_buf_desc *);
 
 /* DMA support (drm_dma.c) */
 int    drm_dma_setup(struct drm_device *);
@@ -729,20 +729,20 @@ int       drm_device_is_pcie(struct drm_device *);
 drm_agp_head_t *drm_agp_init(void);
 int    drm_agp_acquire(struct drm_device *);
 int    drm_agp_release(struct drm_device *);
-int    drm_agp_info(struct drm_device *, drm_agp_info_t *);
-int    drm_agp_enable(struct drm_device *, drm_agp_mode_t);
+int    drm_agp_info(struct drm_device *, struct drm_agp_info *);
+int    drm_agp_enable(struct drm_device *, struct drm_agp_mode);
 void   *drm_agp_allocate_memory(size_t, u32);
 int    drm_agp_free_memory(void *);
 int    drm_agp_bind_memory(void *, off_t);
 int    drm_agp_unbind_memory(void *);
-int    drm_agp_alloc(struct drm_device *, drm_agp_buffer_t *);
-int    drm_agp_free(struct drm_device *, drm_agp_buffer_t *);
-int    drm_agp_bind(struct drm_device *, drm_agp_binding_t *);
-int    drm_agp_unbind(struct drm_device *, drm_agp_binding_t *);
+int    drm_agp_alloc(struct drm_device *, struct drm_agp_buffer *);
+int    drm_agp_free(struct drm_device *, struct drm_agp_buffer *);
+int    drm_agp_bind(struct drm_device *, struct drm_agp_binding *);
+int    drm_agp_unbind(struct drm_device *, struct drm_agp_binding *);
 
 /* Scatter Gather Support (drm_scatter.c) */
 void   drm_sg_cleanup(drm_sg_mem_t *);
-int    drm_sg_alloc(struct drm_device *, drm_scatter_gather_t *);
+int    drm_sg_alloc(struct drm_device *, struct drm_scatter_gather *);
 
 /* ATI PCIGART support (ati_pcigart.c) */
 int    drm_ati_pcigart_init(struct drm_device *,

diff --git a/sys/dev/pci/drm/drm_agpsupport.c b/sys/dev/pci/drm/drm_agpsupport.c
index 9f383fd..03784c0 100644 (file)
--- a/sys/dev/pci/drm/drm_agpsupport.c
+++ b/sys/dev/pci/drm/drm_agpsupport.c
@@ -63,7 +63,7 @@ drm_device_is_pcie(struct drm_device *dev)
 }
 
 int
-drm_agp_info(struct drm_device * dev, drm_agp_info_t *info)
+drm_agp_info(struct drm_device * dev, struct drm_agp_info *info)
 {
        struct agp_info *kern;
 
@@ -91,7 +91,7 @@ int
 drm_agp_info_ioctl(struct drm_device *dev, void *data,
     struct drm_file *file_priv)
 {
-       drm_agp_info_t  *info = data;
+       struct drm_agp_info     *info = data;
 
        return (drm_agp_info(dev, info));
 }
@@ -159,13 +159,13 @@ int
 drm_agp_enable_ioctl(struct drm_device *dev, void *data,
     struct drm_file *file_priv)
 {
-       drm_agp_mode_t  *mode = data;
+       struct drm_agp_mode     *mode = data;
 
        return (drm_agp_enable(dev, *mode));
 }
 
 int
-drm_agp_alloc(struct drm_device *dev, drm_agp_buffer_t *request)
+drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
 {
 #ifndef DRM_NO_AGP
        struct drm_agp_mem      *entry;
@@ -210,7 +210,7 @@ int
 drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
     struct drm_file *file_priv)
 {
-       drm_agp_buffer_t        *request = data;
+       struct drm_agp_buffer   *request = data;
        int                      retcode;
 
        DRM_LOCK();
@@ -232,7 +232,7 @@ drm_agp_lookup_entry(struct drm_device *dev, void *handle)
 }
 
 int
-drm_agp_unbind(struct drm_device *dev, drm_agp_binding_t *request)
+drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)
 {
        struct drm_agp_mem      *entry;
        int                      retcode;
@@ -258,7 +258,7 @@ int
 drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
     struct drm_file *file_priv)
 {
-       drm_agp_binding_t       *request = data;
+       struct drm_agp_binding  *request = data;
        int                      retcode;
 
        DRM_LOCK();
@@ -269,7 +269,7 @@ drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
 }
 
 int
-drm_agp_bind(struct drm_device *dev, drm_agp_binding_t *request)
+drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
 {
        struct drm_agp_mem      *entry;
        int                      retcode, page;
@@ -298,7 +298,7 @@ int
 drm_agp_bind_ioctl(struct drm_device *dev, void *data,
     struct drm_file *file_priv)
 {
-       drm_agp_binding_t       *request = data;
+       struct drm_agp_binding  *request = data;
        int                      retcode;
 
        DRM_LOCK();
@@ -309,7 +309,7 @@ drm_agp_bind_ioctl(struct drm_device *dev, void *data,
 }
 
 int
-drm_agp_free(struct drm_device *dev, drm_agp_buffer_t *request)
+drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
 {
        struct drm_agp_mem      *entry;
        
@@ -338,7 +338,7 @@ int
 drm_agp_free_ioctl(struct drm_device *dev, void *data,
     struct drm_file *file_priv)
 {
-       drm_agp_buffer_t        *request = data;
+       struct drm_agp_buffer   *request = data;
        int                      retcode;
 
        DRM_LOCK();

diff --git a/sys/dev/pci/drm/drm_auth.c b/sys/dev/pci/drm/drm_auth.c
index 6425875..c1631b2 100644 (file)
--- a/sys/dev/pci/drm/drm_auth.c
+++ b/sys/dev/pci/drm/drm_auth.c
@@ -117,7 +117,7 @@ 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)
 {
-       drm_auth_t      *auth = data;
+       struct drm_auth *auth = data;
 
        /* Find unique magic */
        if (file_priv->magic) {
@@ -140,7 +140,7 @@ 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;
        struct drm_file *priv;
 
        DRM_DEBUG("%u\n", auth->magic);

diff --git a/sys/dev/pci/drm/drm_bufs.c b/sys/dev/pci/drm/drm_bufs.c
index fdbf29a..a5166ab 100644 (file)
--- a/sys/dev/pci/drm/drm_bufs.c
+++ b/sys/dev/pci/drm/drm_bufs.c
@@ -110,7 +110,7 @@ drm_get_resource_len(struct drm_device *dev, unsigned int resource)
 
 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, ret = 0;
@@ -302,9 +302,9 @@ done:
 int
 drm_addmap_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_map_t *request = data;
-       drm_local_map_t *map;
-       int err;
+       struct drm_map          *request = data;
+       drm_local_map_t         *map;
+       int                      err;
 
        if (!(file_priv->flags & (FREAD|FWRITE)))
                return EACCES; /* Require read/write */
@@ -374,8 +374,8 @@ drm_rmmap(struct drm_device *dev, drm_local_map_t *map)
 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;
+       drm_local_map_t *map;
+       struct drm_map  *request = data;
 
        DRM_LOCK();
        TAILQ_FOREACH(map, &dev->maplist, link) {
@@ -425,7 +425,7 @@ drm_cleanup_buf_error(struct drm_device *dev, drm_buf_entry_t *entry)
 }
 
 int
-drm_do_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
+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;
@@ -559,7 +559,7 @@ drm_do_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
 }
 
 int
-drm_do_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request)
+drm_do_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request)
 {
        drm_device_dma_t *dma = dev->dma;
        int count;
@@ -717,7 +717,7 @@ drm_do_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request)
 }
 
 int
-drm_do_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
+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;
@@ -826,7 +826,7 @@ drm_do_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
 }
 
 int
-drm_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
+drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc *request)
 {
        int order, ret;
 
@@ -859,7 +859,7 @@ drm_addbufs_agp(struct drm_device *dev, drm_buf_desc_t *request)
 }
 
 int
-drm_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
+drm_addbufs_sg(struct drm_device *dev, struct drm_buf_desc *request)
 {
        int order, ret;
 
@@ -892,7 +892,7 @@ drm_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request)
 }
 
 int
-drm_addbufs_pci(struct drm_device *dev, drm_buf_desc_t *request)
+drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request)
 {
        int order, ret;
 
@@ -927,7 +927,7 @@ 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)
@@ -943,12 +943,10 @@ drm_addbufs_ioctl(struct drm_device *dev, void *data,
 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;
-       int i;
-       int idx;
-       drm_buf_t *buf;
-       int retcode = 0;
+       drm_device_dma_t        *dma = dev->dma;
+       struct drm_buf_free     *request = data;
+       drm_buf_t               *buf;
+       int                      i, idx, retcode = 0;
 
        DRM_DEBUG("%d\n", request->count);
        
@@ -991,7 +989,7 @@ drm_mapbufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
        int retcode = 0;
        const int zero = 0;
 
-       drm_buf_map_t *request = data;
+       struct drm_buf_map *request = data;
        int i;
 
        if (!vfinddev(file_priv->kdev, VCHR, &vn))

diff --git a/sys/dev/pci/drm/drm_context.c b/sys/dev/pci/drm/drm_context.c
index d2c5fb4..d19b585 100644 (file)
--- a/sys/dev/pci/drm/drm_context.c
+++ b/sys/dev/pci/drm/drm_context.c
@@ -115,9 +115,9 @@ drm_ctxbitmap_cleanup(struct drm_device *dev)
 int
 drm_resctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_ctx_res_t *res = data;
-       drm_ctx_t ctx;
-       int i;
+       struct drm_ctx_res      *res = data;
+       struct drm_ctx           ctx;
+       int                      i;
 
        if (res->count >= DRM_RESERVED_CONTEXTS) {
                bzero(&ctx, sizeof(ctx));
@@ -136,7 +136,7 @@ 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) {
@@ -162,7 +162,7 @@ drm_addctx(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;
@@ -173,7 +173,7 @@ drm_getctx(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/sys/dev/pci/drm/drm_drawable.c b/sys/dev/pci/drm/drm_drawable.c
index 4d6e192..563de03 100644 (file)
--- a/sys/dev/pci/drm/drm_drawable.c
+++ b/sys/dev/pci/drm/drm_drawable.c
@@ -86,8 +86,8 @@ drm_get_drawable_info(struct drm_device *dev, unsigned int handle)
 int
 drm_adddraw(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_draw_t *draw = data;
-       struct bsd_drm_drawable_info *info;
+       struct drm_draw                 *draw = data;
+       struct bsd_drm_drawable_info    *info;
 
        info = drm_calloc(1, sizeof(struct bsd_drm_drawable_info),
            DRM_MEM_DRAWABLE);
@@ -108,8 +108,8 @@ 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 bsd_drm_drawable_info *info;
+       struct drm_draw                 *draw = (drm_draw_t *)data;
+       struct bsd_drm_drawable_info    *info;
 
        DRM_SPINLOCK(&dev->drw_lock);
        info = drm_get_drawable(dev, draw->handle);

diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 660044e..45a6b7d 100644 (file)
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -457,8 +457,8 @@ drm_lastclose(struct drm_device *dev)
 int
 drm_version(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_version_t *version = data;
-       int len;
+       struct drm_version      *version = data;
+       int                      len;
 
 #define DRM_COPY(name, value)                                          \
        len = strlen( value );                                          \

diff --git a/sys/dev/pci/drm/drm_ioctl.c b/sys/dev/pci/drm/drm_ioctl.c
index 3cbb939..cd993d7 100644 (file)
--- a/sys/dev/pci/drm/drm_ioctl.c
+++ b/sys/dev/pci/drm/drm_ioctl.c
@@ -46,7 +46,7 @@ int   drm_set_busid(struct drm_device *);
 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))
@@ -63,9 +63,9 @@ drm_getunique(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int
 drm_setunique(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_unique_t *u = data;
-       int domain, bus, slot, func, ret;
-       char *busid;
+       struct drm_unique       *u = data;
+       char                    *busid;
+       int                      domain, bus, slot, func, ret;
 #if defined (__NetBSD__) 
        return EOPNOTSUPP;
 #endif
@@ -148,10 +148,9 @@ 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;
-       drm_local_map_t    *mapinlist;
-       int          idx;
-       int          i = 0;
+       struct drm_map  *map = data;
+       drm_local_map_t *mapinlist;
+       int              idx, i = 0;
 
        idx = map->offset;
 
@@ -185,8 +184,8 @@ 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_file *pt;
+       struct drm_client       *client = data;
+       struct drm_file         *pt;
        int              idx;
        int              i = 0;
 
@@ -212,10 +211,10 @@ drm_getclient(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int
 drm_getstats(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_stats_t *stats = data;
-       int i;
+       struct drm_stats        *stats = data;
+       int                      i;
 
-       memset(stats, 0, sizeof(drm_stats_t));
+       memset(stats, 0, sizeof(struct drm_stats));
        
        DRM_LOCK();
 
@@ -241,9 +240,8 @@ 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;
-       int if_version;
+       struct drm_set_version  ver, *sv = data;
+       int                     if_version;
 
        /* Save the incoming data, and set the response before continuing
         * any further.

diff --git a/sys/dev/pci/drm/drm_irq.c b/sys/dev/pci/drm/drm_irq.c
index 0f6c990..ddc4715 100644 (file)
--- a/sys/dev/pci/drm/drm_irq.c
+++ b/sys/dev/pci/drm/drm_irq.c
@@ -43,7 +43,7 @@ void          vblank_disable(void *);
 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 ||
@@ -149,8 +149,8 @@ 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;
-       int err;
+       struct drm_control      *ctl = data;
+       int                      err;
 
        switch (ctl->func) {
        case DRM_INST_HANDLER:
@@ -344,8 +344,8 @@ out:
 int
 drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-       drm_wait_vblank_t *vblwait = data;
-       int ret, flags, crtc, seq;
+       union drm_wait_vblank   *vblwait = data;
+       int                      ret, flags, crtc, seq;
 
        if (!dev->irq_enabled)
                return EINVAL;

diff --git a/sys/dev/pci/drm/drm_lock.c b/sys/dev/pci/drm/drm_lock.c
index 3a554b6..6b130fd 100644 (file)
--- a/sys/dev/pci/drm/drm_lock.c
+++ b/sys/dev/pci/drm/drm_lock.c
@@ -120,7 +120,7 @@ drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
 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) {
@@ -169,7 +169,7 @@ 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/sys/dev/pci/drm/drm_scatter.c b/sys/dev/pci/drm/drm_scatter.c
index 5dcb7dc..0def503 100644 (file)
--- a/sys/dev/pci/drm/drm_scatter.c
+++ b/sys/dev/pci/drm/drm_scatter.c
@@ -51,11 +51,11 @@ drm_sg_cleanup(drm_sg_mem_t *entry)
 }
 
 int
-drm_sg_alloc(struct drm_device * dev, drm_scatter_gather_t * request)
+drm_sg_alloc(struct drm_device * dev, struct drm_scatter_gather *request)
 {
-       drm_sg_mem_t *entry;
-       unsigned long pages;
-       int i;
+       drm_sg_mem_t    *entry;
+       unsigned long    pages;
+       int              i;
 
        if (dev->sg != NULL)
                return EINVAL;
@@ -107,8 +107,8 @@ int
 drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
     struct drm_file *file_priv)
 {
-       drm_scatter_gather_t *request = data;
-       int ret;
+       struct drm_scatter_gather       *request = data;
+       int                              ret;
 
        DRM_DEBUG("\n");
 
@@ -119,8 +119,8 @@ 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;
-       drm_sg_mem_t *entry;
+       struct drm_scatter_gather       *request = data;
+       drm_sg_mem_t                    *entry;
 
        DRM_LOCK();
        entry = dev->sg;

diff --git a/sys/dev/pci/drm/drm_vm.c b/sys/dev/pci/drm/drm_vm.c
index 8f6660e..19e9039 100644 (file)
--- a/sys/dev/pci/drm/drm_vm.c
+++ b/sys/dev/pci/drm/drm_vm.c
@@ -31,11 +31,11 @@
 paddr_t
 drmmmap(dev_t kdev, off_t offset, int prot)
 {
-       struct drm_device *dev = drm_get_device_from_kdev(kdev);
-       drm_local_map_t *map;
-       struct drm_file *priv;
-       drm_map_type_t type;
-       paddr_t phys;
+       struct drm_device       *dev = drm_get_device_from_kdev(kdev);
+       drm_local_map_t         *map;
+       struct drm_file         *priv;
+       enum drm_map_type        type;
+       paddr_t                  phys;
 
        DRM_LOCK();
        priv = drm_find_file_by_minor(dev, minor(kdev));