From 097c85b924cff74d3f7af072a1ab077de4375ca4 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 13 Apr 2020 10:08:36 +0000 Subject: [PATCH] DevIo.pm: revert warnings, change to use DevIo (Forum #110125) git-svn-id: https://svn.fhem.de/fhem/trunk@21659 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_CUL.pm | 3 +-- fhem/FHEM/00_ZWDongle.pm | 3 +-- fhem/FHEM/98_autocreate.pm | 3 +-- fhem/FHEM/DevIo.pm | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index eae092d2c..c9083d10f 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -4,6 +4,7 @@ package main; use strict; use warnings; +use DevIo; use Time::HiRes qw(gettimeofday); sub CUL_Attr(@); @@ -126,8 +127,6 @@ CUL_Initialize($) { my ($hash) = @_; - require "$attr{global}{modpath}/FHEM/DevIo.pm"; - # Provider $hash->{ReadFn} = "CUL_Read"; $hash->{WriteFn} = "CUL_Write"; diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm index 2efc85845..ea00f1436 100644 --- a/fhem/FHEM/00_ZWDongle.pm +++ b/fhem/FHEM/00_ZWDongle.pm @@ -5,6 +5,7 @@ package main; use strict; use warnings; use Time::HiRes qw(gettimeofday); +use DevIo; use ZWLib; use vars qw($FW_ME); @@ -81,8 +82,6 @@ ZWDongle_Initialize($) { my ($hash) = @_; - require "$attr{global}{modpath}/FHEM/DevIo.pm"; - # Provider $hash->{ReadFn} = "ZWDongle_Read"; $hash->{WriteFn} = "ZWDongle_Write"; diff --git a/fhem/FHEM/98_autocreate.pm b/fhem/FHEM/98_autocreate.pm index 61fa1f781..da787d977 100644 --- a/fhem/FHEM/98_autocreate.pm +++ b/fhem/FHEM/98_autocreate.pm @@ -4,6 +4,7 @@ package main; use strict; use warnings; +use DevIo; sub resolveSymLink($); # Problems: @@ -566,8 +567,6 @@ CommandUsb($$) return "This command is not yet supported on windows"; } - require "$attr{global}{modpath}/FHEM/DevIo.pm"; - Log3 undef, 1, "usb $n starting"; ################ # First try to flash unflashed CULs diff --git a/fhem/FHEM/DevIo.pm b/fhem/FHEM/DevIo.pm index 740c5b534..a1101289a 100644 --- a/fhem/FHEM/DevIo.pm +++ b/fhem/FHEM/DevIo.pm @@ -3,7 +3,6 @@ package main; use strict; -use warnings; sub DevIo_CloseDev($@); sub DevIo_Disconnected($);