diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-05-21 14:31:47 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-05-21 14:31:47 +0000 |
commit | c0859f04be72b3083e7f9e2a6abbc3700cc81715 (patch) | |
tree | b005513b49a23b6c6106d93be545e69437921e4e | |
parent | ab222c170562ba2f89827c2e3185ae359eface76 (diff) | |
download | rockbox-c0859f04be72b3083e7f9e2a6abbc3700cc81715.tar.gz rockbox-c0859f04be72b3083e7f9e2a6abbc3700cc81715.zip |
Move private #defines from i2c-pp.h to i2c-pp.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21014 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/i2c-pp.h | 11 | ||||
-rw-r--r-- | firmware/target/arm/i2c-pp.c | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/firmware/export/i2c-pp.h b/firmware/export/i2c-pp.h index 55e84b65a4..f126fa812d 100644 --- a/firmware/export/i2c-pp.h +++ b/firmware/export/i2c-pp.h | |||
@@ -34,17 +34,6 @@ | |||
34 | #ifndef _I2C_PP_H | 34 | #ifndef _I2C_PP_H |
35 | #define _I2C_PP_H | 35 | #define _I2C_PP_H |
36 | 36 | ||
37 | #define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00)) | ||
38 | #define I2C_ADDR (*(volatile unsigned char*)(I2C_BASE+0x04)) | ||
39 | #define I2C_DATA(X) (*(volatile unsigned char*)(I2C_BASE+0xc+(4*X))) | ||
40 | #define I2C_STATUS (*(volatile unsigned char*)(I2C_BASE+0x1c)) | ||
41 | |||
42 | /* I2C_CTRL bit definitions */ | ||
43 | #define I2C_SEND 0x80 | ||
44 | |||
45 | /* I2C_STATUS bit definitions */ | ||
46 | #define I2C_BUSY (1<<6) | ||
47 | |||
48 | /* TODO: Fully implement i2c driver */ | 37 | /* TODO: Fully implement i2c driver */ |
49 | 38 | ||
50 | /* To be used by drivers that need to do multiple i2c operations | 39 | /* To be used by drivers that need to do multiple i2c operations |
diff --git a/firmware/target/arm/i2c-pp.c b/firmware/target/arm/i2c-pp.c index fef2082e60..b162606680 100644 --- a/firmware/target/arm/i2c-pp.c +++ b/firmware/target/arm/i2c-pp.c | |||
@@ -36,6 +36,17 @@ | |||
36 | #include "ascodec.h" | 36 | #include "ascodec.h" |
37 | #include "as3514.h" | 37 | #include "as3514.h" |
38 | 38 | ||
39 | #define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00)) | ||
40 | #define I2C_ADDR (*(volatile unsigned char*)(I2C_BASE+0x04)) | ||
41 | #define I2C_DATA(X) (*(volatile unsigned char*)(I2C_BASE+0xc+(4*X))) | ||
42 | #define I2C_STATUS (*(volatile unsigned char*)(I2C_BASE+0x1c)) | ||
43 | |||
44 | /* I2C_CTRL bit definitions */ | ||
45 | #define I2C_SEND 0x80 | ||
46 | |||
47 | /* I2C_STATUS bit definitions */ | ||
48 | #define I2C_BUSY (1<<6) | ||
49 | |||
39 | /* Local functions definitions */ | 50 | /* Local functions definitions */ |
40 | static struct mutex i2c_mtx SHAREDBSS_ATTR; | 51 | static struct mutex i2c_mtx SHAREDBSS_ATTR; |
41 | 52 | ||