summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorDaniel Ankers <dan@weirdo.org.uk>2007-01-27 20:09:57 +0000
committerDaniel Ankers <dan@weirdo.org.uk>2007-01-27 20:09:57 +0000
commitec0a362ea29be4254f49da67c7154fb73fedd75d (patch)
treef50aabb7302fa4ad6691540c94555e3beb9aa530 /firmware
parente80470e9583e87ba0cedf7e40884265a462ac5ba (diff)
downloadrockbox-ec0a362ea29be4254f49da67c7154fb73fedd75d.tar.gz
rockbox-ec0a362ea29be4254f49da67c7154fb73fedd75d.tar.bz2
rockbox-ec0a362ea29be4254f49da67c7154fb73fedd75d.zip
More PortalPlayer I2C unification work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12128 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/i2c-pp.h (renamed from firmware/export/i2c-pp5002.h)6
-rw-r--r--firmware/export/i2c-pp5020.h46
-rw-r--r--firmware/target/arm/i2c-pp.c6
3 files changed, 4 insertions, 54 deletions
diff --git a/firmware/export/i2c-pp5002.h b/firmware/export/i2c-pp.h
index 58324035a5..1dc5bc358a 100644
--- a/firmware/export/i2c-pp5002.h
+++ b/firmware/export/i2c-pp.h
@@ -18,12 +18,12 @@
****************************************************************************/
/*
- * PP5002 i2c driver
+ * PortalPlayer i2c driver
*
*/
-#ifndef _I2C_PP5002_H
-#define _I2C_PP5002_H
+#ifndef _I2C_PP_H
+#define _I2C_PP_H
#define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00))
#define I2C_ADDR (*(volatile unsigned char*)(I2C_BASE+0x04))
diff --git a/firmware/export/i2c-pp5020.h b/firmware/export/i2c-pp5020.h
deleted file mode 100644
index c52d07d24f..0000000000
--- a/firmware/export/i2c-pp5020.h
+++ /dev/null
@@ -1,46 +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.
- *
- ****************************************************************************/
-
-/*
- * PP5020 i2c driver
- *
- */
-
-#ifndef _I2C_PP5020_H
-#define _I2C_PP5020_H
-
-#define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00))
-#define I2C_ADDR (*(volatile unsigned char*)(I2C_BASE+0x04))
-#define I2C_DATA(X) (*(volatile unsigned char*)(I2C_BASE+0xc+(4*X)))
-#define I2C_STATUS (*(volatile unsigned char*)(I2C_BASE+0x1c))
-
-/* I2C_CTRL bit definitions */
-#define I2C_SEND 0x80
-
-/* I2C_STATUS bit definitions */
-#define I2C_BUSY (1<<6)
-
-/* TODO: Fully implement i2c driver */
-
-void i2c_init(void);
-int i2c_readbyte(unsigned int dev_addr, int addr);
-int pp_i2c_send(unsigned int addr, int data0, int data1);
-int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data);
-
-#endif
diff --git a/firmware/target/arm/i2c-pp.c b/firmware/target/arm/i2c-pp.c
index 0c8aec8f4b..924eb790a5 100644
--- a/firmware/target/arm/i2c-pp.c
+++ b/firmware/target/arm/i2c-pp.c
@@ -28,11 +28,7 @@
#include "kernel.h"
#include "logf.h"
#include "system.h"
-#if CONFIG_I2C == I2C_PP5002
-#include "i2c-pp5002.h"
-#else
-#include "i2c-pp5020.h"
-#endif
+#include "i2c-pp.h"
/* Local functions definitions */