From 6ffbe3896b89ce86cccfe3b1f492f60e34d89603 Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Thu, 19 Apr 2007 10:14:55 +0000 Subject: move the iriver ifp7xx and other pnx0101 related files together in the target tree git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13207 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/crt0-pnx0101.S | 229 -------------- firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c | 57 ---- firmware/target/arm/iriver/ifp7xx/adc-target.h | 29 -- .../target/arm/iriver/ifp7xx/backlight-ifp7xx.c | 33 -- firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c | 89 ------ firmware/target/arm/iriver/ifp7xx/button-target.h | 56 ---- firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c | 208 ------------ firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c | 85 ----- firmware/target/arm/iriver/ifp7xx/system-target.h | 34 -- firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c | 50 --- firmware/target/arm/pnx0101/backlight-target.h | 26 ++ firmware/target/arm/pnx0101/crt0-pnx0101.S | 229 ++++++++++++++ .../target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c | 57 ++++ .../target/arm/pnx0101/iriver-ifp7xx/adc-target.h | 29 ++ .../arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c | 33 ++ .../arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c | 89 ++++++ .../arm/pnx0101/iriver-ifp7xx/button-target.h | 56 ++++ .../target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c | 208 ++++++++++++ .../arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c | 85 +++++ .../arm/pnx0101/iriver-ifp7xx/system-target.h | 34 ++ .../target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c | 50 +++ firmware/target/arm/pnx0101/system-pnx0101.c | 351 +++++++++++++++++++++ firmware/target/arm/pnx0101/usb-target.h | 27 ++ firmware/target/arm/system-pnx0101.c | 351 --------------------- 24 files changed, 1274 insertions(+), 1221 deletions(-) delete mode 100644 firmware/target/arm/crt0-pnx0101.S delete mode 100644 firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c delete mode 100644 firmware/target/arm/iriver/ifp7xx/adc-target.h delete mode 100644 firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c delete mode 100644 firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c delete mode 100644 firmware/target/arm/iriver/ifp7xx/button-target.h delete mode 100644 firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c delete mode 100644 firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c delete mode 100644 firmware/target/arm/iriver/ifp7xx/system-target.h delete mode 100644 firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c create mode 100644 firmware/target/arm/pnx0101/backlight-target.h create mode 100644 firmware/target/arm/pnx0101/crt0-pnx0101.S create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h create mode 100644 firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c create mode 100644 firmware/target/arm/pnx0101/system-pnx0101.c create mode 100644 firmware/target/arm/pnx0101/usb-target.h delete mode 100644 firmware/target/arm/system-pnx0101.c (limited to 'firmware/target') diff --git a/firmware/target/arm/crt0-pnx0101.S b/firmware/target/arm/crt0-pnx0101.S deleted file mode 100644 index d11546edaa..0000000000 --- a/firmware/target/arm/crt0-pnx0101.S +++ /dev/null @@ -1,229 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: crt0.S 11850 2006-12-29 02:49:12Z markun $ - * - * Copyright (C) 2002 by Linus Nielsen Feltzing - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#define ASM /* do not include structure definitions from pnx0101.h */ - -#include "config.h" -#include "cpu.h" - - .section .init.text,"ax",%progbits - - .global start -start: - -/* Arm bootloader and startup code based on startup.s from the iPodLinux loader - * - * Copyright (c) 2003, Daniel Palffy (dpalffy (at) rainstorm.org) - * Copyright (c) 2005, Bernard Leach - * - */ - - msr cpsr_c, #0xd3 /* enter supervisor mode, disable IRQ */ - -#ifndef BOOTLOADER -#ifndef DEBUG - ldr r0, =0x80105000 - mov r1, #1 - str r1, [r0, #4] - mov r1, #0 - str r1, [r0, #4] -1: ldr r1, [r0] - cmp r1, #0 - bne 1b - mov r1, #0x74 - str r1, [r0, #8] - mov r1, #2 - str r1, [r0, #0x18] - mov r1, #2 - str r1, [r0, #0x20] - mov r1, #82 - str r1, [r0, #0x28] - mov r1, #100 - str r1, [r0, #0x2c] - mov r1, #0x120 - str r1, [r0, #0x30] - mov r1, #6 - str r1, [r0, #4] - ldr r0, =1f - mov r15, r0 -1: -#endif /* !DEBUG */ - -#ifndef DEBUG - /* Copy exception handler code to address 0 */ - ldr r2, =_vectorsstart - ldr r3, =_vectorsend - ldr r4, =_vectorscopy -1: - cmp r3, r2 - ldrhi r5, [r4], #4 - strhi r5, [r2], #4 - bhi 1b -#else - ldr r1, =vectors - ldr r0, =irq_handler - str r0, [r1, #24] - ldr r0, =fiq_handler - str r0, [r1, #28] -#endif - -#ifndef STUB - /* Zero out IBSS */ - ldr r2, =_iedata - ldr r3, =_iend - mov r4, #0 -1: - cmp r3, r2 - strhi r4, [r2], #4 - bhi 1b - - /* Copy the IRAM */ - ldr r2, =_iramcopy - ldr r3, =_iramstart - ldr r4, =_iramend -1: - cmp r4, r3 - ldrhi r5, [r2], #4 - strhi r5, [r3], #4 - bhi 1b -#endif /* !STUB */ -#endif /* !BOOTLOADER */ - - /* Initialise bss section to zero */ - ldr r2, =_edata - ldr r3, =_end - mov r4, #0 -1: - cmp r3, r2 - strhi r4, [r2], #4 - bhi 1b - - /* Set up some stack and munge it with 0xdeadbeef */ - ldr sp, =stackend - mov r3, sp - ldr r2, =stackbegin - ldr r4, =0xdeadbeef -1: - cmp r3, r2 - strhi r4, [r2], #4 - bhi 1b - - /* Set up stack for IRQ mode */ - msr cpsr_c, #0xd2 - ldr sp, =irq_stack - /* Set up stack for FIQ mode */ - msr cpsr_c, #0xd1 - ldr sp, =fiq_stack - - /* Let abort and undefined modes use IRQ stack */ - msr cpsr_c, #0xd7 - ldr sp, =irq_stack - msr cpsr_c, #0xdb - ldr sp, =irq_stack - /* Switch to supervisor mode */ - msr cpsr_c, #0xd3 - ldr sp, =stackend - bl main - /* main() should never return */ - -/* Exception handlers. Will be copied to address 0 after memory remapping */ - .section .vectors,"aw" - ldr pc, [pc, #24] - ldr pc, [pc, #24] - ldr pc, [pc, #24] - ldr pc, [pc, #24] - ldr pc, [pc, #24] - ldr pc, [pc, #24] - ldr pc, [pc, #24] - ldr pc, [pc, #24] - - /* Exception vectors */ - .global vectors -vectors: - .word start - .word undef_instr_handler - .word software_int_handler - .word prefetch_abort_handler - .word data_abort_handler - .word reserved_handler - .word irq_handler - .word fiq_handler - - .text - -#ifndef STUB - .global irq - .global fiq - .global UIE -#endif - -/* All illegal exceptions call into UIE with exception address as first - parameter. This is calculated differently depending on which exception - we're in. Second parameter is exception number, used for a string lookup - in UIE. - */ -undef_instr_handler: - mov r0, lr - mov r1, #0 - b UIE - -/* We run supervisor mode most of the time, and should never see a software - exception being thrown. Perhaps make it illegal and call UIE? - */ -software_int_handler: -reserved_handler: - movs pc, lr - -prefetch_abort_handler: - sub r0, lr, #4 - mov r1, #1 - b UIE - -fiq_handler: - @ Branch straight to FIQ handler in pcm_playback.c. This also handles the - @ the correct return sequence. - stmfd sp!, {r0-r7, r12, lr} - bl fiq - ldmfd sp!, {r0-r7, r12, lr} - subs pc, lr, #4 - -data_abort_handler: - sub r0, lr, #8 - mov r1, #2 - b UIE - -irq_handler: -#ifndef STUB - stmfd sp!, {r0-r11, r12, lr} - bl irq - ldmfd sp!, {r0-r11, r12, lr} -#endif - subs pc, lr, #4 - -#ifdef STUB -UIE: - b UIE -#endif - -/* 256 words of IRQ stack */ - .space 256*4 -irq_stack: - -/* 256 words of FIQ stack */ - .space 256*4 -fiq_stack: diff --git a/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c deleted file mode 100644 index 79b1ad0fcb..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c +++ /dev/null @@ -1,57 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" -#include "cpu.h" -#include "system.h" -#include "kernel.h" -#include "thread.h" -#include "adc.h" - -static unsigned short adcdata[NUM_ADC_CHANNELS]; - -unsigned short adc_read(int channel) -{ - return adcdata[channel]; -} - -static void adc_tick(void) -{ - if (ADCST & 0x10) { - adcdata[0] = ADCCH0 & 0x3ff; - adcdata[1] = ADCCH1 & 0x3ff; - adcdata[2] = ADCCH2 & 0x3ff; - adcdata[3] = ADCCH3 & 0x3ff; - adcdata[4] = ADCCH4 & 0x3ff; - ADCST = 0xa; - } -} - -void adc_init(void) -{ - ADCR24 = 0xaaaaa; - ADCR28 = 0; - ADCST = 2; - ADCST = 0xa; - - while (!(ADCST & 0x10)); - adc_tick(); - - tick_add_task(adc_tick); -} - diff --git a/firmware/target/arm/iriver/ifp7xx/adc-target.h b/firmware/target/arm/iriver/ifp7xx/adc-target.h deleted file mode 100644 index 8e5e6edbc5..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/adc-target.h +++ /dev/null @@ -1,29 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#define NUM_ADC_CHANNELS 5 - -#define ADC_BUTTONS 0 -#define ADC_BATTERY 1 -#define ADC_BUTTON_PLAY 2 -#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ - -#endif diff --git a/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c deleted file mode 100644 index c0dc3974c0..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c +++ /dev/null @@ -1,33 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" -#include "cpu.h" -#include "system.h" -#include "backlight.h" -#include "lcd.h" - -void __backlight_on(void) -{ - GPIO3_SET = 1; -} - -void __backlight_off(void) -{ - GPIO3_CLR = 1; -} diff --git a/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c deleted file mode 100644 index 52e29fdfdf..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c +++ /dev/null @@ -1,89 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - - -#include -#include "config.h" -#include "cpu.h" -#include "system.h" -#include "button.h" -#include "kernel.h" -#include "backlight.h" -#include "adc.h" -#include "system.h" - - -void button_init_device(void) -{ - -} - -bool button_hold(void) -{ - return (GPIO5_READ & 4) ? false : true; -} - -/* - * Get button pressed from hardware - */ -int button_read_device(void) -{ - int btn = BUTTON_NONE; - int data; - static bool hold_button = false; - bool hold_button_old; - - /* normal buttons */ - hold_button_old = hold_button; - hold_button = button_hold(); - - if (hold_button != hold_button_old) - backlight_hold_changed(hold_button); - - if (!button_hold()) - { - data = adc_read(ADC_BUTTONS); - if (data < 0x35c) - { - if (data < 0x151) - if (data < 0xc7) - if (data < 0x41) - btn = BUTTON_LEFT; - else - btn = BUTTON_RIGHT; - else - btn = BUTTON_SELECT; - else - if (data < 0x268) - if (data < 0x1d7) - btn = BUTTON_UP; - else - btn = BUTTON_DOWN; - else - if (data < 0x2f9) - btn = BUTTON_EQ; - else - btn = BUTTON_MODE; - } - - if (adc_read(ADC_BUTTON_PLAY) < 0x64) - btn |= BUTTON_PLAY; - } - return btn; -} diff --git a/firmware/target/arm/iriver/ifp7xx/button-target.h b/firmware/target/arm/iriver/ifp7xx/button-target.h deleted file mode 100644 index 954a2dfe9c..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/button-target.h +++ /dev/null @@ -1,56 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* Custom written for the ifp7xx */ - -#ifndef _BUTTON_TARGET_H_ -#define _BUTTON_TARGET_H_ - -#include -#include "config.h" - -#define HAS_BUTTON_HOLD - -bool button_hold(void); -void button_init_device(void); -int button_read_device(void); - -/* iriver IFP7XX specific button codes */ - -#define BUTTON_PLAY 0x00000001 -#define BUTTON_SELECT 0x00000002 - -#define BUTTON_LEFT 0x00000004 -#define BUTTON_RIGHT 0x00000008 -#define BUTTON_UP 0x00000010 -#define BUTTON_DOWN 0x00000020 - -#define BUTTON_MODE 0x00000040 -#define BUTTON_EQ 0x00000080 - -#define BUTTON_MAIN (BUTTON_PLAY|BUTTON_SELECT\ - |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_UP|BUTTON_DOWN\ - |BUTTON_MODE|BUTTON_EQ) - -#define BUTTON_REMOTE 0 - -#define POWEROFF_BUTTON BUTTON_PLAY -#define POWEROFF_COUNT 40 - -#endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c deleted file mode 100644 index 0aacd8af67..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c +++ /dev/null @@ -1,208 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Alan Korr - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" - -#include "kernel.h" -#include "lcd.h" -#include "system.h" - -/*** definitions ***/ - -#define LCD_SET_LOWER_COLUMN_ADDRESS ((char)0x00) -#define LCD_SET_HIGHER_COLUMN_ADDRESS ((char)0x10) -#define LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO ((char)0x20) -#define LCD_SET_POWER_CONTROL_REGISTER ((char)0x28) -#define LCD_SET_DISPLAY_START_LINE ((char)0x40) -#define LCD_SET_CONTRAST_CONTROL_REGISTER ((char)0x81) -#define LCD_SET_SEGMENT_REMAP ((char)0xA0) -#define LCD_SET_LCD_BIAS ((char)0xA2) -#define LCD_SET_ENTIRE_DISPLAY_OFF ((char)0xA4) -#define LCD_SET_ENTIRE_DISPLAY_ON ((char)0xA5) -#define LCD_SET_NORMAL_DISPLAY ((char)0xA6) -#define LCD_SET_REVERSE_DISPLAY ((char)0xA7) -#define LCD_SET_MULTIPLEX_RATIO ((char)0xA8) -#define LCD_SET_BIAS_TC_OSC ((char)0xA9) -#define LCD_SET_1OVER4_BIAS_RATIO ((char)0xAA) -#define LCD_SET_INDICATOR_OFF ((char)0xAC) -#define LCD_SET_INDICATOR_ON ((char)0xAD) -#define LCD_SET_DISPLAY_OFF ((char)0xAE) -#define LCD_SET_DISPLAY_ON ((char)0xAF) -#define LCD_SET_PAGE_ADDRESS ((char)0xB0) -#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION ((char)0xC0) -#define LCD_SET_TOTAL_FRAME_PHASES ((char)0xD2) -#define LCD_SET_DISPLAY_OFFSET ((char)0xD3) -#define LCD_SET_READ_MODIFY_WRITE_MODE ((char)0xE0) -#define LCD_SOFTWARE_RESET ((char)0xE2) -#define LCD_NOP ((char)0xE3) -#define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE ((char)0xEE) - -/* LCD command codes */ -#define LCD_CNTL_RESET 0xe2 /* Software reset */ -#define LCD_CNTL_POWER 0x2f /* Power control */ -#define LCD_CNTL_CONTRAST 0x81 /* Contrast */ -#define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */ -#define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */ -#define LCD_CNTL_DISPON 0xaf /* Display on */ - -#define LCD_CNTL_PAGE 0xb0 /* Page address */ -#define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */ -#define LCD_CNTL_LOWCOL 0x00 /* Lower column address */ - -/*** driver routines ***/ - -void lcd_write_command(int cmd) -{ - while ((LCDSTAT & 3) != 3); - LCDCMD = cmd; -} - -void lcd_write_data( const unsigned char* data, int count ) -{ - int i; - for (i=0; i < count; i++) { - while ((LCDSTAT & 3) != 3); - LCDDATA = data[i]; - } -} - -/*** hardware configuration ***/ - -int lcd_default_contrast(void) -{ - return 45; -} - -void lcd_set_contrast(int val) -{ - lcd_write_command(LCD_CNTL_CONTRAST); - lcd_write_command(val); -} - -void lcd_set_invert_display(bool yesno) -{ - if (yesno) - lcd_write_command(LCD_SET_REVERSE_DISPLAY); - else - lcd_write_command(LCD_SET_NORMAL_DISPLAY); -} - -/* turn the display upside down (call lcd_update() afterwards) */ -void lcd_set_flip(bool yesno) -{ - if (yesno) - { - lcd_write_command(LCD_SET_SEGMENT_REMAP); - lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION); - } - else - { - lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01); - lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08); - } -} - -void lcd_init_device(void) -{ - LCDREG10 = 0xf; - LCDREG04 = 0x4084; - - /* inits like the original firmware */ - lcd_write_command(LCD_SOFTWARE_RESET); - lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4); - lcd_write_command(LCD_SET_LCD_BIAS); - lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); - /* power control register: op-amp=1, regulator=1, booster=1 */ - lcd_write_command(LCD_SET_DISPLAY_ON); - lcd_write_command(LCD_SET_NORMAL_DISPLAY); - lcd_set_flip(false); - lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0); - lcd_set_contrast(lcd_default_contrast()); - lcd_write_command(LCD_SET_PAGE_ADDRESS); - lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0); - lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0); - - lcd_clear_display(); - lcd_update(); -} - -/*** Update functions ***/ - -/* Performance function that works with an external buffer - note that by and bheight are in 8-pixel units! */ -void lcd_blit(const unsigned char* data, int x, int by, int width, - int bheight, int stride) -{ - /* Copy display bitmap to hardware */ - while (bheight--) - { - lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | (((x+4)>>4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | ((x+4) & 0xf)); - - lcd_write_data(data, width); - data += stride; - } -} - - -/* Update the display. - This must be called after all other LCD functions that change the display. */ -void lcd_update(void) ICODE_ATTR; -void lcd_update(void) -{ - int y; - - /* Copy display bitmap to hardware */ - for (y = 0; y < LCD_FBHEIGHT; y++) - { - lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL); - lcd_write_command (LCD_CNTL_LOWCOL | 4); - - lcd_write_data (lcd_framebuffer[y], LCD_WIDTH); - } -} - -/* Update a fraction of the display. */ -void lcd_update_rect(int, int, int, int) ICODE_ATTR; -void lcd_update_rect(int x, int y, int width, int height) -{ - int ymax; - - /* The Y coordinates have to work on even 8 pixel rows */ - ymax = (y + height-1) >> 3; - y >>= 3; - - if(x + width > LCD_WIDTH) - width = LCD_WIDTH - x; - if (width <= 0) - return; /* nothing left to do, 0 is harmful to lcd_write_data() */ - if(ymax >= LCD_FBHEIGHT) - ymax = LCD_FBHEIGHT-1; - - /* Copy specified rectange bitmap to hardware */ - for (; y <= ymax; y++) - { - lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); - lcd_write_command (LCD_CNTL_HIGHCOL | (((x+4) >> 4) & 0xf)); - lcd_write_command (LCD_CNTL_LOWCOL | ((x+4) & 0xf)); - - lcd_write_data (&lcd_framebuffer[y][x], width); - } -} diff --git a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c deleted file mode 100644 index 4e4f585298..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c +++ /dev/null @@ -1,85 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Linus Nielsen Feltzing - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" -#include "cpu.h" -#include -#include "adc.h" -#include "kernel.h" -#include "system.h" -#include "power.h" -#include "logf.h" -#include "usb.h" - -#if CONFIG_TUNER - -static bool powered = false; - -bool radio_powered(void) -{ - return powered; -} - -bool radio_power(bool status) -{ - bool old_status = powered; - powered = status; - - return old_status; -} - -#endif /* #if CONFIG_TUNER */ - -#ifndef SIMULATOR - -void power_init(void) -{ -} - -void ide_power_enable(bool on) -{ - (void)on; - /* no ide controller */ -} - -bool ide_powered(void) -{ - return true; /* pretend always powered if not controlable */ -} - -void power_off(void) -{ - set_irq_level(HIGHEST_IRQ_LEVEL); - GPIO1_CLR = 1 << 16; - GPIO2_SET = 1; - while(1) - yield(); -} - -#else - -void power_off(void) -{ -} - -void ide_power_enable(bool on) -{ - (void)on; -} - -#endif /* SIMULATOR */ diff --git a/firmware/target/arm/iriver/ifp7xx/system-target.h b/firmware/target/arm/iriver/ifp7xx/system-target.h deleted file mode 100644 index dc11bb74da..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/system-target.h +++ /dev/null @@ -1,34 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Alan Korr - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * 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 "system-arm.h" - -#define CPUFREQ_DEFAULT 12000000 -#define CPUFREQ_NORMAL 48000000 -#define CPUFREQ_MAX 60000000 - -typedef void (*interrupt_handler_t)(void); - -void irq_set_int_handler(int n, interrupt_handler_t handler); -void irq_enable_int(int n); -void irq_disable_int(int n); - -#endif /* SYSTEM_TARGET_H */ diff --git a/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c deleted file mode 100644 index a22a227b15..0000000000 --- a/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" -#include "cpu.h" -#include "kernel.h" -#include "thread.h" -#include "system.h" -#include "debug.h" -#include "ata.h" -#include "fat.h" -#include "disk.h" -#include "panic.h" -#include "lcd.h" -#include "adc.h" -#include "usb.h" -#include "button.h" -#include "sprintf.h" -#include "string.h" - -void usb_init_device(void) -{ -} - -bool usb_detect(void) -{ - /* TODO: Implement USB_ISP1582 */ - return false; -} - -void usb_enable(bool on) -{ - /* TODO: Implement USB_ISP1582 */ - (void)on; -} diff --git a/firmware/target/arm/pnx0101/backlight-target.h b/firmware/target/arm/pnx0101/backlight-target.h new file mode 100644 index 0000000000..04236880ee --- /dev/null +++ b/firmware/target/arm/pnx0101/backlight-target.h @@ -0,0 +1,26 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: backlight-target.h 13136 2007-04-12 22:12:13Z amiconn $ + * + * Copyright (C) 2006 by Barry Wardell + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * 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 + +#define __backlight_init() true +void __backlight_on(void); +void __backlight_off(void); + +#endif diff --git a/firmware/target/arm/pnx0101/crt0-pnx0101.S b/firmware/target/arm/pnx0101/crt0-pnx0101.S new file mode 100644 index 0000000000..d11546edaa --- /dev/null +++ b/firmware/target/arm/pnx0101/crt0-pnx0101.S @@ -0,0 +1,229 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: crt0.S 11850 2006-12-29 02:49:12Z markun $ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#define ASM /* do not include structure definitions from pnx0101.h */ + +#include "config.h" +#include "cpu.h" + + .section .init.text,"ax",%progbits + + .global start +start: + +/* Arm bootloader and startup code based on startup.s from the iPodLinux loader + * + * Copyright (c) 2003, Daniel Palffy (dpalffy (at) rainstorm.org) + * Copyright (c) 2005, Bernard Leach + * + */ + + msr cpsr_c, #0xd3 /* enter supervisor mode, disable IRQ */ + +#ifndef BOOTLOADER +#ifndef DEBUG + ldr r0, =0x80105000 + mov r1, #1 + str r1, [r0, #4] + mov r1, #0 + str r1, [r0, #4] +1: ldr r1, [r0] + cmp r1, #0 + bne 1b + mov r1, #0x74 + str r1, [r0, #8] + mov r1, #2 + str r1, [r0, #0x18] + mov r1, #2 + str r1, [r0, #0x20] + mov r1, #82 + str r1, [r0, #0x28] + mov r1, #100 + str r1, [r0, #0x2c] + mov r1, #0x120 + str r1, [r0, #0x30] + mov r1, #6 + str r1, [r0, #4] + ldr r0, =1f + mov r15, r0 +1: +#endif /* !DEBUG */ + +#ifndef DEBUG + /* Copy exception handler code to address 0 */ + ldr r2, =_vectorsstart + ldr r3, =_vectorsend + ldr r4, =_vectorscopy +1: + cmp r3, r2 + ldrhi r5, [r4], #4 + strhi r5, [r2], #4 + bhi 1b +#else + ldr r1, =vectors + ldr r0, =irq_handler + str r0, [r1, #24] + ldr r0, =fiq_handler + str r0, [r1, #28] +#endif + +#ifndef STUB + /* Zero out IBSS */ + ldr r2, =_iedata + ldr r3, =_iend + mov r4, #0 +1: + cmp r3, r2 + strhi r4, [r2], #4 + bhi 1b + + /* Copy the IRAM */ + ldr r2, =_iramcopy + ldr r3, =_iramstart + ldr r4, =_iramend +1: + cmp r4, r3 + ldrhi r5, [r2], #4 + strhi r5, [r3], #4 + bhi 1b +#endif /* !STUB */ +#endif /* !BOOTLOADER */ + + /* Initialise bss section to zero */ + ldr r2, =_edata + ldr r3, =_end + mov r4, #0 +1: + cmp r3, r2 + strhi r4, [r2], #4 + bhi 1b + + /* Set up some stack and munge it with 0xdeadbeef */ + ldr sp, =stackend + mov r3, sp + ldr r2, =stackbegin + ldr r4, =0xdeadbeef +1: + cmp r3, r2 + strhi r4, [r2], #4 + bhi 1b + + /* Set up stack for IRQ mode */ + msr cpsr_c, #0xd2 + ldr sp, =irq_stack + /* Set up stack for FIQ mode */ + msr cpsr_c, #0xd1 + ldr sp, =fiq_stack + + /* Let abort and undefined modes use IRQ stack */ + msr cpsr_c, #0xd7 + ldr sp, =irq_stack + msr cpsr_c, #0xdb + ldr sp, =irq_stack + /* Switch to supervisor mode */ + msr cpsr_c, #0xd3 + ldr sp, =stackend + bl main + /* main() should never return */ + +/* Exception handlers. Will be copied to address 0 after memory remapping */ + .section .vectors,"aw" + ldr pc, [pc, #24] + ldr pc, [pc, #24] + ldr pc, [pc, #24] + ldr pc, [pc, #24] + ldr pc, [pc, #24] + ldr pc, [pc, #24] + ldr pc, [pc, #24] + ldr pc, [pc, #24] + + /* Exception vectors */ + .global vectors +vectors: + .word start + .word undef_instr_handler + .word software_int_handler + .word prefetch_abort_handler + .word data_abort_handler + .word reserved_handler + .word irq_handler + .word fiq_handler + + .text + +#ifndef STUB + .global irq + .global fiq + .global UIE +#endif + +/* All illegal exceptions call into UIE with exception address as first + parameter. This is calculated differently depending on which exception + we're in. Second parameter is exception number, used for a string lookup + in UIE. + */ +undef_instr_handler: + mov r0, lr + mov r1, #0 + b UIE + +/* We run supervisor mode most of the time, and should never see a software + exception being thrown. Perhaps make it illegal and call UIE? + */ +software_int_handler: +reserved_handler: + movs pc, lr + +prefetch_abort_handler: + sub r0, lr, #4 + mov r1, #1 + b UIE + +fiq_handler: + @ Branch straight to FIQ handler in pcm_playback.c. This also handles the + @ the correct return sequence. + stmfd sp!, {r0-r7, r12, lr} + bl fiq + ldmfd sp!, {r0-r7, r12, lr} + subs pc, lr, #4 + +data_abort_handler: + sub r0, lr, #8 + mov r1, #2 + b UIE + +irq_handler: +#ifndef STUB + stmfd sp!, {r0-r11, r12, lr} + bl irq + ldmfd sp!, {r0-r11, r12, lr} +#endif + subs pc, lr, #4 + +#ifdef STUB +UIE: + b UIE +#endif + +/* 256 words of IRQ stack */ + .space 256*4 +irq_stack: + +/* 256 words of FIQ stack */ + .space 256*4 +fiq_stack: diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c new file mode 100644 index 0000000000..79b1ad0fcb --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c @@ -0,0 +1,57 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Barry Wardell + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include "system.h" +#include "kernel.h" +#include "thread.h" +#include "adc.h" + +static unsigned short adcdata[NUM_ADC_CHANNELS]; + +unsigned short adc_read(int channel) +{ + return adcdata[channel]; +} + +static void adc_tick(void) +{ + if (ADCST & 0x10) { + adcdata[0] = ADCCH0 & 0x3ff; + adcdata[1] = ADCCH1 & 0x3ff; + adcdata[2] = ADCCH2 & 0x3ff; + adcdata[3] = ADCCH3 & 0x3ff; + adcdata[4] = ADCCH4 & 0x3ff; + ADCST = 0xa; + } +} + +void adc_init(void) +{ + ADCR24 = 0xaaaaa; + ADCR28 = 0; + ADCST = 2; + ADCST = 0xa; + + while (!(ADCST & 0x10)); + adc_tick(); + + tick_add_task(adc_tick); +} + diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h new file mode 100644 index 0000000000..8e5e6edbc5 --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h @@ -0,0 +1,29 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Barry Wardell + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#ifndef _ADC_TARGET_H_ +#define _ADC_TARGET_H_ + +#define NUM_ADC_CHANNELS 5 + +#define ADC_BUTTONS 0 +#define ADC_BATTERY 1 +#define ADC_BUTTON_PLAY 2 +#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ + +#endif diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c new file mode 100644 index 0000000000..c0dc3974c0 --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c @@ -0,0 +1,33 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Barry Wardell + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include "system.h" +#include "backlight.h" +#include "lcd.h" + +void __backlight_on(void) +{ + GPIO3_SET = 1; +} + +void __backlight_off(void) +{ + GPIO3_CLR = 1; +} diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c new file mode 100644 index 0000000000..52e29fdfdf --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c @@ -0,0 +1,89 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Barry Wardell + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#include +#include "config.h" +#include "cpu.h" +#include "system.h" +#include "button.h" +#include "kernel.h" +#include "backlight.h" +#include "adc.h" +#include "system.h" + + +void button_init_device(void) +{ + +} + +bool button_hold(void) +{ + return (GPIO5_READ & 4) ? false : true; +} + +/* + * Get button pressed from hardware + */ +int button_read_device(void) +{ + int btn = BUTTON_NONE; + int data; + static bool hold_button = false; + bool hold_button_old; + + /* normal buttons */ + hold_button_old = hold_button; + hold_button = button_hold(); + + if (hold_button != hold_button_old) + backlight_hold_changed(hold_button); + + if (!button_hold()) + { + data = adc_read(ADC_BUTTONS); + if (data < 0x35c) + { + if (data < 0x151) + if (data < 0xc7) + if (data < 0x41) + btn = BUTTON_LEFT; + else + btn = BUTTON_RIGHT; + else + btn = BUTTON_SELECT; + else + if (data < 0x268) + if (data < 0x1d7) + btn = BUTTON_UP; + else + btn = BUTTON_DOWN; + else + if (data < 0x2f9) + btn = BUTTON_EQ; + else + btn = BUTTON_MODE; + } + + if (adc_read(ADC_BUTTON_PLAY) < 0x64) + btn |= BUTTON_PLAY; + } + return btn; +} diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h new file mode 100644 index 0000000000..954a2dfe9c --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h @@ -0,0 +1,56 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Barry Wardell + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +/* Custom written for the ifp7xx */ + +#ifndef _BUTTON_TARGET_H_ +#define _BUTTON_TARGET_H_ + +#include +#include "config.h" + +#define HAS_BUTTON_HOLD + +bool button_hold(void); +void button_init_device(void); +int button_read_device(void); + +/* iriver IFP7XX specific button codes */ + +#define BUTTON_PLAY 0x00000001 +#define BUTTON_SELECT 0x00000002 + +#define BUTTON_LEFT 0x00000004 +#define BUTTON_RIGHT 0x00000008 +#define BUTTON_UP 0x00000010 +#define BUTTON_DOWN 0x00000020 + +#define BUTTON_MODE 0x00000040 +#define BUTTON_EQ 0x00000080 + +#define BUTTON_MAIN (BUTTON_PLAY|BUTTON_SELECT\ + |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_UP|BUTTON_DOWN\ + |BUTTON_MODE|BUTTON_EQ) + +#define BUTTON_REMOTE 0 + +#define POWEROFF_BUTTON BUTTON_PLAY +#define POWEROFF_COUNT 40 + +#endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c new file mode 100644 index 0000000000..0aacd8af67 --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c @@ -0,0 +1,208 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Alan Korr + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" + +#include "kernel.h" +#include "lcd.h" +#include "system.h" + +/*** definitions ***/ + +#define LCD_SET_LOWER_COLUMN_ADDRESS ((char)0x00) +#define LCD_SET_HIGHER_COLUMN_ADDRESS ((char)0x10) +#define LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO ((char)0x20) +#define LCD_SET_POWER_CONTROL_REGISTER ((char)0x28) +#define LCD_SET_DISPLAY_START_LINE ((char)0x40) +#define LCD_SET_CONTRAST_CONTROL_REGISTER ((char)0x81) +#define LCD_SET_SEGMENT_REMAP ((char)0xA0) +#define LCD_SET_LCD_BIAS ((char)0xA2) +#define LCD_SET_ENTIRE_DISPLAY_OFF ((char)0xA4) +#define LCD_SET_ENTIRE_DISPLAY_ON ((char)0xA5) +#define LCD_SET_NORMAL_DISPLAY ((char)0xA6) +#define LCD_SET_REVERSE_DISPLAY ((char)0xA7) +#define LCD_SET_MULTIPLEX_RATIO ((char)0xA8) +#define LCD_SET_BIAS_TC_OSC ((char)0xA9) +#define LCD_SET_1OVER4_BIAS_RATIO ((char)0xAA) +#define LCD_SET_INDICATOR_OFF ((char)0xAC) +#define LCD_SET_INDICATOR_ON ((char)0xAD) +#define LCD_SET_DISPLAY_OFF ((char)0xAE) +#define LCD_SET_DISPLAY_ON ((char)0xAF) +#define LCD_SET_PAGE_ADDRESS ((char)0xB0) +#define LCD_SET_COM_OUTPUT_SCAN_DIRECTION ((char)0xC0) +#define LCD_SET_TOTAL_FRAME_PHASES ((char)0xD2) +#define LCD_SET_DISPLAY_OFFSET ((char)0xD3) +#define LCD_SET_READ_MODIFY_WRITE_MODE ((char)0xE0) +#define LCD_SOFTWARE_RESET ((char)0xE2) +#define LCD_NOP ((char)0xE3) +#define LCD_SET_END_OF_READ_MODIFY_WRITE_MODE ((char)0xEE) + +/* LCD command codes */ +#define LCD_CNTL_RESET 0xe2 /* Software reset */ +#define LCD_CNTL_POWER 0x2f /* Power control */ +#define LCD_CNTL_CONTRAST 0x81 /* Contrast */ +#define LCD_CNTL_OUTSCAN 0xc8 /* Output scan direction */ +#define LCD_CNTL_SEGREMAP 0xa1 /* Segment remap */ +#define LCD_CNTL_DISPON 0xaf /* Display on */ + +#define LCD_CNTL_PAGE 0xb0 /* Page address */ +#define LCD_CNTL_HIGHCOL 0x10 /* Upper column address */ +#define LCD_CNTL_LOWCOL 0x00 /* Lower column address */ + +/*** driver routines ***/ + +void lcd_write_command(int cmd) +{ + while ((LCDSTAT & 3) != 3); + LCDCMD = cmd; +} + +void lcd_write_data( const unsigned char* data, int count ) +{ + int i; + for (i=0; i < count; i++) { + while ((LCDSTAT & 3) != 3); + LCDDATA = data[i]; + } +} + +/*** hardware configuration ***/ + +int lcd_default_contrast(void) +{ + return 45; +} + +void lcd_set_contrast(int val) +{ + lcd_write_command(LCD_CNTL_CONTRAST); + lcd_write_command(val); +} + +void lcd_set_invert_display(bool yesno) +{ + if (yesno) + lcd_write_command(LCD_SET_REVERSE_DISPLAY); + else + lcd_write_command(LCD_SET_NORMAL_DISPLAY); +} + +/* turn the display upside down (call lcd_update() afterwards) */ +void lcd_set_flip(bool yesno) +{ + if (yesno) + { + lcd_write_command(LCD_SET_SEGMENT_REMAP); + lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION); + } + else + { + lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01); + lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08); + } +} + +void lcd_init_device(void) +{ + LCDREG10 = 0xf; + LCDREG04 = 0x4084; + + /* inits like the original firmware */ + lcd_write_command(LCD_SOFTWARE_RESET); + lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4); + lcd_write_command(LCD_SET_LCD_BIAS); + lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); + /* power control register: op-amp=1, regulator=1, booster=1 */ + lcd_write_command(LCD_SET_DISPLAY_ON); + lcd_write_command(LCD_SET_NORMAL_DISPLAY); + lcd_set_flip(false); + lcd_write_command(LCD_SET_DISPLAY_START_LINE + 0); + lcd_set_contrast(lcd_default_contrast()); + lcd_write_command(LCD_SET_PAGE_ADDRESS); + lcd_write_command(LCD_SET_LOWER_COLUMN_ADDRESS + 0); + lcd_write_command(LCD_SET_HIGHER_COLUMN_ADDRESS + 0); + + lcd_clear_display(); + lcd_update(); +} + +/*** Update functions ***/ + +/* Performance function that works with an external buffer + note that by and bheight are in 8-pixel units! */ +void lcd_blit(const unsigned char* data, int x, int by, int width, + int bheight, int stride) +{ + /* Copy display bitmap to hardware */ + while (bheight--) + { + lcd_write_command (LCD_CNTL_PAGE | (by++ & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | (((x+4)>>4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | ((x+4) & 0xf)); + + lcd_write_data(data, width); + data += stride; + } +} + + +/* Update the display. + This must be called after all other LCD functions that change the display. */ +void lcd_update(void) ICODE_ATTR; +void lcd_update(void) +{ + int y; + + /* Copy display bitmap to hardware */ + for (y = 0; y < LCD_FBHEIGHT; y++) + { + lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL); + lcd_write_command (LCD_CNTL_LOWCOL | 4); + + lcd_write_data (lcd_framebuffer[y], LCD_WIDTH); + } +} + +/* Update a fraction of the display. */ +void lcd_update_rect(int, int, int, int) ICODE_ATTR; +void lcd_update_rect(int x, int y, int width, int height) +{ + int ymax; + + /* The Y coordinates have to work on even 8 pixel rows */ + ymax = (y + height-1) >> 3; + y >>= 3; + + if(x + width > LCD_WIDTH) + width = LCD_WIDTH - x; + if (width <= 0) + return; /* nothing left to do, 0 is harmful to lcd_write_data() */ + if(ymax >= LCD_FBHEIGHT) + ymax = LCD_FBHEIGHT-1; + + /* Copy specified rectange bitmap to hardware */ + for (; y <= ymax; y++) + { + lcd_write_command (LCD_CNTL_PAGE | (y & 0xf)); + lcd_write_command (LCD_CNTL_HIGHCOL | (((x+4) >> 4) & 0xf)); + lcd_write_command (LCD_CNTL_LOWCOL | ((x+4) & 0xf)); + + lcd_write_data (&lcd_framebuffer[y][x], width); + } +} diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c new file mode 100644 index 0000000000..4e4f585298 --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c @@ -0,0 +1,85 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include +#include "adc.h" +#include "kernel.h" +#include "system.h" +#include "power.h" +#include "logf.h" +#include "usb.h" + +#if CONFIG_TUNER + +static bool powered = false; + +bool radio_powered(void) +{ + return powered; +} + +bool radio_power(bool status) +{ + bool old_status = powered; + powered = status; + + return old_status; +} + +#endif /* #if CONFIG_TUNER */ + +#ifndef SIMULATOR + +void power_init(void) +{ +} + +void ide_power_enable(bool on) +{ + (void)on; + /* no ide controller */ +} + +bool ide_powered(void) +{ + return true; /* pretend always powered if not controlable */ +} + +void power_off(void) +{ + set_irq_level(HIGHEST_IRQ_LEVEL); + GPIO1_CLR = 1 << 16; + GPIO2_SET = 1; + while(1) + yield(); +} + +#else + +void power_off(void) +{ +} + +void ide_power_enable(bool on) +{ + (void)on; +} + +#endif /* SIMULATOR */ diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h new file mode 100644 index 0000000000..dc11bb74da --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h @@ -0,0 +1,34 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Alan Korr + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * 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 "system-arm.h" + +#define CPUFREQ_DEFAULT 12000000 +#define CPUFREQ_NORMAL 48000000 +#define CPUFREQ_MAX 60000000 + +typedef void (*interrupt_handler_t)(void); + +void irq_set_int_handler(int n, interrupt_handler_t handler); +void irq_enable_int(int n); +void irq_disable_int(int n); + +#endif /* SYSTEM_TARGET_H */ diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c new file mode 100644 index 0000000000..a22a227b15 --- /dev/null +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c @@ -0,0 +1,50 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Barry Wardell + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include "kernel.h" +#include "thread.h" +#include "system.h" +#include "debug.h" +#include "ata.h" +#include "fat.h" +#include "disk.h" +#include "panic.h" +#include "lcd.h" +#include "adc.h" +#include "usb.h" +#include "button.h" +#include "sprintf.h" +#include "string.h" + +void usb_init_device(void) +{ +} + +bool usb_detect(void) +{ + /* TODO: Implement USB_ISP1582 */ + return false; +} + +void usb_enable(bool on) +{ + /* TODO: Implement USB_ISP1582 */ + (void)on; +} diff --git a/firmware/target/arm/pnx0101/system-pnx0101.c b/firmware/target/arm/pnx0101/system-pnx0101.c new file mode 100644 index 0000000000..9d8bb405a8 --- /dev/null +++ b/firmware/target/arm/pnx0101/system-pnx0101.c @@ -0,0 +1,351 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: $ + * + * Copyright (C) 2007 by Tomasz Malesinski + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include +#include "pnx0101.h" +#include "system.h" + +static struct +{ + unsigned char freq; + unsigned char sys_mult; + unsigned char sys_div; + unsigned char mem_conf[9]; +} +perf_modes[3] ICONST_ATTR = +{ + {12, 4, 4, {2, 1, 1, 1, 1, 1, 1, 1, 1, 0}}, + {48, 4, 1, {5, 4, 1, 4, 4, 1, 3, 3, 1, 0}}, + {60, 5, 1, {6, 5, 1, 5, 5, 1, 4, 3, 1, 1}} +}; + +static int performance_mode, bus_divider; + +static void cgu_set_sel_stage_input(int clock, int input) +{ + int s = CGU.base_ssr[clock]; + if (s & 1) + CGU.base_fs2[clock] = input; + else + CGU.base_fs1[clock] = input; + CGU.base_scr[clock] = (s & 3) ^ 3; +} + +static void cgu_reset_sel_stage_clocks(int first_esr, int n_esr, + int first_div, int n_div) +{ + int i; + for (i = 0; i < n_esr; i++) + CGU.clk_esr[first_esr + i] = 0; + for (i = 0; i < n_div; i++) + CGU.base_fdc[first_div + i] = 0; +} + +static void cgu_configure_div(int div, int n, int m) +{ + int msub, madd, div_size, max_n; + unsigned long cfg; + + if (n == m) + { + CGU.base_fdc[div] = CGU.base_fdc[div] & ~1; + return; + } + + msub = -n; + madd = m - n; + div_size = (div == PNX0101_HIPREC_FDC) ? 10 : 8; + max_n = 1 << div_size; + while ((madd << 1) < max_n && (msub << 1) >= -max_n) + { + madd <<= 1; + msub <<= 1; + } + cfg = (((msub << div_size) | madd) << 3) | 4; + CGU.base_fdc[div] = CGU.base_fdc[div] & ~1; + CGU.base_fdc[div] = cfg | 2; + CGU.base_fdc[div] = cfg; + CGU.base_fdc[div] = cfg | 1; +} + +static void cgu_connect_div_to_clock(int rel_div, int esr) +{ + CGU.clk_esr[esr] = (rel_div << 1) | 1; +} + +static void cgu_disconnect_div_from_clock(int esr) +{ + CGU.clk_esr[esr] = 0; +} + +static void cgu_enable_clock(int clock) +{ + CGU.clk_pcr[clock] |= 1; +} + +static void cgu_start_sel_stage_dividers(int bcr) +{ + CGU.base_bcr[bcr] = 1; +} + +/* Convert a pointer that points to IRAM (0x4xxxx) to a pointer that + points to the uncached page (0x0xxxx) that is also mapped to IRAM. */ +static inline void *noncached(void *p) { + return (void *)(((unsigned long)p) & 0xffff); +} + +/* TODO: if it works, then comment it */ +static void do_set_mem_timings(int mode) ICODE_ATTR; +static void do_set_mem_timings(int mode) +{ + unsigned char *mem_conf = noncached(perf_modes[mode].mem_conf); + int old_irq = set_irq_level(HIGHEST_IRQ_LEVEL); + while ((EMC.status & 3) != 0); + EMC.control = 5; + EMCSTATIC0.waitrd = mem_conf[0]; + EMCSTATIC0.waitwr = mem_conf[1]; + EMCSTATIC1.waitrd = mem_conf[3]; + EMCSTATIC1.waitwr = mem_conf[4]; + EMCSTATIC2.waitrd = mem_conf[6]; + EMCSTATIC2.waitwr = mem_conf[7]; + EMCSTATIC0.waitoen = mem_conf[2]; + EMCSTATIC1.waitoen = mem_conf[5]; + EMCSTATIC2.waitoen = mem_conf[8]; +#ifndef DEBUG + EMCSTATIC1.config = mem_conf[9] ? 0x80081 : 0x81; +#endif + EMC.control = 1; + set_irq_level(old_irq); +} + +static void emc_set_mem_timings(int mode) { + void (*f)(int) = noncached(do_set_mem_timings); + (*f)(mode); +} + +/* +static void do_enable_write_buffers(int on) ICODE_ATTR; +static void do_enable_write_buffers(int on) { + int old_irq = set_irq_level(HIGHEST_IRQ_LEVEL); + while ((EMC.status & 3) != 0); + EMC.control = 5; + EMCSTATIC1.config = on ? 0x80081 : 0x81; + EMC.control = 1; + set_irq_level(old_irq); +} + +void emc_enable_write_buffers(int on) { + void (*f)(int) = noncached(do_enable_write_buffers); + (*f)(on); +} +*/ + +/* can it be replaced? */ +static void cgu_busy_wait(int n) +{ + while (n > 0) + { + n--; + } +} + +static void cgu_set_sys_mult(int i) +{ + cgu_set_sel_stage_input(PNX0101_SEL_STAGE_SYS, PNX0101_MAIN_CLOCK_FAST); + cgu_set_sel_stage_input(PNX0101_SEL_STAGE_APB3, PNX0101_MAIN_CLOCK_FAST); + + PLL.lppdn = 1; + PLL.lpfin = 1; + PLL.lpmbyp = 0; + PLL.lpdbyp = 0; + PLL.lppsel = 1; + PLL.lpmsel = i - 1; + PLL.lppdn = 0; + while (!PLL.lplock); + + cgu_configure_div(PNX0101_FIRST_DIV_SYS + 1, 1, (i == 5) ? 15 : 12); + cgu_connect_div_to_clock(1, 0x11); + cgu_enable_clock(0x11); + cgu_start_sel_stage_dividers(PNX0101_BCR_SYS); + + cgu_set_sel_stage_input(PNX0101_SEL_STAGE_SYS, + PNX0101_MAIN_CLOCK_MAIN_PLL); + cgu_set_sel_stage_input(PNX0101_SEL_STAGE_APB3, + PNX0101_MAIN_CLOCK_MAIN_PLL); +} + +static void pnx0101_set_performance_mode(int mode) +{ + int old = performance_mode; + if (perf_modes[old].freq < perf_modes[mode].freq) + { + emc_set_mem_timings(mode); + if (perf_modes[old].sys_mult != perf_modes[mode].sys_mult) + cgu_set_sys_mult(perf_modes[mode].sys_mult); + if (perf_modes[old].sys_div != perf_modes[mode].sys_div) + cgu_configure_div(bus_divider, 1, perf_modes[mode].sys_div); + } + else if (perf_modes[old].freq > perf_modes[mode].freq) + { + if (perf_modes[old].sys_mult != perf_modes[mode].sys_mult) + cgu_set_sys_mult(perf_modes[mode].sys_mult); + if (perf_modes[old].sys_div != perf_modes[mode].sys_div) + cgu_configure_div(bus_divider, 1, perf_modes[mode].sys_div); + emc_set_mem_timings(mode); + } + performance_mode = mode; +} + +static void pnx0101_init_clocks(void) +{ + bus_divider = PNX0101_FIRST_DIV_SYS + (CGU.clk_esr[0] >> 1); + performance_mode = 0; + pnx0101_set_performance_mode(2); +/* +#ifndef DEBUG + emc_enable_write_buffers(1); +#endif +*/ + cgu_set_sel_stage_input(PNX0101_SEL_STAGE_APB1, + PNX0101_MAIN_CLOCK_FAST); + cgu_reset_sel_stage_clocks(PNX0101_FIRST_ESR_APB1, PNX0101_N_ESR_APB1, + PNX0101_FIRST_DIV_APB1, PNX0101_N_DIV_APB1); + cgu_configure_div(PNX0101_FIRST_DIV_APB1, 1, 4); + cgu_connect_div_to_clock(0, PNX0101_ESR_APB1); + cgu_connect_div_to_clock(0, PNX0101_ESR_T0); + cgu_connect_div_to_clock(0, PNX0101_ESR_T1); + cgu_connect_div_to_clock(0, PNX0101_ESR_I2C); + cgu_enable_clock(PNX0101_CLOCK_APB1); + cgu_enable_clock(PNX0101_CLOCK_T0); + cgu_enable_clock(PNX0101_CLOCK_T1); + cgu_enable_clock(PNX0101_CLOCK_I2C); +} + +#ifdef HAVE_ADJUSTABLE_CPU_FREQ +void set_cpu_frequency(long frequency) +{ + switch (frequency) + { + case CPUFREQ_MAX: + pnx0101_set_performance_mode(2); + cpu_frequency = CPUFREQ_MAX; + break; + case CPUFREQ_NORMAL: + pnx0101_set_performance_mode(1); + cpu_frequency = CPUFREQ_NORMAL; + break; + case CPUFREQ_DEFAULT: + default: + pnx0101_set_performance_mode(0); + cpu_frequency = CPUFREQ_DEFAULT; + break; + } + +} +#endif + +interrupt_handler_t interrupt_vector[0x1d] __attribute__ ((section(".idata"))); + +#define IRQ_READ(reg, dest) \ + do { unsigned long v2; \ + do { \ + dest = (reg); \ + v2 = (reg); \ + } while ((dest != v2)); \ + } while (0); + +#define IRQ_WRITE_WAIT(reg, val, cond) \ + do { unsigned long v, v2; \ + do { \ + (reg) = (val); \ + v = (reg); \ + v2 = (reg); \ + } while ((v != v2) || !(cond)); \ + } while (0); + +static void undefined_int(void) +{ +} + +void irq(void) +{ + int n; + IRQ_READ(INTVECTOR[0], n) + (*(interrupt_vector[n >> 3]))(); +} + +void fiq(void) +{ +} + +void irq_enable_int(int n) +{ + IRQ_WRITE_WAIT(INTREQ[n], INTREQ_WEENABLE | INTREQ_ENABLE, v & 0x10000); +} + +void irq_disable_int(int n) +{ + IRQ_WRITE_WAIT(INTREQ[n], INTREQ_WEENABLE, (v & 0x10000) == 0); +} + +void irq_set_int_handler(int n, interrupt_handler_t handler) +{ + interrupt_vector[n] = handler; +} + +void system_init(void) +{ + int i; + + /* turn off watchdog */ + (*(volatile unsigned long *)0x80002804) = 0; + + /* + IRQ_WRITE_WAIT(INTVECTOR[0], 0, v == 0); + IRQ_WRITE_WAIT(INTVECTOR[1], 0, v == 0); + IRQ_WRITE_WAIT(INTPRIOMASK[0], 0, v == 0); + IRQ_WRITE_WAIT(INTPRIOMASK[1], 0, v == 0); + */ + + for (i = 0; i < 0x1c; i++) + { + IRQ_WRITE_WAIT(INTREQ[i], + INTREQ_WEPRIO | INTREQ_WETARGET | + INTREQ_WEENABLE | INTREQ_WEACTVLO | 1, + (v & 0x3010f) == 1); + IRQ_WRITE_WAIT(INTREQ[i], INTREQ_WEENABLE, (v & 0x10000) == 0); + IRQ_WRITE_WAIT(INTREQ[i], INTREQ_WEPRIO | 1, (v & 0xf) == 1); + interrupt_vector[i + 1] = undefined_int; + } + interrupt_vector[0] = undefined_int; + pnx0101_init_clocks(); +} + + +void system_reboot(void) +{ + (*(volatile unsigned long *)0x80002804) = 1; + while (1); +} + +int system_memory_guard(int newmode) +{ + (void)newmode; + return 0; +} diff --git a/firmware/target/arm/pnx0101/usb-target.h b/firmware/target/arm/pnx0101/usb-target.h new file mode 100644 index 0000000000..fb263b2419 --- /dev/null +++ b/firmware/target/arm/pnx0101/usb-target.h @@ -0,0 +1,27 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: usb-target.h 11494 2006-11-10 07:43:36Z tomal $ + * + * Copyright (C) 2006 by Barry Wardelll + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +/* Based off x5 version */ + +#ifndef USB_TARGET_H +#define USB_TARGET_H + +bool usb_init_device(void); + +#endif diff --git a/firmware/target/arm/system-pnx0101.c b/firmware/target/arm/system-pnx0101.c deleted file mode 100644 index 9d8bb405a8..0000000000 --- a/firmware/target/arm/system-pnx0101.c +++ /dev/null @@ -1,351 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: $ - * - * Copyright (C) 2007 by Tomasz Malesinski - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include "pnx0101.h" -#include "system.h" - -static struct -{ - unsigned char freq; - unsigned char sys_mult; - unsigned char sys_div; - unsigned char mem_conf[9]; -} -perf_modes[3] ICONST_ATTR = -{ - {12, 4, 4, {2, 1, 1, 1, 1, 1, 1, 1, 1, 0}}, - {48, 4, 1, {5, 4, 1, 4, 4, 1, 3, 3, 1, 0}}, - {60, 5, 1, {6, 5, 1, 5, 5, 1, 4, 3, 1, 1}} -}; - -static int performance_mode, bus_divider; - -static void cgu_set_sel_stage_input(int clock, int input) -{ - int s = CGU.base_ssr[clock]; - if (s & 1) - CGU.base_fs2[clock] = input; - else - CGU.base_fs1[clock] = input; - CGU.base_scr[clock] = (s & 3) ^ 3; -} - -static void cgu_reset_sel_stage_clocks(int first_esr, int n_esr, - int first_div, int n_div) -{ - int i; - for (i = 0; i < n_esr; i++) - CGU.clk_esr[first_esr + i] = 0; - for (i = 0; i < n_div; i++) - CGU.base_fdc[first_div + i] = 0; -} - -static void cgu_configure_div(int div, int n, int m) -{ - int msub, madd, div_size, max_n; - unsigned long cfg; - - if (n == m) - { - CGU.base_fdc[div] = CGU.base_fdc[div] & ~1; - return; - } - - msub = -n; - madd = m - n; - div_size = (div == PNX0101_HIPREC_FDC) ? 10 : 8; - max_n = 1 << div_size; - while ((madd << 1) < max_n && (msub << 1) >= -max_n) - { - madd <<= 1; - msub <<= 1; - } - cfg = (((msub << div_size) | madd) << 3) | 4; - CGU.base_fdc[div] = CGU.base_fdc[div] & ~1; - CGU.base_fdc[div] = cfg | 2; - CGU.base_fdc[div] = cfg; - CGU.base_fdc[div] = cfg | 1; -} - -static void cgu_connect_div_to_clock(int rel_div, int esr) -{ - CGU.clk_esr[esr] = (rel_div << 1) | 1; -} - -static void cgu_disconnect_div_from_clock(int esr) -{ - CGU.clk_esr[esr] = 0; -} - -static void cgu_enable_clock(int clock) -{ - CGU.clk_pcr[clock] |= 1; -} - -static void cgu_start_sel_stage_dividers(int bcr) -{ - CGU.base_bcr[bcr] = 1; -} - -/* Convert a pointer that points to IRAM (0x4xxxx) to a pointer that - points to the uncached page (0x0xxxx) that is also mapped to IRAM. */ -static inline void *noncached(void *p) { - return (void *)(((unsigned long)p) & 0xffff); -} - -/* TODO: if it works, then comment it */ -static void do_set_mem_timings(int mode) ICODE_ATTR; -static void do_set_mem_timings(int mode) -{ - unsigned char *mem_conf = noncached(perf_modes[mode].mem_conf); - int old_irq = set_irq_level(HIGHEST_IRQ_LEVEL); - while ((EMC.status & 3) != 0); - EMC.control = 5; - EMCSTATIC0.waitrd = mem_conf[0]; - EMCSTATIC0.waitwr = mem_conf[1]; - EMCSTATIC1.waitrd = mem_conf[3]; - EMCSTATIC1.waitwr = mem_conf[4]; - EMCSTATIC2.waitrd = mem_conf[6]; - EMCSTATIC2.waitwr = mem_conf[7]; - EMCSTATIC0.waitoen = mem_conf[2]; - EMCSTATIC1.waitoen = mem_conf[5]; - EMCSTATIC2.waitoen = mem_conf[8]; -#ifndef DEBUG - EMCSTATIC1.config = mem_conf[9] ? 0x80081 : 0x81; -#endif - EMC.control = 1; - set_irq_level(old_irq); -} - -static void emc_set_mem_timings(int mode) { - void (*f)(int) = noncached(do_set_mem_timings); - (*f)(mode); -} - -/* -static void do_enable_write_buffers(int on) ICODE_ATTR; -static void do_enable_write_buffers(int on) { - int old_irq = set_irq_level(HIGHEST_IRQ_LEVEL); - while ((EMC.status & 3) != 0); - EMC.control = 5; - EMCSTATIC1.config = on ? 0x80081 : 0x81; - EMC.control = 1; - set_irq_level(old_irq); -} - -void emc_enable_write_buffers(int on) { - void (*f)(int) = noncached(do_enable_write_buffers); - (*f)(on); -} -*/ - -/* can it be replaced? */ -static void cgu_busy_wait(int n) -{ - while (n > 0) - { - n--; - } -} - -static void cgu_set_sys_mult(int i) -{ - cgu_set_sel_stage_input(PNX0101_SEL_STAGE_SYS, PNX0101_MAIN_CLOCK_FAST); - cgu_set_sel_stage_input(PNX0101_SEL_STAGE_APB3, PNX0101_MAIN_CLOCK_FAST); - - PLL.lppdn = 1; - PLL.lpfin = 1; - PLL.lpmbyp = 0; - PLL.lpdbyp = 0; - PLL.lppsel = 1; - PLL.lpmsel = i - 1; - PLL.lppdn = 0; - while (!PLL.lplock); - - cgu_configure_div(PNX0101_FIRST_DIV_SYS + 1, 1, (i == 5) ? 15 : 12); - cgu_connect_div_to_clock(1, 0x11); - cgu_enable_clock(0x11); - cgu_start_sel_stage_dividers(PNX0101_BCR_SYS); - - cgu_set_sel_stage_input(PNX0101_SEL_STAGE_SYS, - PNX0101_MAIN_CLOCK_MAIN_PLL); - cgu_set_sel_stage_input(PNX0101_SEL_STAGE_APB3, - PNX0101_MAIN_CLOCK_MAIN_PLL); -} - -static void pnx0101_set_performance_mode(int mode) -{ - int old = performance_mode; - if (perf_modes[old].freq < perf_modes[mode].freq) - { - emc_set_mem_timings(mode); - if (perf_modes[old].sys_mult != perf_modes[mode].sys_mult) - cgu_set_sys_mult(perf_modes[mode].sys_mult); - if (perf_modes[old].sys_div != perf_modes[mode].sys_div) - cgu_configure_div(bus_divider, 1, perf_modes[mode].sys_div); - } - else if (perf_modes[old].freq > perf_modes[mode].freq) - { - if (perf_modes[old].sys_mult != perf_modes[mode].sys_mult) - cgu_set_sys_mult(perf_modes[mode].sys_mult); - if (perf_modes[old].sys_div != perf_modes[mode].sys_div) - cgu_configure_div(bus_divider, 1, perf_modes[mode].sys_div); - emc_set_mem_timings(mode); - } - performance_mode = mode; -} - -static void pnx0101_init_clocks(void) -{ - bus_divider = PNX0101_FIRST_DIV_SYS + (CGU.clk_esr[0] >> 1); - performance_mode = 0; - pnx0101_set_performance_mode(2); -/* -#ifndef DEBUG - emc_enable_write_buffers(1); -#endif -*/ - cgu_set_sel_stage_input(PNX0101_SEL_STAGE_APB1, - PNX0101_MAIN_CLOCK_FAST); - cgu_reset_sel_stage_clocks(PNX0101_FIRST_ESR_APB1, PNX0101_N_ESR_APB1, - PNX0101_FIRST_DIV_APB1, PNX0101_N_DIV_APB1); - cgu_configure_div(PNX0101_FIRST_DIV_APB1, 1, 4); - cgu_connect_div_to_clock(0, PNX0101_ESR_APB1); - cgu_connect_div_to_clock(0, PNX0101_ESR_T0); - cgu_connect_div_to_clock(0, PNX0101_ESR_T1); - cgu_connect_div_to_clock(0, PNX0101_ESR_I2C); - cgu_enable_clock(PNX0101_CLOCK_APB1); - cgu_enable_clock(PNX0101_CLOCK_T0); - cgu_enable_clock(PNX0101_CLOCK_T1); - cgu_enable_clock(PNX0101_CLOCK_I2C); -} - -#ifdef HAVE_ADJUSTABLE_CPU_FREQ -void set_cpu_frequency(long frequency) -{ - switch (frequency) - { - case CPUFREQ_MAX: - pnx0101_set_performance_mode(2); - cpu_frequency = CPUFREQ_MAX; - break; - case CPUFREQ_NORMAL: - pnx0101_set_performance_mode(1); - cpu_frequency = CPUFREQ_NORMAL; - break; - case CPUFREQ_DEFAULT: - default: - pnx0101_set_performance_mode(0); - cpu_frequency = CPUFREQ_DEFAULT; - break; - } - -} -#endif - -interrupt_handler_t interrupt_vector[0x1d] __attribute__ ((section(".idata"))); - -#define IRQ_READ(reg, dest) \ - do { unsigned long v2; \ - do { \ - dest = (reg); \ - v2 = (reg); \ - } while ((dest != v2)); \ - } while (0); - -#define IRQ_WRITE_WAIT(reg, val, cond) \ - do { unsigned long v, v2; \ - do { \ - (reg) = (val); \ - v = (reg); \ - v2 = (reg); \ - } while ((v != v2) || !(cond)); \ - } while (0); - -static void undefined_int(void) -{ -} - -void irq(void) -{ - int n; - IRQ_READ(INTVECTOR[0], n) - (*(interrupt_vector[n >> 3]))(); -} - -void fiq(void) -{ -} - -void irq_enable_int(int n) -{ - IRQ_WRITE_WAIT(INTREQ[n], INTREQ_WEENABLE | INTREQ_ENABLE, v & 0x10000); -} - -void irq_disable_int(int n) -{ - IRQ_WRITE_WAIT(INTREQ[n], INTREQ_WEENABLE, (v & 0x10000) == 0); -} - -void irq_set_int_handler(int n, interrupt_handler_t handler) -{ - interrupt_vector[n] = handler; -} - -void system_init(void) -{ - int i; - - /* turn off watchdog */ - (*(volatile unsigned long *)0x80002804) = 0; - - /* - IRQ_WRITE_WAIT(INTVECTOR[0], 0, v == 0); - IRQ_WRITE_WAIT(INTVECTOR[1], 0, v == 0); - IRQ_WRITE_WAIT(INTPRIOMASK[0], 0, v == 0); - IRQ_WRITE_WAIT(INTPRIOMASK[1], 0, v == 0); - */ - - for (i = 0; i < 0x1c; i++) - { - IRQ_WRITE_WAIT(INTREQ[i], - INTREQ_WEPRIO | INTREQ_WETARGET | - INTREQ_WEENABLE | INTREQ_WEACTVLO | 1, - (v & 0x3010f) == 1); - IRQ_WRITE_WAIT(INTREQ[i], INTREQ_WEENABLE, (v & 0x10000) == 0); - IRQ_WRITE_WAIT(INTREQ[i], INTREQ_WEPRIO | 1, (v & 0xf) == 1); - interrupt_vector[i + 1] = undefined_int; - } - interrupt_vector[0] = undefined_int; - pnx0101_init_clocks(); -} - - -void system_reboot(void) -{ - (*(volatile unsigned long *)0x80002804) = 1; - while (1); -} - -int system_memory_guard(int newmode) -{ - (void)newmode; - return 0; -} -- cgit v1.2.3