fixed 64-bit cmd/arg for windows

This commit is contained in:
roel@libnfc.org 2012-12-09 13:00:19 +00:00
commit 9440213d6b
4 changed files with 21 additions and 13 deletions

View file

@ -79,7 +79,8 @@ void ToSendStuffBit(int b)
void DbpString(char *str)
{
cmd_send(CMD_DEBUG_PRINT_STRING,strlen(str),0,0,(byte_t*)str,strlen(str));
byte_t len = strlen(str);
cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
// /* this holds up stuff unless we're connected to usb */
// if (!UsbConnected())
// return;

View file

@ -58,13 +58,13 @@ bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, byte_t*
// Compose the outgoing command frame
txcmd.cmd = cmd;
txcmd.arg[0] = arg0;
txcmd.arg[1] = arg1;
txcmd.arg[1] = arg1;
txcmd.arg[2] = arg2;
// Add the (optional) content to the frame, with a maximum size of USB_CMD_DATA_SIZE
if (data && len) {
memcpy(txcmd.d.asBytes,data,MIN(len,USB_CMD_DATA_SIZE));
}
}
// Send frame and make sure all bytes are transmitted
if (usb_write((byte_t*)&txcmd,sizeof(UsbCommand)) != 0) return false;