1 files changed, 153 insertions, 151 deletions

diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index 502892794c16..6380127be281 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -1,7 +1,7 @@
 /**
- * \file drm_context.h 
+ * \file drm_context.c
  * IOCTLs for generic contexts
- * 
+ *
  * \author Rickard E. (Rik) Faith <faith@valinux.com>
  * \author Gareth Hughes <gareth@valinux.com>
  */
@@ -56,25 +56,26 @@
  * in drm_device::context_sareas, while holding the drm_device::struct_sem
  * lock.
  */
-void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle )
+void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle)
 {
-        if ( ctx_handle < 0 ) goto failed;
-        if ( !dev->ctx_bitmap ) goto failed;
+        if (ctx_handle < 0)
+                goto failed;
+        if (!dev->ctx_bitmap)
+                goto failed;
 
-        if ( ctx_handle < DRM_MAX_CTXBITMAP ) {
+        if (ctx_handle < DRM_MAX_CTXBITMAP) {
                 down(&dev->struct_sem);
-                clear_bit( ctx_handle, dev->ctx_bitmap );
+                clear_bit(ctx_handle, dev->ctx_bitmap);
                 dev->context_sareas[ctx_handle] = NULL;
                 up(&dev->struct_sem);
                 return;
         }
-failed:
-        DRM_ERROR( "Attempt to free invalid context handle: %d\n",
-                   ctx_handle );
-        return;
+      failed:
+        DRM_ERROR("Attempt to free invalid context handle: %d\n", ctx_handle);
+        return;
 }
 
-/** 
+/**
  * Context bitmap allocation.
  *
  * \param dev DRM device.
@@ -84,29 +85,33 @@ failed:
  * drm_device::context_sareas to accommodate the new entry while holding the
  * drm_device::struct_sem lock.
  */
-static int drm_ctxbitmap_next( drm_device_t *dev )
+static int drm_ctxbitmap_next(drm_device_t * dev)
 {
         int bit;
 
-        if(!dev->ctx_bitmap) return -1;
+        if (!dev->ctx_bitmap)
+                return -1;
 
         down(&dev->struct_sem);
-        bit = find_first_zero_bit( dev->ctx_bitmap, DRM_MAX_CTXBITMAP );
-        if ( bit < DRM_MAX_CTXBITMAP ) {
-                set_bit( bit, dev->ctx_bitmap );
-                DRM_DEBUG( "drm_ctxbitmap_next bit : %d\n", bit );
-                if((bit+1) > dev->max_context) {
-                        dev->max_context = (bit+1);
-                        if(dev->context_sareas) {
+        bit = find_first_zero_bit(dev->ctx_bitmap, DRM_MAX_CTXBITMAP);
+        if (bit < DRM_MAX_CTXBITMAP) {
+                set_bit(bit, dev->ctx_bitmap);
+                DRM_DEBUG("drm_ctxbitmap_next bit : %d\n", bit);
+                if ((bit + 1) > dev->max_context) {
+                        dev->max_context = (bit + 1);
+                        if (dev->context_sareas) {
                                 drm_map_t **ctx_sareas;
 
                                 ctx_sareas = drm_realloc(dev->context_sareas,
-                                                (dev->max_context - 1) * 
-                                                sizeof(*dev->context_sareas),
-                                                dev->max_context * 
-                                                sizeof(*dev->context_sareas),
-                                                DRM_MEM_MAPS);
-                                if(!ctx_sareas) {
+                                                         (dev->max_context -
+                                                          1) *
+                                                         sizeof(*dev->
+                                                                context_sareas),
+                                                         dev->max_context *
+                                                         sizeof(*dev->
+                                                                context_sareas),
+                                                         DRM_MEM_MAPS);
+                                if (!ctx_sareas) {
                                         clear_bit(bit, dev->ctx_bitmap);
                                         up(&dev->struct_sem);
                                         return -1;
@@ -115,11 +120,11 @@ static int drm_ctxbitmap_next( drm_device_t *dev )
                                 dev->context_sareas[bit] = NULL;
                         } else {
                                 /* max_context == 1 at this point */
-                                dev->context_sareas = drm_alloc(
-                                                dev->max_context * 
-                                                sizeof(*dev->context_sareas),
-                                                DRM_MEM_MAPS);
-                                if(!dev->context_sareas) {
+                                dev->context_sareas =
+                                    drm_alloc(dev->max_context *
+                                              sizeof(*dev->context_sareas),
+                                              DRM_MEM_MAPS);
+                                if (!dev->context_sareas) {
                                         clear_bit(bit, dev->ctx_bitmap);
                                         up(&dev->struct_sem);
                                         return -1;
@@ -142,26 +147,26 @@ static int drm_ctxbitmap_next( drm_device_t *dev )
  * Allocates and initialize drm_device::ctx_bitmap and drm_device::context_sareas, while holding
  * the drm_device::struct_sem lock.
  */
-int drm_ctxbitmap_init( drm_device_t *dev )
+int drm_ctxbitmap_init(drm_device_t * dev)
 {
         int i;
-        int temp;
+        int temp;
 
         down(&dev->struct_sem);
-        dev->ctx_bitmap = (unsigned long *) drm_alloc( PAGE_SIZE,
-                                                        DRM_MEM_CTXBITMAP );
-        if ( dev->ctx_bitmap == NULL ) {
+        dev->ctx_bitmap = (unsigned long *)drm_alloc(PAGE_SIZE,
+                                                     DRM_MEM_CTXBITMAP);
+        if (dev->ctx_bitmap == NULL) {
                 up(&dev->struct_sem);
                 return -ENOMEM;
         }
-        memset( (void *)dev->ctx_bitmap, 0, PAGE_SIZE );
+        memset((void *)dev->ctx_bitmap, 0, PAGE_SIZE);
         dev->context_sareas = NULL;
         dev->max_context = -1;
         up(&dev->struct_sem);
 
-        for ( i = 0 ; i < DRM_RESERVED_CONTEXTS ; i++ ) {
-                temp = drm_ctxbitmap_next( dev );
-                DRM_DEBUG( "drm_ctxbitmap_init : %d\n", temp );
+        for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+                temp = drm_ctxbitmap_next(dev);
+                DRM_DEBUG("drm_ctxbitmap_init : %d\n", temp);
         }
 
         return 0;
@@ -175,14 +180,14 @@ int drm_ctxbitmap_init( drm_device_t *dev )
  * Frees drm_device::ctx_bitmap and drm_device::context_sareas, while holding
  * the drm_device::struct_sem lock.
  */
-void drm_ctxbitmap_cleanup( drm_device_t *dev )
+void drm_ctxbitmap_cleanup(drm_device_t * dev)
 {
         down(&dev->struct_sem);
-        if( dev->context_sareas ) drm_free( dev->context_sareas,
-                                             sizeof(*dev->context_sareas) * 
-                                             dev->max_context,
-                                             DRM_MEM_MAPS );
-        drm_free( (void *)dev->ctx_bitmap, PAGE_SIZE, DRM_MEM_CTXBITMAP );
+        if (dev->context_sareas)
+                drm_free(dev->context_sareas,
+                         sizeof(*dev->context_sareas) *
+                         dev->max_context, DRM_MEM_MAPS);
+        drm_free((void *)dev->ctx_bitmap, PAGE_SIZE, DRM_MEM_CTXBITMAP);
         up(&dev->struct_sem);
 }
 
@@ -194,7 +199,7 @@ void drm_ctxbitmap_cleanup( drm_device_t *dev )
 
 /**
  * Get per-context SAREA.
- * 
+ *
  * \param inode device inode.
  * \param filp file pointer.
  * \param cmd command.
@@ -205,10 +210,10 @@ void drm_ctxbitmap_cleanup( drm_device_t *dev )
  * returns its handle.
  */
 int drm_getsareactx(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg)
+                    unsigned int cmd, unsigned long arg)
 {
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->head->dev;
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
         drm_ctx_priv_map_t __user *argp = (void __user *)arg;
         drm_ctx_priv_map_t request;
         drm_map_t *map;
@@ -218,7 +223,8 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
                 return -EFAULT;
 
         down(&dev->struct_sem);
-        if (dev->max_context < 0 || request.ctx_id >= (unsigned) dev->max_context) {
+        if (dev->max_context < 0
+            || request.ctx_id >= (unsigned)dev->max_context) {
                 up(&dev->struct_sem);
                 return -EINVAL;
         }
@@ -227,16 +233,16 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
         up(&dev->struct_sem);
 
         request.handle = 0;
-        list_for_each_entry(_entry, &dev->maplist->head,head) {
+        list_for_each_entry(_entry, &dev->maplist->head, head) {
                 if (_entry->map == map) {
-                        request.handle = (void *)(unsigned long)_entry->user_token;
+                        request.handle =
+                            (void *)(unsigned long)_entry->user_token;
                         break;
                 }
         }
         if (request.handle == 0)
                 return -EINVAL;
 
-
         if (copy_to_user(argp, &request, sizeof(request)))
                 return -EFAULT;
         return 0;
@@ -244,7 +250,7 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
 
 /**
  * Set per-context SAREA.
- * 
+ *
  * \param inode device inode.
  * \param filp file pointer.
  * \param cmd command.
@@ -255,37 +261,37 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
  * drm_device::context_sareas with it.
  */
 int drm_setsareactx(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg)
+                    unsigned int cmd, unsigned long arg)
 {
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->head->dev;
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
         drm_ctx_priv_map_t request;
         drm_map_t *map = NULL;
         drm_map_list_t *r_list = NULL;
         struct list_head *list;
 
         if (copy_from_user(&request,
-                           (drm_ctx_priv_map_t __user *)arg,
-                           sizeof(request)))
+                           (drm_ctx_priv_map_t __user *) arg, sizeof(request)))
                 return -EFAULT;
 
         down(&dev->struct_sem);
         list_for_each(list, &dev->maplist->head) {
                 r_list = list_entry(list, drm_map_list_t, head);
                 if (r_list->map
-                    && r_list->user_token == (unsigned long) request.handle)
+                    && r_list->user_token == (unsigned long)request.handle)
                         goto found;
         }
-bad:
+      bad:
         up(&dev->struct_sem);
         return -EINVAL;
 
-found:
+      found:
         map = r_list->map;
-        if (!map) goto bad;
+        if (!map)
+                goto bad;
         if (dev->max_context < 0)
                 goto bad;
-        if (request.ctx_id >= (unsigned) dev->max_context)
+        if (request.ctx_id >= (unsigned)dev->max_context)
                 goto bad;
         dev->context_sareas[request.ctx_id] = map;
         up(&dev->struct_sem);
@@ -308,22 +314,21 @@ found:
  *
  * Attempt to set drm_device::context_flag.
  */
-static int drm_context_switch( drm_device_t *dev, int old, int new )
+static int drm_context_switch(drm_device_t * dev, int old, int new)
 {
-        if ( test_and_set_bit( 0, &dev->context_flag ) ) {
-                DRM_ERROR( "Reentering -- FIXME\n" );
-                return -EBUSY;
-        }
-
+        if (test_and_set_bit(0, &dev->context_flag)) {
+                DRM_ERROR("Reentering -- FIXME\n");
+                return -EBUSY;
+        }
 
-        DRM_DEBUG( "Context switch from %d to %d\n", old, new );
+        DRM_DEBUG("Context switch from %d to %d\n", old, new);
 
-        if ( new == dev->last_context ) {
-                clear_bit( 0, &dev->context_flag );
-                return 0;
-        }
+        if (new == dev->last_context) {
+                clear_bit(0, &dev->context_flag);
+                return 0;
+        }
 
-        return 0;
+        return 0;
 }
 
 /**
@@ -337,22 +342,22 @@ static int drm_context_switch( drm_device_t *dev, int old, int new )
  * hardware lock is held, clears the drm_device::context_flag and wakes up
  * drm_device::context_wait.
  */
-static int drm_context_switch_complete( drm_device_t *dev, int new )
+static int drm_context_switch_complete(drm_device_t * dev, int new)
 {
-        dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
-        dev->last_switch  = jiffies;
+        dev->last_context = new;        /* PRE/POST: This is the _only_ writer. */
+        dev->last_switch = jiffies;
 
-        if ( !_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ) {
-                DRM_ERROR( "Lock isn't held after context switch\n" );
-        }
+        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+                DRM_ERROR("Lock isn't held after context switch\n");
+        }
 
-                                /* If a context switch is ever initiated
-                                   when the kernel holds the lock, release
-                                   that lock here. */
-        clear_bit( 0, &dev->context_flag );
-        wake_up( &dev->context_wait );
+        /* If a context switch is ever initiated
+           when the kernel holds the lock, release
+           that lock here. */
+        clear_bit(0, &dev->context_flag);
+        wake_up(&dev->context_wait);
 
-        return 0;
+        return 0;
 }
 
 /**
@@ -364,29 +369,28 @@ static int drm_context_switch_complete( drm_device_t *dev, int new )
  * \param arg user argument pointing to a drm_ctx_res structure.
  * \return zero on success or a negative number on failure.
  */
-int drm_resctx( struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg )
+int drm_resctx(struct inode *inode, struct file *filp,
+               unsigned int cmd, unsigned long arg)
 {
         drm_ctx_res_t res;
         drm_ctx_t __user *argp = (void __user *)arg;
         drm_ctx_t ctx;
         int i;
 
-        if ( copy_from_user( &res, argp, sizeof(res) ) )
+        if (copy_from_user(&res, argp, sizeof(res)))
                 return -EFAULT;
 
-        if ( res.count >= DRM_RESERVED_CONTEXTS ) {
-                memset( &ctx, 0, sizeof(ctx) );
-                for ( i = 0 ; i < DRM_RESERVED_CONTEXTS ; i++ ) {
+        if (res.count >= DRM_RESERVED_CONTEXTS) {
+                memset(&ctx, 0, sizeof(ctx));
+                for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
                         ctx.handle = i;
-                        if ( copy_to_user( &res.contexts[i],
-                                           &ctx, sizeof(ctx) ) )
+                        if (copy_to_user(&res.contexts[i], &ctx, sizeof(ctx)))
                                 return -EFAULT;
                 }
         }
         res.count = DRM_RESERVED_CONTEXTS;
 
-        if ( copy_to_user( argp, &res, sizeof(res) ) )
+        if (copy_to_user(argp, &res, sizeof(res)))
                 return -EFAULT;
         return 0;
 }
@@ -402,58 +406,57 @@ int drm_resctx( struct inode *inode, struct file *filp,
  *
  * Get a new handle for the context and copy to userspace.
  */
-int drm_addctx( struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg )
+int drm_addctx(struct inode *inode, struct file *filp,
+               unsigned int cmd, unsigned long arg)
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_ctx_list_t * ctx_entry;
+        drm_ctx_list_t *ctx_entry;
         drm_ctx_t __user *argp = (void __user *)arg;
         drm_ctx_t ctx;
 
-        if ( copy_from_user( &ctx, argp, sizeof(ctx) ) )
+        if (copy_from_user(&ctx, argp, sizeof(ctx)))
                 return -EFAULT;
 
-        ctx.handle = drm_ctxbitmap_next( dev );
-        if ( ctx.handle == DRM_KERNEL_CONTEXT ) {
-                                /* Skip kernel's context and get a new one. */
-                ctx.handle = drm_ctxbitmap_next( dev );
+        ctx.handle = drm_ctxbitmap_next(dev);
+        if (ctx.handle == DRM_KERNEL_CONTEXT) {
+                /* Skip kernel's context and get a new one. */
+                ctx.handle = drm_ctxbitmap_next(dev);
         }
-        DRM_DEBUG( "%d\n", ctx.handle );
-        if ( ctx.handle == -1 ) {
-                DRM_DEBUG( "Not enough free contexts.\n" );
-                                /* Should this return -EBUSY instead? */
+        DRM_DEBUG("%d\n", ctx.handle);
+        if (ctx.handle == -1) {
+                DRM_DEBUG("Not enough free contexts.\n");
+                /* Should this return -EBUSY instead? */
                 return -ENOMEM;
         }
 
-        if ( ctx.handle != DRM_KERNEL_CONTEXT )
-        {
+        if (ctx.handle != DRM_KERNEL_CONTEXT) {
                 if (dev->driver->context_ctor)
                         dev->driver->context_ctor(dev, ctx.handle);
         }
 
-        ctx_entry = drm_alloc( sizeof(*ctx_entry), DRM_MEM_CTXLIST );
-        if ( !ctx_entry ) {
+        ctx_entry = drm_alloc(sizeof(*ctx_entry), DRM_MEM_CTXLIST);
+        if (!ctx_entry) {
                 DRM_DEBUG("out of memory\n");
                 return -ENOMEM;
         }
 
-        INIT_LIST_HEAD( &ctx_entry->head );
+        INIT_LIST_HEAD(&ctx_entry->head);
         ctx_entry->handle = ctx.handle;
         ctx_entry->tag = priv;
 
-        down( &dev->ctxlist_sem );
-        list_add( &ctx_entry->head, &dev->ctxlist->head );
+        down(&dev->ctxlist_sem);
+        list_add(&ctx_entry->head, &dev->ctxlist->head);
         ++dev->ctx_count;
-        up( &dev->ctxlist_sem );
+        up(&dev->ctxlist_sem);
 
-        if ( copy_to_user( argp, &ctx, sizeof(ctx) ) )
+        if (copy_to_user(argp, &ctx, sizeof(ctx)))
                 return -EFAULT;
         return 0;
 }
 
-int drm_modctx( struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg )
+int drm_modctx(struct inode *inode, struct file *filp,
+               unsigned int cmd, unsigned long arg)
 {
         /* This does nothing */
         return 0;
@@ -468,19 +471,19 @@ int drm_modctx( struct inode *inode, struct file *filp,
  * \param arg user argument pointing to a drm_ctx structure.
  * \return zero on success or a negative number on failure.
  */
-int drm_getctx( struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg )
+int drm_getctx(struct inode *inode, struct file *filp,
+               unsigned int cmd, unsigned long arg)
 {
         drm_ctx_t __user *argp = (void __user *)arg;
         drm_ctx_t ctx;
 
-        if ( copy_from_user( &ctx, argp, sizeof(ctx) ) )
+        if (copy_from_user(&ctx, argp, sizeof(ctx)))
                 return -EFAULT;
 
         /* This is 0, because we don't handle any context flags */
         ctx.flags = 0;
 
-        if ( copy_to_user( argp, &ctx, sizeof(ctx) ) )
+        if (copy_to_user(argp, &ctx, sizeof(ctx)))
                 return -EFAULT;
         return 0;
 }
@@ -496,18 +499,18 @@ int drm_getctx( struct inode *inode, struct file *filp,
  *
  * Calls context_switch().
  */
-int drm_switchctx( struct inode *inode, struct file *filp,
-                    unsigned int cmd, unsigned long arg )
+int drm_switchctx(struct inode *inode, struct file *filp,
+                  unsigned int cmd, unsigned long arg)
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_ctx_t ctx;
 
-        if ( copy_from_user( &ctx, (drm_ctx_t __user *)arg, sizeof(ctx) ) )
+        if (copy_from_user(&ctx, (drm_ctx_t __user *) arg, sizeof(ctx)))
                 return -EFAULT;
 
-        DRM_DEBUG( "%d\n", ctx.handle );
-        return drm_context_switch( dev, dev->last_context, ctx.handle );
+        DRM_DEBUG("%d\n", ctx.handle);
+        return drm_context_switch(dev, dev->last_context, ctx.handle);
 }
 
 /**
@@ -521,18 +524,18 @@ int drm_switchctx( struct inode *inode, struct file *filp,
  *
  * Calls context_switch_complete().
  */
-int drm_newctx( struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg )
+int drm_newctx(struct inode *inode, struct file *filp,
+               unsigned int cmd, unsigned long arg)
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_ctx_t ctx;
 
-        if ( copy_from_user( &ctx, (drm_ctx_t __user *)arg, sizeof(ctx) ) )
+        if (copy_from_user(&ctx, (drm_ctx_t __user *) arg, sizeof(ctx)))
                 return -EFAULT;
 
-        DRM_DEBUG( "%d\n", ctx.handle );
-        drm_context_switch_complete( dev, ctx.handle );
+        DRM_DEBUG("%d\n", ctx.handle);
+        drm_context_switch_complete(dev, ctx.handle);
 
         return 0;
 }
@@ -548,42 +551,41 @@ int drm_newctx( struct inode *inode, struct file *filp,
  *
  * If not the special kernel context, calls ctxbitmap_free() to free the specified context.
  */
-int drm_rmctx( struct inode *inode, struct file *filp,
-                unsigned int cmd, unsigned long arg )
+int drm_rmctx(struct inode *inode, struct file *filp,
+              unsigned int cmd, unsigned long arg)
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_ctx_t ctx;
 
-        if ( copy_from_user( &ctx, (drm_ctx_t __user *)arg, sizeof(ctx) ) )
+        if (copy_from_user(&ctx, (drm_ctx_t __user *) arg, sizeof(ctx)))
                 return -EFAULT;
 
-        DRM_DEBUG( "%d\n", ctx.handle );
-        if ( ctx.handle == DRM_KERNEL_CONTEXT + 1 ) {
+        DRM_DEBUG("%d\n", ctx.handle);
+        if (ctx.handle == DRM_KERNEL_CONTEXT + 1) {
                 priv->remove_auth_on_close = 1;
         }
-        if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
+        if (ctx.handle != DRM_KERNEL_CONTEXT) {
                 if (dev->driver->context_dtor)
                         dev->driver->context_dtor(dev, ctx.handle);
-                drm_ctxbitmap_free( dev, ctx.handle );
+                drm_ctxbitmap_free(dev, ctx.handle);
         }
 
-        down( &dev->ctxlist_sem );
-        if ( !list_empty( &dev->ctxlist->head ) ) {
+        down(&dev->ctxlist_sem);
+        if (!list_empty(&dev->ctxlist->head)) {
                 drm_ctx_list_t *pos, *n;
 
-                list_for_each_entry_safe( pos, n, &dev->ctxlist->head, head ) {
-                        if ( pos->handle == ctx.handle ) {
-                                list_del( &pos->head );
-                                drm_free( pos, sizeof(*pos), DRM_MEM_CTXLIST );
+                list_for_each_entry_safe(pos, n, &dev->ctxlist->head, head) {
+                        if (pos->handle == ctx.handle) {
+                                list_del(&pos->head);
+                                drm_free(pos, sizeof(*pos), DRM_MEM_CTXLIST);
                                 --dev->ctx_count;
                         }
                 }
         }
-        up( &dev->ctxlist_sem );
+        up(&dev->ctxlist_sem);
 
         return 0;
 }
 
 /*@}*/
-