projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comment out unused includes and defines
[proxmark3-svn]
/
armsrc
/
iso15693.c
diff --git
a/armsrc/iso15693.c
b/armsrc/iso15693.c
index ec8120b9d810a9f5844ef1275b62cb3ae3f5c606..e7145c5c9e84b3d6dd5399c145e74123e72be077 100644
(file)
--- a/
armsrc/iso15693.c
+++ b/
armsrc/iso15693.c
@@
-296,7
+296,7
@@
static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
{
int c = 0;
static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
{
int c = 0;
- uint8_t *dest =
(uint8_t *)BigBuf
;
+ uint8_t *dest =
BigBuf_get_addr()
;
int getNext = 0;
int8_t prev = 0;
int getNext = 0;
int8_t prev = 0;
@@
-446,7
+446,7
@@
static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
{
int c = 0;
static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
{
int c = 0;
- uint8_t *dest =
(uint8_t *)BigBuf
;
+ uint8_t *dest =
BigBuf_get_addr()
;
int getNext = 0;
int8_t prev = 0;
int getNext = 0;
int8_t prev = 0;
@@
-596,7
+596,7
@@
static void BuildIdentifyRequest(void);
//-----------------------------------------------------------------------------
void AcquireRawAdcSamplesIso15693(void)
{
//-----------------------------------------------------------------------------
void AcquireRawAdcSamplesIso15693(void)
{
- uint8_t *dest =
(uint8_t *)BigBuf
;
+ uint8_t *dest =
BigBuf_get_addr()
;
int c = 0;
int getNext = 0;
int c = 0;
int getNext = 0;
@@
-678,7
+678,7
@@
void AcquireRawAdcSamplesIso15693(void)
void RecordRawAdcSamplesIso15693(void)
{
void RecordRawAdcSamplesIso15693(void)
{
- uint8_t *dest =
(uint8_t *)BigBuf
;
+ uint8_t *dest =
BigBuf_get_addr()
;
int c = 0;
int getNext = 0;
int c = 0;
int getNext = 0;
@@
-877,12
+877,12
@@
int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv)
LED_C_OFF();
LED_D_OFF();
LED_C_OFF();
LED_D_OFF();
+ if (init) Iso15693InitReader();
+
int answerLen=0;
int answerLen=0;
- uint8_t *answer =
(((uint8_t *)BigBuf) + 3660)
;
- if (recv
!=NULL) memset(BigBuf + 3660
, 0, 100);
+ uint8_t *answer =
BigBuf_get_addr() + 3660
;
+ if (recv
!= NULL) memset(answer
, 0, 100);
- if (init) Iso15693InitReader();
-
if (!speed) {
// low speed (1 out of 256)
CodeIso15693AsReader256(send, sendlen);
if (!speed) {
// low speed (1 out of 256)
CodeIso15693AsReader256(send, sendlen);
@@
-999,10
+999,6
@@
void ReaderIso15693(uint32_t parameter)
LED_C_OFF();
LED_D_OFF();
LED_C_OFF();
LED_D_OFF();
- uint8_t *answer1 = (((uint8_t *)BigBuf) + 3660); //
- uint8_t *answer2 = (((uint8_t *)BigBuf) + 3760);
- uint8_t *answer3 = (((uint8_t *)BigBuf) + 3860);
-
int answerLen1 = 0;
int answerLen2 = 0;
int answerLen3 = 0;
int answerLen1 = 0;
int answerLen2 = 0;
int answerLen3 = 0;
@@
-1013,19
+1009,21
@@
void ReaderIso15693(uint32_t parameter)
int elapsed = 0;
uint8_t TagUID[8] = {0x00};
int elapsed = 0;
uint8_t TagUID[8] = {0x00};
+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+ uint8_t *answer1 = BigBuf_get_addr() + 3660;
+ uint8_t *answer2 = BigBuf_get_addr() + 3760;
+ uint8_t *answer3 = BigBuf_get_addr() + 3860;
// Blank arrays
// Blank arrays
- memset(BigBuf + 3660, 0x00, 300);
-
- FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+ memset(answer1, 0x00, 300);
SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
// Setup SSC
FpgaSetupSsc();
// Start from off (no field generated)
SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
// Setup SSC
FpgaSetupSsc();
// Start from off (no field generated)
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(200);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ SpinDelay(200);
// Give the tags time to energize
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
// Give the tags time to energize
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
@@
-1111,24
+1109,22
@@
void SimTagIso15693(uint32_t parameter, uint8_t *uid)
LED_C_OFF();
LED_D_OFF();
LED_C_OFF();
LED_D_OFF();
- uint8_t *buf = (((uint8_t *)BigBuf) + 3660); //
-
int answerLen1 = 0;
int samples = 0;
int tsamples = 0;
int wait = 0;
int elapsed = 0;
int answerLen1 = 0;
int samples = 0;
int tsamples = 0;
int wait = 0;
int elapsed = 0;
- memset(buf, 0x00, 100);
-
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+ uint8_t *buf = BigBuf_get_addr() + 3660;
+ memset(buf, 0x00, 100);
+
SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-
FpgaSetupSsc();
// Start from off (no field generated)
FpgaSetupSsc();
// Start from off (no field generated)
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
SpinDelay(200);
LED_A_OFF();
SpinDelay(200);
LED_A_OFF();
@@
-1213,7
+1209,7
@@
void BruteforceIso15693Afi(uint32_t speed)
void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t data[]) {
int recvlen=0;
void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t data[]) {
int recvlen=0;
- uint8_t *recvbuf
=(uint8_t *)BigBuf
;
+ uint8_t *recvbuf
= BigBuf_get_addr()
;
// UsbCommand n;
if (DEBUG) {
// UsbCommand n;
if (DEBUG) {
Impressum
,
Datenschutz