diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-11-06 01:41:47 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-11-06 01:41:47 +0000 |
| commit | c9202c89653b8dac2ac322c3d3a7389945e1c94c (patch) | |
| tree | da57c01384977ea6a2962cfaac9c7c426da2c0f8 /bsd-core/drm_auth.c | |
| parent | 39a23640b2de9e59e99d48e6de8c9edae0231856 (diff) | |
Commit WIP of BSD conversion to core model. Compiles for r128, radeon, but
doesn't run yet. Moves the ioctl definitions for these two drivers back
to the shared code -- they aren't OS-specific.
Diffstat (limited to 'bsd-core/drm_auth.c')
| -rw-r--r-- | bsd-core/drm_auth.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/bsd-core/drm_auth.c b/bsd-core/drm_auth.c index 537718c1..c04c6546 100644 --- a/bsd-core/drm_auth.c +++ b/bsd-core/drm_auth.c @@ -32,16 +32,18 @@ #include "drmP.h" -static int DRM(hash_magic)(drm_magic_t magic) +static int drm_hash_magic(drm_magic_t magic) { return magic & (DRM_HASH_SIZE-1); } -static drm_file_t *DRM(find_file)(drm_device_t *dev, drm_magic_t magic) +static drm_file_t *drm_find_file(drm_device_t *dev, drm_magic_t magic) { drm_file_t *retval = NULL; drm_magic_entry_t *pt; - int hash = DRM(hash_magic)(magic); + int hash; + + hash = drm_hash_magic(magic); DRM_LOCK(); for (pt = dev->magiclist[hash].head; pt; pt = pt->next) { @@ -54,15 +56,15 @@ static drm_file_t *DRM(find_file)(drm_device_t *dev, drm_magic_t magic) return retval; } -static int DRM(add_magic)(drm_device_t *dev, drm_file_t *priv, drm_magic_t magic) +static int drm_add_magic(drm_device_t *dev, drm_file_t *priv, drm_magic_t magic) { int hash; drm_magic_entry_t *entry; DRM_DEBUG("%d\n", magic); - hash = DRM(hash_magic)(magic); - entry = (drm_magic_entry_t*) DRM(alloc)(sizeof(*entry), DRM_MEM_MAGIC); + hash = drm_hash_magic(magic); + entry = (drm_magic_entry_t*) drm_alloc(sizeof(*entry), DRM_MEM_MAGIC); if (!entry) return DRM_ERR(ENOMEM); memset(entry, 0, sizeof(*entry)); entry->magic = magic; @@ -82,14 +84,14 @@ static int DRM(add_magic)(drm_device_t *dev, drm_file_t *priv, drm_magic_t magic return 0; } -static int DRM(remove_magic)(drm_device_t *dev, drm_magic_t magic) +static int drm_remove_magic(drm_device_t *dev, drm_magic_t magic) { drm_magic_entry_t *prev = NULL; drm_magic_entry_t *pt; int hash; DRM_DEBUG("%d\n", magic); - hash = DRM(hash_magic)(magic); + hash = drm_hash_magic(magic); DRM_LOCK(); for (pt = dev->magiclist[hash].head; pt; prev = pt, pt = pt->next) { @@ -109,11 +111,11 @@ static int DRM(remove_magic)(drm_device_t *dev, drm_magic_t magic) } DRM_UNLOCK(); - DRM(free)(pt, sizeof(*pt), DRM_MEM_MAGIC); + drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC); return DRM_ERR(EINVAL); } -int DRM(getmagic)(DRM_IOCTL_ARGS) +int drm_getmagic(DRM_IOCTL_ARGS) { static drm_magic_t sequence = 0; drm_auth_t auth; @@ -133,9 +135,9 @@ int DRM(getmagic)(DRM_IOCTL_ARGS) if (!atomic_cmpset_int(&sequence, old, auth.magic)) continue; - } while (DRM(find_file)(dev, auth.magic)); + } while (drm_find_file(dev, auth.magic)); priv->magic = auth.magic; - DRM(add_magic)(dev, priv, auth.magic); + drm_add_magic(dev, priv, auth.magic); } DRM_DEBUG("%u\n", auth.magic); @@ -145,7 +147,7 @@ int DRM(getmagic)(DRM_IOCTL_ARGS) return 0; } -int DRM(authmagic)(DRM_IOCTL_ARGS) +int drm_authmagic(DRM_IOCTL_ARGS) { drm_auth_t auth; drm_file_t *file; @@ -155,9 +157,9 @@ int DRM(authmagic)(DRM_IOCTL_ARGS) DRM_DEBUG("%u\n", auth.magic); - if ((file = DRM(find_file)(dev, auth.magic))) { + if ((file = drm_find_file(dev, auth.magic))) { file->authenticated = 1; - DRM(remove_magic)(dev, auth.magic); + drm_remove_magic(dev, auth.magic); return 0; } return DRM_ERR(EINVAL); |