[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  d3c9e434373f6eac20ee4ff827286d5e97960a9a (commit)
       via  9a4d2fce48c33ef2779f103605e688d3839a06a0 (commit)
      from  26597a5cac2930c191ae540c03c7406745c03e36 (commit)

Summary of changes:
 drivers/dahdi/xpp/card_fxs.c     |    2 +-
 drivers/dahdi/xpp/init_card_1_30 |    2 +-
 drivers/dahdi/xpp/init_card_6_30 |    4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit d3c9e434373f6eac20ee4ff827286d5e97960a9a
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Sun Feb 11 19:22:03 2018 +0200

    xpp: Support FXS module with 4 ports and no I/O
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c
index 38f000f..03fcc3a 100644
--- a/drivers/dahdi/xpp/card_fxs.c
+++ b/drivers/dahdi/xpp/card_fxs.c
@@ -593,7 +593,7 @@ static xpd_t *FXS_card_new(xbus_t *xbus, int unit, int subunit,
 		regular_channels = min(8, subunit_ports);
 	channels = regular_channels;
 	/* Calculate digital inputs/outputs */
-	if (unit == 0 && unit_descriptor->subtype != 4) {
+	if (unit == 0 && unit_descriptor->subtype != 4 && unit_descriptor->numchips != 4) {
 		channels += 6;	/* 2 DIGITAL OUTPUTS, 4 DIGITAL INPUTS */
 		d_inputs = LINES_DIGI_INP;
 		d_outputs = LINES_DIGI_OUT;

commit 9a4d2fce48c33ef2779f103605e688d3839a06a0
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Tue Feb 20 19:07:50 2018 +0200

    xpp: init_card: eeprom_release_201 applies to any 20x
    
    * The variable eeprom_release_201 was added in the initialization
      script of the FXS module to add a case where it is different from
      101 mains.
    * However, it tests for "201" and it should apply for any 20x.
    * Remove the variable from the init script of module type 6 (new FXS)
      as it was not used.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/init_card_1_30 b/drivers/dahdi/xpp/init_card_1_30
index e0e3485..7251ca9 100755
--- a/drivers/dahdi/xpp/init_card_1_30
+++ b/drivers/dahdi/xpp/init_card_1_30
@@ -94,7 +94,7 @@ if (-t STDERR) {
 		}
 	}
 	logit "XBUS_MODEL_STRING='$ENV{XBUS_MODEL_STRING}'";
-	if ($ENV{XBUS_MODEL_STRING} =~ m{.*/.*/201}) {
+	if ($ENV{XBUS_MODEL_STRING} =~ m{.*/.*/20.}) {
 		$eeprom_release_201 = 1;
 	}
 	$chipregs = sprintf "/sys/bus/xpds/devices/%02d:%1d:0/chipregs",
diff --git a/drivers/dahdi/xpp/init_card_6_30 b/drivers/dahdi/xpp/init_card_6_30
index 977c9f7..dcf9179 100755
--- a/drivers/dahdi/xpp/init_card_6_30
+++ b/drivers/dahdi/xpp/init_card_6_30
@@ -51,7 +51,6 @@ BEGIN { $init_dir = dirname($0); unshift(@INC, "$init_dir"); }
 use XppConfig $init_dir;
 my $unit_id;
 my %opts;
-my $eeprom_release_201 = 0;
 
 getopts('o:', \%opts);
 
@@ -96,9 +95,6 @@ if (-t STDERR) {
 		}
 	}
 	logit "XBUS_MODEL_STRING='$ENV{XBUS_MODEL_STRING}'";
-	if ($ENV{XBUS_MODEL_STRING} =~ m{.*/.*/201}) {
-		$eeprom_release_201 = 1;
-	}
 	$chipregs = sprintf "/sys/bus/xpds/devices/%02d:%1d:0/chipregs",
 		$ENV{XBUS_NUMBER}, $ENV{UNIT_NUMBER};
 	$command = "/proc/xpp/$ENV{XBUS_NAME}/command";

-----------------------------------------------------------------------


-- 
dahdi/linux.git