sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/fb'

This commit is contained in:
Sascha Hauer 2015-12-08 08:27:29 +01:00
parent 5e79364a66 42c797b091
commit a59ae014e1
10 changed files with 185 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/video/backlight-pwm.c
View File

@ -39,6 +39,7 @@ struct pwm_backlight {
int enable_active_high;
int max_value;
int enabled;
unsigned int scale;
};
static int backlight_pwm_enable(struct pwm_backlight *pwm_backlight)
@ -87,18 +88,26 @@ static int backlight_pwm_disable(struct pwm_backlight *pwm_backlight)
return 0;
}
static int compute_duty_cycle(struct pwm_backlight *pwm_backlight, int brightness)
{
int duty_cycle;
if (pwm_backlight->levels)
duty_cycle = pwm_backlight->levels[brightness];
else
duty_cycle = brightness;
return duty_cycle * pwm_backlight->period / pwm_backlight->scale;
}
static int backlight_pwm_set(struct backlight_device *backlight,
int brightness)
{
struct pwm_backlight *pwm_backlight = container_of(backlight,
struct pwm_backlight, backlight);
unsigned long long duty = pwm_backlight->period;
unsigned int max = pwm_backlight->backlight.brightness_max;
duty *= brightness;
do_div(duty, max);
pwm_config(pwm_backlight->pwm, duty, pwm_backlight->period);
pwm_config(pwm_backlight->pwm, compute_duty_cycle(pwm_backlight, brightness),
pwm_backlight->period);
if (brightness)
return backlight_pwm_enable(pwm_backlight);
@ -113,7 +122,7 @@ static int pwm_backlight_parse_dt(struct device_d *dev,
struct property *prop;
int length;
u32 value;
int ret;
int ret, i;
enum of_gpio_flags flags;
if (!node)
@ -141,6 +150,10 @@ static int pwm_backlight_parse_dt(struct device_d *dev,
if (ret < 0)
return ret;
for (i = 0; i <= pwm_backlight->backlight.brightness_max; i++)
if (pwm_backlight->levels[i] > pwm_backlight->scale)
pwm_backlight->scale = pwm_backlight->levels[i];
ret = of_property_read_u32(node, "default-brightness-level",
&value);
if (ret < 0)

39
drivers/video/fbconsole.c
View File

@ -22,8 +22,8 @@ struct fbc_priv {
struct param_d *par_font;
int par_font_val;
int font_width, font_height;
const u8 *fontdata;
const struct font_desc *font;
unsigned int cols, rows;
unsigned int x, y; /* cursor position */
@ -84,7 +84,7 @@ static struct rgb colors[] = {
{ 255, 255, 255 },
};
static void drawchar(struct fbc_priv *priv, int x, int y, char c)
static void drawchar(struct fbc_priv *priv, int x, int y, int c)
{
void *buf;
int bpp = priv->fb->bits_per_pixel >> 3;
@ -97,7 +97,8 @@ static void drawchar(struct fbc_priv *priv, int x, int y, char c)
buf = gui_screen_render_buffer(priv->sc);
inbuf = &priv->fontdata[c * priv->font_height];
i = find_font_index(priv->font, c);
inbuf = priv->font->data + i;
line_length = priv->fb->line_length;
@ -113,13 +114,13 @@ static void drawchar(struct fbc_priv *priv, int x, int y, char c)
rgb = &colors[bgcolor];
bgcolor = gu_rgb_to_pixel(priv->fb, rgb->r, rgb->g, rgb->b, 0xff);
for (i = 0; i < priv->font_height; i++) {
for (i = 0; i < priv->font->height; i++) {
uint8_t t = inbuf[i];
int j;
adr = buf + line_length * (y * priv->font_height + i) + x * priv->font_width * bpp;
adr = buf + line_length * (y * priv->font->height + i) + x * priv->font->width * bpp;
for (j = 0; j < priv->font_width; j++) {
for (j = 0; j < priv->font->width; j++) {
if (t & 0x80)
gu_set_pixel(priv->fb, adr, color);
else
@ -137,10 +138,10 @@ static void video_invertchar(struct fbc_priv *priv, int x, int y)
buf = gui_screen_render_buffer(priv->sc);
gu_invert_area(priv->fb, buf, x * priv->font_width, y * priv->font_height,
priv->font_width, priv->font_height);
gu_screen_blit_area(priv->sc, x * priv->font_width, y * priv->font_height,
priv->font_width, priv->font_height);
gu_invert_area(priv->fb, buf, x * priv->font->width, y * priv->font->height,
priv->font->width, priv->font->height);
gu_screen_blit_area(priv->sc, x * priv->font->width, y * priv->font->height,
priv->font->width, priv->font->height);
}
static void printchar(struct fbc_priv *priv, int c)
@ -174,9 +175,9 @@ static void printchar(struct fbc_priv *priv, int c)
default:
drawchar(priv, priv->x, priv->y, c);
gu_screen_blit_area(priv->sc, priv->x * priv->font_width,
priv->y * priv->font_height,
priv->font_width, priv->font_height);
gu_screen_blit_area(priv->sc, priv->x * priv->font->width,
priv->y * priv->font->height,
priv->font->width, priv->font->height);
priv->x++;
if (priv->x > priv->cols) {
@ -188,7 +189,7 @@ static void printchar(struct fbc_priv *priv, int c)
if (priv->y > priv->rows) {
void *buf;
u32 line_length = priv->fb->line_length;
int line_height = line_length * priv->font_height;
int line_height = line_length * priv->font->height;
buf = gui_screen_render_buffer(priv->sc);
@ -356,12 +357,10 @@ static int setup_font(struct fbc_priv *priv)
return -ENOENT;
}
priv->font_width = font->width;
priv->font_height = font->height;
priv->fontdata = font->data;
priv->font = font;
priv->rows = fb->yres / priv->font_height - 1;
priv->cols = fb->xres / priv->font_width - 1;
priv->rows = fb->yres / priv->font->height - 1;
priv->cols = fb->xres / priv->font->width - 1;
return 0;
}

15
include/linux/font.h
View File

@ -12,24 +12,31 @@
#define _VIDEO_FONT_H
#include <param.h>
#include <wchar.h>
struct font_index {
wchar_t wc; /* code of the char. */
short index; /* offset of the char in the bitmap. */
};
struct font_desc {
const char *name;
int width, height;
struct font_index *index;
const void *data;
int num_chars;
struct list_head list;
};
extern const struct font_desc font_vga_8x16,
font_7x14,
font_mini_4x6;
/* Max. length for the name of a predefined font */
#define MAX_FONT_NAME 32
extern int find_font_index(const struct font_desc *font, int ch);
extern const struct font_desc *find_font_enum(int n);
extern struct param_d *add_param_font(struct device_d *dev,
int (*set)(struct param_d *p, void *priv),
int (*get)(struct param_d *p, void *priv),
int *value, void *priv);
int font_register(struct font_desc *font);
#endif /* _VIDEO_FONT_H */

5
lib/fonts/Kconfig
View File

@ -20,6 +20,11 @@ config FONT_7x14
config FONT_MINI_4x6
bool "Mini 4x6 font"
config FONT_CUSTOM_16X
bool "Custom 16x16 font"
help
This font is useful for Chinese and other non ascii chars.
config FONT_AUTOSELECT
def_bool y
depends on !FONT_MINI_4x6

1
lib/fonts/Makefile
View File

@ -5,6 +5,7 @@ font-objs := fonts.o
font-objs-$(CONFIG_FONT_8x16) += font_8x16.o
font-objs-$(CONFIG_FONT_7x14) += font_7x14.o
font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o
font-objs-$(CONFIG_FONT_CUSTOM_16X)+= font_custom_16x.o
font-objs += $(font-objs-y)

9
lib/fonts/font_7x14.c
View File

@ -3,6 +3,7 @@
/* by Jurriaan Kalkman 05-2005 */
/**************************************/
#include <init.h>
#include <linux/font.h>
#define FONTDATAMAX 3584
@ -4108,9 +4109,15 @@ static const unsigned char fontdata_7x14[FONTDATAMAX] = {
};
const struct font_desc font_7x14 = {
static struct font_desc font_7x14 = {
.name = "7x14",
.width = 7,
.height = 14,
.data = fontdata_7x14,
};
static int font_7x14_register(void)
{
return font_register(&font_7x14);
}
postcore_initcall(font_7x14_register);

10
lib/fonts/font_8x16.c
View File

@ -4,6 +4,7 @@
/* */
/**********************************************/
#include <init.h>
#include <module.h>
#include <linux/font.h>
@ -4621,10 +4622,15 @@ static const unsigned char fontdata_8x16[FONTDATAMAX] = {
};
const struct font_desc font_vga_8x16 = {
static struct font_desc font_vga_8x16 = {
.name = "VGA8x16",
.width = 8,
.height = 16,
.data = fontdata_8x16,
};
EXPORT_SYMBOL(font_vga_8x16);
static int font_vga_8x16_register(void)
{
return font_register(&font_vga_8x16);
}
postcore_initcall(font_vga_8x16_register);

50
lib/fonts/font_custom_16x.c Normal file
View File

@ -0,0 +1,50 @@
/*
* by Du Huanpeng <u74147@gmail.com>
*/
#include <init.h>
#include <module.h>
#include <linux/font.h>
#include <common.h>
/* place real font data here or set fontdata_custom_16x points to
* the address of font data and also setup the index.
*/
static const unsigned char fontdata_custom_16x[] = {
0xFF, 0xFF, /*OOOOOOOOOOOOOOOO*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0x80, 0x01, /*O______________O*/
0xFF, 0xFF, /*OOOOOOOOOOOOOOOO*/
};
static struct font_index fontdata_custom_16x_index[] = {
{ 0x0000, 0x0000 },
};
static struct font_desc font_custom_16x = {
.name = "CUSTOM-16x",
.width = 16,
.height = 16,
.data = fontdata_custom_16x,
.index = fontdata_custom_16x_index,
.num_chars = ARRAY_SIZE(fontdata_custom_16x_index),
};
static int font_custom_16x_register(void)
{
return font_register(&font_custom_16x);
}
postcore_initcall(font_custom_16x_register);

9
lib/fonts/font_mini_4x6.c
View File

@ -39,6 +39,7 @@ __END__;
MSBit to LSBit = left to right.
*/
#include <init.h>
#include <linux/font.h>
#define FONTDATAMAX 1536
@ -2147,9 +2148,15 @@ static const unsigned char fontdata_mini_4x6[FONTDATAMAX] = {
/*}*/
};
const struct font_desc font_mini_4x6 = {
static struct font_desc font_mini_4x6 = {
.name = "MINI4x6",
.width = 4,
.height = 6,
.data = fontdata_mini_4x6,
};
static int font_mini_4x6_register(void)
{
return font_register(&font_mini_4x6);
}
postcore_initcall(font_mini_4x6_register);

84
lib/fonts/fonts.c
View File

@ -18,37 +18,55 @@
#include <linux/string.h>
#include <linux/font.h>
#define NO_FONTS
static const struct font_desc *fonts[] = {
#ifdef CONFIG_FONT_8x16
#undef NO_FONTS
&font_vga_8x16,
#endif
#ifdef CONFIG_FONT_7x14
#undef NO_FONTS
&font_7x14,
#endif
#ifdef CONFIG_FONT_MINI_4x6
#undef NO_FONTS
&font_mini_4x6,
#endif
};
#define num_fonts ARRAY_SIZE(fonts)
#ifdef NO_FONTS
#error No fonts configured.
#endif
static char *font_names;
static LIST_HEAD(fonts_list);
int font_register(struct font_desc *font)
{
if (font_names)
return -EBUSY;
list_add_tail(&font->list, &fonts_list);
return 0;
}
int find_font_index(const struct font_desc *font, int ch)
{
int index;
if (font->index == NULL) {
index = font->width + 7;
index /= 8;
index *= font->height;
index *= ch;
} else {
/*
* FIXME: use binary search instead!
*/
index = font->num_chars - 1;
while (index && font->index[index].wc != ch)
index--;
/* return 0 if not found. */
index = font->index->index;
}
return index;
}
const struct font_desc *find_font_enum(int n)
{
if (n > num_fonts)
return NULL;
struct font_desc *f;
int i = 0;
return fonts[n];
list_for_each_entry(f, &fonts_list, list) {
if (i == n)
return f;
i++;
}
return NULL;
}
struct param_d *add_param_font(struct device_d *dev,
@ -56,13 +74,21 @@ struct param_d *add_param_font(struct device_d *dev,
int (*get)(struct param_d *p, void *priv),
int *value, void *priv)
{
unsigned int i;
struct font_desc *f;
int num_fonts = 0;
list_for_each_entry(f, &fonts_list, list)
num_fonts++;
if (!font_names) {
int i = 0;
font_names = xmalloc(sizeof(char *) * num_fonts);
for (i = 0; i < num_fonts; i++)
((const char **)font_names)[i] = fonts[i]->name;
list_for_each_entry(f, &fonts_list, list) {
((const char **)font_names)[i] = f->name;
i++;
}
}
return dev_add_param_enum(dev, "font",