diff options
-rw-r--r-- | firmware/export/i2c-pp.h (renamed from firmware/export/i2c-pp5002.h) | 6 | ||||
-rw-r--r-- | firmware/export/i2c-pp5020.h | 46 | ||||
-rw-r--r-- | firmware/target/arm/i2c-pp.c | 6 |
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 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * PP5002 i2c driver | 21 | * PortalPlayer i2c driver |
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #ifndef _I2C_PP5002_H | 25 | #ifndef _I2C_PP_H |
26 | #define _I2C_PP5002_H | 26 | #define _I2C_PP_H |
27 | 27 | ||
28 | #define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00)) | 28 | #define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00)) |
29 | #define I2C_ADDR (*(volatile unsigned char*)(I2C_BASE+0x04)) | 29 | #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 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 by Linus Nielsen Feltzing | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | /* | ||
21 | * PP5020 i2c driver | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #ifndef _I2C_PP5020_H | ||
26 | #define _I2C_PP5020_H | ||
27 | |||
28 | #define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00)) | ||
29 | #define I2C_ADDR (*(volatile unsigned char*)(I2C_BASE+0x04)) | ||
30 | #define I2C_DATA(X) (*(volatile unsigned char*)(I2C_BASE+0xc+(4*X))) | ||
31 | #define I2C_STATUS (*(volatile unsigned char*)(I2C_BASE+0x1c)) | ||
32 | |||
33 | /* I2C_CTRL bit definitions */ | ||
34 | #define I2C_SEND 0x80 | ||
35 | |||
36 | /* I2C_STATUS bit definitions */ | ||
37 | #define I2C_BUSY (1<<6) | ||
38 | |||
39 | /* TODO: Fully implement i2c driver */ | ||
40 | |||
41 | void i2c_init(void); | ||
42 | int i2c_readbyte(unsigned int dev_addr, int addr); | ||
43 | int pp_i2c_send(unsigned int addr, int data0, int data1); | ||
44 | int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data); | ||
45 | |||
46 | #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 @@ | |||
28 | #include "kernel.h" | 28 | #include "kernel.h" |
29 | #include "logf.h" | 29 | #include "logf.h" |
30 | #include "system.h" | 30 | #include "system.h" |
31 | #if CONFIG_I2C == I2C_PP5002 | 31 | #include "i2c-pp.h" |
32 | #include "i2c-pp5002.h" | ||
33 | #else | ||
34 | #include "i2c-pp5020.h" | ||
35 | #endif | ||
36 | 32 | ||
37 | /* Local functions definitions */ | 33 | /* Local functions definitions */ |
38 | 34 | ||