From: James S. <jsi...@us...> - 2002-11-01 23:46:11
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video In directory usw-pr-cvs1:/tmp/cvs-serv12123 Modified Files: fbcmap.c Removed Files: Config.in dummycon.c fbcon.c fbcon.h mdacon.c newport_con.c nvvgacon.c pm3fb.c pm3fb.h sa1100fb.c sa1100fb.h skeletonfb.c tx3912fb.c tx3912fb.h vgacon.c Log Message: So long Index: fbcmap.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbcmap.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- fbcmap.c 15 Jun 2002 19:17:10 -0000 1.13 +++ fbcmap.c 1 Nov 2002 23:46:07 -0000 1.14 @@ -115,13 +115,12 @@ return 0; } - /** - * fb_dealloc_cmap - deallocate a colormap - * @cmap: frame buffer colormap structure - * - * Deallocates a colormap that was previously allocated with - * fb_alloc_cmap(). + * fb_dealloc_cmap - deallocate a colormap + * @cmap: frame buffer colormap structure + * + * Deallocates a colormap that was previously allocated with + * fb_alloc_cmap(). * */ @@ -140,7 +139,6 @@ cmap->len = 0; } - /** * fb_copy_cmap - copy a colormap * @from: frame buffer colormap structure @@ -197,58 +195,6 @@ } } - -/** - * fb_get_cmap - get a colormap - * @cmap: frame buffer colormap - * @kspc: boolean, 0 copy local, 1 put_user() function - * @getcolreg: pointer to a function to get a color register - * @info: frame buffer info structure - * - * Get a colormap @cmap for a screen of device @info. - * - * Returns negative errno on error, or zero on success. - * - */ - -int fb_get_cmap(struct fb_cmap *cmap, int kspc, struct fb_info *info) -{ - u16 *red, *green, *blue, *transp; - int i, start; - - red = cmap->red; - green = cmap->green; - blue = cmap->blue; - transp = cmap->transp; - start = cmap->start; - if (start < 0) - return -EINVAL; - for (i = 0; i < cmap->len; i++) { - if (!&info->cmap) - return 0; - if (kspc) { - *red = info->cmap.red[i]; - *green = info->cmap.green[i]; - *blue = info->cmap.blue[i]; - if (transp) - *transp = info->cmap.transp[i]; - } else { - put_user(info->cmap.red[i], red); - put_user(info->cmap.green[i], green); - put_user(info->cmap.blue[i], blue); - if (transp) - put_user(info->cmap.transp[i], transp); - } - red++; - green++; - blue++; - if (transp) - transp++; - } - return 0; -} - - /** * fb_set_cmap - set the colormap * @cmap: frame buffer colormap structure @@ -366,7 +312,6 @@ EXPORT_SYMBOL(fb_alloc_cmap); EXPORT_SYMBOL(fb_dealloc_cmap); EXPORT_SYMBOL(fb_copy_cmap); -EXPORT_SYMBOL(fb_get_cmap); EXPORT_SYMBOL(fb_set_cmap); EXPORT_SYMBOL(fb_default_cmap); EXPORT_SYMBOL(fb_invert_cmaps); --- Config.in DELETED --- --- dummycon.c DELETED --- --- fbcon.c DELETED --- --- fbcon.h DELETED --- --- mdacon.c DELETED --- --- newport_con.c DELETED --- --- nvvgacon.c DELETED --- --- pm3fb.c DELETED --- --- pm3fb.h DELETED --- --- sa1100fb.c DELETED --- --- sa1100fb.h DELETED --- --- skeletonfb.c DELETED --- --- tx3912fb.c DELETED --- --- tx3912fb.h DELETED --- --- vgacon.c DELETED --- |