toholio-serialport 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.7.2 => 02/09/2008:    Fix several Windows and POSIX compilation problems.
+                        Make GCC compile the code without any warnings.
+                        Make RDoc not be so talkative during gem installation.
+
 0.7.1 => 31/08/2008:    Change to gemspec creation and fix posix compilation.
 
 0.7.0 => 03/07/2008:    Major Code Cleanup

data/README

@@ -12,7 +12,7 @@ and Borland's C++ compilers.
 -- Installation --
 
 This gem is hosted at GitHub. Before you can install this, or any other GitHub gem you must
-add it as a repository:
+add it as a gem source:
   gem sources -a http://gems.github.com
 
 Then you can install the gem as normal:

data/serialport.gemspec

@@ -1,6 +1,6 @@
 SPEC = Gem::Specification.new do |s|
   s.name = 'serialport'
-  s.version = '0.7.1'
+  s.version = '0.7.2'
   s.summary  = 'Library for using RS-232 serial ports.'
   s.description = 'SerialPort is a Ruby library that provides a class for using RS-232 serial ports.'
   s.files = [ 'CHANGELOG',

data/src/posix_serialport_impl.c

@@ -636,13 +636,13 @@ VALUE set_signal_impl(obj, val, sig)
 VALUE sp_set_rts_impl(self, val)
    VALUE self, val;
 {
-   return set_signal(self, val, TIOCM_RTS);
+   return set_signal_impl(self, val, TIOCM_RTS);
 }
 
 VALUE sp_set_dtr_impl(self, val)
    VALUE self, val;
 {
-   return set_signal(self, val, TIOCM_DTR);
+   return set_signal_impl(self, val, TIOCM_DTR);
 }
 
 VALUE sp_get_rts_impl(self)
@@ -650,7 +650,7 @@ VALUE sp_get_rts_impl(self)
 {
    struct line_signals ls;
 
-   get_line_signals_helper(self, &ls);
+   get_line_signals_helper_impl(self, &ls);
    return INT2FIX(ls.rts);
 }
 
@@ -659,7 +659,7 @@ VALUE sp_get_dtr_impl(self)
 {
    struct line_signals ls;
 
-   get_line_signals_helper(self, &ls);
+   get_line_signals_helper_impl(self, &ls);
 
    return INT2FIX(ls.dtr);
 }

data/src/serialport.c

@@ -20,12 +20,19 @@
 
 VALUE cSerialPort; /* serial port class */
 
+VALUE sBaud, sDataBits, sStopBits, sParity; /* strings */
+VALUE sRts, sDtr, sCts, sDsr, sDcd, sRi;
+
+/*
+ */
 static VALUE sp_create(class, _port)
    VALUE class, _port;
 {
    return sp_create_impl(class, _port);
 }
 
+/*
+ */
 static VALUE sp_set_modem_params(argc, argv, self)
    int argc;
    VALUE *argv, self;
@@ -33,67 +40,91 @@ static VALUE sp_set_modem_params(argc, argv, self)
    return sp_set_modem_params_impl(argc, argv, self);
 }
 
+/*
+ */
 static VALUE sp_break(self, time)
    VALUE self, time;
 {
    return sp_break_impl(self, time);
 }
 
+/*
+ */
 static VALUE sp_get_dtr(self)
    VALUE self;
 {
    return sp_get_dtr_impl(self);
 }
 
+/*
+ */
 static VALUE sp_get_flow_control(self)
    VALUE self;
 {
    return sp_get_flow_control_impl(self);
 }
 
+/*
+ */
 static VALUE sp_get_read_timeout(self)
    VALUE self;
 {
    return sp_get_read_timeout_impl(self);
 }
 
+/*
+ */
 static VALUE sp_get_rts(self)
    VALUE self;
 {
    return sp_get_rts_impl(self);
 }
 
+/*
+ */
 static VALUE sp_get_write_timeout(self)
    VALUE self;
 {
    return sp_get_write_timeout_impl(self);
 }
 
+/*
+ */
 static VALUE sp_set_dtr(self, val)
 {
    return sp_set_dtr_impl(self, val);
 }
 
+/*
+ */
 static VALUE sp_set_flow_control(self, val)
 {
    return sp_set_flow_control_impl(self, val);
 }
 
+/*
+ */
 static VALUE sp_set_read_timeout(self, val)
 {
    return sp_set_read_timeout_impl(self, val);
 }
 
+/*
+ */
 static VALUE sp_set_rts(self, val)
 {
    return sp_set_rts_impl(self, val);
 }
 
+/*
+ */
 static VALUE sp_set_write_timeout(self, val)
 {
    return sp_set_write_timeout_impl(self, val);
 }
 
+/*
+ */
 static void get_modem_params(self, mp)
    VALUE self;
    struct modem_params *mp;
@@ -101,6 +132,8 @@ static void get_modem_params(self, mp)
    get_modem_params_impl(self, mp);
 }
 
+/*
+ */
 static VALUE sp_set_data_rate(self, data_rate)
    VALUE self, data_rate;
 {
@@ -113,6 +146,8 @@ static VALUE sp_set_data_rate(self, data_rate)
    return data_rate;
 }
 
+/*
+ */
 static VALUE sp_set_data_bits(self, data_bits)
    VALUE self, data_bits;
 {
@@ -125,6 +160,8 @@ static VALUE sp_set_data_bits(self, data_bits)
    return data_bits;
 }
 
+/*
+ */
 static VALUE sp_set_stop_bits(self, stop_bits)
    VALUE self, stop_bits;
 {
@@ -137,6 +174,8 @@ static VALUE sp_set_stop_bits(self, stop_bits)
    return stop_bits;
 }
 
+/*
+ */
 static VALUE sp_set_parity(self, parity)
    VALUE self, parity;
 {
@@ -149,6 +188,8 @@ static VALUE sp_set_parity(self, parity)
    return parity;
 }
 
+/*
+ */
 static VALUE sp_get_data_rate(self)
    VALUE self;
 {
@@ -159,6 +200,8 @@ static VALUE sp_get_data_rate(self)
    return INT2FIX(mp.data_rate);
 }
 
+/*
+ */
 static VALUE sp_get_data_bits(self)
    VALUE self;
 {
@@ -169,6 +212,8 @@ static VALUE sp_get_data_bits(self)
    return INT2FIX(mp.data_bits);
 }
 
+/*
+ */
 static VALUE sp_get_stop_bits(self)
    VALUE self;
 {
@@ -179,6 +224,8 @@ static VALUE sp_get_stop_bits(self)
    return INT2FIX(mp.stop_bits);
 }
 
+/*
+ */
 static VALUE sp_get_parity(self)
    VALUE self;
 {
@@ -189,6 +236,8 @@ static VALUE sp_get_parity(self)
    return INT2FIX(mp.parity);
 }
 
+/*
+ */
 static VALUE sp_get_modem_params(self)
    VALUE self;
 {
@@ -207,6 +256,15 @@ static VALUE sp_get_modem_params(self)
    return hash;
 }
 
+void get_line_signals_helper(obj, ls)
+   VALUE obj;
+   struct line_signals *ls;
+{
+   get_line_signals_helper_impl(obj, ls);
+}
+
+/*
+ */
 static VALUE sp_get_cts(self)
    VALUE self;
 {
@@ -217,6 +275,8 @@ static VALUE sp_get_cts(self)
    return INT2FIX(ls.cts);
 }
 
+/*
+ */
 static VALUE sp_get_dsr(self)
    VALUE self;
 {
@@ -227,6 +287,8 @@ static VALUE sp_get_dsr(self)
    return INT2FIX(ls.dsr);
 }
 
+/*
+ */
 static VALUE sp_get_dcd(self)
    VALUE self;
 {
@@ -237,6 +299,8 @@ static VALUE sp_get_dcd(self)
    return INT2FIX(ls.dcd);
 }
 
+/*
+ */
 static VALUE sp_get_ri(self)
    VALUE self;
 {
@@ -247,6 +311,8 @@ static VALUE sp_get_ri(self)
    return INT2FIX(ls.ri);
 }
 
+/*
+ */
 static VALUE sp_signals(self)
    VALUE self;
 {

data/src/serialport.h

@@ -2,6 +2,7 @@
  * Guillaume Pierronnet <moumar@netcourrier.com>
  * Alan Stern <stern@rowland.harvard.edu>
  * Daniel E. Shipton <dshipton@redshiptechnologies.com>
+ * Tobin Richard <tobin.richard@gmail.com>
  *
  * This code is hereby licensed for public consumption under either the
  * GNU GPL v2 or greater.
@@ -19,7 +20,7 @@
 #ifndef _RUBY_SERIAL_PORT_H_
 #define _RUBY_SERIAL_PORT_H_
 
-#define RUBY_SERIAL_PORT_VERSION   "0.7.0"
+#define RUBY_SERIAL_PORT_VERSION   "0.7.2"
 
 #include <ruby.h>    /* ruby inclusion */
 #include <rubyio.h>  /* ruby io inclusion */
@@ -51,14 +52,38 @@ struct line_signals
    #define MARK   MARKPARITY
    #define EVEN   EVENPARITY
    #define ODD    ODDPARITY
+   
+   #ifndef RB_SERIAL_EXPORT
+   #define RB_SERIAL_EXPORT __declspec(dllexport)
+   #endif
 #else
    #define SPACE  0
    #define MARK   0
    #define EVEN   1
    #define ODD    2
+   
+   #define RB_SERIAL_EXPORT
 #endif
 
-static VALUE sBaud, sDataBits, sStopBits, sParity; /* strings */
-static VALUE sRts, sDtr, sCts, sDsr, sDcd, sRi;
+extern VALUE sBaud, sDataBits, sStopBits, sParity; /* strings */
+extern VALUE sRts, sDtr, sCts, sDsr, sDcd, sRi;
+
+/* Implementation specific functions. */
+VALUE RB_SERIAL_EXPORT sp_create_impl(VALUE class, VALUE _port);
+VALUE RB_SERIAL_EXPORT sp_set_modem_params_impl(int argc, VALUE *argv, VALUE self);
+void RB_SERIAL_EXPORT get_modem_params_impl(VALUE self, struct modem_params *mp);
+VALUE RB_SERIAL_EXPORT sp_set_flow_control_impl(VALUE self, VALUE val);
+VALUE RB_SERIAL_EXPORT sp_get_flow_control_impl(VALUE self);
+VALUE RB_SERIAL_EXPORT sp_set_read_timeout_impl(VALUE self, VALUE val);
+VALUE RB_SERIAL_EXPORT sp_get_read_timeout_impl(VALUE self);
+VALUE RB_SERIAL_EXPORT sp_set_write_timeout_impl(VALUE self, VALUE val);
+VALUE RB_SERIAL_EXPORT sp_get_write_timeout_impl(VALUE self);
+VALUE RB_SERIAL_EXPORT sp_break_impl(VALUE self, VALUE time);
+void RB_SERIAL_EXPORT get_line_signals_helper_impl(VALUE obj, struct line_signals *ls);
+VALUE RB_SERIAL_EXPORT set_signal_impl(VALUE obj, VALUE val, int sig);
+VALUE RB_SERIAL_EXPORT sp_set_rts_impl(VALUE self, VALUE val);
+VALUE RB_SERIAL_EXPORT sp_set_dtr_impl(VALUE self, VALUE val);
+VALUE RB_SERIAL_EXPORT sp_get_rts_impl(VALUE self);
+VALUE RB_SERIAL_EXPORT sp_get_dtr_impl(VALUE self);
 
 #endif

data/src/win_serialport_impl.c

@@ -25,10 +25,6 @@
 #include <fcntl.h>   /* File control definitions */
 #include <windows.h> /* Windows standard function definitions */
 
-#ifndef RB_SERIAL_EXPORT
-#define RB_SERIAL_EXPORT __declspec(dllexport)
-//#define RB_SERIAL_EXPORT 
-#endif
 
 static char sGetCommState[] = "GetCommState";
 static char sSetCommState[] = "SetCommState";
@@ -536,7 +532,7 @@ VALUE RB_SERIAL_EXPORT sp_break_impl(self, time)
    return Qnil;
 }
 
-void RB_SERIAL_EXPORT get_line_signals_helper(obj, ls)
+void RB_SERIAL_EXPORT get_line_signals_helper_impl(obj, ls)
    VALUE obj;
    struct line_signals *ls;
 {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toholio-serialport
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Guillaume Pierronnet