summaryrefslogtreecommitdiffstats
path: root/src/drivers/bitbash
diff options
context:
space:
mode:
authorUdayan Kumar2007-07-01 23:11:22 +0200
committerUdayan Kumar2007-07-15 03:08:05 +0200
commitc6d0ef34787104d6011ff2a1f7ed8a8c726e9d4d (patch)
tree4ac4b73a4381dc5fdfe6975967e6f5ffaf374edd /src/drivers/bitbash
parentfree_netdev -> netdev_put (diff)
downloadipxe-c6d0ef34787104d6011ff2a1f7ed8a8c726e9d4d.tar.gz
ipxe-c6d0ef34787104d6011ff2a1f7ed8a8c726e9d4d.tar.xz
ipxe-c6d0ef34787104d6011ff2a1f7ed8a8c726e9d4d.zip
added endianness to natsemi.
Diffstat (limited to 'src/drivers/bitbash')
-rw-r--r--src/drivers/bitbash/spi_bit.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c
index fe5838549..e2175d603 100644
--- a/src/drivers/bitbash/spi_bit.c
+++ b/src/drivers/bitbash/spi_bit.c
@@ -96,18 +96,13 @@ static void spi_bit_transfer ( struct spi_bit_basher *spibit,
DBG ( "Transferring %d bits in mode %x\n", len, bus->mode );
-<<<<<<< HEAD:src/drivers/bitbash/spi_bit.c
for ( step = 0 ; step < ( len * 2 ) ; step++ ) {
/* Calculate byte offset and byte mask */
bit_offset = ( ( endianness == SPI_BIT_BIG_ENDIAN ) ?
( len - ( step / 2 ) - 1 ) : ( step / 2 ) );
byte_offset = ( bit_offset / 8 );
byte_mask = ( 1 << ( bit_offset % 8 ) );
-=======
->>>>>>> debugging natsemi.c:src/drivers/bitbash/spi_bit.c
-<<<<<<< HEAD:src/drivers/bitbash/spi_bit.c
-=======
->>>>>>> debugging natsemi.c:src/drivers/bitbash/spi_bit.c
+
/* Shift data in or out */
if ( sclk == cpha ) {
const uint8_t *byte;