瀏覽代碼

added endianness to natsemi.

tags/v0.9.3
Udayan Kumar 18 年之前
父節點
當前提交
c6d0ef3478
共有 2 個檔案被更改,包括 2 行新增6 行删除
  1. 1
    6
      src/drivers/bitbash/spi_bit.c
  2. 1
    0
      src/drivers/net/natsemi.c

+ 1
- 6
src/drivers/bitbash/spi_bit.c 查看文件

@@ -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;

+ 1
- 0
src/drivers/net/natsemi.c 查看文件

@@ -221,6 +221,7 @@ static struct nvo_fragment nat_nvo_fragments[] = {
221 221
 	// Initialise three-wire bus 
222 222
 	nat->spibit.basher.op = &nat_basher_ops;
223 223
 	nat->spibit.bus.mode = SPI_MODE_THREEWIRE;
224
+	nat->spibit.endianness = SPI_BIT_LITTLE_ENDIAN;
224 225
 	init_spi_bit_basher ( &nat->spibit );
225 226
 
226 227
 	DBG ( "EEPROM is an AT93C46\n" );

Loading…
取消
儲存