devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Move the PP5020 ADC defines to the c-file instead of repeating them across the header files. Also, the Tatung TPJ1022 should use the common PP5020 ADC driver.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19864 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Mark Arigo 2009-01-27 03:19:57 +00:00
parent a4e7bc383e
commit 04992ef050
7 changed files with 7 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/SOURCES
View file

@ -857,7 +857,7 @@ target/arm/ata-as-arm.S
target/arm/ata-pp5020.c
target/arm/wmcodec-pp.c
target/arm/i2s-pp.c
target/arm/tatung/tpj1022/adc-tpj1022.c
target/arm/adc-pp5020.c
target/arm/tatung/tpj1022/backlight-tpj1022.c
target/arm/tatung/tpj1022/button-tpj1022.c
target/arm/tatung/tpj1022/lcd-tpj1022.c

6
firmware/target/arm/adc-pp5020.c
View file

@ -25,6 +25,12 @@
#include "thread.h"
#include "adc.h"
#define ADC_ADDR (*(volatile unsigned long*)(0x7000ad00))
#define ADC_STATUS (*(volatile unsigned long*)(0x7000ad04))
#define ADC_DATA_1 (*(volatile unsigned long*)(0x7000ad20))
#define ADC_DATA_2 (*(volatile unsigned long*)(0x7000ad24))
#define ADC_INIT (*(volatile unsigned long*)(0x7000ad2c))
static unsigned short adcdata[NUM_ADC_CHANNELS];
/* Scan ADC so that adcdata[channel] gets updated. */

6
firmware/target/arm/iriver/h10/adc-target.h
View file

@ -21,12 +21,6 @@
#ifndef _ADC_TARGET_H_
#define _ADC_TARGET_H_
#define ADC_ADDR (*(volatile unsigned long*)(0x7000ad00))
#define ADC_STATUS (*(volatile unsigned long*)(0x7000ad04))
#define ADC_DATA_1 (*(volatile unsigned long*)(0x7000ad20))
#define ADC_DATA_2 (*(volatile unsigned long*)(0x7000ad24))
#define ADC_INIT (*(volatile unsigned long*)(0x7000ad2c))
#define NUM_ADC_CHANNELS 4
#define ADC_BATTERY 0

6
firmware/target/arm/olympus/mrobe-100/adc-target.h
View file

@ -21,12 +21,6 @@
#ifndef _ADC_TARGET_H_
#define _ADC_TARGET_H_
#define ADC_ADDR (*(volatile unsigned long*)(0x7000ad00))
#define ADC_STATUS (*(volatile unsigned long*)(0x7000ad04))
#define ADC_DATA_1 (*(volatile unsigned long*)(0x7000ad20))
#define ADC_DATA_2 (*(volatile unsigned long*)(0x7000ad24))
#define ADC_INIT (*(volatile unsigned long*)(0x7000ad2c))
#define NUM_ADC_CHANNELS 4
#define ADC_BATTERY 0

6
firmware/target/arm/philips/hdd1630/adc-target.h
View file

@ -21,12 +21,6 @@
#ifndef _ADC_TARGET_H_
#define _ADC_TARGET_H_
#define ADC_ADDR (*(volatile unsigned long*)(0x7000ad00))
#define ADC_STATUS (*(volatile unsigned long*)(0x7000ad04))
#define ADC_DATA_1 (*(volatile unsigned long*)(0x7000ad20))
#define ADC_DATA_2 (*(volatile unsigned long*)(0x7000ad24))
#define ADC_INIT (*(volatile unsigned long*)(0x7000ad2c))
#define NUM_ADC_CHANNELS 4
#define ADC_BATTERY 0

9
firmware/target/arm/tatung/tpj1022/adc-target.h
View file

@ -21,15 +21,6 @@
#ifndef _ADC_TARGET_H_
#define _ADC_TARGET_H_
#define ADC_ENABLE_ADDR (*(volatile unsigned long*)(0x70000010))
#define ADC_ENABLE 0x1100
#define ADC_ADDR (*(volatile unsigned long*)(0x7000ad00))
#define ADC_STATUS (*(volatile unsigned long*)(0x7000ad04))
#define ADC_DATA_1 (*(volatile unsigned long*)(0x7000ad20))
#define ADC_DATA_2 (*(volatile unsigned long*)(0x7000ad24))
#define ADC_INIT (*(volatile unsigned long*)(0x7000ad2c))
#define NUM_ADC_CHANNELS 4
#define ADC_BATTERY 0

103
firmware/target/arm/tatung/tpj1022/adc-tpj1022.c
View file

@ -1,103 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2006 by Barry Wardell
*
* 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 "cpu.h"
#include "system.h"
#include "kernel.h"
#include "thread.h"
#include "adc.h"
static unsigned short adcdata[NUM_ADC_CHANNELS];
/* Scan ADC so that adcdata[channel] gets updated */
unsigned short adc_scan(int channel)
{
unsigned int adc_data_1;
unsigned int adc_data_2;
/* Initialise */
ADC_ADDR=0x130;
ADC_STATUS=0; /* 4 bytes, 1 per channel. Each byte is 0 if the channel is
off, 0x40 if the channel is on */
/* Enable Channel */
ADC_ADDR |= (0x1000000<<channel);
/* Start? */
ADC_ADDR |= 0x20000000;
ADC_ADDR |= 0x80000000;
/* ADC_DATA_1 and ADC_DATA_2 are both four bytes, one byte per channel.
For each channel, ADC_DATA_1 stores the 8-bit msb, ADC_DATA_2 stores the
2-bit lsb (in bits 0 and 1). Each channel is 10 bits total. */
adc_data_1 = ((ADC_DATA_1 >> (8*channel)) & 0xff);
adc_data_2 = ((ADC_DATA_2 >> (8*channel+6)) & 0x3);
adcdata[channel] = (adc_data_1<<2 | adc_data_2);
return adcdata[channel];
}
/* Read 10-bit channel data */
unsigned short adc_read(int channel)
{
return adcdata[channel];
}
static int adc_counter;
static void adc_tick(void)
{
if(++adc_counter == HZ)
{
adc_counter = 0;
adc_scan(ADC_BATTERY);
adc_scan(ADC_UNKNOWN_1);
adc_scan(ADC_UNKNOWN_2);
adc_scan(ADC_SCROLLPAD);
}
}
void adc_init(void)
{
/* Enable ADC */
ADC_ENABLE_ADDR |= ADC_ENABLE;
/* Initialise */
ADC_INIT=0;
ADC_ADDR=0x130;
ADC_STATUS=0;
/* Enable Channels 1-4 */
ADC_ADDR |= 0x1000000;
ADC_ADDR |= 0x2000000;
ADC_ADDR |= 0x4000000;
ADC_ADDR |= 0x8000000;
/* Start? */
ADC_ADDR |= 0x20000000;
ADC_ADDR |= 0x80000000;
/* Wait 50ms for things to settle */
sleep(HZ/20);
tick_add_task(adc_tick);
}