From 7d8e2b9e783f766abc5ce747e896e6a8ab83f84e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 3 Aug 2013 15:47:02 +0000 Subject: whitespace cleanups git-svn-id: https://svn.spreadspace.org/avr/trunk@213 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- lib/onewire.c | 176 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'lib/onewire.c') diff --git a/lib/onewire.c b/lib/onewire.c index b733b72..f28ef41 100644 --- a/lib/onewire.c +++ b/lib/onewire.c @@ -134,10 +134,10 @@ uint8_t owi_LastDeviceFlag; void owi_init(uint8_t pin, volatile IO_REG_TYPE *pin_read_port) { owi_bitmask = _BV(pin); - owi_baseReg = pin_read_port; + owi_baseReg = pin_read_port; DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask); #if ONEWIRE_SEARCH - owi_reset_search(); + owi_reset_search(); #endif } @@ -150,32 +150,32 @@ void owi_init(uint8_t pin, volatile IO_REG_TYPE *pin_read_port) // uint8_t owi_reset(void) { - IO_REG_TYPE mask = owi_bitmask; - register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg; - uint8_t r; - uint8_t retries = 125; - - cli(); - DIRECT_MODE_INPUT(reg, mask); - sei(); - // wait until the wire is high... just in case - do { - if (--retries == 0) return 0; - _delay_us(2); - } while ( !DIRECT_READ(reg, mask)); - - cli(); - DIRECT_WRITE_LOW(reg, mask); - DIRECT_MODE_OUTPUT(reg, mask); // drive output low - sei(); - _delay_us(480); - cli(); - DIRECT_MODE_INPUT(reg, mask); // allow it to float - _delay_us(70); - r = !DIRECT_READ(reg, mask); - sei(); - _delay_us(410); - return r; + IO_REG_TYPE mask = owi_bitmask; + register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg; + uint8_t r; + uint8_t retries = 125; + + cli(); + DIRECT_MODE_INPUT(reg, mask); + sei(); + // wait until the wire is high... just in case + do { + if (--retries == 0) return 0; + _delay_us(2); + } while ( !DIRECT_READ(reg, mask)); + + cli(); + DIRECT_WRITE_LOW(reg, mask); + DIRECT_MODE_OUTPUT(reg, mask); // drive output low + sei(); + _delay_us(480); + cli(); + DIRECT_MODE_INPUT(reg, mask); // allow it to float + _delay_us(70); + r = !DIRECT_READ(reg, mask); + sei(); + _delay_us(410); + return r; } // @@ -184,26 +184,26 @@ uint8_t owi_reset(void) // void owi_write_bit(uint8_t v) { - IO_REG_TYPE mask=owi_bitmask; - register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg; - - if (v & 1) { - cli(); - DIRECT_WRITE_LOW(reg, mask); - DIRECT_MODE_OUTPUT(reg, mask); // drive output low - _delay_us(10); - DIRECT_WRITE_HIGH(reg, mask); // drive output high - sei(); - _delay_us(55); - } else { - cli(); - DIRECT_WRITE_LOW(reg, mask); - DIRECT_MODE_OUTPUT(reg, mask); // drive output low - _delay_us(65); - DIRECT_WRITE_HIGH(reg, mask); // drive output high - sei(); - _delay_us(5); - } + IO_REG_TYPE mask=owi_bitmask; + register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg; + + if (v & 1) { + cli(); + DIRECT_WRITE_LOW(reg, mask); + DIRECT_MODE_OUTPUT(reg, mask); // drive output low + _delay_us(10); + DIRECT_WRITE_HIGH(reg, mask); // drive output high + sei(); + _delay_us(55); + } else { + cli(); + DIRECT_WRITE_LOW(reg, mask); + DIRECT_MODE_OUTPUT(reg, mask); // drive output low + _delay_us(65); + DIRECT_WRITE_HIGH(reg, mask); // drive output high + sei(); + _delay_us(5); + } } // @@ -212,20 +212,20 @@ void owi_write_bit(uint8_t v) // uint8_t owi_read_bit(void) { - IO_REG_TYPE mask=owi_bitmask; - register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg; - uint8_t r; - - cli(); - DIRECT_MODE_OUTPUT(reg, mask); - DIRECT_WRITE_LOW(reg, mask); - _delay_us(3); - DIRECT_MODE_INPUT(reg, mask); // let pin float, pull up will raise - _delay_us(10); - r = DIRECT_READ(reg, mask); - sei(); - _delay_us(53); - return r; + IO_REG_TYPE mask=owi_bitmask; + register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg; + uint8_t r; + + cli(); + DIRECT_MODE_OUTPUT(reg, mask); + DIRECT_WRITE_LOW(reg, mask); + _delay_us(3); + DIRECT_MODE_INPUT(reg, mask); // let pin float, pull up will raise + _delay_us(10); + r = DIRECT_READ(reg, mask); + sei(); + _delay_us(53); + return r; } // @@ -239,13 +239,13 @@ void owi_write(uint8_t v, uint8_t power /* = 0 */) { uint8_t bitMask; for (bitMask = 0x01; bitMask; bitMask <<= 1) { - owi_write_bit( (bitMask & v)?1:0); + owi_write_bit( (bitMask & v)?1:0); } if ( !power) { - cli(); - DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask); - DIRECT_WRITE_LOW(owi_baseReg, owi_bitmask); - sei(); + cli(); + DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask); + DIRECT_WRITE_LOW(owi_baseReg, owi_bitmask); + sei(); } } @@ -268,7 +268,7 @@ uint8_t owi_read() { uint8_t r = 0; for (bitMask = 0x01; bitMask; bitMask <<= 1) { - if ( owi_read_bit()) r |= bitMask; + if ( owi_read_bit()) r |= bitMask; } return r; } @@ -300,9 +300,9 @@ void owi_skip() void owi_depower() { - cli(); - DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask); - sei(); + cli(); + DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask); + sei(); } #if ONEWIRE_SEARCH @@ -508,12 +508,12 @@ const uint8_t PROGMEM dscrc_table[] = { // uint8_t owi_crc8(const uint8_t *addr, uint8_t len) { - uint8_t crc = 0; + uint8_t crc = 0; - while (len--) { - crc = pgm_read_byte(dscrc_table + (crc ^ *addr++)); - } - return crc; + while (len--) { + crc = pgm_read_byte(dscrc_table + (crc ^ *addr++)); + } + return crc; } #else // @@ -522,18 +522,18 @@ uint8_t owi_crc8(const uint8_t *addr, uint8_t len) // uint8_t owi_crc8(const uint8_t *addr, uint8_t len) { - uint8_t crc = 0; - - while (len--) { - uint8_t inbyte = *addr++; - for (uint8_t i = 8; i; i--) { - uint8_t mix = (crc ^ inbyte) & 0x01; - crc >>= 1; - if (mix) crc ^= 0x8C; - inbyte >>= 1; - } - } - return crc; + uint8_t crc = 0; + + while (len--) { + uint8_t inbyte = *addr++; + for (uint8_t i = 8; i; i--) { + uint8_t mix = (crc ^ inbyte) & 0x01; + crc >>= 1; + if (mix) crc ^= 0x8C; + inbyte >>= 1; + } + } + return crc; } #endif -- cgit v1.2.3