X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4e3d8d0f764823d3550970d6d686a86e8f04d8af..31abe49fd323411b391dd10335eb4c60cfcecb06:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 6bc66f06..fa056b67 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -21,6 +21,8 @@
 #include "cmdmain.h"
 #include "cmddata.h"
 #include "lfdemod.h"
+#include "usb_cmd.h"
+
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 int DemodBufferLen;
 static int CmdHelp(const char *Cmd);
@@ -618,7 +620,7 @@ int CmdFSKdemodHID(const char *Cmd)
     uint32_t cardnum = 0;
     if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used
       uint32_t lo2=0;
-      lo2=(((hi & 15) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
+      lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
       uint8_t idx3 = 1;
       while(lo2>1){ //find last bit set to 1 (format len bit)
         lo2=lo2>>1;
@@ -631,10 +633,6 @@ int CmdFSKdemodHID(const char *Cmd)
         cardnum = (lo>>1)&0xFFFF;
         fc = (lo>>17)&0xFF;
       }
-      if(fmtLen==37){
-        cardnum = (lo>>1)&0x7FFFF;
-        fc = ((hi&0xF)<<12)|(lo>>20);
-      }
       if(fmtLen==34){
         cardnum = (lo>>1)&0xFFFF;
         fc= ((hi&1)<<15)|(lo>>17);
@@ -645,10 +643,10 @@ int CmdFSKdemodHID(const char *Cmd)
       }
     }
     else { //if bit 38 is not set then 37 bit format is used
-      fmtLen= 37;
-      fc =0;
-      cardnum=0;
-      if(fmtLen==37){
+      fmtLen = 37;
+      fc = 0;
+      cardnum = 0;
+      if(fmtLen == 37){
         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }
@@ -870,20 +868,35 @@ int PSKnrzDemod(const char *Cmd){
 // optional arguments - same as CmdpskNRZrawDemod (clock & invert)
 int CmdIndalaDecode(const char *Cmd)
 {
+  uint8_t verbose = 1;
+  int ans;
+  if (strlen(Cmd)>0){
+    if (Cmd[0]=='0'){
+      verbose=0;
+      ans = PSKnrzDemod("32");
+    }else{
+      ans = PSKnrzDemod(Cmd);
+    }
+  } else{ //default to RF/32
+    ans = PSKnrzDemod("32");
+  }
 
-	int ans=PSKnrzDemod(Cmd);
 	if (ans < 0){
-		PrintAndLog("Error1: %d",ans);
+		if (verbose) 
+      PrintAndLog("Error1: %d",ans);
 		return 0;
 	}
 	uint8_t invert=0;
 	ans = indala26decode(DemodBuffer,(size_t *) &DemodBufferLen, &invert);
 	if (ans < 1) {
-		PrintAndLog("Error2: %d",ans);
+		if (verbose)
+      PrintAndLog("Error2: %d",ans);
 		return -1;
 	}
 	char showbits[251];
-	if(invert==1) PrintAndLog("Had to invert bits");
+	if (invert)
+    if (verbose)
+      PrintAndLog("Had to invert bits");
 	//convert UID to HEX
 	uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
 	int idx;
@@ -947,11 +960,19 @@ int CmdPskClean(const char *Cmd)
 //prints binary found and saves in graphbuffer for further commands
 int CmdpskNRZrawDemod(const char *Cmd)
 {
-	int errCnt= PSKnrzDemod(Cmd);
+  uint8_t verbose = 1;
+  int errCnt;
+  if (strlen(Cmd)>0){
+    if (Cmd[0]=='0')
+      verbose=0;
+  }
+
+  errCnt = PSKnrzDemod(Cmd);
 	//output
 	if (errCnt<0) return 0;
 	if (errCnt>0){
-		PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
+		if (verbose)
+      PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
 	}
 	PrintAndLog("PSK or NRZ demoded bitstream:");
 	// Now output the bitstream to the scrollback by line of 16 bits
@@ -1032,27 +1053,81 @@ int CmdHpf(const char *Cmd)
   RepaintGraphWindow();
   return 0;
 }
+typedef struct {
+	uint8_t * buffer;
+	uint32_t numbits;
+	uint32_t position;
+}BitstreamOut;
+
+bool _headBit( BitstreamOut *stream)
+{
+	int bytepos = stream->position >> 3; // divide by 8
+	int bitpos = (stream->position++) & 7; // mask out 00000111
+	return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;
+}
+
+uint8_t getByte(uint8_t bits_per_sample, BitstreamOut* b)
+{
+	int i;
+	uint8_t val = 0;
+	for(i =0 ; i < bits_per_sample; i++)
+	{
+		val |= (_headBit(b) << (7-i));
+	}
+	return val;
+}
 
 int CmdSamples(const char *Cmd)
 {
-	uint8_t got[40000];
+	//If we get all but the last byte in bigbuf,
+	// we don't have to worry about remaining trash
+	// in the last byte in case the bits-per-sample
+	// does not line up on byte boundaries
+	uint8_t got[40000-1];
 
 	int n = strtol(Cmd, NULL, 0);
 	if (n == 0)
-		n = 20000;
+		n = sizeof(got);
 
 	if (n > sizeof(got))
 		n = sizeof(got);
 
-	PrintAndLog("Reading %d samples from device memory\n", n);
-  GetFromBigBuf(got,n,0);
-  WaitForResponse(CMD_ACK,NULL);
-	for (int j = 0; j < n; j++) {
-		GraphBuffer[j] = ((int)got[j]) - 128;
-  }
-  GraphTraceLen = n;
-  RepaintGraphWindow();
-  return 0;
+	PrintAndLog("Reading %d bytes from device memory\n", n);
+	GetFromBigBuf(got,n,0);
+	PrintAndLog("Data fetched");
+	UsbCommand response;
+	WaitForResponse(CMD_ACK, &response);
+	uint8_t bits_per_sample = 8;
+
+	//Old devices without this feature would send 0 at arg[0]
+	if(response.arg[0] > 0)
+	{
+		sample_config *sc = (sample_config *) response.d.asBytes;
+		PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample
+					, sc->decimation);
+		bits_per_sample = sc->bits_per_sample;
+	}
+	if(bits_per_sample < 8)
+	{
+		PrintAndLog("Unpacking...");
+		BitstreamOut bout = { got, bits_per_sample * n,  0};
+		int j =0;
+		for (j = 0; j * bits_per_sample < n * 8 && j < sizeof(GraphBuffer); j++) {
+			uint8_t sample = getByte(bits_per_sample, &bout);
+			GraphBuffer[j] = ((int) sample )- 128;
+		}
+		GraphTraceLen = j;
+		PrintAndLog("Unpacked %d samples" , j );
+	}else
+	{
+		for (int j = 0; j < n; j++) {
+			GraphBuffer[j] = ((int)got[j]) - 128;
+		}
+		GraphTraceLen = n;
+	}
+
+	RepaintGraphWindow();
+	return 0;
 }
 
 int CmdTuneSamples(const char *Cmd)