X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag.c;h=415f36a368e607ec4a9211f0870f43a1b6819d76;hp=d28a02f4e4d82e4ecacec22d68a1c1f084b33e53;hb=d85d45d823dda71280f4ed9083717ec8e5ce28ae;hpb=ae09939eb8c62c83f244527e7916cee5f9145e6c diff --git a/firmware/apps/jtag/jtag.c b/firmware/apps/jtag/jtag.c index d28a02f..415f36a 100644 --- a/firmware/apps/jtag/jtag.c +++ b/firmware/apps/jtag/jtag.c @@ -13,14 +13,134 @@ void jtagsetup(){ P5DIR|=MOSI+SCK+TMS; P5DIR&=~MISO; + /* P5OUT|=0xFFFF; P5OUT=0; + */ P4DIR|=TST; P2DIR|=RST; msdelay(100); } +/************************** JTAG Primitives ****************************/ +// these have been turned into functions to save flash space +void jtag_tcktock() { + //delay(1); // FIXME: Should never wait this long... + CLRTCK; + PLEDOUT^=PLEDPIN; + //delay(1); // FIXME: Should never wait this long... + SETTCK; + PLEDOUT^=PLEDPIN; +} + +void jtag_goto_shift_ir() { + SETTMS; + jtag_tcktock(); + jtag_tcktock(); + CLRTMS; + jtag_tcktock(); + jtag_tcktock(); + +} +void jtag_goto_shift_dr() { + SETTMS; + jtag_tcktock(); + CLRTMS; + jtag_tcktock(); + jtag_tcktock(); +} + +void jtag_reset_to_runtest_idle() { + SETTMS; + jtag_tcktock(); + jtag_tcktock(); + jtag_tcktock(); + jtag_tcktock(); + jtag_tcktock(); // now in Reset state + CLRTMS; + jtag_tcktock(); // now in Run-Test/Idle state +} + + int savedtclk=0; +// NOTE: important: THIS MODULE REVOLVES AROUND RETURNING TO RUNTEST/IDLE, OR THE FUNCTIONAL EQUIVALENT +//! Shift N bits over TDI/TDO. May choose LSB or MSB, and select whether to terminate (TMS-high on last bit) and whether to return to RUNTEST/IDLE +// flags should be 0 for most uses. +// for the extreme case, flags should be (NOEND|NORETDLE|LSB) +// other edge cases can involve a combination of those three flags +// +// the max bit-size that can be be shifted is 32-bits. +// for longer shifts, use the NOEND flag (which infers NORETIDLE so the additional flag is unnecessary) +// +// NORETIDLE is used for special cases where (as with arm) the debug subsystem does not want to +// return to the RUN-TEST/IDLE state between setting IR and DR +unsigned long jtagtransn(unsigned long word, unsigned char bitcount, unsigned char flags){ + unsigned char bit; + unsigned long high = 1L; + unsigned long mask; + + //for (bit=(bitcount-1)/8; bit>0; bit--) + // high <<= 8; + //high <<= ((bitcount-1)%8); + high <<= (bitcount-1); + + mask = high-1; + + SAVETCLK; + if (flags & LSB) { + for (bit = bitcount; bit > 0; bit--) { + /* write MOSI on trailing edge of previous clock */ + if (word & 1) + {SETMOSI;} + else + {CLRMOSI;} + word >>= 1; + + if (bit==1 && !(flags & NOEND)) + SETTMS;//TMS high on last bit to exit. + + jtag_tcktock(); + + /* read MISO on trailing edge */ + if (READMISO){ + word += (high); + } + } + } else { + for (bit = bitcount; bit > 0; bit--) { + /* write MOSI on trailing edge of previous clock */ + if (word & high) + {SETMOSI;} + else + {CLRMOSI;} + word = (word & mask) << 1; + + if (bit==1 && !(flags & NOEND)) + SETTMS;//TMS high on last bit to exit. + + jtag_tcktock(); + + /* read MISO on trailing edge */ + word |= (READMISO); + } + } + + + RESTORETCLK; + //SETMOSI; + + if (!(flags & NOEND)){ + // exit state + jtag_tcktock(); + // update state + if (!(flags & NORETIDLE)){ + CLRTMS; + jtag_tcktock(); + } + } + return word; +} + //! Shift 8 bits in and out. unsigned char jtagtrans8(unsigned char byte){ unsigned int bit; @@ -36,30 +156,27 @@ unsigned char jtagtrans8(unsigned char byte){ if(bit==7) SETTMS;//TMS high on last bit to exit. - CLRTCK; - SETTCK; - /* read MISO on trailing edge */ + TCKTOCK; + /* read MISO on trailing edge */ byte |= READMISO; } RESTORETCLK; // exit state - CLRTCK; - SETTCK; + TCKTOCK; // update state CLRTMS; - CLRTCK; - SETTCK; + TCKTOCK; return byte; } //! Shift n bits in and out. -unsigned long jtagtransn(unsigned long word, +/*unsigned long jtagtransn(unsigned long word, unsigned int bitcount){ unsigned int bit; //0x8000 - unsigned long high; + unsigned long high=0x8000; if(bitcount==20) high=0x80000; @@ -69,7 +186,7 @@ unsigned long jtagtransn(unsigned long word, SAVETCLK; for (bit = 0; bit < bitcount; bit++) { - /* write MOSI on trailing edge of previous clock */ + //* write MOSI on trailing edge of previous clock * if (word & high) {SETMOSI;} else @@ -79,9 +196,8 @@ unsigned long jtagtransn(unsigned long word, if(bit==bitcount-1) SETTMS;//TMS high on last bit to exit. - CLRTCK; - SETTCK; - /* read MISO on trailing edge */ + TCKTOCK; + //* read MISO on trailing edge * word |= READMISO; } @@ -92,50 +208,14 @@ unsigned long jtagtransn(unsigned long word, RESTORETCLK; // exit state - CLRTCK; - SETTCK; + TCKTOCK; // update state CLRTMS; - CLRTCK; - SETTCK; + TCKTOCK; return word; } - -/* -//! Shift 16 bits in and out. -unsigned int jtagtrans16(unsigned int word){ //REMOVEME - unsigned int bit; - SAVETCLK; - - for (bit = 0; bit < 16; bit++) { - // write MOSI on trailing edge of previous clock - if (word & 0x8000) - {SETMOSI;} - else - {CLRMOSI;} - word <<= 1; - - if(bit==15) - SETTMS;//TMS high on last bit to exit. - - CLRTCK; - SETTCK; - // read MISO on trailing edge - word |= READMISO; - } - RESTORETCLK; - - // exit state - CLRTCK; - SETTCK; - // update state - CLRTMS; - CLRTCK; - SETTCK; - - return word; -}*/ +*/ //! Stop JTAG, release pins void jtag_stop(){ @@ -143,23 +223,20 @@ void jtag_stop(){ P4OUT=0; } -unsigned int drwidth=20; +unsigned int drwidth=16; //! Shift all bits of the DR. unsigned long jtag_dr_shift20(unsigned long in){ // idle SETTMS; - CLRTCK; - SETTCK; + TCKTOCK; // select DR CLRTMS; - CLRTCK; - SETTCK; + TCKTOCK; // capture IR - CLRTCK; - SETTCK; + TCKTOCK; // shift DR, then idle - return(jtagtransn(in,20)); + return(jtagtransn(in,20,0)); } @@ -167,18 +244,35 @@ unsigned long jtag_dr_shift20(unsigned long in){ unsigned int jtag_dr_shift16(unsigned int in){ // idle SETTMS; - CLRTCK; - SETTCK; + TCKTOCK; // select DR CLRTMS; - CLRTCK; - SETTCK; + TCKTOCK; // capture IR - CLRTCK; - SETTCK; + TCKTOCK; + + // shift DR, then idle + return(jtagtransn(in,16,0)); +} + +//! Shift native width of the DR +unsigned long jtag_dr_shiftadr(unsigned long in){ + unsigned long out=0; + + // idle + SETTMS; + TCKTOCK; + // select DR + CLRTMS; + TCKTOCK; + // capture IR + TCKTOCK; + + + out=jtagtransn(in,drwidth,0); // shift DR, then idle - return(jtagtransn(in,16)); + return(out); } @@ -186,18 +280,14 @@ unsigned int jtag_dr_shift16(unsigned int in){ unsigned char jtag_ir_shift8(unsigned char in){ // idle SETTMS; - CLRTCK; - SETTCK; + TCKTOCK; // select DR - CLRTCK; - SETTCK; + TCKTOCK; // select IR CLRTMS; - CLRTCK; - SETTCK; + TCKTOCK; // capture IR - CLRTCK; - SETTCK; + TCKTOCK; // shift IR, then idle. return(jtagtrans8(in)); @@ -206,7 +296,7 @@ unsigned char jtag_ir_shift8(unsigned char in){ //! Handles a monitor command. void jtaghandle(unsigned char app, unsigned char verb, - unsigned char len){ + unsigned long len){ switch(verb){ //START handled by specific JTAG case STOP: