diff --git a/host/describe.go b/describe.go similarity index 73% rename from host/describe.go rename to describe.go index 8fc3a89..2ad2c67 100644 --- a/host/describe.go +++ b/describe.go @@ -1,4 +1,4 @@ -package host +package embd import ( "errors" @@ -8,13 +8,13 @@ import ( "github.com/kidoman/embd/i2c" ) -type Descriptor interface { +type descriptor interface { GPIO() gpio.GPIO I2C() i2c.I2C } -func Describe() (Descriptor, error) { - host, rev, err := Detect() +func describeHost() (descriptor, error) { + host, rev, err := DetectHost() if err != nil { return nil, err } diff --git a/host/detect.go b/detect.go similarity index 95% rename from host/detect.go rename to detect.go index 4a3dad9..147f79d 100644 --- a/host/detect.go +++ b/detect.go @@ -1,4 +1,4 @@ -package host +package embd import ( "fmt" @@ -49,7 +49,7 @@ func kernelVersion() (major, minor, patch int, err error) { return } -func Detect() (host Host, rev int, err error) { +func DetectHost() (host Host, rev int, err error) { major, minor, patch, err := kernelVersion() if err != nil { return diff --git a/hal.go b/hal.go index b9c9704..7979531 100644 --- a/hal.go +++ b/hal.go @@ -2,7 +2,6 @@ package embd import ( "github.com/kidoman/embd/gpio" - "github.com/kidoman/embd/host" "github.com/kidoman/embd/i2c" ) @@ -17,7 +16,7 @@ const ( ) func NewGPIO() (gpio.GPIO, error) { - desc, err := host.Describe() + desc, err := describeHost() if err != nil { return nil, err } @@ -26,7 +25,7 @@ func NewGPIO() (gpio.GPIO, error) { } func NewI2C() (i2c.I2C, error) { - desc, err := host.Describe() + desc, err := describeHost() if err != nil { return nil, err } diff --git a/samples/gpiodetect.go b/samples/gpiodetect.go index cbd0e81..1cb3717 100644 --- a/samples/gpiodetect.go +++ b/samples/gpiodetect.go @@ -4,11 +4,10 @@ import ( "time" "github.com/kidoman/embd" - "github.com/kidoman/embd/host" ) func main() { - h, _, err := host.Detect() + h, _, err := embd.DetectHost() if err != nil { return } @@ -16,9 +15,9 @@ func main() { var pinNo interface{} switch h { - case host.BBB: + case embd.BBB: pinNo = "P9_31" - case host.RPi: + case embd.RPi: pinNo = 10 default: panic("host not supported (yet :P)")