vato007/SwiftSerial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from 5sw/master

Browse Source 
Update for Swift 4/5
This commit is contained in:
Yeo Kheng Meng
2019-04-08 15:26:00 +08:00
committed by GitHub
parent 581ebc7e10 10b91eb8a2
commit 66c27258da
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sources/SwiftSerial.swift
View File

@@ -269,7 +269,7 @@ public class SerialPort {
useHardwareFlowControl: Bool = false, useHardwareFlowControl: Bool = false,
useSoftwareFlowControl: Bool = false, useSoftwareFlowControl: Bool = false,
processOutput: Bool = false) { processOutput: Bool = false) {
guard let fileDescriptor = fileDescriptor else { guard let fileDescriptor = fileDescriptor else {
return return
} }
@@ -372,13 +372,13 @@ extension SerialPort {
guard let fileDescriptor = fileDescriptor else { guard let fileDescriptor = fileDescriptor else {
throw PortError.mustBeOpen throw PortError.mustBeOpen
} }
var s: stat = stat() var s: stat = stat()
fstat(fileDescriptor, &s) fstat(fileDescriptor, &s)
if s.st_nlink != 1 { if s.st_nlink != 1 {
throw PortError.deviceNotConnected throw PortError.deviceNotConnected
} }
let bytesRead = read(fileDescriptor, buffer, size) let bytesRead = read(fileDescriptor, buffer, size)
return bytesRead return bytesRead
} }
@@ -386,7 +386,7 @@ extension SerialPort {
public func readData(ofLength length: Int) throws -> Data { public func readData(ofLength length: Int) throws -> Data {
let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: length) let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: length)
defer { defer {
buffer.deallocate(capacity: length) buffer.deallocate()
} }
let bytesRead = try readBytes(into: buffer, size: length) let bytesRead = try readBytes(into: buffer, size: length)
@@ -425,7 +425,7 @@ extension SerialPort {
var data = Data() var data = Data()
let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: 1) let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: 1)
defer { defer {
buffer.deallocate(capacity: 1) buffer.deallocate()
} }
while true { while true {
@@ -436,7 +436,7 @@ extension SerialPort {
throw PortError.unableToConvertByteToCharacter throw PortError.unableToConvertByteToCharacter
} }
let character = CChar(buffer[0]) let character = CChar(buffer[0])
if character == terminator { if character == terminator {
break break
} else { } else {
@@ -459,14 +459,14 @@ extension SerialPort {
public func readByte() throws -> UInt8 { public func readByte() throws -> UInt8 {
let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: 1) let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: 1)
defer { defer {
buffer.deallocate(capacity: 1) buffer.deallocate()
} }
while true { while true {
let bytesRead = try readBytes(into: buffer, size: 1) let bytesRead = try readBytes(into: buffer, size: 1)
if bytesRead > 0 { if bytesRead > 0 {
return buffer[0] return buffer[0]
} }
@@ -478,7 +478,7 @@ extension SerialPort {
let character = UnicodeScalar(byteRead) let character = UnicodeScalar(byteRead)
return character return character
} }
} }
// MARK: Transmitting // MARK: Transmitting
@@ -498,7 +498,7 @@ extension SerialPort {
let size = data.count let size = data.count
let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: size) let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: size)
defer { defer {
buffer.deallocate(capacity: size) buffer.deallocate()
} }
data.copyBytes(to: buffer, count: size) data.copyBytes(to: buffer, count: size)