added endianness to natsemi.

diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c
index fe5838549699577ee4b47e37137425c01374ccb2..e2175d60337570e8e323d0c6871cec0f178c5a0a 100644 (file)
--- 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;

diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index 8bd63bb915d90c078b7730263a65e80d33a6af65..f1a226051cb25cb60846660ad485da73cd6cce6f 100644 (file)
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -221,6 +221,7 @@ static struct nvo_fragment nat_nvo_fragments[] = {
        // Initialise three-wire bus 
        nat->spibit.basher.op = &nat_basher_ops;
        nat->spibit.bus.mode = SPI_MODE_THREEWIRE;
+       nat->spibit.endianness = SPI_BIT_LITTLE_ENDIAN;
        init_spi_bit_basher ( &nat->spibit );
 
        DBG ( "EEPROM is an AT93C46\n" );