ffi-serial 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44fd8d0003d2e47f4722d3db91858c0ef47895ae
-  data.tar.gz: ad008840aa913c6f549173132911f9e4675cba98
+  metadata.gz: 3202efbedc0fb5ee6984b9f2f338b2594e216788
+  data.tar.gz: 759504a859ecc078d47316b89eb19a5f25940d41
 SHA512:
-  metadata.gz: aa8df84c7b52849bc7e51dc3f1c30ea2c1566f8de0c9dbe2082ab931816daa8e949a1444a04dea90e7b8a7ae7d61f2eba97e8f261876ef3684188414eaf64104
-  data.tar.gz: 0ced23dda4e32e280b99473331bc8d55d7f871a5b72fe4cec3fa8b1790a95bcbe549718a7c7ed755a4e54f4046f5902c8c3f77918d1368a1aef962d3d290ce5f
+  metadata.gz: 06650bbfcf4d148d086a475b2d13779a184f7c126f44363fe475c4e272e45e0266834f02d68b4afb78371e5f2109ea282ff27b2ab37e6932afa582caa1a2e37c
+  data.tar.gz: 0bebc5200e44b6fb342429a9f82f500d2fa5f5951edb1c653780544d05d30146eef3062474d6cbd388b38b254a7c8053220f2f09d7dee687fea35112b2a31a19

data/lib/ffi-serial/bsd.rb

@@ -28,21 +28,7 @@ module Serial #:nodoc:
                 :c_oflag, :ulong,
                 :c_cflag, :ulong,
                 :c_lflag, :ulong,
-                :cc_c, [:uchar, 20],
-                :c_ispeed, :ulong,
-                :c_ospeed, :ulong
-
-        def baud #:nodoc:
-          CONSTANTS['BAUD_'].fetch(self[:c_ispeed])
-        end
-
-        def baud=(val) #:nodoc:
-          mask = CONSTANTS['BAUD'].fetch(val, nil)
-          if mask.nil?
-            raise ArgumentError.new "Invalid baud, supported values #{CONSTANTS['BAUD'].keys.inspect}"
-          end
-          self[:c_cflag] = self[:c_cflag] | mask; self[:c_ispeed] = mask; self[:c_ospeed] = mask; val
-        end
+                :cc_c, [:uchar, 64]
       end
     end
   end

data/lib/ffi-serial/darwin.rb

@@ -27,21 +27,7 @@ module Serial #:nodoc:
                 :c_oflag, :ulong,
                 :c_cflag, :ulong,
                 :c_lflag, :ulong,
-                :cc_c, [:uchar, 20],
-                :c_ispeed, :ulong,
-                :c_ospeed, :ulong
-
-        def baud #:nodoc:
-          CONSTANTS['BAUD_'].fetch(self[:c_ispeed])
-        end
-
-        def baud=(val) #:nodoc:
-          mask = CONSTANTS['BAUD'].fetch(val, nil)
-          if mask.nil?
-            raise ArgumentError.new "Invalid baud, supported values #{CONSTANTS['BAUD'].keys.inspect}"
-          end
-          self[:c_cflag] = self[:c_cflag] | mask; self[:c_ispeed] = mask; self[:c_ospeed] = mask; val
-        end
+                :cc_c, [:uchar, 64]
       end
     end
   end

data/lib/ffi-serial/linux.rb

@@ -31,20 +31,7 @@ module Serial #:nodoc:
                 :c_cflag, :uint,
                 :c_lflag, :uint,
                 :c_line, :uchar,
-                :cc_c, [:uchar, 19],
-                :ignored, [:uint8, 48] # ignored padding bytes
-
-        def baud #:nodoc:
-          CONSTANTS['BAUD_'].fetch(self[:c_cflag] & CONSTANTS['BAUD_BITMASK'])
-        end
-
-        def baud=(val) #:nodoc:
-          mask = CONSTANTS['BAUD'].fetch(val, nil)
-          if mask.nil?
-            raise ArgumentError.new "Invalid baud, supported values #{CONSTANTS['BAUD'].keys.inspect}"
-          end
-          self[:c_cflag] = self[:c_cflag] | mask; val
-        end
+                :cc_c, [:uchar, 64]
       end
     end
   end

data/lib/ffi-serial/posix.rb

@@ -29,7 +29,12 @@ module Serial #:nodoc:
       # Parse configuration first
       termios = LIBC::Termios.new
 
-      termios.baud = baud
+      baud = LIBC::CONSTANTS['BAUD'].fetch(baud, nil)
+      if baud.nil?
+        raise ArgumentError.new "Invalid baud, supported values #{CONSTANTS['BAUD'].keys.inspect}"
+      end
+      LIBC.cfsetispeed(termios, baud)
+      LIBC.cfsetospeed(termios, baud)
       termios.data_bits = data_bits
       termios.stop_bits = stop_bits
       termios.parity = parity
@@ -43,8 +48,8 @@ module Serial #:nodoc:
         termios[:c_iflag] = (termios[:c_iflag] | LIBC::CONSTANTS['IXON'] | LIBC::CONSTANTS['IXOFF'] | LIBC::CONSTANTS['IXANY'])
         termios[:c_cflag] = (termios[:c_cflag] | LIBC::CONSTANTS['CLOCAL'] | LIBC::CONSTANTS['CREAD'] | LIBC::CONSTANTS['HUPCL'])
 
-        # Blocking read
-        termios[:cc_c][LIBC::CONSTANTS['VMIN']] = 1 
+        # non-blocking read
+        termios[:cc_c][LIBC::CONSTANTS['VMIN']] = 0
         termios[:cc_c][LIBC::CONSTANTS['VTIME']] = 0
 
         LIBC.tcsetattr(io,  termios)
@@ -58,7 +63,7 @@ module Serial #:nodoc:
     end
 
     def baud #:nodoc:
-      LIBC.tcgetattr(self).baud
+      LIBC::CONSTANTS['BAUD_'].fetch(LIBC.cfgetispeed(LIBC.tcgetattr(self)))
     end
 
     def data_bits #:nodoc:
@@ -93,16 +98,23 @@ module Serial #:nodoc:
 
       def self.tcgetattr(ruby_io) #:nodoc:
         termios = Termios.new
-        if (0 != c_tcgetattr(ruby_io.fileno, termios))
-          raise ERRNO[FFI.errno].new
-        end
-        termios
+        return termios if (0 == c_tcgetattr(ruby_io.fileno, termios))
+        raise ERRNO[FFI.errno].new
       end
 
       def self.tcsetattr(ruby_io, termios) #:nodoc:
-        if (0 != c_tcsetattr(ruby_io.fileno, CONSTANTS['TCSANOW'], termios))
-          raise ERRNO[FFI.errno].new
-        end
+        return true if (0 == c_tcsetattr(ruby_io.fileno, CONSTANTS['TCSANOW'], termios))
+        raise ERRNO[FFI.errno].new
+      end
+
+      def self.cfsetispeed(termios, speed)
+        return true if (0 == c_cfsetispeed(termios, speed))
+        raise ERRNO[FFI.errno].new
+      end
+
+      def self.cfsetospeed(termios, speed)
+        return true if (0 == c_cfsetospeed(termios, speed))
+        raise ERRNO[FFI.errno].new
       end
 
       class Termios #:nodoc:
@@ -152,7 +164,6 @@ module Serial #:nodoc:
         constants['DATA_BITS_'] = constants['DATA_BITS'].each_with_object({}) { |(k,v),r| r[v] = k }.freeze
         constants['STOP_BITS_'] = constants['STOP_BITS'].each_with_object({}) { |(k,v),r| r[v] = k }.freeze
         constants['PARITY_'] = constants['PARITY'].each_with_object({}) { |(k,v),r| r[v] = k }.freeze
-        constants['BAUD_BITMASK'] = constants['BAUD'].values.max
         constants['DATA_BITS_BITMASK'] = constants['DATA_BITS'].values.max
         constants['STOP_BITS_BITMASK'] = constants['STOP_BITS'].values.max
         constants['PARITY_BITMASK'] = constants['PARITY'].values.max
@@ -164,7 +175,11 @@ module Serial #:nodoc:
       attach_function :c_tcgetattr, :tcgetattr, [:int, :buffer_in], :int #:nodoc:
       attach_function :c_tcsetattr, :tcsetattr, [:int, :int, :buffer_out], :int #:nodoc:
 
-      private_class_method :os_specific_constants, :c_tcgetattr, :c_tcsetattr #:nodoc:
+      attach_function :c_cfsetispeed, :cfsetispeed, [:buffer_in, :uint32], :int #:nodoc:
+      attach_function :c_cfsetospeed, :cfsetospeed, [:buffer_in, :uint32], :int #:nodoc:
+      attach_function :cfgetispeed, [:buffer_in], :uint32 #:nodoc:
+
+      private_class_method :os_specific_constants, :c_tcgetattr, :c_tcsetattr, :c_cfsetispeed, :c_cfsetospeed #:nodoc:
       private_constant :ERRNO #:nodoc:
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-serial
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Johan van der Vyver