part of monstermerge..

This commit is contained in:
iceman1001 2017-07-27 20:58:59 +02:00
commit a8569849d6
14 changed files with 2705 additions and 1773 deletions

View file

@ -69,7 +69,7 @@ endif
#COMMON_FLAGS += -DHAS_512_FLASH
# Also search prerequisites in the common directory (for usb.c), the fpga directory (for fpga.bit), and the zlib directory
VPATH = . ../common ../fpga ../zlib
VPATH = . ../common ../fpga ../zlib --/uart
INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)

View file

@ -35,7 +35,7 @@
bool cmd_receive(UsbCommand* cmd) {
// Check if there is a usb packet available
if (!usb_poll()) return false;
if (!usb_poll_validate_length()) return false;
// Try to retrieve the available command frame
size_t rxlen = usb_read((byte_t*)cmd,sizeof(UsbCommand));