summaryrefslogtreecommitdiff
path: root/firmware/drivers/i2c-pp5020.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/drivers/i2c-pp5020.c')
-rw-r--r--firmware/drivers/i2c-pp5020.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/firmware/drivers/i2c-pp5020.c b/firmware/drivers/i2c-pp5020.c
index e81783dba0..2aeb11128d 100644
--- a/firmware/drivers/i2c-pp5020.c
+++ b/firmware/drivers/i2c-pp5020.c
@@ -49,7 +49,7 @@
49 49
50#define POLL_TIMEOUT (HZ) 50#define POLL_TIMEOUT (HZ)
51 51
52static int ipod_i2c_wait_not_busy(void) 52static 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;
@@ -63,9 +63,9 @@ static int ipod_i2c_wait_not_busy(void)
63 return -1; 63 return -1;
64} 64}
65 65
66static int ipod_i2c_read_byte(unsigned int addr, unsigned int *data) 66static int pp_i2c_read_byte(unsigned int addr, unsigned int *data)
67{ 67{
68 if (ipod_i2c_wait_not_busy() < 0) 68 if (pp_i2c_wait_not_busy() < 0)
69 { 69 {
70 return -1; 70 return -1;
71 } 71 }
@@ -82,7 +82,7 @@ static int ipod_i2c_read_byte(unsigned int addr, unsigned int *data)
82 outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL); 82 outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL);
83 83
84 set_irq_level(old_irq_level); 84 set_irq_level(old_irq_level);
85 if (ipod_i2c_wait_not_busy() < 0) 85 if (pp_i2c_wait_not_busy() < 0)
86 { 86 {
87 return -1; 87 return -1;
88 } 88 }
@@ -99,7 +99,7 @@ static int ipod_i2c_read_byte(unsigned int addr, unsigned int *data)
99 return 0; 99 return 0;
100} 100}
101 101
102static int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) 102static int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data)
103{ 103{
104 int data_addr; 104 int data_addr;
105 unsigned int i; 105 unsigned int i;
@@ -109,7 +109,7 @@ static int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned cha
109 return -1; 109 return -1;
110 } 110 }
111 111
112 if (ipod_i2c_wait_not_busy() < 0) 112 if (pp_i2c_wait_not_busy() < 0)
113 { 113 {
114 return -2; 114 return -2;
115 } 115 }
@@ -139,13 +139,13 @@ static int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned cha
139 return 0x0; 139 return 0x0;
140} 140}
141 141
142static int ipod_i2c_send_byte(unsigned int addr, int data0) 142static int pp_i2c_send_byte(unsigned int addr, int data0)
143{ 143{
144 unsigned char data[1]; 144 unsigned char data[1];
145 145
146 data[0] = data0; 146 data[0] = data0;
147 147
148 return ipod_i2c_send_bytes(addr, 1, data); 148 return pp_i2c_send_bytes(addr, 1, data);
149} 149}
150 150
151/* Public functions */ 151/* Public functions */
@@ -155,9 +155,9 @@ int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data)
155 unsigned int temp; 155 unsigned int temp;
156 int i; 156 int i;
157 mutex_lock(&i2c_mutex); 157 mutex_lock(&i2c_mutex);
158 ipod_i2c_send_byte(dev_addr, addr); 158 pp_i2c_send_byte(dev_addr, addr);
159 for (i = 0; i < len; i++) { 159 for (i = 0; i < len; i++) {
160 ipod_i2c_read_byte(dev_addr, &temp); 160 pp_i2c_read_byte(dev_addr, &temp);
161 data[i] = temp; 161 data[i] = temp;
162 } 162 }
163 mutex_unlock(&i2c_mutex); 163 mutex_unlock(&i2c_mutex);
@@ -169,14 +169,14 @@ int i2c_readbyte(unsigned int dev_addr, int addr)
169 int data; 169 int data;
170 170
171 mutex_lock(&i2c_mutex); 171 mutex_lock(&i2c_mutex);
172 ipod_i2c_send_byte(dev_addr, addr); 172 pp_i2c_send_byte(dev_addr, addr);
173 ipod_i2c_read_byte(dev_addr, &data); 173 pp_i2c_read_byte(dev_addr, &data);
174 mutex_unlock(&i2c_mutex); 174 mutex_unlock(&i2c_mutex);
175 175
176 return data; 176 return data;
177} 177}
178 178
179int ipod_i2c_send(unsigned int addr, int data0, int data1) 179int pp_i2c_send(unsigned int addr, int data0, int data1)
180{ 180{
181 int retval; 181 int retval;
182 unsigned char data[2]; 182 unsigned char data[2];
@@ -185,7 +185,7 @@ int ipod_i2c_send(unsigned int addr, int data0, int data1)
185 data[1] = data1; 185 data[1] = data1;
186 186
187 mutex_lock(&i2c_mutex); 187 mutex_lock(&i2c_mutex);
188 retval = ipod_i2c_send_bytes(addr, 2, data); 188 retval = pp_i2c_send_bytes(addr, 2, data);
189 mutex_unlock(&i2c_mutex); 189 mutex_unlock(&i2c_mutex);
190 190
191 return retval; 191 return retval;