summaryrefslogtreecommitdiffstats
path: root/drivers/video/fonts.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
commit74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch)
tree7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/video/fonts.c
parentee6374c8b0d333c08061c6a97bc77090d7461225 (diff)
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to switch to another getty like getty_ps. This commit also includes a fix for a setitimer bug which did prevent getty_ps from working on older kernels.
Diffstat (limited to 'drivers/video/fonts.c')
-rw-r--r--drivers/video/fonts.c32
1 files changed, 26 insertions, 6 deletions
diff --git a/drivers/video/fonts.c b/drivers/video/fonts.c
index 82aedaf0f..6b531b3cd 100644
--- a/drivers/video/fonts.c
+++ b/drivers/video/fonts.c
@@ -4,6 +4,9 @@
* Created 1995 by Geert Uytterhoeven
* Rewritten 1998 by Martin Mares <mj@ucw.cz>
*
+ * 2001 - Documented with DocBook
+ * - Brad Douglas <brad@neruo.com>
+ *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive
* for more details.
@@ -61,9 +64,17 @@ static struct fbcon_font_desc *fbcon_fonts[] = {
#error No fonts configured.
#endif
- /*
- * Find a font with a specific name
- */
+
+/**
+ * fbcon_find_font - find a font
+ * @name: string name of a font
+ *
+ * Find a specified font with string name @name.
+ *
+ * Returns %NULL if no font found, or a pointer to the
+ * specified font.
+ *
+ */
struct fbcon_font_desc *fbcon_find_font(char *name)
{
@@ -76,9 +87,18 @@ struct fbcon_font_desc *fbcon_find_font(char *name)
}
- /*
- * Get the default font for a specific screen size
- */
+/**
+ * fbcon_get_default_font - get default font
+ * @xres: screen size of X
+ * @yres: screen size of Y
+ *
+ * Get the default font for a specified screen size.
+ * Dimensions are in pixels.
+ *
+ * Returns %NULL if no font is found, or a pointer to the
+ * chosen font.
+ *
+ */
struct fbcon_font_desc *fbcon_get_default_font(int xres, int yres)
{