Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug in the ATR parsing; If TA(i) was absent, then TA(i+1) was 

used as TA(i) (and similary for TB(i) and TC(i))
This commit is contained in:
kristerw 2000-02-13 01:31:22 +00:00
parent 6be4d2a451
commit 952281e8fb
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/arch/arm32/shark/scr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scr.c,v 1.5 2000/02/12 22:40:12 kristerw Exp $ */ /* $NetBSD: scr.c,v 1.6 2000/02/13 01:31:22 kristerw Exp $ */
/* /*
* Copyright 1997 * Copyright 1997
@ -510,10 +510,7 @@ struct scr_softc
int atrY; /* indicates if TA,TB,TC,TD is to follow */ int atrY; /* indicates if TA,TB,TC,TD is to follow */
int atrK; /* number of historical characters*/ int atrK; /* number of historical characters*/
int atrKCount; /* progressive could of historical characters*/ int atrKCount; /* progressive could of historical characters*/
int atrTAx; /* how many TA characters we have received */ int atrTABCDx; /* the 'i' in TA(i), TB(i), TC(i) and TD(i) */
int atrTBx; /* how many TB characters we have received */
int atrTCx; /* how many TB characters we have received */
int atrTDx; /* how many TB characters we have received */
int atrFi; /* value of Fi */ int atrFi; /* value of Fi */
int atrDi; /* value of Di */ int atrDi; /* value of Di */
@ -2662,11 +2659,8 @@ static void ATRSM (struct scr_softc * sc,int cmd)
/* store Y & K */ /* store Y & K */
sc->atrY = sc->dataByte & 0xf0; sc->atrY = sc->dataByte & 0xf0;
sc->atrK = sc->dataByte & 0x0f; sc->atrK = sc->dataByte & 0x0f;
sc->atrTAx = 1; sc->atrTABCDx = 1;
sc->atrTBx = 1;
sc->atrTCx = 1;
sc->atrTDx = 1;
sc->atrKCount = 1; sc->atrKCount = 1;
/* if there are no TDx following set T0 protocol */ /* if there are no TDx following set T0 protocol */
@ -2736,7 +2730,7 @@ static void ATRSM (struct scr_softc * sc,int cmd)
if (sc->atrY & ATR_Y_TA) if (sc->atrY & ATR_Y_TA)
{ {
sc->atrY &= ~ATR_Y_TA; sc->atrY &= ~ATR_Y_TA;
if (sc->atrTAx == 1) if (sc->atrTABCDx == 1)
{ {
sc->Fi = FI2Fi[((sc->dataByte >> 4) & 0x0f)]; sc->Fi = FI2Fi[((sc->dataByte >> 4) & 0x0f)];
if (sc->Fi == 0) if (sc->Fi == 0)
@ -2753,40 +2747,39 @@ static void ATRSM (struct scr_softc * sc,int cmd)
} }
} }
sc->atrTAx++;
} }
else if (sc->atrY & ATR_Y_TB) else if (sc->atrY & ATR_Y_TB)
{ {
sc->atrY &= ~ATR_Y_TB; sc->atrY &= ~ATR_Y_TB;
sc->atrTBx++;
} }
else if (sc->atrY & ATR_Y_TC) else if (sc->atrY & ATR_Y_TC)
{ {
sc->atrY &= ~ATR_Y_TC; sc->atrY &= ~ATR_Y_TC;
if (sc->atrTCx == 1) if (sc->atrTABCDx == 1)
{ {
sc->N = sc->dataByte; sc->N = sc->dataByte;
} }
if (sc->atrTCx == 2) if (sc->atrTABCDx == 2)
{ {
sc->Wi = sc->dataByte; sc->Wi = sc->dataByte;
} }
sc->atrTCx++;
} }
else else
{ {
ASSERT(sc->atrY & ATR_Y_TD); ASSERT(sc->atrY & ATR_Y_TD);
sc->atrY &= ~ATR_Y_TD; sc->atrY &= ~ATR_Y_TD;
sc->atrTDx++;
/* copy across the y section of TD */ /* copy across the y section of TD */
sc->atrY = sc->dataByte; sc->atrY = sc->dataByte;
sc->atrY &= 0xf0; sc->atrY &= 0xf0;
/* step to the next group of TABCD */
sc->atrTABCDx++;
/* store protocols */ /* store protocols */
sc->protocolType = (1 << (sc->dataByte &0x0f)); sc->protocolType = (1 << (sc->dataByte &0x0f));
} }