bugst
diff --git a/‎go.mod
+1-1 b/‎go.mod
+1-1
diff --git a/‎go.sum
+2-2 b/‎go.sum
+2-2
diff --git a/‎serial_unix.go
+8-13 b/‎serial_unix.go
+8-13
diff --git a/‎syscall_darwin.go
-9 b/‎syscall_darwin.go
-9
diff --git a/‎syscall_freebsd.go
-9 b/‎syscall_freebsd.go
-9
diff --git a/‎syscall_linux.go
-9 b/‎syscall_linux.go
-9
diff --git a/‎syscall_openbsd.go
-9 b/‎syscall_openbsd.go
-9
diff --git a/‎zsyscall_darwin.go
-21 b/‎zsyscall_darwin.go
-21
diff --git a/‎zsyscall_freebsd.go
-21 b/‎zsyscall_freebsd.go
-21
diff --git a/‎zsyscall_linux.go
-21 b/‎zsyscall_linux.go
-21
diff --git a/‎zsyscall_openbsd.go
-21 b/‎zsyscall_openbsd.go
-21
@@ -5,5 +5,5 @@ go 1.13
 require (
 	github.com/creack/goselect v0.1.1
 	github.com/stretchr/testify v1.4.0
-	golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9
+	golang.org/x/sys v0.0.0-20200909081042-eff7692f9009
 )
@@ -7,8 +7,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 h1:ZBzSG/7F4eNKz2L3GE9o300RX0Az1Bw5HF7PDraD+qU=
-golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 
@@ -14,7 +14,6 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
-	"unsafe"
 
 	"go.bug.st/serial/unixutils"
 	"golang.org/x/sys/unix"
@@ -94,11 +93,11 @@ func (port *unixPort) Write(p []byte) (n int, err error) {
 }
 
 func (port *unixPort) ResetInputBuffer() error {
-	return ioctl(port.handle, ioctlTcflsh, unix.TCIFLUSH)
+	return unix.IoctlSetInt(port.handle, ioctlTcflsh, unix.TCIFLUSH)
 }
 
 func (port *unixPort) ResetOutputBuffer() error {
-	return ioctl(port.handle, ioctlTcflsh, unix.TCOFLUSH)
+	return unix.IoctlSetInt(port.handle, ioctlTcflsh, unix.TCOFLUSH)
 }
 
 func (port *unixPort) SetMode(mode *Mode) error {
@@ -390,29 +389,25 @@ func setRawMode(settings *unix.Termios) {
 // native syscall wrapper functions
 
 func (port *unixPort) getTermSettings() (*unix.Termios, error) {
-	settings := &unix.Termios{}
-	err := ioctl(port.handle, ioctlTcgetattr, uintptr(unsafe.Pointer(settings)))
-	return settings, err
+	return unix.IoctlGetTermios(port.handle, ioctlTcgetattr)
 }
 
 func (port *unixPort) setTermSettings(settings *unix.Termios) error {
-	return ioctl(port.handle, ioctlTcsetattr, uintptr(unsafe.Pointer(settings)))
+	return unix.IoctlSetTermios(port.handle, ioctlTcsetattr, settings)
 }
 
 func (port *unixPort) getModemBitsStatus() (int, error) {
-	var status int
-	err := ioctl(port.handle, unix.TIOCMGET, uintptr(unsafe.Pointer(&status)))
-	return status, err
+	return unix.IoctlGetInt(port.handle, unix.TIOCMGET)
 }
 
 func (port *unixPort) setModemBitsStatus(status int) error {
-	return ioctl(port.handle, unix.TIOCMSET, uintptr(unsafe.Pointer(&status)))
+	return unix.IoctlSetPointerInt(port.handle, unix.TIOCMSET, status)
 }
 
 func (port *unixPort) acquireExclusiveAccess() error {
-	return ioctl(port.handle, unix.TIOCEXCL, 0)
+	return unix.IoctlSetInt(port.handle, unix.TIOCEXCL, 0)
 }
 
 func (port *unixPort) releaseExclusiveAccess() error {
-	return ioctl(port.handle, unix.TIOCNXCL, 0)
+	return unix.IoctlSetInt(port.handle, unix.TIOCNXCL, 0)
 }
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ go 1.13`
`5`	`5`	`require (`
`6`	`6`	`github.com/creack/goselect v0.1.1`
`7`	`7`	`github.com/stretchr/testify v1.4.0`
`8`		`- golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9`
	`8`	`+ golang.org/x/sys v0.0.0-20200909081042-eff7692f9009`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import (`
`14`	`14`	`"strings"`
`15`	`15`	`"sync"`
`16`	`16`	`"sync/atomic"`
`17`		`- "unsafe"`
`18`	`17`
`19`	`18`	`"go.bug.st/serial/unixutils"`
`20`	`19`	`"golang.org/x/sys/unix"`
`@@ -94,11 +93,11 @@ func (port *unixPort) Write(p []byte) (n int, err error) {`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`func (port *unixPort) ResetInputBuffer() error {`
`97`		`- return ioctl(port.handle, ioctlTcflsh, unix.TCIFLUSH)`
	`96`	`+ return unix.IoctlSetInt(port.handle, ioctlTcflsh, unix.TCIFLUSH)`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`func (port *unixPort) ResetOutputBuffer() error {`
`101`		`- return ioctl(port.handle, ioctlTcflsh, unix.TCOFLUSH)`
	`100`	`+ return unix.IoctlSetInt(port.handle, ioctlTcflsh, unix.TCOFLUSH)`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`func (port unixPort) SetMode(mode Mode) error {`
`@@ -390,29 +389,25 @@ func setRawMode(settings *unix.Termios) {`
`390`	`389`	`// native syscall wrapper functions`
`391`	`390`
`392`	`391`	`func (port unixPort) getTermSettings() (unix.Termios, error) {`
`393`		`- settings := &unix.Termios{}`
`394`		`- err := ioctl(port.handle, ioctlTcgetattr, uintptr(unsafe.Pointer(settings)))`
`395`		`- return settings, err`
	`392`	`+ return unix.IoctlGetTermios(port.handle, ioctlTcgetattr)`
`396`	`393`	`}`
`397`	`394`
`398`	`395`	`func (port unixPort) setTermSettings(settings unix.Termios) error {`
`399`		`- return ioctl(port.handle, ioctlTcsetattr, uintptr(unsafe.Pointer(settings)))`
	`396`	`+ return unix.IoctlSetTermios(port.handle, ioctlTcsetattr, settings)`
`400`	`397`	`}`
`401`	`398`
`402`	`399`	`func (port *unixPort) getModemBitsStatus() (int, error) {`
`403`		`- var status int`
`404`		`- err := ioctl(port.handle, unix.TIOCMGET, uintptr(unsafe.Pointer(&status)))`
`405`		`- return status, err`
	`400`	`+ return unix.IoctlGetInt(port.handle, unix.TIOCMGET)`
`406`	`401`	`}`
`407`	`402`
`408`	`403`	`func (port *unixPort) setModemBitsStatus(status int) error {`
`409`		`- return ioctl(port.handle, unix.TIOCMSET, uintptr(unsafe.Pointer(&status)))`
	`404`	`+ return unix.IoctlSetPointerInt(port.handle, unix.TIOCMSET, status)`
`410`	`405`	`}`
`411`	`406`
`412`	`407`	`func (port *unixPort) acquireExclusiveAccess() error {`
`413`		`- return ioctl(port.handle, unix.TIOCEXCL, 0)`
	`408`	`+ return unix.IoctlSetInt(port.handle, unix.TIOCEXCL, 0)`
`414`	`409`	`}`
`415`	`410`
`416`	`411`	`func (port *unixPort) releaseExclusiveAccess() error {`
`417`		`- return ioctl(port.handle, unix.TIOCNXCL, 0)`
	`412`	`+ return unix.IoctlSetInt(port.handle, unix.TIOCNXCL, 0)`
`418`	`413`	`}`