diff --git a/alliance/src/pcbs/configure.in b/alliance/src/pcbs/configure.in index 76ae338e..9eabe371 100644 --- a/alliance/src/pcbs/configure.in +++ b/alliance/src/pcbs/configure.in @@ -3,7 +3,7 @@ AC_INIT(src/pcbs/pcbs.c) EMULBS_MAJOR_VERSION=3 -EMULBS_MINOR_VERSION=1 +EMULBS_MINOR_VERSION=2 EMULBS_VERSION=$EMULBS_MAJOR_VERSION.$EMULBS_MINOR_VERSION AC_SUBST(EMULBS_MAJOR_VERSION) diff --git a/alliance/src/pcbs/src/emulbs/Makefile.am b/alliance/src/pcbs/src/emulbs/Makefile.am index 81450d72..3f4409d8 100644 --- a/alliance/src/pcbs/src/emulbs/Makefile.am +++ b/alliance/src/pcbs/src/emulbs/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in YACC = @YACC@ -d -DEFS = @DEFS@ -DEMULBS_NBR_EMULBS=4 -DEMULBS_VERSION=\"@EMULBS_VERSION@\" -DPROGRAM_NAME=\"emulbs\" +DEFS = @DEFS@ -DEMULBS_NBR_EMULBS=4 -DEMULBS_BS_SIZE=40 -DEMULBS_VERSION=\"@EMULBS_VERSION@\" -DPROGRAM_NAME=\"emulbs\" AM_CFLAGS = @ALLIANCE_CFLAGS@ diff --git a/alliance/src/pcbs/src/emulbs/emul31.h b/alliance/src/pcbs/src/emulbs/emul31.h index 9b54a1bf..2b226155 100644 --- a/alliance/src/pcbs/src/emulbs/emul31.h +++ b/alliance/src/pcbs/src/emulbs/emul31.h @@ -1,6 +1,8 @@ /*********** Donnees relatives a l'ensemble Boundary Scan ********************/ #define EMULBS_INST_SIZE 2 /*taille du registre instruction de la carte EMULBS 31*/ +#ifndef EMULBS_BS_SIZE #define EMULBS_BS_SIZE 31 /*nombre de cellules BS dans EMUL31 Rq: de 0 a 30*/ +#endif #define EMULBS_BYPASS_SIZE 1 /*revient a indiquer le nbr de cycles de retard*/ #define EMULBS_BYPASS0_VALUE "00" /*instructions d'EMUL31*/ #define EMULBS_BYPASS1_VALUE "11" diff --git a/alliance/src/pcbs/src/emulbs/emulbs.c b/alliance/src/pcbs/src/emulbs/emulbs.c index 6bd8d1a5..b84195be 100644 --- a/alliance/src/pcbs/src/emulbs/emulbs.c +++ b/alliance/src/pcbs/src/emulbs/emulbs.c @@ -191,7 +191,7 @@ extern int main(int argc, char *argv[]) /****initialisation environnement****/ mbkenv(); initializeBdd(SMALL_BDD); /*SMALL_BDD=0*/ - alliancebanner_with_authors("EmulBs", EMULBS_VERSION "[2002/02/18]", + alliancebanner_with_authors("EmulBs", EMULBS_VERSION "[2003/01/13]", "Emulated Boundary-Scan Tester Platform", "2001", ALLIANCE_VERSION, "Ana ABRIL, François DONNET, Eric MECHIN, Philippe OLEK");