From dbabd0d9c34a33bc0c51243ec37f230d117db955 Mon Sep 17 00:00:00 2001 From: Udo Schläpfer Date: Mon, 2 Feb 2015 21:44:29 +0100 Subject: iBasso DX50/DX90: Major code cleanup and reorganization. Reorganization - Separated iBasso devices from PLATFORM_ANDROID. These are now standlone hosted targets. Most device specific code is in the firmware/target/hosted/ibasso directory. - No dependency on Android SDK, only the Android NDK is needed. 32 bit Android NDK and Android API Level 16. - Separate implementation for each device where feasible. Code cleanup - Rewrite of existing code, from simple reformat to complete reimplementation. - New backlight interface, seperating backlight from touchscreen. - Rewrite of device button handler, removing unneeded code and fixing memory leaks. - New Debug messages interface logging to Android adb logcat (DEBUGF, panicf, logf). - Rewrite of lcd device handler, removing unneeded code and fixing memory leaks. - Rewrite of audiohw device handler/pcm interface, removing unneeded code and fixing memory leaks, enabling 44.1/48kHz pthreaded playback. - Rewrite of power and powermng, proper shutdown, using batterylog results (see http://gerrit.rockbox.org/r/#/c/1047/). - Rewrite of configure (Android NDK) and device specific config. - Rewrite of the Android NDK specific Makefile. Misc - All plugins/games/demos activated. - Update tinyalsa to latest from https://github.com/tinyalsa/tinyalsa. Includes - http://gerrit.rockbox.org/r/#/c/993/ - http://gerrit.rockbox.org/r/#/c/1010/ - http://gerrit.rockbox.org/r/#/c/1035/ Does not include http://gerrit.rockbox.org/r/#/c/1007/ due to new backlight interface and new option for hold switch, touchscreen, physical button interaction. Rockbox needs the iBasso DX50/DX90 loader for startup, see http://gerrit.rockbox.org/r/#/c/1099/ The loader expects Rockbox to be installed in /mnt/sdcard/.rockbox/. If /mnt/sdcard/ is accessed as USB mass storage device, Rockbox will exit gracefully and the loader will restart Rockbox on USB disconnect. Tested on iBasso DX50. Compiled (not tested) for iBasso DX90. Compiled (not tested) for PLATFORM_ANDROID. Change-Id: I5f5e22e68f5b4cf29c28e2b40b2c265f2beb7ab7 --- firmware/target/hosted/android/dx50/lcd-dx50.c | 120 ------------------------- 1 file changed, 120 deletions(-) delete mode 100644 firmware/target/hosted/android/dx50/lcd-dx50.c (limited to 'firmware/target/hosted/android/dx50/lcd-dx50.c') diff --git a/firmware/target/hosted/android/dx50/lcd-dx50.c b/firmware/target/hosted/android/dx50/lcd-dx50.c deleted file mode 100644 index 4d78baaf00..0000000000 --- a/firmware/target/hosted/android/dx50/lcd-dx50.c +++ /dev/null @@ -1,120 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: lcd-bitmap.c 29248 2011-02-08 20:05:25Z thomasjfox $ - * - * Copyright (C) 2011 Lorenzo Miori, Thomas Martitz - * Copyright (C) 2013 Lorenzo Miori - * - * 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 -#include -#include -#include -#include -#include -#include "config.h" -#include "file.h" -#include "debug.h" -#include "system.h" -#include "screendump.h" -#include "lcd.h" -#include "lcd-target.h" - -static int dev_fd = 0; -fb_data *dev_fb = 0; - -#ifdef HAVE_LCD_SHUTDOWN -void lcd_shutdown(void) -{ - printf("FB closed."); - munmap(dev_fb, FRAMEBUFFER_SIZE); - close(dev_fd); -} -#endif - -void lcd_init_device(void) -{ - size_t screensize; - struct fb_var_screeninfo vinfo; - struct fb_fix_screeninfo finfo; - - /* Open the framebuffer device */ - dev_fd = open("/dev/graphics/fb0", O_RDWR); - if (dev_fd == -1) { - perror("Error: cannot open framebuffer device"); - exit(1); - } - - /* Get the fixed properties */ - if (ioctl(dev_fd, FBIOGET_FSCREENINFO, &finfo) == -1) { - perror("Error reading fixed information"); - exit(2); - } - - - /* Now we get the settable settings, and we set 16 bit bpp */ - if (ioctl(dev_fd, FBIOGET_VSCREENINFO, &vinfo) == -1) { - perror("Error reading variable information"); - exit(3); - } - /* framebuffer does not fit the screen, a bug of iBassos Firmware, not rockbox. - cannot be solved with parameters */ - vinfo.bits_per_pixel = LCD_DEPTH; - vinfo.xres = vinfo.xres_virtual = vinfo.width = LCD_WIDTH; - vinfo.yres = vinfo.yres_virtual = vinfo.height = LCD_HEIGHT; - - if (ioctl(dev_fd, FBIOPUT_VSCREENINFO, &vinfo)) { - perror("fbset(ioctl)"); - exit(4); - } - - /* Figure out the size of the screen in bytes */ - screensize = vinfo.xres * vinfo.yres * vinfo.bits_per_pixel / 8; - if (screensize != FRAMEBUFFER_SIZE) { - exit(4); - perror("Display and framebuffer mismatch!\n"); - } - - /* Map the device to memory */ - dev_fb = mmap(0, screensize, PROT_READ | PROT_WRITE, MAP_SHARED, dev_fd, 0); - if ((int)dev_fb == -1) { - perror("Error: failed to map framebuffer device to memory"); - exit(4); - } - - /* Be sure to turn on display at startup */ - ioctl(dev_fd, FBIOBLANK, VESA_NO_BLANKING); -#ifdef HAVE_LCD_ENABLE - lcd_set_active(true); -#endif -} - -#ifdef HAVE_LCD_ENABLE -void lcd_enable(bool enable) - { - if (lcd_active() == enable) - return; - - lcd_set_active(enable); - - /* Turn on or off the display using Linux interface */ - ioctl(dev_fd, FBIOBLANK, enable ? VESA_NO_BLANKING : VESA_POWERDOWN); - - if (enable) - send_event(LCD_EVENT_ACTIVATION, NULL); -} -#endif -- cgit v1.2.3