diff options
| author | Michael Brown <mcb30@etherboot.org> | 2006-06-12 19:29:50 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2006-06-12 19:29:50 +0000 |
| commit | 51a36f1cfbb45609c5e50b2257f4030b956316ae (patch) | |
| tree | 03a9103239678c94b1e91adf297b545d484c92f0 /src/drivers/bitbash | |
| parent | 2e49441535e98ac95397ef825aef7e1483bd50ed (diff) | |
| download | ipxe-51a36f1cfbb45609c5e50b2257f4030b956316ae.tar.gz | |
Change read_bit() to return 0 or -1UL, rather than 0 or 1.
Diffstat (limited to 'src/drivers/bitbash')
| -rw-r--r-- | src/drivers/bitbash/bitbash.c | 6 | ||||
| -rw-r--r-- | src/drivers/bitbash/i2c_bit.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/drivers/bitbash/bitbash.c b/src/drivers/bitbash/bitbash.c index 270c1b922..92abe1a70 100644 --- a/src/drivers/bitbash/bitbash.c +++ b/src/drivers/bitbash/bitbash.c @@ -48,8 +48,10 @@ void write_bit ( struct bit_basher *basher, unsigned int bit_id, * @v bit_id Bit number * @ret data Value read * - * @c data will always be either 0 or 1. + * @c data will always be either 0 or -1UL. The idea is that the + * caller can simply binary-AND the returned value with whatever mask + * it needs to apply. */ int read_bit ( struct bit_basher *basher, unsigned int bit_id ) { - return ( basher->read ( basher, bit_id ) ? 1 : 0 ); + return ( basher->read ( basher, bit_id ) ? -1UL : 0 ); } diff --git a/src/drivers/bitbash/i2c_bit.c b/src/drivers/bitbash/i2c_bit.c index 9524d6312..cc73968b7 100644 --- a/src/drivers/bitbash/i2c_bit.c +++ b/src/drivers/bitbash/i2c_bit.c @@ -153,7 +153,7 @@ static uint8_t i2c_recv_byte ( struct bit_basher *basher ) { /* Receive byte */ for ( i = 8 ; i ; i-- ) { value <<= 1; - value |= i2c_recv_bit ( basher ); + value |= ( i2c_recv_bit ( basher ) & 0x1 ); } /* Send NACK */ |