go-packages/go-rpio
1
0
Fork 0
mirror of https://github.com/stianeikeland/go-rpio.git synced 2025-01-23 02:31:05 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Drahoslav 2017-11-14 22:25:26 +01:00
parent b7b1bd8b81
commit b604d03178
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rpio.go
View File

@ -78,8 +78,6 @@ const (
clkOffset = 0x101000 clkOffset = 0x101000
memLength = 4096 memLength = 4096
pinMask uint32 = 7 // 0b111 - pinmode is 3 bits
) )
var ( var (
@ -198,9 +196,6 @@ func PinMode(pin Pin, mode Mode) {
shift := (uint8(pin) % 10) * 3 shift := (uint8(pin) % 10) * 3
f := uint32(0) f := uint32(0)
memlock.Lock()
defer memlock.Unlock()
switch mode { switch mode {
case Input: case Input:
f = 0 // 000 f = 0 // 000
@ -216,6 +211,12 @@ func PinMode(pin Pin, mode Mode) {
return return
} }
} }
memlock.Lock()
defer memlock.Unlock()
const pinMask = 7 // 0b111 - pinmode is 3 bits
gpioMem[fselReg] = (gpioMem[fselReg] &^ (pinMask << shift)) | (f << shift) gpioMem[fselReg] = (gpioMem[fselReg] &^ (pinMask << shift)) | (f << shift)
} }
@ -246,7 +247,7 @@ func ReadPin(pin Pin) State {
// Input level register offset (13 / 14 depending on bank) // Input level register offset (13 / 14 depending on bank)
levelReg := uint8(pin)/32 + 13 levelReg := uint8(pin)/32 + 13
if (gpioMem[levelReg] & (1 << uint8(pin))) != 0 { if (gpioMem[levelReg] & (1 << uint8(pin & 31))) != 0 {
return High return High
} }
@ -401,8 +402,12 @@ func memMap (fd uintptr, offset int64) (mem []uint32, mem8 []byte, err error) {
func Close() error { func Close() error {
memlock.Lock() memlock.Lock()
defer memlock.Unlock() defer memlock.Unlock()
syscall.Munmap(gpioMem8) if err := syscall.Munmap(gpioMem8) {
syscall.Munmap(clkMem8) return err
}
if err := syscall.Munmap(clkMem8) {
return err
}
return nil return nil
} }