Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hiby: Refactor X3ii/X20 and Rocker LCD code

Browse source 
Once some missing power optimization stuff was added to the X3ii code,
they were completely identical.

Change-Id: I68e4db5e270e8ff22f91e521616a054bd7baa95d
This commit is contained in:
Solomon Peachy 2020-04-08 09:53:13 -04:00
parent 6fcd69a365
commit 53b93ea6a6
3 changed files with 12 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
firmware/SOURCES
View file

@ -124,12 +124,12 @@ target/hosted/lc-unix.c
target/hosted/sysfs.c
target/hosted/backlight-unix.c
target/hosted/system-hosted.c
target/hosted/lcd-linuxfb.c
#endif
#if defined(AGPTEK_ROCKER) && !defined(SIMULATOR)
target/hosted/agptek/button-agptek.c
target/hosted/agptek/debug-agptek.c
target/hosted/agptek/lcd-agptek.c
target/hosted/agptek/power-agptek.c
target/hosted/agptek/powermgmt-agptek.c
target/hosted/agptek/usb-agptek.c
@ -138,7 +138,7 @@ target/hosted/agptek/usb-agptek.c
#if ((defined(XDUOO_X3II)||defined(XDUOO_X20)) && !defined(SIMULATOR))
target/hosted/xduoo/button-xduoo.c
target/hosted/xduoo/debug-xduoo.c
target/hosted/xduoo/lcd-xduoo.c
target/hosted/xduoo/power-xduoo.c
target/hosted/xduoo/powermgmt-xduoo.c
target/hosted/xduoo/usb-xduoo.c

12
firmware/target/hosted/agptek/lcd-agptek.c → firmware/target/hosted/lcd-linuxfb.c
View file

@ -92,10 +92,14 @@ void lcd_enable(bool on)
{
const char * const sysfs_fb_blank = "/sys/class/graphics/fb0/blank";
#ifdef HAVE_LCD_SLEEP
if (lcd_active() != on)
#endif
{
sysfs_set_int(sysfs_fb_blank, on ? 0 : 1);
#ifdef HAVE_LCD_ENABLE
lcd_set_active(on);
#endif
if (on)
{
@ -114,7 +118,9 @@ extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
void lcd_update(void)
{
if (lcd_active())
#ifdef HAVE_LCD_SLEEP
if (lcd_active() != on)
#endif
{
/* Copy the Rockbox framebuffer to the second framebuffer */
lcd_copy_buffer_rect(LCD_FRAMEBUF_ADDR(0, 0), FBADDR(0,0),
@ -125,7 +131,9 @@ void lcd_update(void)
void lcd_update_rect(int x, int y, int width, int height)
{
if (lcd_active())
#ifdef HAVE_LCD_SLEEP
if (lcd_active() != on)
#endif
{
fb_data *dst = LCD_FRAMEBUF_ADDR(x, y);
fb_data * src = FBADDR(x,y);

140
firmware/target/hosted/xduoo/lcd-xduoo.c
View file

@ -1,140 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
*
* Copyright (C) 2017 Marcin Bukat
* Copyright (C) 2016 Amaury Pouly
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <linux/fb.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include "lcd.h"
#include "lcd-target.h"
#include "backlight-target.h"
#include "sysfs.h"
#include "panic.h"
static int fd = -1;
static struct fb_var_screeninfo vinfo;
fb_data *framebuffer = 0; /* global variable, see lcd-target.h */
void lcd_init_device(void)
{
const char * const fb_dev = "/dev/fb0";
fd = open(fb_dev, O_RDWR);
if(fd < 0)
{
panicf("Cannot open framebuffer: %s\n", fb_dev);
}
/* get fixed and variable information */
struct fb_fix_screeninfo finfo;
if(ioctl(fd, FBIOGET_FSCREENINFO, &finfo) < 0)
{
panicf("Cannot read framebuffer fixed information");
}
if(ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) < 0)
{
panicf("Cannot read framebuffer variable information");
}
#if 0
/* check resolution and framebuffer size */
if(vinfo.xres != LCD_WIDTH || vinfo.yres != LCD_HEIGHT || vinfo.bits_per_pixel != LCD_DEPTH)
{
panicf("Unexpected framebuffer resolution: %dx%dx%d\n", vinfo.xres,
vinfo.yres, vinfo.bits_per_pixel);
}
#endif
/* Note: we use a framebuffer size of width*height*bbp. We cannot trust the
* values returned by the driver for line_length */
/* map framebuffer */
framebuffer = mmap(0, FRAMEBUFFER_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if((void *)framebuffer == MAP_FAILED)
{
panicf("Cannot map framebuffer");
}
#ifdef HAVE_LCD_ENABLE
lcd_set_active(true);
#endif
}
#ifdef HAVE_LCD_SHUTDOWN
void lcd_shutdown(void)
{
munmap(framebuffer, FRAMEBUFFER_SIZE);
close(fd);
}
#endif
void lcd_enable(bool on)
{
const char * const sysfs_fb_blank = "/sys/class/graphics/fb0/blank";
if (lcd_active() != on)
{
sysfs_set_int(sysfs_fb_blank, on ? 0 : 1);
lcd_set_active(on);
if (on)
{
send_event(LCD_EVENT_ACTIVATION, NULL);
}
}
}
static void redraw(void)
{
ioctl(fd, FBIOPAN_DISPLAY, &vinfo);
}
extern void lcd_copy_buffer_rect(fb_data *dst, const fb_data *src,
int width, int height);
void lcd_update(void)
{
/* Copy the Rockbox framebuffer to the second framebuffer */
lcd_copy_buffer_rect(LCD_FRAMEBUF_ADDR(0, 0), FBADDR(0,0),
LCD_WIDTH*LCD_HEIGHT, 1);
redraw();
}
void lcd_update_rect(int x, int y, int width, int height)
{
fb_data *dst = LCD_FRAMEBUF_ADDR(x, y);
fb_data * src = FBADDR(x,y);
/* Copy part of the Rockbox framebuffer to the second framebuffer */
if (width < LCD_WIDTH)
{
/* Not full width - do line-by-line */
lcd_copy_buffer_rect(dst, src, width, height);
}
else
{
/* Full width - copy as one line */
lcd_copy_buffer_rect(dst, src, LCD_WIDTH*height, 1);
}
redraw();
}