From 6bc4e4567259ec1f7cd18af4a0b6c23e560bf16a Mon Sep 17 00:00:00 2001
From: jpawlowski <jpawlowski@users.noreply.github.com>
Date: Mon, 6 Jan 2014 15:15:31 +0000
Subject: [PATCH] ONKYO_AVR: protocol independent EOL recognition

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@4575 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/70_ONKYO_AVR.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FHEM/70_ONKYO_AVR.pm b/FHEM/70_ONKYO_AVR.pm
index b7da1c630..af90772d4 100644
--- a/FHEM/70_ONKYO_AVR.pm
+++ b/FHEM/70_ONKYO_AVR.pm
@@ -1393,11 +1393,11 @@ sub ONKYO_AVR_sysreadline($;$$) {
 
 ###################################
 sub ONKYO_AVR_at_eol($;$) {
-    if ( defined( $_[1] ) && $_[1] eq "pre2013" ) {
-        $_[0] =~ /\r\z/;
+    if ( $_[0] =~ /\r\z/ || $_[0] =~ /\r\n\z/ ) {
+        return 1;
     }
     else {
-        $_[0] =~ /\r\n\z/;
+        return 0;
     }
 }
 
@@ -1452,7 +1452,7 @@ sub ONKYO_AVR_read($$) {
 
     my $body = substr $$rbuf, 0, $data_size, '';
     my $sd = substr $body, 0, 2, '';
-    $body =~ s/([\032\r\n]|[\032\r]|[\032]|[\r\n]|[\r])+$//;
+    $body =~ s/([\032\r\n]|[\032\r]|[\r\n]|[\r])+$//;
 
     Log3 $name, 5,
       "ONKYO_AVR $name: Unexpected start/destination: expected '!1', got '$sd'"