From b296368a0557615cbc3ba19bd21965d364d44dba Mon Sep 17 00:00:00 2001 From: Gavin Cabbage Date: Sat, 10 Oct 2015 23:58:24 -0400 Subject: [PATCH] removing failed Stat use --- controller/hd44780/hd44780_test.go | 2 +- host/generic/i2cbus.go | 12 +++--------- i2c.go | 2 -- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/controller/hd44780/hd44780_test.go b/controller/hd44780/hd44780_test.go index 9542bf7..eee375d 100644 --- a/controller/hd44780/hd44780_test.go +++ b/controller/hd44780/hd44780_test.go @@ -131,7 +131,7 @@ type mockI2CBus struct { closed bool } -func (bus *mockI2CBus) ReadBytes(addr byte) ([]byte, error) { return []byte{0x00}, nil } +func (bus *mockI2CBus) ReadBytes(addr byte, num int) ([]byte, error) { return []byte{0x00}, nil } func (bus *mockI2CBus) ReadByte(addr byte) (byte, error) { return 0x00, nil } func (bus *mockI2CBus) WriteBytes(addr byte, value []byte) error { return nil } func (bus *mockI2CBus) ReadFromReg(addr, reg byte, value []byte) error { return nil } diff --git a/host/generic/i2cbus.go b/host/generic/i2cbus.go index 63b6eb1..45c5870 100644 --- a/host/generic/i2cbus.go +++ b/host/generic/i2cbus.go @@ -101,7 +101,7 @@ func (b *i2cBus) ReadByte(addr byte) (byte, error) { return bytes[0], nil } -func (b *i2cBus) ReadBytes(addr byte) ([]byte, error) { +func (b *i2cBus) ReadBytes(addr byte, num int) ([]byte, error) { b.mu.Lock() defer b.mu.Unlock() @@ -113,16 +113,10 @@ func (b *i2cBus) ReadBytes(addr byte) ([]byte, error) { return []byte{0}, err } - info, err := b.file.Stat() - if err != nil { - return []byte{0}, err - } - - size := int(info.Size()) - bytes := make([]byte, size) + bytes := make([]byte, num) n, _ := b.file.Read(bytes) - if n != size { + if n != num { return []byte{0}, fmt.Errorf("i2c: Unexpected number (%v) of bytes read", n) } diff --git a/i2c.go b/i2c.go index f0c79da..6a5d1ec 100644 --- a/i2c.go +++ b/i2c.go @@ -4,8 +4,6 @@ package embd // I2CBus interface is used to interact with the I2C bus. type I2CBus interface { - // ReadBytes reads a slice of bytes from the given address. - ReadBytes(addr byte) (value []byte, err error) // ReadByte reads a byte from the given address. ReadByte(addr byte) (value byte, err error) // ReadBytes reads a slice of bytes from the given address.