joppe/fpga_modem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added back in the jtag bridge

Browse Source 
Now talking over the bus instead of using dpram
This commit is contained in:
Joppe Blondel
2026-02-27 17:39:43 +01:00
parent 6f680377db
commit 105dbed8e4
16 changed files with 685 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
tools/test.cpp
View File

@@ -10,45 +10,64 @@ static constexpr uint8_t OP_RESET_ON = 0x10;
static constexpr uint8_t OP_RESET_OFF = 0x11;
static constexpr uint8_t OP_WRITE8 = 0x20;
static constexpr uint8_t OP_READ8 = 0x21;
static constexpr uint8_t OP_WRITE32 = 0x22;
static constexpr uint8_t OP_READ32 = 0x23;
static constexpr uint8_t OP_PING = 0x30;
static constexpr uint8_t OP_CLEAR_FLAGS = 0x40;
static void shift48(DigilentJtag &jtag, const uint8_t tx[6], uint8_t rx[6]) {
jtag.shiftData(tx, rx, 48);
static void shift72(DigilentJtag &jtag, const uint8_t tx[9], uint8_t rx[9]) {
jtag.shiftData(tx, rx, 72);
}
static void make_cmd(uint8_t out[6], uint8_t opcode, uint32_t addr, uint8_t data) {
out[0] = data;
out[1] = (uint8_t)addr;
out[2] = (uint8_t)(addr >> 8);
out[3] = (uint8_t)(addr >> 16);
out[4] = (uint8_t)(addr >> 24);
out[5] = opcode;
static void make_cmd(uint8_t out[9], uint8_t opcode, uint32_t addr, uint32_t data) {
out[0] = (uint8_t)data;
out[1] = (uint8_t)(data >> 8);
out[2] = (uint8_t)(data >> 16);
out[3] = (uint8_t)(data >> 24);
out[4] = (uint8_t)addr;
out[5] = (uint8_t)(addr >> 8);
out[6] = (uint8_t)(addr >> 16);
out[7] = (uint8_t)(addr >> 24);
out[8] = opcode;
}
static uint8_t do_cmd(DigilentJtag& jtag, uint8_t opcode, uint32_t addr, uint8_t data){
uint8_t tx[6], rx[6];
static uint32_t get_data32(const uint8_t rx[9]) {
return ((uint32_t)rx[2]) |
((uint32_t)rx[3] << 8) |
((uint32_t)rx[4] << 16) |
((uint32_t)rx[5] << 24);
}
static uint32_t do_cmd32(DigilentJtag& jtag, uint8_t opcode, uint32_t addr, uint32_t data){
uint8_t tx[9], rx[9];
make_cmd(tx, opcode, addr, data);
shift48(jtag, tx, rx);
shift72(jtag, tx, rx);
for(int i=0; i<32; i++){
make_cmd(tx, OP_NOP, 0, 0);
shift48(jtag, tx, rx);
shift72(jtag, tx, rx);
if(rx[0] == opcode){
return rx[2];
return get_data32(rx);
}
}
printf("Could not do command\r\n");
return 0;
}
struct Resp48 {
uint8_t last_op;
uint8_t flags;
uint8_t data;
uint8_t cmd_seq;
uint8_t status;
uint8_t resp_seq;
};
static inline void write8(DigilentJtag& jtag, uint32_t addr, uint8_t value) {
(void)do_cmd32(jtag, OP_WRITE8, addr, value);
}
static inline uint8_t read8(DigilentJtag& jtag, uint32_t addr) {
return (uint8_t)do_cmd32(jtag, OP_READ8, addr, 0);
}
static inline void write32(DigilentJtag& jtag, uint32_t addr, uint32_t value) {
(void)do_cmd32(jtag, OP_WRITE32, addr, value);
}
static inline uint32_t read32(DigilentJtag& jtag, uint32_t addr) {
return do_cmd32(jtag, OP_READ32, addr, 0);
}
int main(int argc, char** argv){
ArgParser parser(argc > 0 ? argv[0] : "test");
@@ -74,9 +93,9 @@ int main(int argc, char** argv){
jtag.setChain(1);
do_cmd(jtag, OP_CLEAR_FLAGS, 0, 0);
do_cmd32(jtag, OP_CLEAR_FLAGS, 0, 0);
// Check for ping
if(do_cmd(jtag, OP_PING, 0, 0) != 0xa5){
if((do_cmd32(jtag, OP_PING, 0, 0) & 0xffu) != 0xa5u){
printf("PING response was not right\r\n");
jtag.close();
return -1;
@@ -90,32 +109,32 @@ int main(int argc, char** argv){
return -1;
}
do_cmd(jtag, OP_RESET_ON, 0, 0);
do_cmd32(jtag, OP_RESET_ON, 0, 0);
int nr = 0;
int addr = 0;
do{
uint8_t buf[64];
nr = fread(buf, 1, 64, f);
uint32_t buf[32];
nr = fread(buf, sizeof(uint32_t), 32, f);
for(int i=0; i<nr; i++){
do_cmd(jtag, OP_WRITE8, addr+i, buf[i]);
write32(jtag, addr+(i*4), buf[i]);
printf(".");
}
printf("\r\n");
if(parser.getFlag("verify")){
for(int i=0; i<nr; i++){
uint8_t r = do_cmd(jtag, OP_READ8, addr+i, 0);
uint32_t r = read32(jtag, addr+(i*4));
if(r!=buf[i]){
printf(" -- Verify failed at %04x : %02x != %02x\r\n", addr+i, r, buf[i]);
printf(" -- Verify failed at %04x : %08x != %08x\r\n", addr+(i*4), r, buf[i]);
}
}
}
addr += nr;
addr += nr*4;
}while(nr > 0);
do_cmd(jtag, OP_RESET_OFF, 0, 0);
do_cmd32(jtag, OP_RESET_OFF, 0, 0);
fclose(f);
jtag.close();