From 77c915ad61c654d6ef8f49e801ca9136f7cec49d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 27 Oct 2006 11:24:23 +0000 Subject: 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 --- firmware/drivers/i2c-pp5002.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'firmware/drivers/i2c-pp5002.c') 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 @@ #define POLL_TIMEOUT (HZ) -static int ipod_i2c_wait_not_busy(void) +static int pp_i2c_wait_not_busy(void) { unsigned long timeout; timeout = current_tick + POLL_TIMEOUT; @@ -66,9 +66,9 @@ static int ipod_i2c_wait_not_busy(void) /* Public functions */ -int ipod_i2c_read_byte(unsigned int addr, unsigned int *data) +int pp_i2c_read_byte(unsigned int addr, unsigned int *data) { - if (ipod_i2c_wait_not_busy() < 0) + if (pp_i2c_wait_not_busy() < 0) { return -1; } @@ -80,7 +80,7 @@ int ipod_i2c_read_byte(unsigned int addr, unsigned int *data) outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL); - if (ipod_i2c_wait_not_busy() < 0) + if (pp_i2c_wait_not_busy() < 0) { return -1; } @@ -93,7 +93,7 @@ int ipod_i2c_read_byte(unsigned int addr, unsigned int *data) return 0; } -int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) +int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) { int data_addr; unsigned int i; @@ -103,7 +103,7 @@ int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data return -1; } - if (ipod_i2c_wait_not_busy() < 0) + if (pp_i2c_wait_not_busy() < 0) { return -2; } @@ -127,21 +127,21 @@ int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data return 0x0; } -int ipod_i2c_send_byte(unsigned int addr, int data0) +int pp_i2c_send_byte(unsigned int addr, int data0) { unsigned char data[1]; data[0] = data0; - return ipod_i2c_send_bytes(addr, 1, data); + return pp_i2c_send_bytes(addr, 1, data); } int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data) { unsigned int temp; int i; - ipod_i2c_send_byte(dev_addr, addr); + pp_i2c_send_byte(dev_addr, addr); for (i = 0; i < len; i++) { - ipod_i2c_read_byte(dev_addr, &temp); + pp_i2c_read_byte(dev_addr, &temp); data[i] = temp; } return i; @@ -151,20 +151,20 @@ int i2c_readbyte(unsigned int dev_addr, int addr) { int data; - ipod_i2c_send_byte(dev_addr, addr); - ipod_i2c_read_byte(dev_addr, &data); + pp_i2c_send_byte(dev_addr, addr); + pp_i2c_read_byte(dev_addr, &data); return data; } -int ipod_i2c_send(unsigned int addr, int data0, int data1) +int pp_i2c_send(unsigned int addr, int data0, int data1) { unsigned char data[2]; data[0] = data0; data[1] = data1; - return ipod_i2c_send_bytes(addr, 2, data); + return pp_i2c_send_bytes(addr, 2, data); } void i2c_init(void) -- cgit v1.2.3