From d55680993df9b6743506814d98b5cc1859828f8a Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Thu, 27 Apr 2017 11:36:40 +0200 Subject: Agptek Rocker: Initial commit Change-Id: I26b51106c7b1c36a603fba6d521e917d79b5a95b --- firmware/SOURCES | 51 ++++--- firmware/asm/SOURCES | 4 +- firmware/asm/mips/thread-mips32.c | 71 ++++----- firmware/asm/mips/thread.h | 17 ++- firmware/drivers/audio/rocker_codec.c | 77 ++++++++++ firmware/drivers/lcd-24bit.c | 3 +- firmware/export/audiohw.h | 2 + firmware/export/config.h | 5 + firmware/export/config/agptekrocker.h | 119 +++++++++++++++ firmware/export/rbpaths.h | 5 +- firmware/export/rocker_codec.h | 6 + firmware/include/bitarray.h | 1 + firmware/kernel/thread.c | 3 + firmware/screendump.c | 4 +- firmware/target/hosted/agptek/adc-target.h | 0 firmware/target/hosted/agptek/backlight-agptek.c | 64 ++++++++ firmware/target/hosted/agptek/backlight-target.h | 36 +++++ firmware/target/hosted/agptek/button-agptek.c | 149 ++++++++++++++++++ firmware/target/hosted/agptek/button-target.h | 43 ++++++ firmware/target/hosted/agptek/debug-agptek.c | 6 + firmware/target/hosted/agptek/lcd-agptek.c | 111 ++++++++++++++ firmware/target/hosted/agptek/lcd-target.h | 26 ++++ firmware/target/hosted/agptek/power-agptek.c | 59 +++++++ firmware/target/hosted/agptek/power-agptek.h | 29 ++++ firmware/target/hosted/agptek/powermgmt-agptek.c | 63 ++++++++ firmware/target/hosted/agptek/rocker.make | 48 ++++++ firmware/target/hosted/agptek/sysfs.c | 186 +++++++++++++++++++++++ firmware/target/hosted/agptek/sysfs.h | 31 ++++ firmware/target/hosted/agptek/system-agptek.c | 184 ++++++++++++++++++++++ firmware/target/hosted/agptek/system-target.h | 28 ++++ firmware/target/hosted/alsa-controls.c | 2 +- firmware/target/hosted/alsa-controls.h | 9 ++ firmware/target/hosted/filesystem-app.c | 3 +- firmware/target/hosted/sdl/sim-ui-defines.h | 6 + 34 files changed, 1389 insertions(+), 62 deletions(-) create mode 100644 firmware/drivers/audio/rocker_codec.c create mode 100644 firmware/export/config/agptekrocker.h create mode 100644 firmware/export/rocker_codec.h create mode 100644 firmware/target/hosted/agptek/adc-target.h create mode 100644 firmware/target/hosted/agptek/backlight-agptek.c create mode 100644 firmware/target/hosted/agptek/backlight-target.h create mode 100644 firmware/target/hosted/agptek/button-agptek.c create mode 100644 firmware/target/hosted/agptek/button-target.h create mode 100644 firmware/target/hosted/agptek/debug-agptek.c create mode 100644 firmware/target/hosted/agptek/lcd-agptek.c create mode 100644 firmware/target/hosted/agptek/lcd-target.h create mode 100644 firmware/target/hosted/agptek/power-agptek.c create mode 100644 firmware/target/hosted/agptek/power-agptek.h create mode 100644 firmware/target/hosted/agptek/powermgmt-agptek.c create mode 100644 firmware/target/hosted/agptek/rocker.make create mode 100644 firmware/target/hosted/agptek/sysfs.c create mode 100644 firmware/target/hosted/agptek/sysfs.h create mode 100644 firmware/target/hosted/agptek/system-agptek.c create mode 100644 firmware/target/hosted/agptek/system-target.h (limited to 'firmware') diff --git a/firmware/SOURCES b/firmware/SOURCES index 1310fa0434..96d5d3dcec 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -96,10 +96,6 @@ target/hosted/samsungypr/radio-ypr.c #endif #if defined(SONY_NWZ_LINUX) && !defined(SIMULATOR) -target/hosted/backtrace-glibc.c -target/hosted/kernel-unix.c -target/hosted/filesystem-unix.c -target/hosted/lc-unix.c target/hosted/sonynwz/lcd-nwz.c target/hosted/sonynwz/button-nwz.c target/hosted/sonynwz/system-nwz.c @@ -113,6 +109,23 @@ target/hosted/sonynwz/nvp-nwz.c target/hosted/sonynwz/nwz-db.c #endif +#if defined(AGPTEK_ROCKER) && !defined(SIMULATOR) +target/hosted/backtrace-glibc.c +target/hosted/kernel-unix.c +target/hosted/filesystem-unix.c +target/hosted/lc-unix.c +target/hosted/alsa-controls.c +target/hosted/pcm-alsa.c +target/hosted/agptek/sysfs.c +target/hosted/agptek/backlight-agptek.c +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/system-agptek.c +#endif + #if defined(SAMSUNG_YPR0) && !defined(SIMULATOR) drivers/adc-as3514.c #if (CONFIG_RTC == RTC_AS3514) @@ -250,7 +263,7 @@ drivers/lcd-16bit-vert.c #else drivers/lcd-16bit.c #endif -#elif LCD_DEPTH == 24 +#elif (LCD_DEPTH == 24) || (LCD_PIXELFORMAT == XRGB8888) drivers/lcd-24bit.c #endif /* LCD_DEPTH */ common/diacritic.c @@ -470,6 +483,8 @@ target/hosted/pcm-alsa.c drivers/audio/nwzlinux-codec.c target/hosted/alsa-controls.c target/hosted/pcm-alsa.c +#elif defined(HAVE_ROCKER_CODEC) +drivers/audio/rocker_codec.c #elif defined(HAVE_SDL_AUDIO) drivers/audio/sdl.c #if CONFIG_CODEC == SWCODEC @@ -1618,10 +1633,10 @@ target/arm/s5l8700/ipodnano2g/piezo-nano2g.c #ifdef IPOD_6G target/arm/ipod/button-clickwheel.c -target/arm/s5l8702/ipod6g/storage_ata-6g.c -target/arm/s5l8702/ipod6g/backlight-6g.c -target/arm/s5l8702/ipod6g/powermgmt-6g.c -target/arm/s5l8702/ipod6g/power-6g.c +target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c +target/arm/s5l8702/ipod6g/backlight-ipod6g.c +target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c +target/arm/s5l8702/ipod6g/power-ipod6g.c target/arm/s5l8702/kernel-s5l8702.c target/arm/s5l8702/system-s5l8702.c target/arm/s5l8702/timer-s5l8702.c @@ -1629,28 +1644,28 @@ target/arm/s5l8702/gpio-s5l8702.c target/arm/s5l8702/pl080.c target/arm/s5l8702/dma-s5l8702.c target/arm/s5l8702/clocking-s5l8702.c -target/arm/s5l8702/ipod6g/lcd-6g.c -target/arm/s5l8702/ipod6g/lcd-asm-6g.S -target/arm/s5l8702/ipod6g/piezo-6g.c +target/arm/s5l8702/ipod6g/lcd-ipod6g.c +target/arm/s5l8702/ipod6g/lcd-asm-ipod6g.S +target/arm/s5l8702/ipod6g/piezo-ipod6g.c #if 0 //TODO target/arm/s5l8702/postmortemstub.S #endif -target/arm/s5l8702/ipod6g/pmu-6g.c -target/arm/s5l8702/ipod6g/rtc-6g.c -target/arm/s5l8702/ipod6g/adc-6g.c +target/arm/s5l8702/ipod6g/pmu-ipod6g.c +target/arm/s5l8702/ipod6g/rtc-ipod6g.c +target/arm/s5l8702/ipod6g/adc-ipod6g.c #if !defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE) target/arm/s5l8702/usb-s5l8702.c #endif #ifdef HAVE_SERIAL target/arm/uc870x.c target/arm/s5l8702/uart-s5l8702.c -target/arm/s5l8702/ipod6g/serial-6g.c +target/arm/s5l8702/ipod6g/serial-ipod6g.c #endif #ifndef BOOTLOADER target/arm/s5l8702/debug-s5l8702.c target/arm/s5l8702/pcm-s5l8702.c -target/arm/s5l8702/ipod6g/audio-6g.c -target/arm/s5l8702/ipod6g/cscodec-6g.c +target/arm/s5l8702/ipod6g/audio-ipod6g.c +target/arm/s5l8702/ipod6g/cscodec-ipod6g.c #else target/arm/s5l8702/spi-s5l8702.c target/arm/s5l8702/crypto-s5l8702.c diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES index 5a1310ed65..eba5bd2cb6 100644 --- a/firmware/asm/SOURCES +++ b/firmware/asm/SOURCES @@ -15,9 +15,9 @@ mempcpy.c defined(CREATIVE_ZVx) || defined(SANSA_CONNECT) || defined(SANSA_FUZEPLUS) || \ defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \ defined(SAMSUNG_YPR1) || defined(DX50) || defined(DX90) || (defined(MROBE_500) && !defined(LCD_USE_DMA)) || \ - defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX)) && \ + defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX) || defined(AGPTEK_ROCKER)) && \ !defined(SIMULATOR) -#if LCD_DEPTH == 24 +#if LCD_DEPTH >= 24 lcd-as-memframe-24bit.c #else lcd-as-memframe.c diff --git a/firmware/asm/mips/thread-mips32.c b/firmware/asm/mips/thread-mips32.c index e754df7e29..19efb6eea9 100644 --- a/firmware/asm/mips/thread-mips32.c +++ b/firmware/asm/mips/thread-mips32.c @@ -26,24 +26,23 @@ *--------------------------------------------------------------------------- */ -void start_thread(void); /* Provide C access to ASM label */ -static void USED_ATTR _start_thread(void) +static void USED_ATTR start_thread(void *addr) { - /* t1 = context */ asm volatile ( - "start_thread: \n" ".set noreorder \n" ".set noat \n" - "lw $8, 4($9) \n" /* Fetch thread function pointer ($8 = t0, $9 = t1) */ - "lw $29, 36($9) \n" /* Set initial sp(=$29) */ - "jalr $8 \n" /* Start the thread */ - "sw $0, 44($9) \n" /* Clear start address */ + "lw $t9, 4(%0) \n" /* Fetch thread function pointer ($25 = t9) */ + "lw $sp, 40(%0) \n" /* Set initial sp(=$29) */ + "jalr $t9 \n" /* Start the thread */ + "sw $zero, 48(%0) \n" /* Clear start address */ ".set at \n" ".set reorder \n" + : : "r" (addr) : "t9" ); thread_exit(); } + /* Place context pointer in s0 slot, function pointer in s1 slot, and * start_thread pointer in context_start */ #define THREAD_STARTUP_INIT(core, thread, function) \ @@ -60,17 +59,18 @@ static inline void store_context(void* addr) asm volatile ( ".set noreorder \n" ".set noat \n" - "sw $16, 0(%0) \n" /* s0 */ - "sw $17, 4(%0) \n" /* s1 */ - "sw $18, 8(%0) \n" /* s2 */ - "sw $19, 12(%0) \n" /* s3 */ - "sw $20, 16(%0) \n" /* s4 */ - "sw $21, 20(%0) \n" /* s5 */ - "sw $22, 24(%0) \n" /* s6 */ - "sw $23, 28(%0) \n" /* s7 */ - "sw $30, 32(%0) \n" /* fp */ - "sw $29, 36(%0) \n" /* sp */ - "sw $31, 40(%0) \n" /* ra */ + "sw $s0, 0(%0) \n" /* s0 */ + "sw $s1, 4(%0) \n" /* s1 */ + "sw $s2, 8(%0) \n" /* s2 */ + "sw $s3, 12(%0) \n" /* s3 */ + "sw $s4, 16(%0) \n" /* s4 */ + "sw $s5, 20(%0) \n" /* s5 */ + "sw $s6, 24(%0) \n" /* s6 */ + "sw $s7, 28(%0) \n" /* s7 */ + "sw $gp, 32(%0) \n" /* gp */ + "sw $fp, 36(%0) \n" /* fp */ + "sw $sp, 40(%0) \n" /* sp */ + "sw $ra, 44(%0) \n" /* ra */ ".set at \n" ".set reorder \n" : : "r" (addr) @@ -86,26 +86,27 @@ static inline void load_context(const void* addr) asm volatile ( ".set noat \n" ".set noreorder \n" - "lw $8, 44(%0) \n" /* Get start address ($8 = t0) */ - "beqz $8, running \n" /* NULL -> already running */ + "lw $t9, 48(%0) \n" /* Get start address ($8 = t0) */ + "beqz $t9, running \n" /* NULL -> already running */ "nop \n" - "jr $8 \n" - "move $9, %0 \n" /* t1 = context */ + "jr $t9 \n" + "move $a0, %0 \n" /* a0 = context branch delay slot anyway */ "running: \n" - "lw $16, 0(%0) \n" /* s0 */ - "lw $17, 4(%0) \n" /* s1 */ - "lw $18, 8(%0) \n" /* s2 */ - "lw $19, 12(%0) \n" /* s3 */ - "lw $20, 16(%0) \n" /* s4 */ - "lw $21, 20(%0) \n" /* s5 */ - "lw $22, 24(%0) \n" /* s6 */ - "lw $23, 28(%0) \n" /* s7 */ - "lw $30, 32(%0) \n" /* fp */ - "lw $29, 36(%0) \n" /* sp */ - "lw $31, 40(%0) \n" /* ra */ + "lw $s0, 0(%0) \n" /* s0 */ + "lw $s1, 4(%0) \n" /* s1 */ + "lw $s2, 8(%0) \n" /* s2 */ + "lw $s3, 12(%0) \n" /* s3 */ + "lw $s4, 16(%0) \n" /* s4 */ + "lw $s5, 20(%0) \n" /* s5 */ + "lw $s6, 24(%0) \n" /* s6 */ + "lw $s7, 28(%0) \n" /* s7 */ + "lw $gp, 32(%0) \n" /* gp */ + "lw $fp, 36(%0) \n" /* fp */ + "lw $sp, 40(%0) \n" /* sp */ + "lw $ra, 44(%0) \n" /* ra */ ".set at \n" ".set reorder \n" - : : "r" (addr) : "t0", "t1" + : : "r" (addr) : "t9" ); } diff --git a/firmware/asm/mips/thread.h b/firmware/asm/mips/thread.h index ac37560a68..42b0f7049f 100644 --- a/firmware/asm/mips/thread.h +++ b/firmware/asm/mips/thread.h @@ -19,9 +19,24 @@ * ****************************************************************************/ +/* index offset register + * 0 0 $16 s0 + * 1 4 $17 s1 + * 2 8 $18 s2 + * 3 12 $19 s3 + * 4 16 $20 s4 + * 5 20 $21 s5 + * 6 24 $22 s6 + * 7 28 $23 s7 + * 8 32 $28 gp + * 9 36 $30 s8 (s8) + * 10 40 $29 sp + * 11 44 $31 ra + * 12 48 start + */ struct regs { - uint32_t r[9]; /* 0-32 - Registers s0-s7, fp */ + uint32_t r[10]; /* 0-32 - Registers s0-s7, gp, fp */ uint32_t sp; /* 36 - Stack pointer */ uint32_t ra; /* 40 - Return address */ uint32_t start; /* 44 - Thread start address, or NULL when started */ diff --git a/firmware/drivers/audio/rocker_codec.c b/firmware/drivers/audio/rocker_codec.c new file mode 100644 index 0000000000..23541a4ddb --- /dev/null +++ b/firmware/drivers/audio/rocker_codec.c @@ -0,0 +1,77 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * + * Copyright (c) 2018 Marcin Bukat + * + * 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 "config.h" +#include "audio.h" +#include "audiohw.h" +#include "system.h" +#include "panic.h" +#include "alsa-controls.h" + +static int fd_hw; + +static void hw_open(void) +{ + fd_hw = open("/dev/snd/controlC0", O_RDWR); + if(fd_hw < 0) + panicf("Cannot open '/dev/snd/controlC0'"); +} + +static void hw_close(void) +{ + close(fd_hw); +} + +void audiohw_preinit(void) +{ + long int hp = 2; + + alsa_controls_init(); + hw_open(); + + /* Output port switch set to Headphones */ + alsa_controls_set_ints("Output Port Switch", 1, &hp); +} + +void audiohw_postinit(void) +{ +} + +void audiohw_close(void) +{ + hw_close(); + alsa_controls_close(); +} + +void audiohw_set_frequency(int fsel) +{ + (void)fsel; +} + +void audiohw_set_volume(int vol_l, int vol_r) +{ + long int vol_l_hw = -vol_l/5; + long int vol_r_hw = -vol_r/5; + + alsa_controls_set_ints("Left Playback Volume", 1, &vol_l_hw); + alsa_controls_set_ints("Right Playback Volume", 1, &vol_r_hw); +} diff --git a/firmware/drivers/lcd-24bit.c b/firmware/drivers/lcd-24bit.c index 092ed9d576..0585cfb7a0 100644 --- a/firmware/drivers/lcd-24bit.c +++ b/firmware/drivers/lcd-24bit.c @@ -189,7 +189,8 @@ void lcd_fillrect(int x, int y, int width, int height) enum fill_opt fillopt = OPT_NONE; fb_data *dst, *dst_end; int len, step; - fb_data bits = { 0, 0, 0 }; + fb_data bits; // = { 0, 0, 0 }; + memset(&bits, 0, sizeof(fb_data)); /******************** In viewport clipping **********************/ /* nothing to draw? */ diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 6026a3b4bd..26a1a69f95 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h @@ -216,6 +216,8 @@ struct sound_settings_info #include "codec-dx50.h" #elif defined(DX90) #include "codec-dx90.h" +#elif defined(HAVE_ROCKER_CODEC) +#include "rocker_codec.h" #endif /* convert caps into defines */ diff --git a/firmware/export/config.h b/firmware/export/config.h index 0d15ab6a33..14664257bf 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -166,6 +166,7 @@ #define SAMSUNG_YH92X_PAD 62 #define DX50_PAD 63 #define SONY_NWZA860_PAD 64 /* The NWZ-A860 is too different (touchscreen) */ +#define AGPTEK_ROCKER_PAD 65 /* CONFIG_REMOTE_KEYPAD */ #define H100_REMOTE 1 @@ -279,6 +280,7 @@ #define LCD_CREATIVEZENXFISTYLE 61 /* as used by Creative Zen X-Fi Style */ #define LCD_SAMSUNGYPR1 62 /* as used by Samsung YP-R1 */ #define LCD_NWZ_LINUX 63 /* as used in the Linux-based NWZ series */ +#define LCD_INGENIC_LINUX 64 /* LCD_PIXELFORMAT */ #define HORIZONTAL_PACKING 1 @@ -288,6 +290,7 @@ #define RGB565 565 #define RGB565SWAPPED 3553 #define RGB888 888 +#define XRGB8888 8888 /* LCD_STRIDEFORMAT */ #define VERTICAL_STRIDE 1 @@ -601,6 +604,8 @@ Lyre prototype 1 */ #include "config/sonynwzs750.h" #elif defined(SONY_NWZE350) #include "config/sonynwze350.h" +#elif defined(AGPTEK_ROCKER) +#include "config/agptekrocker.h" #else /* no known platform */ #endif diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h new file mode 100644 index 0000000000..517448b86d --- /dev/null +++ b/firmware/export/config/agptekrocker.h @@ -0,0 +1,119 @@ +/* + * This config file is for the Agptek Rocket + */ + +/* For Rolo and boot loader */ +#define MODEL_NUMBER 103//??? + +#define MODEL_NAME "Agptek Rocker" + +/* LCD dimensions */ +#define LCD_WIDTH 128 +#define LCD_HEIGHT 160 +/* sqrt(128^2 + 160^2) / 2 = 102. */ +#define LCD_DPI 102 + +#ifndef SIMULATOR +#define CONFIG_PLATFORM (PLATFORM_HOSTED) +#endif + +/* define this if you have a bitmap LCD display */ +#define HAVE_LCD_BITMAP + +/* define this if you have a colour LCD */ +#define HAVE_LCD_COLOR + +/* Define this if the LCD can shut down */ +//#define HAVE_LCD_SHUTDOWN + +/* define this if you want album art for this target */ +#define HAVE_ALBUMART + +/* define this to enable bitmap scaling */ +#define HAVE_BMP_SCALING + +/* define this to enable JPEG decoding */ +#define HAVE_JPEG + +/* define this if you have access to the quickscreen */ +#define HAVE_QUICKSCREEN + +/* define this if you would like tagcache to build on this target */ +#define HAVE_TAGCACHE + +#define LCD_DEPTH 32 +/* Check that but should not matter */ +#define LCD_PIXELFORMAT XRGB8888 + +#define HAVE_BACKLIGHT +#define HAVE_BACKLIGHT_BRIGHTNESS + +/* Main LCD backlight brightness range and defaults: the backlight driver + * has levels from 0 to 2555. But 0 is off so start at 1. + */ +#define MIN_BRIGHTNESS_SETTING 1 +#define MAX_BRIGHTNESS_SETTING 255 +#define DEFAULT_BRIGHTNESS_SETTING 70 + +/* Which backlight fading type? */ +#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING + +/* define this if you have a real-time clock */ +#define CONFIG_RTC 0 + +/* The number of bytes reserved for loadable codecs */ +#define CODEC_SIZE 0x80000 + +/* The number of bytes reserved for loadable plugins */ +#define PLUGIN_BUFFER_SIZE 0x100000 + +/* Define this if you do software codec */ +#define CONFIG_CODEC SWCODEC +#define HAVE_ROCKER_CODEC + +#define HAVE_HEADPHONE_DETECTION + +/* KeyPad configuration for plugins */ +#define CONFIG_KEYPAD AGPTEK_ROCKER_PAD + +#ifndef SIMULATOR +/* We have usb power and can detect usb but it is handled by Linux */ +#define HAVE_USB_POWER +#define USB_NONE +#endif + +#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE + +/* Linux controlls charging, we can monitor */ +#define CONFIG_CHARGING CHARGING_MONITOR + +/* define this if the hardware can be powered off while charging */ +#define HAVE_POWEROFF_WHILE_CHARGING + +/* same dimensions as gigabeats */ +#define CONFIG_LCD LCD_INGENIC_LINUX + +/* Define this if you have a software controlled poweroff */ +#define HAVE_SW_POWEROFF + +/* Define this to the CPU frequency */ +#define CPU_FREQ 532000000 + +/* No special storage */ +#define CONFIG_STORAGE (STORAGE_HOSTFS)//|STORAGE_SD) +//#define MULTIDRIVE_DIR "/mnt/sd_0" +//#define NUM_DRIVES 1 +//#define HAVE_HOTSWAP +#define HAVE_STORAGE_FLUSH + +/* Battery */ +#define BATTERY_TYPES_COUNT 1 + +/* Audio codec */ +#define HAVE_ROCKER_CODEC + +/* Battery */ +#define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity */ +#define BATTERY_CAPACITY_MIN 600 /* min. capacity selectable */ +#define BATTERY_CAPACITY_MAX 600 /* max. capacity selectable */ +#define BATTERY_CAPACITY_INC 0 /* capacity increment */ diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index 8dc9b3a7f9..6623461639 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h @@ -41,7 +41,8 @@ #endif /* def __PCTOOL__ */ #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ - defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) + defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \ + defined(AGPTEK_ROCKER) #if defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) #define HOME_DIR "/mnt/media0" @@ -50,6 +51,8 @@ #elif defined(DX50) || defined(DX90) /* Where to put save files like recordings, playlists, screen dumps ...*/ #define HOME_DIR "/mnt/sdcard" +#elif defined(AGPTEK_ROCKER) +#define HOME_DIR "/mnt/sd_0" #else #define HOME_DIR "/" #endif diff --git a/firmware/export/rocker_codec.h b/firmware/export/rocker_codec.h new file mode 100644 index 0000000000..366900d717 --- /dev/null +++ b/firmware/export/rocker_codec.h @@ -0,0 +1,6 @@ +#ifndef __ROCKER_CODEC__ +#define __ROCKER_CODEC__ + +#define AUDIOHW_CAPS 0 +AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -1020, 0, -300, ) +#endif diff --git a/firmware/include/bitarray.h b/firmware/include/bitarray.h index 4777ccb6a4..a1e7a3fd58 100644 --- a/firmware/include/bitarray.h +++ b/firmware/include/bitarray.h @@ -44,6 +44,7 @@ /** Iterators **/ #include "config.h" #include +#include #if (defined(CPU_ARM) && ARM_ARCH >= 5) || UINT32_MAX < UINT_MAX #define __BITARRAY_CTZ(wval) __builtin_ctz(wval) diff --git a/firmware/kernel/thread.c b/firmware/kernel/thread.c index 29ab9db873..307be7116a 100644 --- a/firmware/kernel/thread.c +++ b/firmware/kernel/thread.c @@ -37,6 +37,9 @@ #endif #include "core_alloc.h" +#if (CONFIG_PLATFORM & PLATFORM_HOSTED) +#include +#endif /* Define THREAD_EXTRA_CHECKS as 1 to enable additional state checks */ #ifdef DEBUG #define THREAD_EXTRA_CHECKS 1 /* Always 1 for DEBUG */ diff --git a/firmware/screendump.c b/firmware/screendump.c index 226d08a390..1acaaafba6 100644 --- a/firmware/screendump.c +++ b/firmware/screendump.c @@ -234,8 +234,8 @@ void screen_dump(void) #endif } while (dst < dst_end); -#elif LCD_DEPTH == 24 - dst_end = dst + LCD_WIDTH*3; +#elif LCD_DEPTH >= 24 + dst_end = dst + LCD_WIDTH*sizeof(fb_data); src = FBADDR(0, y); do { diff --git a/firmware/target/hosted/agptek/adc-target.h b/firmware/target/hosted/agptek/adc-target.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/firmware/target/hosted/agptek/backlight-agptek.c b/firmware/target/hosted/agptek/backlight-agptek.c new file mode 100644 index 0000000000..2f00787f72 --- /dev/null +++ b/firmware/target/hosted/agptek/backlight-agptek.c @@ -0,0 +1,64 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2017 Marcin Bukat + * + * 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 +#include "config.h" +#include "backlight-target.h" +#include "sysfs.h" +#include "panic.h" + +static const char * const sysfs_bl_brightness = + "/sys/class/backlight/pwm-backlight.0/brightness"; + +static const char * const sysfs_bl_power = + "/sys/class/backlight/pwm-backlight.0/bl_power"; + +bool backlight_hw_init(void) +{ + backlight_hw_on(); + backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); + return true; +} + +void backlight_hw_on(void) +{ + sysfs_set_int(sysfs_bl_power, 0); +} + +void backlight_hw_off(void) +{ + sysfs_set_int(sysfs_bl_power, 1); +} + +void backlight_hw_brightness(int brightness) +{ + /* cap range, just in case */ + if (brightness > MAX_BRIGHTNESS_SETTING) + brightness = MAX_BRIGHTNESS_SETTING; + if (brightness < MIN_BRIGHTNESS_SETTING) + brightness = MIN_BRIGHTNESS_SETTING; + + sysfs_set_int(sysfs_bl_brightness, brightness); +} diff --git a/firmware/target/hosted/agptek/backlight-target.h b/firmware/target/hosted/agptek/backlight-target.h new file mode 100644 index 0000000000..e3b8a7bd78 --- /dev/null +++ b/firmware/target/hosted/agptek/backlight-target.h @@ -0,0 +1,36 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2017 Marcin Bukat + * + * 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. + * + ****************************************************************************/ + +#ifndef _BACKLIGHT_TARGET_H_ +#define _BACKLIGHT_TARGET_H_ + + +#include + + +/* See backlight.c */ +bool backlight_hw_init(void); +void backlight_hw_on(void); +void backlight_hw_off(void); +void backlight_hw_brightness(int brightness); + + +#endif + diff --git a/firmware/target/hosted/agptek/button-agptek.c b/firmware/target/hosted/agptek/button-agptek.c new file mode 100644 index 0000000000..a8b5debee5 --- /dev/null +++ b/firmware/target/hosted/agptek/button-agptek.c @@ -0,0 +1,149 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2017 Marcin Bukat + * + * 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 +#include +#include + +#include "sysfs.h" +#include "button.h" +#include "button-target.h" +#include "panic.h" + +#define NR_POLL_DESC 2 +static struct pollfd poll_fds[NR_POLL_DESC]; + +static int button_map(int keycode) +{ + switch(keycode) + { + case KEY_LEFT: + return BUTTON_LEFT; + + case KEY_RIGHT: + return BUTTON_RIGHT; + + case KEY_UP: + return BUTTON_UP; + + case KEY_DOWN: + return BUTTON_DOWN; + + case KEY_PLAYPAUSE: + return BUTTON_SELECT; + + case KEY_VOLUMEUP: + return BUTTON_VOLUP; + + case KEY_VOLUMEDOWN: + return BUTTON_VOLDOWN; + + case KEY_POWER: + return BUTTON_POWER; + + default: + return 0; + } +} + +void button_init_device(void) +{ + const char * const input_devs[] = { + "/dev/input/event0", + "/dev/input/event1" + }; + + for(int i = 0; i < NR_POLL_DESC; i++) + { + int fd = open(input_devs[i], O_RDWR); + + if(fd < 0) + { + panicf("Cannot open input device: %s\n", input_devs[i]); + } + + poll_fds[i].fd = fd; + poll_fds[i].events = POLLIN; + poll_fds[i].revents = 0; + } +} + +int button_read_device(void) +{ + static int button_bitmap = 0; + struct input_event event; + + /* check if there are any events pending and process them */ + while(poll(poll_fds, NR_POLL_DESC, 0)) + { + for(int i = 0; i < NR_POLL_DESC; i++) + { + /* read only if non-blocking */ + if(poll_fds[i].revents & POLLIN) + { + int size = read(poll_fds[i].fd, &event, sizeof(event)); + if(size == (int)sizeof(event)) + { + int keycode = event.code; + /* event.value == 0x10000 means press + * event.value == 0 means release + */ + bool press = event.value ? true : false; + + /* map linux event code to rockbox button bitmap */ + if(press) + { + button_bitmap |= button_map(keycode); + } + else + { + button_bitmap &= ~button_map(keycode); + } + } + } + } + } + + return button_bitmap; +} + +bool headphones_inserted(void) +{ + int status = 0; + const char * const sysfs_hp_switch = "/sys/devices/switch/headset/status"; + sysfs_get_int(sysfs_hp_switch, &status); + + return status ? true : false; +} + +void button_close_device(void) +{ + /* close descriptors */ + for(int i = 0; i < NR_POLL_DESC; i++) + { + close(poll_fds[i].fd); + } +} + diff --git a/firmware/target/hosted/agptek/button-target.h b/firmware/target/hosted/agptek/button-target.h new file mode 100644 index 0000000000..b08c055895 --- /dev/null +++ b/firmware/target/hosted/agptek/button-target.h @@ -0,0 +1,43 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2017 by Marcin Bukat + * + * 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. + * + ****************************************************************************/ +#ifndef _BUTTON_TARGET_H_ +#define _BUTTON_TARGET_H_ + +#include +#include "config.h" + +/* Main unit's buttons */ +#define BUTTON_LEFT 0x00000001 +#define BUTTON_RIGHT 0x00000002 +#define BUTTON_UP 0x00000004 +#define BUTTON_DOWN 0x00000008 +#define BUTTON_SELECT 0x00000010 +#define BUTTON_VOLDOWN 0x00000020 +#define BUTTON_VOLUP 0x00000040 +#define BUTTON_POWER 0x00000080 + +#define BUTTON_MAIN 0x000000ff + +/* Software power-off */ +#define POWEROFF_BUTTON BUTTON_POWER +#define POWEROFF_COUNT 10 + +#endif /* _BUTTON_TARGET_H_ */ + diff --git a/firmware/target/hosted/agptek/debug-agptek.c b/firmware/target/hosted/agptek/debug-agptek.c new file mode 100644 index 0000000000..33f3ac4b97 --- /dev/null +++ b/firmware/target/hosted/agptek/debug-agptek.c @@ -0,0 +1,6 @@ +#include + +bool debug_hw_info(void) +{ + return false; +} diff --git a/firmware/target/hosted/agptek/lcd-agptek.c b/firmware/target/hosted/agptek/lcd-agptek.c new file mode 100644 index 0000000000..abf89ea9e3 --- /dev/null +++ b/firmware/target/hosted/agptek/lcd-agptek.c @@ -0,0 +1,111 @@ +/*************************************************************************** + * __________ __ ___. + * 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 +#include +#include +#include +#include +#include +#include +#include "lcd.h" +#include "lcd-target.h" +#include "backlight-target.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"); + } +} + +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(); +} diff --git a/firmware/target/hosted/agptek/lcd-target.h b/firmware/target/hosted/agptek/lcd-target.h new file mode 100644 index 0000000000..346644bdfc --- /dev/null +++ b/firmware/target/hosted/agptek/lcd-target.h @@ -0,0 +1,26 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * 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. + * + ****************************************************************************/ + +#ifndef __LCD_TARGET_H__ +#define __LCD_TARGET_H__ + +extern fb_data *framebuffer; /* see lcd-nwz.c */ +#define LCD_FRAMEBUF_ADDR(col, row) (framebuffer + (row)*LCD_WIDTH + (col)) +#endif /* __LCD_TARGET_H__ */ diff --git a/firmware/target/hosted/agptek/power-agptek.c b/firmware/target/hosted/agptek/power-agptek.c new file mode 100644 index 0000000000..7403801681 --- /dev/null +++ b/firmware/target/hosted/agptek/power-agptek.c @@ -0,0 +1,59 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2017 by Marcin Bukat + * + * 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 "system.h" +#include "power-agptek.h" +#include "power.h" +#include "panic.h" +#include "sysfs.h" + +const char * const sysfs_bat_voltage = + "/sys/class/power_supply/battery/voltage_now"; + +const char * const sysfs_bat_status = + "/sys/class/power_supply/battery/status"; + +unsigned int agptek_power_get_status(void) +{ + char buf[12] = {0}; + sysfs_get_string(sysfs_bat_status, buf, sizeof(buf)); + + if (strncmp(buf, "Charging", 8) == 0) + { + return POWER_INPUT_USB_CHARGER; + } + else + { + return POWER_INPUT_NONE; + } +} + +unsigned int agptek_power_get_battery_voltage(void) +{ + int battery_voltage; + sysfs_get_int(sysfs_bat_voltage, &battery_voltage); + + return battery_voltage/1000; +} diff --git a/firmware/target/hosted/agptek/power-agptek.h b/firmware/target/hosted/agptek/power-agptek.h new file mode 100644 index 0000000000..16f32b76ad --- /dev/null +++ b/firmware/target/hosted/agptek/power-agptek.h @@ -0,0 +1,29 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2017 by Marcin Bukat + * + * 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. + * + ****************************************************************************/ +#ifndef _POWER_AGPTEK_H_ +#define _POWER_AGPTEK_H_ + +#include +#include "config.h" + +unsigned int agptek_power_get_status(void); +unsigned int agptek_power_get_battery_voltage(void); +#endif /* _POWER_AGPTEK_H_ */ + diff --git a/firmware/target/hosted/agptek/powermgmt-agptek.c b/firmware/target/hosted/agptek/powermgmt-agptek.c new file mode 100644 index 0000000000..3371d1e793 --- /dev/null +++ b/firmware/target/hosted/agptek/powermgmt-agptek.c @@ -0,0 +1,63 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2017 Marcin Bukat + * + * 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 "powermgmt.h" +#include "power.h" +#include "power-agptek.h" + +const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = +{ + 3470 +}; + +/* the OF shuts down at this voltage */ +const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = +{ + 3400 +}; + +/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled + * NOTE: not calibrated simple linear scale for now + */ +const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = +{ + { 3400, 3480, 3560, 3640, 3720, 3800, 3880, 3960, 4040, 4120, 4200 } +}; + +/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ +const unsigned short const percent_to_volt_charge[11] = +{ + 3450, 3670, 3721, 3751, 3782, 3821, 3876, 3941, 4034, 4125, 4200 +}; + +unsigned int power_input_status(void) +{ + /* POWER_INPUT_USB_CHARGER, POWER_INPUT_NONE */ + return agptek_power_get_status(); +} + +int _battery_voltage(void) +{ + return agptek_power_get_battery_voltage(); +} + +bool charging_state(void) +{ + return agptek_power_get_status() == POWER_INPUT_USB_CHARGER; +} diff --git a/firmware/target/hosted/agptek/rocker.make b/firmware/target/hosted/agptek/rocker.make new file mode 100644 index 0000000000..1e8faaac0d --- /dev/null +++ b/firmware/target/hosted/agptek/rocker.make @@ -0,0 +1,48 @@ +# __________ __ ___. +# Open \______ \ ____ ____ | | _\_ |__ _______ ___ +# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +# \/ \/ \/ \/ \/ +# $Id$ +# + +INCLUDES += -I$(FIRMDIR)/include -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR) + +SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS) + +# bootloader build is sligtly different +ifneq (,$(findstring bootloader,$(APPSDIR))) + +SRC += $(call preprocess, $(APPSDIR)/SOURCES) +CLEANOBJS += $(BUILDDIR)/bootloader.* + +endif #bootloader + +.SECONDEXPANSION: # $$(OBJ) is not populated until after this + +ifneq (,$(findstring bootloader,$(APPSDIR))) +# bootloader build + +$(BUILDDIR)/bootloader.elf : $$(OBJ) $(FIRMLIB) $(CORE_LIBS) + $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \ + -L$(BUILDDIR)/firmware -lfirmware \ + -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ + $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/bootloader.map + +$(BUILDDIR)/$(BINARY): $(BUILDDIR)/bootloader.elf + +else +# rockbox app build + +$(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) + $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \ + -L$(BUILDDIR)/firmware -lfirmware \ + -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ + -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ + $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map + +$(BUILDDIR)/rockbox.rocker : $(BUILDDIR)/rockbox.elf + $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) + +endif diff --git a/firmware/target/hosted/agptek/sysfs.c b/firmware/target/hosted/agptek/sysfs.c new file mode 100644 index 0000000000..ad4635ac57 --- /dev/null +++ b/firmware/target/hosted/agptek/sysfs.c @@ -0,0 +1,186 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 + * Copyright (C) 2014 by Mario Basister: iBasso DX90 port + * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features + * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features + * + * 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 "config.h" +#include "debug.h" +#include "sysfs.h" + + +static FILE* open_read(const char *file_name) +{ + FILE *f = fopen(file_name, "r"); + if(f == NULL) + { + DEBUGF("ERROR %s: Can not open %s for reading.", __func__, file_name); + } + + return f; +} + + +static FILE* open_write(const char* file_name) +{ + FILE *f = fopen(file_name, "w"); + if(f == NULL) + { + DEBUGF("ERROR %s: Can not open %s for writing.", __func__, file_name); + } + + return f; +} + + +bool sysfs_get_int(const char *path, int *value) +{ + *value = -1; + + FILE *f = open_read(path); + if(f == NULL) + { + return false; + } + + bool success = true; + if(fscanf(f, "%d", value) == EOF) + { + DEBUGF("ERROR %s: Read failed for %s.", __func__, path); + success = false; + } + + fclose(f); + return success; +} + + +bool sysfs_set_int(const char *path, int value) +{ + FILE *f = open_write(path); + if(f == NULL) + { + return false; + } + + bool success = true; + if(fprintf(f, "%d", value) < 1) + { + DEBUGF("ERROR %s: Write failed for %s.", __func__, path); + success = false; + } + + fclose(f); + return success; +} + + +bool sysfs_get_char(const char *path, char *value) +{ + *value = '\0'; + FILE *f = open_read(path); + if(f == NULL) + { + return false; + } + + bool success = true; + if(fscanf(f, "%c", value) == EOF) + { + DEBUGF("ERROR %s: Read failed for %s.", __func__, path); + success = false; + } + + fclose(f); + return success; +} + + +bool sysfs_set_char(const char *path, char value) +{ + FILE *f = open_write(path); + if(f == NULL) + { + return false; + } + + bool success = true; + if(fprintf(f, "%c", value) < 1) + { + DEBUGF("ERROR %s: Write failed for %s.", __func__, path); + success = false; + } + + fclose(f); + return success; +} + + +bool sysfs_get_string(const char *path, char *value, int size) +{ + value[0] = '\0'; + FILE *f = open_read(path); + if(f == NULL) + { + return false; + } + + bool success = true; + if(fgets(value, size, f) == NULL) + { + DEBUGF("ERROR %s: Read failed for %s.", __func__, path); + success = false; + } + else + { + size_t length = strlen(value); + if((length > 0) && value[length - 1] == '\n') + { + value[length - 1] = '\0'; + } + } + + fclose(f); + return success; +} + + +bool sysfs_set_string(const char *path, char *value) +{ + FILE *f = open_write(path); + if(f == NULL) + { + return false; + } + + bool success = true; + if(fprintf(f, "%s", value) < 1) + { + DEBUGF("ERROR %s: Write failed for %s.", __func__, path); + success = false; + } + + fclose(f); + return success; +} diff --git a/firmware/target/hosted/agptek/sysfs.h b/firmware/target/hosted/agptek/sysfs.h new file mode 100644 index 0000000000..639cc1c409 --- /dev/null +++ b/firmware/target/hosted/agptek/sysfs.h @@ -0,0 +1,31 @@ +/*************************************************************************** + * __________ __ ___ + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2014 by Ilia Sergachev: Initial Rockbox port to iBasso DX50 + * Copyright (C) 2014 by Mario Basister: iBasso DX90 port + * Copyright (C) 2014 by Simon Rothen: Initial Rockbox repository submission, additional features + * Copyright (C) 2014 by Udo Schläpfer: Code clean up, additional features + * + * 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 + +bool sysfs_get_int(const char *path, int *value); +bool sysfs_set_int(const char *path, int value); +bool sysfs_get_char(const char *path, char *value); +bool sysfs_set_char(const char *path, char value); +bool sysfs_get_string(const char *path, char *value, int size); +bool sysfs_set_string(const char *path, char *value); diff --git a/firmware/target/hosted/agptek/system-agptek.c b/firmware/target/hosted/agptek/system-agptek.c new file mode 100644 index 0000000000..7f0949daf2 --- /dev/null +++ b/firmware/target/hosted/agptek/system-agptek.c @@ -0,0 +1,184 @@ +/*************************************************************************** + * __________ __ ___. + * 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 +#include +#include +#include +#include + +#include "system.h" +#include "mv.h" +#include "font.h" +#include "power.h" +#include "button.h" +#include "backlight-target.h" +#include "lcd.h" + +/* to make thread-internal.h happy */ +uintptr_t *stackbegin; +uintptr_t *stackend; + +static void sig_handler(int sig, siginfo_t *siginfo, void *context) +{ + /* safe guard variable - we call backtrace() only on first + * UIE call. This prevent endless loop if backtrace() touches + * memory regions which cause abort + */ + static bool triggered = false; + + lcd_set_backdrop(NULL); + lcd_set_drawmode(DRMODE_SOLID); + lcd_set_foreground(LCD_BLACK); + lcd_set_background(LCD_WHITE); + unsigned line = 0; + + lcd_setfont(FONT_SYSFIXED); + lcd_set_viewport(NULL); + lcd_clear_display(); + + /* get context info */ + ucontext_t *uc = (ucontext_t *)context; + unsigned long pc = uc->uc_mcontext.pc; + unsigned long sp = uc->uc_mcontext.gregs[29]; + + lcd_putsf(0, line++, "%s at %08x", strsignal(sig), pc); + + if(sig == SIGILL || sig == SIGFPE || sig == SIGSEGV || sig == SIGBUS || sig == SIGTRAP) + lcd_putsf(0, line++, "address 0x%08x", siginfo->si_addr); + + if(!triggered) + { + triggered = true; + rb_backtrace(pc, sp, &line); + } + +#ifdef ROCKBOX_HAS_LOGF + lcd_putsf(0, line++, "logf:"); + logf_panic_dump(&line); +#endif + + lcd_update(); + + system_exception_wait(); /* If this returns, try to reboot */ + system_reboot(); + while (1); /* halt */ +} + +void power_off(void) +{ + system("/sbin/poweroff"); +} + +void system_init(void) +{ + int *s; + /* fake stack, to make thread-internal.h happy */ + stackbegin = stackend = (uintptr_t*)&s; + /* catch some signals for easier debugging */ + struct sigaction sa; + sigfillset(&sa.sa_mask); + sa.sa_flags = SA_SIGINFO; + sa.sa_sigaction = &sig_handler; + sigaction(SIGILL, &sa, NULL); + sigaction(SIGABRT, &sa, NULL); + sigaction(SIGFPE, &sa, NULL); + sigaction(SIGSEGV, &sa, NULL); + sigaction(SIGPIPE, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); + sigaction(SIGBUS, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); +} + +void system_reboot(void) +{ + system("/sbin/reboot"); +} + +void system_exception_wait(void) +{ + backlight_hw_on(); + backlight_hw_brightness(DEFAULT_BRIGHTNESS_SETTING); + /* wait until button press and release */ + while(button_read_device() != 0) {} + while(button_read_device() == 0) {} + while(button_read_device() != 0) {} + while(button_read_device() == 0) {} +} + +bool hostfs_removable(IF_MD_NONVOID(int drive)) +{ +#ifdef HAVE_MULTIDRIVE + if (drive > 0) /* Active LOW */ + return true; + else +#endif + return false; /* internal: always present */ +} + +bool hostfs_present(IF_MD_NONVOID(int drive)) +{ +#ifdef HAVE_MULTIDRIVE + if (drive > 0) /* Active LOW */ + return true; //FIXME + else +#endif + return true; /* internal: always present */ +} + +#ifdef HAVE_MULTIDRIVE +int volume_drive(int drive) +{ + return drive; +} +#endif /* HAVE_MULTIDRIVE */ + +#ifdef CONFIG_STORAGE_MULTI +int hostfs_driver_type(int drive) +{ + return drive > 0 ? STORAGE_SD_NUM : STORAGE_HOSTFS_NUM; +} +#endif /* CONFIG_STORAGE_MULTI */ + +int hostfs_init(void) +{ + return 0; +} + +int hostfs_flush(void) +{ + sync(); + return 0; +} + +#ifdef HAVE_HOTSWAP +bool volume_removable(int volume) +{ + /* don't support more than one partition yet, so volume == drive */ + return hostfs_removable(volume); +} + +bool volume_present(int volume) +{ + /* don't support more than one partition yet, so volume == drive */ + return hostfs_present(volume); +} +#endif + diff --git a/firmware/target/hosted/agptek/system-target.h b/firmware/target/hosted/agptek/system-target.h new file mode 100644 index 0000000000..830f19fde4 --- /dev/null +++ b/firmware/target/hosted/agptek/system-target.h @@ -0,0 +1,28 @@ +/*************************************************************************** + * __________ __ ___. + * 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. + * + ****************************************************************************/ +#ifndef __SYSTEM_TARGET_H__ +#define __SYSTEM_TARGET_H__ + +#include "kernel-unix.h" +#include "system-hosted.h" + +#define NEED_GENERIC_BYTESWAPS +#endif /* __SYSTEM_TARGET_H__ */ diff --git a/firmware/target/hosted/alsa-controls.c b/firmware/target/hosted/alsa-controls.c index 1d6d73e751..19de7aea44 100644 --- a/firmware/target/hosted/alsa-controls.c +++ b/firmware/target/hosted/alsa-controls.c @@ -3,7 +3,7 @@ * Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ * * Copyright (C) 2016 Amaury Pouly diff --git a/firmware/target/hosted/alsa-controls.h b/firmware/target/hosted/alsa-controls.h index 870797c5b8..a08fc46e14 100644 --- a/firmware/target/hosted/alsa-controls.h +++ b/firmware/target/hosted/alsa-controls.h @@ -1,10 +1,19 @@ /*************************************************************************** +<<<<<<< 9a9c7f2b7c63a9db203084a3485988c07f17b86c * __________ __ ___. * Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ +======= + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ +>>>>>>> Agptek rocker port initial commit * * Copyright (C) 2016 Amaury Pouly * diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c index 64ce9f41bc..4f1019c7a1 100644 --- a/firmware/target/hosted/filesystem-app.c +++ b/firmware/target/hosted/filesystem-app.c @@ -48,7 +48,8 @@ static const char rbhome[] = HOME_DIR; #endif #if !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || defined(DX50) || \ - defined(SONY_NWZ_LINUX) || defined(DX90)) && !defined(__PCTOOL__) + defined(SONY_NWZ_LINUX) || defined(DX90) || defined(AGPTEK_ROCKER)) && \ + !defined(__PCTOOL__) /* Special dirs are user-accessible (and user-writable) dirs which take priority * over the ones where Rockbox is installed to. Classic example would be * $HOME/.config/rockbox.org vs /usr/share/rockbox */ diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index d14f70bf99..1ac124c881 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h @@ -515,6 +515,12 @@ #define UI_LCD_POSX 78 #define UI_LCD_POSY 92 +#elif defined(AGPTEK_ROCKER) +#define UI_TITLE "Agptek Rocker" +#define UI_WIDTH 186 +#define UI_HEIGHT 380 +#define UI_LCD_POSX 29 +#define UI_LCD_POSY 25 #elif defined(SIMULATOR) #error no UI defines #endif -- cgit v1.2.3