diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-10-27 11:24:23 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-10-27 11:24:23 +0000 |
commit | 77c915ad61c654d6ef8f49e801ca9136f7cec49d (patch) | |
tree | b8b4d88780488ec2e48810e74a8658264cfce6b3 /firmware/drivers/i2c-pp5002.c | |
parent | 2c1eec5533db4676e73132923f6c3fa73ad248e6 (diff) | |
download | rockbox-77c915ad61c654d6ef8f49e801ca9136f7cec49d.tar.gz rockbox-77c915ad61c654d6ef8f49e801ca9136f7cec49d.zip |
Renamed the ipod_i2c functions to the more appropriate pp_i2c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11361 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/i2c-pp5002.c')
-rw-r--r-- | firmware/drivers/i2c-pp5002.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/firmware/drivers/i2c-pp5002.c b/firmware/drivers/i2c-pp5002.c index 958ddeebe4..7cb37f6090 100644 --- a/firmware/drivers/i2c-pp5002.c +++ b/firmware/drivers/i2c-pp5002.c | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | #define POLL_TIMEOUT (HZ) | 50 | #define POLL_TIMEOUT (HZ) |
51 | 51 | ||
52 | static int ipod_i2c_wait_not_busy(void) | 52 | static int pp_i2c_wait_not_busy(void) |
53 | { | 53 | { |
54 | unsigned long timeout; | 54 | unsigned long timeout; |
55 | timeout = current_tick + POLL_TIMEOUT; | 55 | timeout = current_tick + POLL_TIMEOUT; |
@@ -66,9 +66,9 @@ static int ipod_i2c_wait_not_busy(void) | |||
66 | 66 | ||
67 | /* Public functions */ | 67 | /* Public functions */ |
68 | 68 | ||
69 | int ipod_i2c_read_byte(unsigned int addr, unsigned int *data) | 69 | int pp_i2c_read_byte(unsigned int addr, unsigned int *data) |
70 | { | 70 | { |
71 | if (ipod_i2c_wait_not_busy() < 0) | 71 | if (pp_i2c_wait_not_busy() < 0) |
72 | { | 72 | { |
73 | return -1; | 73 | return -1; |
74 | } | 74 | } |
@@ -80,7 +80,7 @@ int ipod_i2c_read_byte(unsigned int addr, unsigned int *data) | |||
80 | 80 | ||
81 | outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL); | 81 | outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL); |
82 | 82 | ||
83 | if (ipod_i2c_wait_not_busy() < 0) | 83 | if (pp_i2c_wait_not_busy() < 0) |
84 | { | 84 | { |
85 | return -1; | 85 | return -1; |
86 | } | 86 | } |
@@ -93,7 +93,7 @@ int ipod_i2c_read_byte(unsigned int addr, unsigned int *data) | |||
93 | return 0; | 93 | return 0; |
94 | } | 94 | } |
95 | 95 | ||
96 | int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) | 96 | int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) |
97 | { | 97 | { |
98 | int data_addr; | 98 | int data_addr; |
99 | unsigned int i; | 99 | unsigned int i; |
@@ -103,7 +103,7 @@ int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data | |||
103 | return -1; | 103 | return -1; |
104 | } | 104 | } |
105 | 105 | ||
106 | if (ipod_i2c_wait_not_busy() < 0) | 106 | if (pp_i2c_wait_not_busy() < 0) |
107 | { | 107 | { |
108 | return -2; | 108 | return -2; |
109 | } | 109 | } |
@@ -127,21 +127,21 @@ int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data | |||
127 | return 0x0; | 127 | return 0x0; |
128 | } | 128 | } |
129 | 129 | ||
130 | int ipod_i2c_send_byte(unsigned int addr, int data0) | 130 | int pp_i2c_send_byte(unsigned int addr, int data0) |
131 | { | 131 | { |
132 | unsigned char data[1]; | 132 | unsigned char data[1]; |
133 | 133 | ||
134 | data[0] = data0; | 134 | data[0] = data0; |
135 | 135 | ||
136 | return ipod_i2c_send_bytes(addr, 1, data); | 136 | return pp_i2c_send_bytes(addr, 1, data); |
137 | } | 137 | } |
138 | 138 | ||
139 | int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data) { | 139 | int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data) { |
140 | unsigned int temp; | 140 | unsigned int temp; |
141 | int i; | 141 | int i; |
142 | ipod_i2c_send_byte(dev_addr, addr); | 142 | pp_i2c_send_byte(dev_addr, addr); |
143 | for (i = 0; i < len; i++) { | 143 | for (i = 0; i < len; i++) { |
144 | ipod_i2c_read_byte(dev_addr, &temp); | 144 | pp_i2c_read_byte(dev_addr, &temp); |
145 | data[i] = temp; | 145 | data[i] = temp; |
146 | } | 146 | } |
147 | return i; | 147 | return i; |
@@ -151,20 +151,20 @@ int i2c_readbyte(unsigned int dev_addr, int addr) | |||
151 | { | 151 | { |
152 | int data; | 152 | int data; |
153 | 153 | ||
154 | ipod_i2c_send_byte(dev_addr, addr); | 154 | pp_i2c_send_byte(dev_addr, addr); |
155 | ipod_i2c_read_byte(dev_addr, &data); | 155 | pp_i2c_read_byte(dev_addr, &data); |
156 | 156 | ||
157 | return data; | 157 | return data; |
158 | } | 158 | } |
159 | 159 | ||
160 | int ipod_i2c_send(unsigned int addr, int data0, int data1) | 160 | int pp_i2c_send(unsigned int addr, int data0, int data1) |
161 | { | 161 | { |
162 | unsigned char data[2]; | 162 | unsigned char data[2]; |
163 | 163 | ||
164 | data[0] = data0; | 164 | data[0] = data0; |
165 | data[1] = data1; | 165 | data[1] = data1; |
166 | 166 | ||
167 | return ipod_i2c_send_bytes(addr, 2, data); | 167 | return pp_i2c_send_bytes(addr, 2, data); |
168 | } | 168 | } |
169 | 169 | ||
170 | void i2c_init(void) | 170 | void i2c_init(void) |