update DWeather::Debug, Logger, Serial

[dweather.git] / DWeather / lib / DWeather / Serial.pm

diff --git a/DWeather/lib/DWeather/Serial.pm b/DWeather/lib/DWeather/Serial.pm
index cbd6cbebc244694485f9be027328b903937d2d5f..ccf31ca7d124693b48202a1867a215d14082cdb1 100644 (file)
--- a/DWeather/lib/DWeather/Serial.pm
+++ b/DWeather/lib/DWeather/Serial.pm
@@ -2,54 +2,39 @@
 # Module to do serial handling on perl FileHandles
 #
 
-use strict;
-
 package DWeather::Serial;
 
 use POSIX qw(:termios_h);
 use Fcntl;
+use Scalar::Util qw(weaken);
 
-use AnyEvent;
-use base qw(AnyEvent::Handle);
 
+@ISA = qw(IO::File);
+$VERSION = 1.3;
+
+use strict;
 
-# Linux-specific Baud-Rates (for reference really)
+# Linux-specific Baud-Rates
 use constant B57600 => 0010001;
 use constant B115200 => 0010002;
 use constant B230400 => 0010003;
 use constant B460800 => 0010004;
 use constant CRTSCTS => 020000000000;
 
-#
-# my $h = DWeather::Serial->new("/dev/ttyXXX", 19200 [,cs7] [,odd] [,rtscts]);
-#
-# all parameters are optional
-#
-# you are expected to add AE callbacks as required, all this module
-# does is create the AE::Handle and associates an IO::File handle with it
-#
-# default is /dev/ttyS0, 9600 8N1 no handshaking
-#
-# the tty is set to raw mode.
-#
-# returns a subclassed AE::Handle
-#
 sub new
 {
        my $pkg = shift;
        my $class = ref $pkg || $pkg;
        my $device = shift || "/dev/ttyS0";
 
-       my $fh = IO::File->new($device, O_RDWR|O_NOCTTY|O_EXCL|O_NDELAY) || return;
-       my $self = $class->new(fh => $fh);
+       my $self = $pkg->SUPER::new($device, O_RDWR|O_NOCTTY|O_EXCL|O_NDELAY) || return;
 
        # get my attributes
-       $self->{ORIGTERM} = POSIX::Termios->new();
-       my $term =  $self->{TERM} = POSIX::Termios->new();
-       $self->{ORIGTERM} = $self->{ORIGTERM}->getattr(fileno($fh));
-       $term->getattr(fileno($fh));
+       $$self->{ORIGTERM} = POSIX::Termios->new();
+       my $term = POSIX::Termios->new();
+       $$self->{ORIGTERM}->getattr(fileno($self));
+       $term->getattr(fileno($self));
        my ($speed) = grep {/^\d+$/} @_; 
-       $speed ||= 9600;
        my $baud;
        {
                no strict 'refs';
@@ -79,30 +64,39 @@ sub new
        $cflag |= CRTSCTS if grep /rtscts$/, $@;
        $term->setcflag($cflag); $term->setlflag($lflag);
        $term->setoflag($oflag); $term->setiflag($iflag);
-       $term->setattr(fileno($fh), TCSANOW);
-       $self->{device} = $device;
-       $self->{speed} = $speed;
+       $term->setattr(fileno($self), TCSANOW);
+       $$self->{TERM} = $term;
+       
        return $self;
 }
 
 sub getattr
 {
        my $self = shift;
-       $self->{TERM}->getattr(fileno($self->fh));
-       return $self->{TERM};
+       $$self->{TERM}->getattr;
+       return $$self->{TERM};
 }
 
 sub setattr
 {
        my $self = shift;
-       my $attr = shift || $self->{TERM};
-       $attr->setattr(fileno($self->fh), &POSIX::TCSANOW);
+       my $attr = shift || $$self->{TERM};
+       $attr->setattr(fileno($self), &POSIX::TCSANOW) if fileno($self);
+}
+
+sub close
+{
+       my $self = shift;
+       $self->setattr(delete $$self->{ORIGTERM}) if fileno($self) && $$self->{ORIGTERM};
+       $self->SUPER::close;
 }
 
 sub DESTROY
 {
        my $self = shift;
-       $self->setattr($self->{ORIGTERM});
+       if (exists $$self->{ORIGTERM}) {
+               $self->close;
+       }
 }
 
 1;