|
@@ -96,18 +96,13 @@ static void spi_bit_transfer ( struct spi_bit_basher *spibit,
|
96
|
96
|
|
97
|
97
|
DBG ( "Transferring %d bits in mode %x\n", len, bus->mode );
|
98
|
98
|
|
99
|
|
-<<<<<<< HEAD:src/drivers/bitbash/spi_bit.c
|
100
|
99
|
for ( step = 0 ; step < ( len * 2 ) ; step++ ) {
|
101
|
100
|
/* Calculate byte offset and byte mask */
|
102
|
101
|
bit_offset = ( ( endianness == SPI_BIT_BIG_ENDIAN ) ?
|
103
|
102
|
( len - ( step / 2 ) - 1 ) : ( step / 2 ) );
|
104
|
103
|
byte_offset = ( bit_offset / 8 );
|
105
|
104
|
byte_mask = ( 1 << ( bit_offset % 8 ) );
|
106
|
|
-=======
|
107
|
|
->>>>>>> debugging natsemi.c:src/drivers/bitbash/spi_bit.c
|
108
|
|
-<<<<<<< HEAD:src/drivers/bitbash/spi_bit.c
|
109
|
|
-=======
|
110
|
|
->>>>>>> debugging natsemi.c:src/drivers/bitbash/spi_bit.c
|
|
105
|
+
|
111
|
106
|
/* Shift data in or out */
|
112
|
107
|
if ( sclk == cpha ) {
|
113
|
108
|
const uint8_t *byte;
|