OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

smbus: return -1 if nothing found at the given address 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-03-31 18:26:30 +02:00 committed by Michael S. Tsirkin
parent 285364e968
commit 046a184414
2 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
hw/i2c/smbus.c
View File

@ -208,34 +208,44 @@ static int smbus_device_init(I2CSlave *i2c)
} }
/* Master device commands. */ /* Master device commands. */
void smbus_quick_command(I2CBus *bus, uint8_t addr, int read) int smbus_quick_command(I2CBus *bus, uint8_t addr, int read)
{ {
i2c_start_transfer(bus, addr, read); if (i2c_start_transfer(bus, addr, read)) {
return -1;
}
i2c_end_transfer(bus); i2c_end_transfer(bus);
return 0;
} }
int smbus_receive_byte(I2CBus *bus, uint8_t addr) int smbus_receive_byte(I2CBus *bus, uint8_t addr)
{ {
uint8_t data; uint8_t data;
i2c_start_transfer(bus, addr, 1); if (i2c_start_transfer(bus, addr, 1)) {
return -1;
}
data = i2c_recv(bus); data = i2c_recv(bus);
i2c_nack(bus); i2c_nack(bus);
i2c_end_transfer(bus); i2c_end_transfer(bus);
return data; return data;
} }
void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data) int smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data)
{ {
i2c_start_transfer(bus, addr, 0); if (i2c_start_transfer(bus, addr, 0)) {
return -1;
}
i2c_send(bus, data); i2c_send(bus, data);
i2c_end_transfer(bus); i2c_end_transfer(bus);
return 0;
} }
int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command) int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command)
{ {
uint8_t data; uint8_t data;
i2c_start_transfer(bus, addr, 0); if (i2c_start_transfer(bus, addr, 0)) {
return -1;
}
i2c_send(bus, command); i2c_send(bus, command);
i2c_start_transfer(bus, addr, 1); i2c_start_transfer(bus, addr, 1);
data = i2c_recv(bus); data = i2c_recv(bus);
@ -244,18 +254,23 @@ int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command)
return data; return data;
} }
void smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t data) int smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t data)
{ {
i2c_start_transfer(bus, addr, 0); if (i2c_start_transfer(bus, addr, 0)) {
return -1;
}
i2c_send(bus, command); i2c_send(bus, command);
i2c_send(bus, data); i2c_send(bus, data);
i2c_end_transfer(bus); i2c_end_transfer(bus);
return 0;
} }
int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command) int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command)
{ {
uint16_t data; uint16_t data;
i2c_start_transfer(bus, addr, 0); if (i2c_start_transfer(bus, addr, 0)) {
return -1;
}
i2c_send(bus, command); i2c_send(bus, command);
i2c_start_transfer(bus, addr, 1); i2c_start_transfer(bus, addr, 1);
data = i2c_recv(bus); data = i2c_recv(bus);
@ -265,13 +280,16 @@ int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command)
return data; return data;
} }
void smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t data) int smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t data)
{ {
i2c_start_transfer(bus, addr, 0); if (i2c_start_transfer(bus, addr, 0)) {
return -1;
}
i2c_send(bus, command); i2c_send(bus, command);
i2c_send(bus, data & 0xff); i2c_send(bus, data & 0xff);
i2c_send(bus, data >> 8); i2c_send(bus, data >> 8);
i2c_end_transfer(bus); i2c_end_transfer(bus);
return 0;
} }
int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data) int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data)
@ -279,33 +297,41 @@ int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data)
int len; int len;
int i; int i;
i2c_start_transfer(bus, addr, 0); if (i2c_start_transfer(bus, addr, 0)) {
return -1;
}
i2c_send(bus, command); i2c_send(bus, command);
i2c_start_transfer(bus, addr, 1); i2c_start_transfer(bus, addr, 1);
len = i2c_recv(bus); len = i2c_recv(bus);
if (len > 32) if (len > 32) {
len = 0; len = 0;
for (i = 0; i < len; i++) }
for (i = 0; i < len; i++) {
data[i] = i2c_recv(bus); data[i] = i2c_recv(bus);
}
i2c_nack(bus); i2c_nack(bus);
i2c_end_transfer(bus); i2c_end_transfer(bus);
return len; return len;
} }
void smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data,
int len) int len)
{ {
int i; int i;
if (len > 32) if (len > 32)
len = 32; len = 32;
i2c_start_transfer(bus, addr, 0); if (i2c_start_transfer(bus, addr, 0)) {
return -1;
}
i2c_send(bus, command); i2c_send(bus, command);
i2c_send(bus, len); i2c_send(bus, len);
for (i = 0; i < len; i++) for (i = 0; i < len; i++) {
i2c_send(bus, data[i]); i2c_send(bus, data[i]);
}
i2c_end_transfer(bus); i2c_end_transfer(bus);
return 0;
} }
static void smbus_device_class_init(ObjectClass *klass, void *data) static void smbus_device_class_init(ObjectClass *klass, void *data)

12
include/hw/i2c/smbus.h
View File

@ -66,16 +66,16 @@ struct SMBusDevice {
}; };
/* Master device commands. */ /* Master device commands. */
void smbus_quick_command(I2CBus *bus, uint8_t addr, int read); int smbus_quick_command(I2CBus *bus, uint8_t addr, int read);
int smbus_receive_byte(I2CBus *bus, uint8_t addr); int smbus_receive_byte(I2CBus *bus, uint8_t addr);
void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data); int smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data);
int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command); int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command);
void smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t data); int smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t data);
int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command); int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command);
void smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t data); int smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t data);
int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data); int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data);
void smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data,
int len); int len);
void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom,
const uint8_t *eeprom_spd, int size); const uint8_t *eeprom_spd, int size);