Ver código fonte

added endianness to natsemi.

tags/v0.9.3
Udayan Kumar 18 anos atrás
pai
commit
c6d0ef3478
2 arquivos alterados com 2 adições e 6 exclusões
  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 Ver arquivo

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

+ 1
- 0
src/drivers/net/natsemi.c Ver arquivo

221
 	// Initialise three-wire bus 
221
 	// Initialise three-wire bus 
222
 	nat->spibit.basher.op = &nat_basher_ops;
222
 	nat->spibit.basher.op = &nat_basher_ops;
223
 	nat->spibit.bus.mode = SPI_MODE_THREEWIRE;
223
 	nat->spibit.bus.mode = SPI_MODE_THREEWIRE;
224
+	nat->spibit.endianness = SPI_BIT_LITTLE_ENDIAN;
224
 	init_spi_bit_basher ( &nat->spibit );
225
 	init_spi_bit_basher ( &nat->spibit );
225
 
226
 
226
 	DBG ( "EEPROM is an AT93C46\n" );
227
 	DBG ( "EEPROM is an AT93C46\n" );

Carregando…
Cancelar
Salvar