projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
futex_requeue_pi optimization
[powerpc.git]
/
include
/
linux
/
font.h
diff --git
a/include/linux/font.h
b/include/linux/font.h
index
8fc80a7
..
40a24ab
100644
(file)
--- a/
include/linux/font.h
+++ b/
include/linux/font.h
@@
-15,9
+15,9
@@
struct font_desc {
int idx;
struct font_desc {
int idx;
- char *name;
+ c
onst c
har *name;
int width, height;
int width, height;
- void *data;
+
const
void *data;
int pref;
};
int pref;
};
@@
-32,7
+32,7
@@
struct font_desc {
#define ACORN8x8_IDX 8
#define MINI4x6_IDX 9
#define ACORN8x8_IDX 8
#define MINI4x6_IDX 9
-extern
struct font_desc
font_vga_8x8,
+extern
const struct font_desc
font_vga_8x8,
font_vga_8x16,
font_pearl_8x8,
font_vga_6x11,
font_vga_8x16,
font_pearl_8x8,
font_vga_6x11,
@@
-45,11
+45,12
@@
extern struct font_desc font_vga_8x8,
/* Find a font with a specific name */
/* Find a font with a specific name */
-extern
struct font_desc *find_font(
char *name);
+extern
const struct font_desc *find_font(const
char *name);
/* Get the default font for a specific screen size */
/* Get the default font for a specific screen size */
-extern struct font_desc *get_default_font(int xres, int yres);
+extern const struct font_desc *get_default_font(int xres, int yres,
+ u32 font_w, u32 font_h);
/* Max. length for the name of a predefined font */
#define MAX_FONT_NAME 32
/* Max. length for the name of a predefined font */
#define MAX_FONT_NAME 32