Zorchenhimer
/
INL-retro-progdump
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

making some changes to dictionary call for print options.

This commit is contained in:
Paul Molloy 2016-12-01 23:15:58 -06:00
parent a24d728cea
commit 2f8823053e
3 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/source/logic.h
View File

@ -1,7 +1,6 @@
#ifndef _logic_h #ifndef _logic_h
#define _logic_h #define _logic_h
#define NILL 0x00
#define LO 0x00 #define LO 0x00
#define HI 0xFF #define HI 0xFF
@ -12,4 +11,7 @@
#define TRUE 0x00 #define TRUE 0x00
//false is anything besides TRUE //false is anything besides TRUE
//used to indicate when intentionally passing zero because option not used
#define NILL 0x00
#endif #endif

23
host/source/dictionary.c
View File

@ -15,7 +15,19 @@
* debug print of call and return values * debug print of call and return values
*/ */
//default call dictionary without print option
int dictionary_call( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length) int dictionary_call( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length)
{
return dictionary_call_print_option( ~TRUE, transfer, dictionary, opcode, addr, miscdata, endpoint, buffer, length);
}
//debug call dictionary without print option
int dictionary_call_debug( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length)
{
return dictionary_call_print_option( TRUE, transfer, dictionary, opcode, addr, miscdata, endpoint, buffer, length);
}
int dictionary_call_print_option( int print_debug; USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length)
{ {
transfer->request = dictionary; transfer->request = dictionary;
transfer->wValueMSB = miscdata; transfer->wValueMSB = miscdata;
@ -133,6 +145,7 @@ int dictionary_call( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode,
xfr_cnt = usb_transfer( transfer ); xfr_cnt = usb_transfer( transfer );
if (print_debug == TRUE) {
//print transfer details if small xfr //print transfer details if small xfr
if (xfr_cnt <= 8) { if (xfr_cnt <= 8) {
printf(" xf: %d er: %d rv:",xfr_cnt, rbuf[0]); printf(" xf: %d er: %d rv:",xfr_cnt, rbuf[0]);
@ -141,14 +154,18 @@ int dictionary_call( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode,
printf(" %x,", rbuf[i]); printf(" %x,", rbuf[i]);
} }
printf("\n"); printf("\n");
check(rbuf[0] == SUCCESS, "retro programmer had error: %d, dict:%d, opcode:%d/%x, addr:%x, data:%x",rbuf[0], dictionary, opcode, opcode, addr, miscdata)
} else { } else {
//just print xfr cnt //just print xfr cnt
//printf(" xf: %d\n",xfr_cnt); printf(" xf: %d\n",xfr_cnt);
} }
}
return 0; if (xfr_cnt <= 8) {
check(rbuf[0] == SUCCESS, "retro programmer had error: %d, dict:%d, opcode:%d/%x, addr:%x, data:%x",rbuf[0], dictionary, opcode, opcode, addr, miscdata)
}
return SUCCESS;
error: error:
printf("dictionary call went to error\n"); printf("dictionary call went to error\n");

6
host/source/dictionary.h
View File

@ -20,6 +20,12 @@
#include "shared_dictionaries.h" #include "shared_dictionaries.h"
//dictionary call with debug prints
int dictionary_call_debug( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length);
//dictionary call without printing output
int dictionary_call( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length); int dictionary_call( USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length);
int dictionary_call_print_option( int print_debug, USBtransfer *transfer, uint8_t dictionary, uint8_t opcode, uint16_t addr, uint8_t miscdata, uint8_t endpoint, uint8_t *buffer, uint16_t length);
#endif #endif