sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-25 00:17:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed length parameter in SPI methods to be a byte length, rather than

Browse Source 
a word length.
This commit is contained in:
Michael Brown
2006-12-04 16:09:59 +00:00
parent 931f94dca3
commit dc06c895fc
5 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/bitbash/spi_bit.c
View File

@@ -139,13 +139,12 @@ static void spi_bit_transfer ( struct spi_bit_basher *spibit,
* @v address Address to read/write (<0 for no address)
* @v data_out TX data buffer (or NULL)
* @v data_in RX data buffer (or NULL)
* @v len Length of transfer (in @b words)
* @v len Length of transfer
* @ret rc Return status code
*/
static int spi_bit_rw ( struct spi_bus *bus, struct spi_device *device,
unsigned int command, int address,
const void *data_out, void *data_in,
unsigned int len ) {
const void *data_out, void *data_in, size_t len ) {
struct spi_bit_basher *spibit
= container_of ( bus, struct spi_bit_basher, bus );
struct spi_device_type *devtype = device->type;
@@ -167,8 +166,7 @@ static int spi_bit_rw ( struct spi_bus *bus, struct spi_device *device,
}
/* Transmit/receive data */
spi_bit_transfer ( spibit, data_out, data_in,
( len * devtype->word_len ) );
spi_bit_transfer ( spibit, data_out, data_in, ( len * 8 ) );
/* Deassert chip select on specified slave */
spi_bit_set_slave_select ( spibit, device->slave, DESELECT_SLAVE );

2
src/drivers/net/rtl8139.c
View File

@@ -276,7 +276,7 @@ static void rtl_read_mac ( struct rtl8139_nic *rtl, uint8_t *mac_addr ) {
DBG ( "MAC address is " );
for ( i = EE_MAC ; i < ( EE_MAC + ( ETH_ALEN / 2 ) ) ; i++ ) {
device->type->read ( device, i, mac_addr, 1 );
device->type->read ( device, i, mac_addr, 2 );
DBG ( "%02x%02x", mac_addr[0], mac_addr[1] );
mac_addr += 2;
}

7
src/drivers/nvs/threewire.c
View File

@@ -31,17 +31,16 @@
* @v device SPI device
* @v address Address from which to read
* @v data Data buffer
* @v len Length of data to read, in @b words
* @v len Length of data buffer
* @ret rc Return status code
*/
int threewire_read ( struct spi_device *device, unsigned int address,
void *data, unsigned int len ) {
void *data, size_t len ) {
struct spi_bus *bus = device->bus;
assert ( bus->mode == SPI_MODE_THREEWIRE );
DBG ( "3wire %p reading words [%04x,%04x)\n", device,
address, ( address + len ) );
DBG ( "3wire %p reading %d bytes at %04x\n", device, len, address );
return bus->rw ( bus, device, THREEWIRE_READ, address,
NULL, data, len );