mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2026-05-12 11:18:11 -07:00
style
This commit is contained in:
+1
-1
@@ -309,7 +309,7 @@ bool LogTrace_ISO15693(const uint8_t *bytes, uint16_t len, uint32_t ts_start, ui
|
||||
// specific LogTrace function for bitstreams: the partial byte size is stored in first parity byte. E.g. bitstream "1100 00100010" -> partial byte: 4 bits
|
||||
bool RAMFUNC LogTraceBits(const uint8_t *btBytes, uint16_t bitLen, uint32_t timestamp_start, uint32_t timestamp_end, bool reader2tag) {
|
||||
|
||||
if ( bitLen == 0 ) {
|
||||
if (bitLen == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+16
-16
@@ -630,9 +630,9 @@ static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size
|
||||
writestate = WRITE_STATE_PROG;
|
||||
} else {
|
||||
Dbprintf("hitag2_write_page: Page number was not received correctly: rxlen %d rx %02x%02x%02x%02x"
|
||||
, rxlen
|
||||
, rx[0], rx[1], rx[2], rx[3]
|
||||
);
|
||||
, rxlen
|
||||
, rx[0], rx[1], rx[2], rx[3]
|
||||
);
|
||||
bSuccessful = false;
|
||||
return false;
|
||||
}
|
||||
@@ -651,7 +651,7 @@ static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size
|
||||
Dbprintf("hitag2_write_page: Unknown state " _RED_("%d"), writestate);
|
||||
bSuccessful = false;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -792,10 +792,10 @@ static bool hitag2_crypto(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *
|
||||
|
||||
uint32_t ui32uid = rx[0] | ((uint32_t)rx[1]) << 8 | ((uint32_t)rx[2]) << 16 | ((uint32_t)rx[3]) << 24;
|
||||
DBG Dbprintf("hitag2_crypto: key=0x%x%x uid=0x%x"
|
||||
, (uint32_t)((REV64(ui64key)) >> 32)
|
||||
, (uint32_t)((REV64(ui64key)) & 0xffffffff)
|
||||
, REV32(ui32uid)
|
||||
);
|
||||
, (uint32_t)((REV64(ui64key)) >> 32)
|
||||
, (uint32_t)((REV64(ui64key)) & 0xffffffff)
|
||||
, REV32(ui32uid)
|
||||
);
|
||||
|
||||
cipher_state = ht2_hitag2_init(REV64(ui64key), REV32(ui32uid), 0);
|
||||
|
||||
@@ -1024,7 +1024,7 @@ void SniffHitag2(bool ledcontrol) {
|
||||
lf_init(false, false, ledcontrol);
|
||||
|
||||
// no logging of the raw signal
|
||||
// g_logging = lf_get_reader_modulation();
|
||||
// g_logging = lf_get_reader_modulation();
|
||||
g_logging = false;
|
||||
uint32_t total_count = 0;
|
||||
|
||||
@@ -1456,7 +1456,7 @@ void SimulateHitag2(bool ledcontrol) {
|
||||
// NRZ modulation: (11 => --|) or (11 __|)
|
||||
nrz_samples[nrzs++] = reader_modulation;
|
||||
if (nrzs < max_nrzs) {
|
||||
nrz_samples[nrzs++] = reader_modulation;
|
||||
nrz_samples[nrzs++] = reader_modulation;
|
||||
}
|
||||
// Invert tag modulation state
|
||||
reader_modulation ^= 1;
|
||||
@@ -1875,7 +1875,7 @@ void ReaderHitag(hitag_function htf, const hitag_data *htd, bool ledcontrol) {
|
||||
// Store the TX frame, we do this now at this point, to avoid delay in processing
|
||||
// and to be able to overwrite the first samples with the trace (since they currently
|
||||
// still use the same memory space)
|
||||
LogTraceBits(tx, txlen, command_start, command_start + command_duration, true);
|
||||
LogTraceBits(tx, txlen, command_start, command_start + command_duration, true);
|
||||
|
||||
// Reset values for receiving frames
|
||||
memset(rx, 0x00, sizeof(rx));
|
||||
@@ -1941,7 +1941,7 @@ void ReaderHitag(hitag_function htf, const hitag_data *htd, bool ledcontrol) {
|
||||
}
|
||||
|
||||
// Check if frame was captured and store it
|
||||
LogTraceBits(rx, rxlen, response_start, response_start + response_duration, false);
|
||||
LogTraceBits(rx, rxlen, response_start, response_start + response_duration, false);
|
||||
|
||||
// TODO when using cumulative time for command_start, pm3 doesn't reply anymore, e.g. on lf hitag reader --23 -k 4F4E4D494B52
|
||||
// Use delta time?
|
||||
@@ -2217,7 +2217,7 @@ void WriterHitag(hitag_function htf, const hitag_data *htd, int page, bool ledco
|
||||
// Store the TX frame, we do this now at this point, to avoid delay in processing
|
||||
// and to be able to overwrite the first samples with the trace (since they currently
|
||||
// still use the same memory space)
|
||||
LogTraceBits(tx, txlen, command_start, command_start + command_duration, true);
|
||||
LogTraceBits(tx, txlen, command_start, command_start + command_duration, true);
|
||||
|
||||
// Reset values for receiving frames
|
||||
memset(rx, 0x00, sizeof(rx));
|
||||
@@ -2248,7 +2248,7 @@ void WriterHitag(hitag_function htf, const hitag_data *htd, int page, bool ledco
|
||||
|
||||
// Verify if the header consists of five consecutive ones
|
||||
if (nrzs < 5) {
|
||||
DBG Dbprintf("Detected unexpected number of manchester decoded samples [%zu]", nrzs);
|
||||
DBG Dbprintf("Detected unexpected number of manchester decoded samples [%zu]", nrzs);
|
||||
break;
|
||||
} else {
|
||||
|
||||
@@ -2287,8 +2287,8 @@ void WriterHitag(hitag_function htf, const hitag_data *htd, int page, bool ledco
|
||||
}
|
||||
|
||||
// Check if frame was captured and store it
|
||||
LogTraceBits(rx, rxlen, response_start, response_start + response_duration, false);
|
||||
command_start = 0;
|
||||
LogTraceBits(rx, rxlen, response_start, response_start + response_duration, false);
|
||||
command_start = 0;
|
||||
nrzs = 0;
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -451,9 +451,9 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
|
||||
temp2++;
|
||||
*txlen = 32;
|
||||
state = ht2_hitag2_init(REV64(tag.key),
|
||||
REV32((tag.pages[0][3] << 24) + (tag.pages[0][2] << 16) + (tag.pages[0][1] << 8) + tag.pages[0][0]),
|
||||
REV32((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])
|
||||
);
|
||||
REV32((tag.pages[0][3] << 24) + (tag.pages[0][2] << 16) + (tag.pages[0][1] << 8) + tag.pages[0][0]),
|
||||
REV32((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])
|
||||
);
|
||||
Dbprintf(",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
|
||||
rx[0], rx[1], rx[2], rx[3],
|
||||
rx[4], rx[5], rx[6], rx[7]
|
||||
|
||||
+11
-11
@@ -57,7 +57,7 @@ static char *commaprint(size_t n) {
|
||||
static int comma = '\0';
|
||||
static char retbuf[30];
|
||||
|
||||
char *p = &retbuf[sizeof(retbuf)-1];
|
||||
char *p = &retbuf[sizeof(retbuf) - 1];
|
||||
int i = 0;
|
||||
|
||||
if (comma == '\0') {
|
||||
@@ -65,7 +65,7 @@ static char *commaprint(size_t n) {
|
||||
struct lconv *lcp = localeconv();
|
||||
if (lcp != NULL) {
|
||||
|
||||
if(lcp->thousands_sep != NULL && *lcp->thousands_sep != '\0') {
|
||||
if (lcp->thousands_sep != NULL && *lcp->thousands_sep != '\0') {
|
||||
comma = *lcp->thousands_sep;
|
||||
} else {
|
||||
comma = ',';
|
||||
@@ -76,7 +76,7 @@ static char *commaprint(size_t n) {
|
||||
*p = '\0';
|
||||
|
||||
do {
|
||||
if ( i % 3 == 0 && i != 0 ) {
|
||||
if (i % 3 == 0 && i != 0) {
|
||||
*--p = comma;
|
||||
}
|
||||
|
||||
@@ -3288,9 +3288,9 @@ static int CmdNumCon(const char *Cmd) {
|
||||
if (slen) {
|
||||
size_t n = (slen >> 1);
|
||||
uint8_t *d = calloc(n, sizeof(uint8_t));
|
||||
if (d != NULL ) {
|
||||
if (d != NULL) {
|
||||
hexstr_to_byte_array(s, d, &n);
|
||||
PrintAndLogEx(SUCCESS, "ascii... " _YELLOW_("%s"), sprint_ascii((const uint8_t*)d, n));
|
||||
PrintAndLogEx(SUCCESS, "ascii... " _YELLOW_("%s"), sprint_ascii((const uint8_t *)d, n));
|
||||
free(d);
|
||||
}
|
||||
}
|
||||
@@ -3314,9 +3314,9 @@ static int CmdNumCon(const char *Cmd) {
|
||||
str_reverse(s, strlen(s));
|
||||
size_t n = (slen >> 1);
|
||||
uint8_t *d = calloc(n, sizeof(uint8_t));
|
||||
if (d != NULL ) {
|
||||
if (d != NULL) {
|
||||
hexstr_to_byte_array(s, d, &n);
|
||||
PrintAndLogEx(SUCCESS, "ascii... " _YELLOW_("%s"), sprint_ascii((const uint8_t*)d, n));
|
||||
PrintAndLogEx(SUCCESS, "ascii... " _YELLOW_("%s"), sprint_ascii((const uint8_t *)d, n));
|
||||
free(d);
|
||||
}
|
||||
}
|
||||
@@ -3353,9 +3353,9 @@ static int CmdNumCon(const char *Cmd) {
|
||||
str_inverse_hex(s, strlen(s));
|
||||
size_t n = (slen >> 1);
|
||||
uint8_t *d = calloc(n, sizeof(uint8_t));
|
||||
if (d != NULL ) {
|
||||
if (d != NULL) {
|
||||
hexstr_to_byte_array(s, d, &n);
|
||||
PrintAndLogEx(SUCCESS, "ascii... " _YELLOW_("%s"), sprint_ascii((const uint8_t*)d, n));
|
||||
PrintAndLogEx(SUCCESS, "ascii... " _YELLOW_("%s"), sprint_ascii((const uint8_t *)d, n));
|
||||
free(d);
|
||||
}
|
||||
}
|
||||
@@ -3779,7 +3779,7 @@ static int CmdXor(const char *Cmd) {
|
||||
PrintAndLogEx(FAILED, "Length mismatch, got %i != %i", hlen, xlen);
|
||||
return PM3_EINVARG;
|
||||
}
|
||||
|
||||
|
||||
PrintAndLogEx(SUCCESS, "input... %s", sprint_hex_inrow(hex, hlen));
|
||||
PrintAndLogEx(SUCCESS, "xor..... %s", sprint_hex_inrow(xor, xlen));
|
||||
hex_xor(hex, xor, hlen);
|
||||
@@ -3841,7 +3841,7 @@ static command_t CommandTable[] = {
|
||||
{"samples", CmdSamples, IfPm3Present, "Get raw samples for graph window ( GraphBuffer )"},
|
||||
{"save", CmdSave, AlwaysAvailable, "Save signal trace data ( GraphBuffer )"},
|
||||
{"setdebugmode", CmdSetDebugMode, AlwaysAvailable, "Set Debugging Level on client side"},
|
||||
{"xor", CmdXor, AlwaysAvailable, "Xor a input string"},
|
||||
{"xor", CmdXor, AlwaysAvailable, "Xor a input string"},
|
||||
{NULL, NULL, NULL, NULL}
|
||||
};
|
||||
|
||||
|
||||
@@ -891,7 +891,7 @@ int CmdHF14ASniff(const char *Cmd) {
|
||||
"Sniff the communication between Hitag reader and tag.\n"
|
||||
"Use `hf 14a list` to view collected data.",
|
||||
" hf 14a sniff -c -r"
|
||||
);
|
||||
);
|
||||
void *argtable[] = {
|
||||
arg_param_begin,
|
||||
arg_lit0("c", "card", "triggered by first data from card"),
|
||||
|
||||
+13
-13
@@ -4250,12 +4250,12 @@ void printKeyTableEx(size_t sectorscnt, sector_t *e_sector, uint8_t start_sector
|
||||
}
|
||||
|
||||
PrintAndLogEx(SUCCESS, " " _YELLOW_("%03d") " | %03d | %s | %s | %s | %s %s"
|
||||
, s
|
||||
, mfSectorTrailerOfSector(s)
|
||||
, strA, resA
|
||||
, strB, resB
|
||||
, extra
|
||||
);
|
||||
, s
|
||||
, mfSectorTrailerOfSector(s)
|
||||
, strA, resA
|
||||
, strB, resB
|
||||
, extra
|
||||
);
|
||||
}
|
||||
|
||||
PrintAndLogEx(SUCCESS, "-----+-----+--------------+---+--------------+----");
|
||||
@@ -7660,7 +7660,7 @@ static int CmdHF14AMfView(const char *Cmd) {
|
||||
}
|
||||
|
||||
static int parse_gtu_cfg(uint8_t *d, size_t n) {
|
||||
|
||||
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
PrintAndLogEx(INFO, "---------- " _CYAN_("GTU Gen4 Configuration") " -------------------------------------");
|
||||
if (n != 30 && n != 32) {
|
||||
@@ -7676,7 +7676,7 @@ static int parse_gtu_cfg(uint8_t *d, size_t n) {
|
||||
PrintAndLogEx(INFO, _CYAN_("Config 1 - UID & modes"));
|
||||
PrintAndLogEx(INFO, "%s", sprint_hex_inrow(d, 8));
|
||||
PrintAndLogEx(INFO, "%02X.............. " NOLF, d[0]);
|
||||
bool is_ul_enabled = ( d[0] == 1 );
|
||||
bool is_ul_enabled = (d[0] == 1);
|
||||
switch (d[0]) {
|
||||
case 0x00:
|
||||
PrintAndLogEx(NORMAL, "MIFARE Classic mode");
|
||||
@@ -7743,16 +7743,16 @@ static int parse_gtu_cfg(uint8_t *d, size_t n) {
|
||||
PrintAndLogEx(INFO, "......%02X........ " NOLF, d[27]);
|
||||
switch (d[27]) {
|
||||
case 0x00:
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("Ultralight EV1") : "Ultralight Ev1" );
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("Ultralight EV1") : "Ultralight Ev1");
|
||||
break;
|
||||
case 0x01:
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("NTAG") : "NTAG" );
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("NTAG") : "NTAG");
|
||||
break;
|
||||
case 0x02:
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("Ultralight C") : "Ultralight C" );
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("Ultralight C") : "Ultralight C");
|
||||
break;
|
||||
case 0x03:
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("Ultralight") : "Ultralight" );
|
||||
PrintAndLogEx(NORMAL, "%s", (is_ul_enabled) ? _GREEN_("Ultralight") : "Ultralight");
|
||||
break;
|
||||
default:
|
||||
PrintAndLogEx(NORMAL, _RED_("unknown"));
|
||||
@@ -7816,7 +7816,7 @@ static int CmdHF14AGen4Info(const char *cmd) {
|
||||
uint8_t resp[40] = {0};
|
||||
size_t resplen = 0;
|
||||
int res = 0;
|
||||
|
||||
|
||||
if (dlen != 32) {
|
||||
res = mfG4GetConfig(pwd, resp, &resplen, verbose);
|
||||
if (res != PM3_SUCCESS || resplen == 0) {
|
||||
|
||||
@@ -407,15 +407,15 @@ void annotateHitag2(char *exp, size_t size, const uint8_t *cmd, uint8_t cmdsize,
|
||||
if (cmdsize == 1) {
|
||||
bn = bits;
|
||||
} else if (cmdsize > 1) {
|
||||
bn = ((cmdsize - 1) * 8) + bits;
|
||||
bn = ((cmdsize - 1) * 8) + bits;
|
||||
}
|
||||
}
|
||||
|
||||
// 11000 AUTH only one with 5 bits. cmdsize 1
|
||||
switch(bn) {
|
||||
switch (bn) {
|
||||
case 5: {
|
||||
_ht2state.state = STATE_HALT;
|
||||
if(memcmp(binstr, HITAG2_START_AUTH, 5) == 0) {
|
||||
if (memcmp(binstr, HITAG2_START_AUTH, 5) == 0) {
|
||||
snprintf(exp, size, "START AUTH");
|
||||
_ht2state.state = STATE_START_AUTH;
|
||||
} else {
|
||||
@@ -430,22 +430,22 @@ void annotateHitag2(char *exp, size_t size, const uint8_t *cmd, uint8_t cmdsize,
|
||||
break;
|
||||
}
|
||||
|
||||
if(memcmp(binstr, HITAG2_HALT, 2) == 0) {
|
||||
if (memcmp(binstr, HITAG2_HALT, 2) == 0) {
|
||||
snprintf(exp, size, "HALT");
|
||||
_ht2state.state = STATE_HALT;
|
||||
break;
|
||||
}
|
||||
if(memcmp(binstr, HITAG2_READ_PAGE, 2) == 0) {
|
||||
if (memcmp(binstr, HITAG2_READ_PAGE, 2) == 0) {
|
||||
snprintf(exp, size, "READ_PAGE (%u)", 0);
|
||||
break;
|
||||
}
|
||||
|
||||
if(memcmp(binstr, HITAG2_READ_PAGE_INVERTED, 2) == 0) {
|
||||
if (memcmp(binstr, HITAG2_READ_PAGE_INVERTED, 2) == 0) {
|
||||
snprintf(exp, size, "READ_PAGE_INVERTED (%u)", 0);
|
||||
break;
|
||||
}
|
||||
|
||||
if(memcmp(binstr, HITAG2_WRITE_PAGE, 2) == 0) {
|
||||
if (memcmp(binstr, HITAG2_WRITE_PAGE, 2) == 0) {
|
||||
snprintf(exp, size, "WRITE_PAGE ()");
|
||||
break;
|
||||
}
|
||||
@@ -465,7 +465,7 @@ void annotateHitag2(char *exp, size_t size, const uint8_t *cmd, uint8_t cmdsize,
|
||||
|
||||
if (_ht2state.state == STATE_AUTH) {
|
||||
snprintf(exp, size, "DATA");
|
||||
} else{
|
||||
} else {
|
||||
snprintf(exp, size, "?");
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -646,9 +646,9 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
|
||||
uint8_t nbits = parityBytes[0];
|
||||
if (j == 0) {
|
||||
|
||||
// only apply this to lesser than one byte
|
||||
// only apply this to lesser than one byte
|
||||
if (data_len == 1) {
|
||||
|
||||
|
||||
if (nbits == 5) {
|
||||
snprintf(line[0], 120, "%2u: %02X ", nbits, frame[0] >> (8 - nbits));
|
||||
} else {
|
||||
@@ -667,7 +667,7 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
|
||||
} else {
|
||||
snprintf(line[j / 18] + ((j % 18) * 4) + offset, 120, "%02X ", frame[j]);
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
snprintf(line[j / 18] + ((j % 18) * 4), 120, "%02X ", frame[j]);
|
||||
}
|
||||
|
||||
+4
-4
@@ -329,10 +329,10 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
|
||||
case CMD_DEBUG_PRINT_INTEGERS: {
|
||||
if (packet->ng == false) {
|
||||
PrintAndLogEx(NORMAL, "[" _MAGENTA_("pm3") "] ["_BLUE_("#")"] " "%" PRIx64 ", %" PRIx64 ", %" PRIx64 ""
|
||||
, packet->oldarg[0]
|
||||
, packet->oldarg[1]
|
||||
, packet->oldarg[2]
|
||||
);
|
||||
, packet->oldarg[0]
|
||||
, packet->oldarg[1]
|
||||
, packet->oldarg[2]
|
||||
);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -245,9 +245,9 @@ static int open_aiddf_file(json_t **root, bool verbose) {
|
||||
|
||||
if (verbose) {
|
||||
PrintAndLogEx(SUCCESS, "Loaded file `" _YELLOW_("%s") "` " _GREEN_("%zu") " records ( " _GREEN_("ok") " )"
|
||||
, path
|
||||
, json_array_size(*root)
|
||||
);
|
||||
, path
|
||||
, json_array_size(*root)
|
||||
);
|
||||
}
|
||||
|
||||
out:
|
||||
|
||||
@@ -124,7 +124,7 @@ static bool WINAPI terminate_handler(DWORD t) {
|
||||
static struct sigaction gs_old_sigint_action;
|
||||
static void sigint_handler(int signum) {
|
||||
|
||||
switch(signum) {
|
||||
switch (signum) {
|
||||
case SIGINT: {
|
||||
sigaction(SIGINT, &gs_old_sigint_action, NULL);
|
||||
pm3line_flush_history();
|
||||
|
||||
@@ -119,6 +119,7 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "data samples" },
|
||||
{ 1, "data save" },
|
||||
{ 1, "data setdebugmode" },
|
||||
{ 1, "data xor" },
|
||||
{ 1, "emv help" },
|
||||
{ 1, "emv list" },
|
||||
{ 1, "emv test" },
|
||||
@@ -581,6 +582,7 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "lf em 410x spoof" },
|
||||
{ 0, "lf em 410x clone" },
|
||||
{ 1, "lf em 4x05 help" },
|
||||
{ 0, "lf em 4x05 clonehelp" },
|
||||
{ 0, "lf em 4x05 brute" },
|
||||
{ 0, "lf em 4x05 chk" },
|
||||
{ 1, "lf em 4x05 config" },
|
||||
|
||||
@@ -1459,7 +1459,7 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
// Plot/Overlay moved or resized
|
||||
if (g_session.window_changed) {
|
||||
if (g_session.window_changed) {
|
||||
preferences_save();
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -1146,7 +1146,7 @@ void binstr_2_bytes(uint8_t *target, size_t *targetlen, const char *src) {
|
||||
}
|
||||
|
||||
void hex_xor(uint8_t *d, uint8_t *x, int n) {
|
||||
while(n--) {
|
||||
while (n--) {
|
||||
d[n] ^= x[n];
|
||||
}
|
||||
}
|
||||
@@ -1488,7 +1488,7 @@ uint8_t get_highest_frequency(const uint8_t *d, uint8_t n) {
|
||||
uint8_t v = 0;
|
||||
|
||||
// Count the frequency of each byte
|
||||
for(uint8_t i = 0; i < n; i++) {
|
||||
for (uint8_t i = 0; i < n; i++) {
|
||||
frequency[d[i]]++;
|
||||
|
||||
if (frequency[d[i]] > highest) {
|
||||
@@ -1498,4 +1498,4 @@ uint8_t get_highest_frequency(const uint8_t *d, uint8_t n) {
|
||||
}
|
||||
PrintAndLogEx(DEBUG, "highest occurance... %u xor byte... 0x%02X", highest, v);
|
||||
return v;
|
||||
}
|
||||
}
|
||||
|
||||
+57
-28
File diff suppressed because one or more lines are too long
+22
-20
@@ -135,9 +135,10 @@ Check column "offline" for their availability.
|
||||
|`data load `|Y |`Load contents of file into graph window`
|
||||
|`data num `|Y |`Converts dec/hex/bin`
|
||||
|`data print `|Y |`Print the data in the DemodBuffer`
|
||||
|`data samples `|N |`Get raw samples for graph window (GraphBuffer)`
|
||||
|`data save `|Y |`Save signal trace data (from graph window)`
|
||||
|`data samples `|N |`Get raw samples for graph window ( GraphBuffer )`
|
||||
|`data save `|Y |`Save signal trace data ( GraphBuffer )`
|
||||
|`data setdebugmode `|Y |`Set Debugging Level on client side`
|
||||
|`data xor `|Y |`Xor a input string`
|
||||
|
||||
|
||||
### emv
|
||||
@@ -858,7 +859,7 @@ Check column "offline" for their availability.
|
||||
|`lf awid help `|Y |`this help`
|
||||
|`lf awid demod `|Y |`demodulate an AWID FSK tag from the GraphBuffer`
|
||||
|`lf awid reader `|N |`attempt to read and extract tag data`
|
||||
|`lf awid clone `|N |`clone AWID tag to T55x7 or Q5/T5555`
|
||||
|`lf awid clone `|N |`clone AWID tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf awid sim `|N |`simulate AWID tag`
|
||||
|`lf awid brute `|N |`bruteforce card number against reader`
|
||||
|`lf awid watch `|N |`continuously watch for cards. Reader mode`
|
||||
@@ -884,7 +885,7 @@ Check column "offline" for their availability.
|
||||
|`lf destron help `|Y |`This help`
|
||||
|`lf destron demod `|Y |`demodulate an Destron tag from the GraphBuffer`
|
||||
|`lf destron reader `|N |`attempt to read and extract tag data`
|
||||
|`lf destron clone `|N |`clone Destron tag to T55x7`
|
||||
|`lf destron clone `|N |`clone Destron tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf destron sim `|N |`simulate Destron tag`
|
||||
|
||||
|
||||
@@ -910,7 +911,7 @@ Check column "offline" for their availability.
|
||||
|`lf em 410x brute `|N |`reader bruteforce attack by simulating EM410x tags`
|
||||
|`lf em 410x watch `|N |`watches for EM410x 125/134 kHz tags`
|
||||
|`lf em 410x spoof `|N |`watches for EM410x 125/134 kHz tags, and replays them`
|
||||
|`lf em 410x clone `|N |`write EM410x Tag ID to T55x7 or Q5/T5555 tag`
|
||||
|`lf em 410x clone `|N |`clone EM410x Tag ID to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|
||||
|
||||
### lf em 4x05
|
||||
@@ -920,6 +921,7 @@ Check column "offline" for their availability.
|
||||
|command |offline |description
|
||||
|------- |------- |-----------
|
||||
|`lf em 4x05 help `|Y |`This help`
|
||||
|`lf em 4x05 clonehelp `|N |`Shows the available clone commands`
|
||||
|`lf em 4x05 brute `|N |`Bruteforce password`
|
||||
|`lf em 4x05 chk `|N |`Check passwords from dictionary`
|
||||
|`lf em 4x05 config `|Y |`Create common configuration words`
|
||||
@@ -986,7 +988,7 @@ Check column "offline" for their availability.
|
||||
|`lf fdxb help `|Y |`this help`
|
||||
|`lf fdxb demod `|Y |`demodulate a FDX-B ISO11784/85 tag from the GraphBuffer`
|
||||
|`lf fdxb reader `|N |`attempt to read at 134kHz and extract tag data`
|
||||
|`lf fdxb clone `|N |`clone animal ID tag to T55x7 or Q5/T5555`
|
||||
|`lf fdxb clone `|N |`clone animal ID tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf fdxb sim `|N |`simulate Animal ID tag`
|
||||
|
||||
|
||||
@@ -999,7 +1001,7 @@ Check column "offline" for their availability.
|
||||
|`lf gallagher help `|Y |`This help`
|
||||
|`lf gallagher demod `|Y |`demodulate an GALLAGHER tag from the GraphBuffer`
|
||||
|`lf gallagher reader `|N |`attempt to read and extract tag data`
|
||||
|`lf gallagher clone `|N |`clone GALLAGHER tag to T55x7`
|
||||
|`lf gallagher clone `|N |`clone GALLAGHER tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf gallagher sim `|N |`simulate GALLAGHER tag`
|
||||
|
||||
|
||||
@@ -1025,7 +1027,7 @@ Check column "offline" for their availability.
|
||||
|`lf hid help `|Y |`this help`
|
||||
|`lf hid demod `|Y |`demodulate HID Prox tag from the GraphBuffer`
|
||||
|`lf hid reader `|N |`attempt to read and extract tag data`
|
||||
|`lf hid clone `|N |`clone HID tag to T55x7`
|
||||
|`lf hid clone `|N |`clone HID tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf hid sim `|N |`simulate HID tag`
|
||||
|`lf hid brute `|N |`bruteforce facility code or card number against reader`
|
||||
|`lf hid watch `|N |`continuously watch for cards. Reader mode`
|
||||
@@ -1103,7 +1105,7 @@ Check column "offline" for their availability.
|
||||
|`lf jablotron help `|Y |`This help`
|
||||
|`lf jablotron demod `|Y |`demodulate an Jablotron tag from the GraphBuffer`
|
||||
|`lf jablotron reader `|N |`attempt to read and extract tag data`
|
||||
|`lf jablotron clone `|N |`clone jablotron tag to T55x7 or Q5/T5555`
|
||||
|`lf jablotron clone `|N |`clone jablotron tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf jablotron sim `|N |`simulate jablotron tag`
|
||||
|
||||
|
||||
@@ -1116,7 +1118,7 @@ Check column "offline" for their availability.
|
||||
|`lf keri help `|Y |`This help`
|
||||
|`lf keri demod `|Y |`demodulate an KERI tag from the GraphBuffer`
|
||||
|`lf keri reader `|N |`attempt to read and extract tag data`
|
||||
|`lf keri clone `|N |`clone KERI tag to T55x7 or Q5/T5555`
|
||||
|`lf keri clone `|N |`clone KERI tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf keri sim `|N |`simulate KERI tag`
|
||||
|
||||
|
||||
@@ -1142,7 +1144,7 @@ Check column "offline" for their availability.
|
||||
|`lf nedap help `|Y |`This help`
|
||||
|`lf nedap demod `|Y |`demodulate Nedap tag from the GraphBuffer`
|
||||
|`lf nedap reader `|N |`attempt to read and extract tag data`
|
||||
|`lf nedap clone `|N |`clone Nedap tag to T55x7 or Q5/T5555`
|
||||
|`lf nedap clone `|N |`clone Nedap tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf nedap sim `|N |`simulate Nedap tag`
|
||||
|
||||
|
||||
@@ -1155,7 +1157,7 @@ Check column "offline" for their availability.
|
||||
|`lf nexwatch help `|Y |`This help`
|
||||
|`lf nexwatch demod `|Y |`demodulate a NexWatch tag (nexkey, quadrakey) from the GraphBuffer`
|
||||
|`lf nexwatch reader `|N |`attempt to read and extract tag data`
|
||||
|`lf nexwatch clone `|N |`clone NexWatch tag to T55x7`
|
||||
|`lf nexwatch clone `|N |`clone NexWatch tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf nexwatch sim `|N |`simulate NexWatch tag`
|
||||
|
||||
|
||||
@@ -1168,7 +1170,7 @@ Check column "offline" for their availability.
|
||||
|`lf noralsy help `|Y |`This help`
|
||||
|`lf noralsy demod `|Y |`demodulate an Noralsy tag from the GraphBuffer`
|
||||
|`lf noralsy reader `|N |`attempt to read and extract tag data`
|
||||
|`lf noralsy clone `|N |`clone Noralsy tag to T55x7 or Q5/T5555`
|
||||
|`lf noralsy clone `|N |`clone Noralsy tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf noralsy sim `|N |`simulate Noralsy tag`
|
||||
|
||||
|
||||
@@ -1181,7 +1183,7 @@ Check column "offline" for their availability.
|
||||
|`lf pac help `|Y |`This help`
|
||||
|`lf pac demod `|Y |`demodulate a PAC tag from the GraphBuffer`
|
||||
|`lf pac reader `|N |`attempt to read and extract tag data`
|
||||
|`lf pac clone `|N |`clone PAC tag to T55x7`
|
||||
|`lf pac clone `|N |`clone PAC tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf pac sim `|N |`simulate PAC tag`
|
||||
|
||||
|
||||
@@ -1194,7 +1196,7 @@ Check column "offline" for their availability.
|
||||
|`lf paradox help `|Y |`This help`
|
||||
|`lf paradox demod `|Y |`demodulate a Paradox FSK tag from the GraphBuffer`
|
||||
|`lf paradox reader `|N |`attempt to read and extract tag data`
|
||||
|`lf paradox clone `|N |`clone paradox tag`
|
||||
|`lf paradox clone `|N |`clone paradox tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf paradox sim `|N |`simulate paradox tag`
|
||||
|
||||
|
||||
@@ -1219,7 +1221,7 @@ Check column "offline" for their availability.
|
||||
|`lf presco help `|Y |`This help`
|
||||
|`lf presco demod `|Y |`demodulate Presco tag from the GraphBuffer`
|
||||
|`lf presco reader `|N |`attempt to read and extract tag data`
|
||||
|`lf presco clone `|N |`clone presco tag to T55x7 or Q5/T5555`
|
||||
|`lf presco clone `|N |`clone presco tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf presco sim `|N |`simulate presco tag`
|
||||
|
||||
|
||||
@@ -1232,7 +1234,7 @@ Check column "offline" for their availability.
|
||||
|`lf pyramid help `|Y |`this help`
|
||||
|`lf pyramid demod `|Y |`demodulate a Pyramid FSK tag from the GraphBuffer`
|
||||
|`lf pyramid reader `|N |`attempt to read and extract tag data`
|
||||
|`lf pyramid clone `|N |`clone pyramid tag to T55x7 or Q5/T5555`
|
||||
|`lf pyramid clone `|N |`clone pyramid tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf pyramid sim `|N |`simulate pyramid tag`
|
||||
|
||||
|
||||
@@ -1245,7 +1247,7 @@ Check column "offline" for their availability.
|
||||
|`lf securakey help `|Y |`This help`
|
||||
|`lf securakey demod `|Y |`demodulate an Securakey tag from the GraphBuffer`
|
||||
|`lf securakey reader `|N |`attempt to read and extract tag data`
|
||||
|`lf securakey clone `|N |`clone Securakey tag to T55x7`
|
||||
|`lf securakey clone `|N |`clone Securakey tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf securakey sim `|N |`simulate Securakey tag`
|
||||
|
||||
|
||||
@@ -1300,7 +1302,7 @@ Check column "offline" for their availability.
|
||||
|`lf viking help `|Y |`This help`
|
||||
|`lf viking demod `|Y |`demodulate a Viking tag from the GraphBuffer`
|
||||
|`lf viking reader `|N |`attempt to read and extract tag data`
|
||||
|`lf viking clone `|N |`clone Viking tag to T55x7 or Q5/T5555`
|
||||
|`lf viking clone `|N |`clone Viking tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf viking sim `|N |`simulate Viking tag`
|
||||
|
||||
|
||||
@@ -1313,7 +1315,7 @@ Check column "offline" for their availability.
|
||||
|`lf visa2000 help `|Y |`This help`
|
||||
|`lf visa2000 demod `|Y |`demodulate an VISA2000 tag from the GraphBuffer`
|
||||
|`lf visa2000 reader `|N |`attempt to read and extract tag data`
|
||||
|`lf visa2000 clone `|N |`clone Visa2000 tag to T55x7 or Q5/T5555`
|
||||
|`lf visa2000 clone `|N |`clone Visa2000 tag to T55x7, Q5/T5555 or EM4305/4469`
|
||||
|`lf visa2000 sim `|N |`simulate Visa2000 tag`
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -101,11 +101,11 @@ typedef cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromD3D10KHR_t(
|
||||
cl_platform_id platform,
|
||||
cl_d3d10_device_source_khr d3d_device_source,
|
||||
void* d3d_object,
|
||||
void *d3d_object,
|
||||
cl_d3d10_device_set_khr d3d_device_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices);
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices);
|
||||
|
||||
typedef clGetDeviceIDsFromD3D10KHR_t *
|
||||
clGetDeviceIDsFromD3D10KHR_fn CL_API_SUFFIX__VERSION_1_0;
|
||||
@@ -114,8 +114,8 @@ typedef cl_mem CL_API_CALL
|
||||
clCreateFromD3D10BufferKHR_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D10Buffer* resource,
|
||||
cl_int* errcode_ret);
|
||||
ID3D10Buffer *resource,
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromD3D10BufferKHR_t *
|
||||
clCreateFromD3D10BufferKHR_fn CL_API_SUFFIX__VERSION_1_0;
|
||||
@@ -124,9 +124,9 @@ typedef cl_mem CL_API_CALL
|
||||
clCreateFromD3D10Texture2DKHR_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D10Texture2D* resource,
|
||||
ID3D10Texture2D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret);
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromD3D10Texture2DKHR_t *
|
||||
clCreateFromD3D10Texture2DKHR_fn CL_API_SUFFIX__VERSION_1_0;
|
||||
@@ -135,9 +135,9 @@ typedef cl_mem CL_API_CALL
|
||||
clCreateFromD3D10Texture3DKHR_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D10Texture3D* resource,
|
||||
ID3D10Texture3D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret);
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromD3D10Texture3DKHR_t *
|
||||
clCreateFromD3D10Texture3DKHR_fn CL_API_SUFFIX__VERSION_1_0;
|
||||
@@ -146,10 +146,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueAcquireD3D10ObjectsKHR_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueAcquireD3D10ObjectsKHR_t *
|
||||
clEnqueueAcquireD3D10ObjectsKHR_fn CL_API_SUFFIX__VERSION_1_0;
|
||||
@@ -158,10 +158,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueReleaseD3D10ObjectsKHR_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueReleaseD3D10ObjectsKHR_t *
|
||||
clEnqueueReleaseD3D10ObjectsKHR_fn CL_API_SUFFIX__VERSION_1_0;
|
||||
@@ -172,52 +172,52 @@ extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromD3D10KHR(
|
||||
cl_platform_id platform,
|
||||
cl_d3d10_device_source_khr d3d_device_source,
|
||||
void* d3d_object,
|
||||
void *d3d_object,
|
||||
cl_d3d10_device_set_khr d3d_device_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_0;
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_0;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromD3D10BufferKHR(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D10Buffer* resource,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
||||
ID3D10Buffer *resource,
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromD3D10Texture2DKHR(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D10Texture2D* resource,
|
||||
ID3D10Texture2D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromD3D10Texture3DKHR(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D10Texture3D* resource,
|
||||
ID3D10Texture3D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueAcquireD3D10ObjectsKHR(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_0;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_0;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueReleaseD3D10ObjectsKHR(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_0;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_0;
|
||||
|
||||
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
||||
|
||||
@@ -236,8 +236,8 @@ clGetSupportedD3D10TextureFormatsINTEL_t(
|
||||
cl_mem_flags flags,
|
||||
cl_mem_object_type image_type,
|
||||
cl_uint num_entries,
|
||||
DXGI_FORMAT* d3d10_formats,
|
||||
cl_uint* num_texture_formats);
|
||||
DXGI_FORMAT *d3d10_formats,
|
||||
cl_uint *num_texture_formats);
|
||||
|
||||
typedef clGetSupportedD3D10TextureFormatsINTEL_t *
|
||||
clGetSupportedD3D10TextureFormatsINTEL_fn ;
|
||||
@@ -250,8 +250,8 @@ clGetSupportedD3D10TextureFormatsINTEL(
|
||||
cl_mem_flags flags,
|
||||
cl_mem_object_type image_type,
|
||||
cl_uint num_entries,
|
||||
DXGI_FORMAT* d3d10_formats,
|
||||
cl_uint* num_texture_formats) ;
|
||||
DXGI_FORMAT *d3d10_formats,
|
||||
cl_uint *num_texture_formats) ;
|
||||
|
||||
#endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
||||
|
||||
|
||||
@@ -101,11 +101,11 @@ typedef cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromD3D11KHR_t(
|
||||
cl_platform_id platform,
|
||||
cl_d3d11_device_source_khr d3d_device_source,
|
||||
void* d3d_object,
|
||||
void *d3d_object,
|
||||
cl_d3d11_device_set_khr d3d_device_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices);
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices);
|
||||
|
||||
typedef clGetDeviceIDsFromD3D11KHR_t *
|
||||
clGetDeviceIDsFromD3D11KHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -114,8 +114,8 @@ typedef cl_mem CL_API_CALL
|
||||
clCreateFromD3D11BufferKHR_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D11Buffer* resource,
|
||||
cl_int* errcode_ret);
|
||||
ID3D11Buffer *resource,
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromD3D11BufferKHR_t *
|
||||
clCreateFromD3D11BufferKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -124,9 +124,9 @@ typedef cl_mem CL_API_CALL
|
||||
clCreateFromD3D11Texture2DKHR_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D11Texture2D* resource,
|
||||
ID3D11Texture2D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret);
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromD3D11Texture2DKHR_t *
|
||||
clCreateFromD3D11Texture2DKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -135,9 +135,9 @@ typedef cl_mem CL_API_CALL
|
||||
clCreateFromD3D11Texture3DKHR_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D11Texture3D* resource,
|
||||
ID3D11Texture3D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret);
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromD3D11Texture3DKHR_t *
|
||||
clCreateFromD3D11Texture3DKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -146,10 +146,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueAcquireD3D11ObjectsKHR_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueAcquireD3D11ObjectsKHR_t *
|
||||
clEnqueueAcquireD3D11ObjectsKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -158,10 +158,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueReleaseD3D11ObjectsKHR_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueReleaseD3D11ObjectsKHR_t *
|
||||
clEnqueueReleaseD3D11ObjectsKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -172,52 +172,52 @@ extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromD3D11KHR(
|
||||
cl_platform_id platform,
|
||||
cl_d3d11_device_source_khr d3d_device_source,
|
||||
void* d3d_object,
|
||||
void *d3d_object,
|
||||
cl_d3d11_device_set_khr d3d_device_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_2;
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromD3D11BufferKHR(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D11Buffer* resource,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
ID3D11Buffer *resource,
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromD3D11Texture2DKHR(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D11Texture2D* resource,
|
||||
ID3D11Texture2D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromD3D11Texture3DKHR(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
ID3D11Texture3D* resource,
|
||||
ID3D11Texture3D *resource,
|
||||
UINT subresource,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueAcquireD3D11ObjectsKHR(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_2;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueReleaseD3D11ObjectsKHR(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_2;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
||||
|
||||
@@ -237,8 +237,8 @@ clGetSupportedD3D11TextureFormatsINTEL_t(
|
||||
cl_mem_object_type image_type,
|
||||
cl_uint plane,
|
||||
cl_uint num_entries,
|
||||
DXGI_FORMAT* d3d11_formats,
|
||||
cl_uint* num_texture_formats);
|
||||
DXGI_FORMAT *d3d11_formats,
|
||||
cl_uint *num_texture_formats);
|
||||
|
||||
typedef clGetSupportedD3D11TextureFormatsINTEL_t *
|
||||
clGetSupportedD3D11TextureFormatsINTEL_fn ;
|
||||
@@ -252,8 +252,8 @@ clGetSupportedD3D11TextureFormatsINTEL(
|
||||
cl_mem_object_type image_type,
|
||||
cl_uint plane,
|
||||
cl_uint num_entries,
|
||||
DXGI_FORMAT* d3d11_formats,
|
||||
cl_uint* num_texture_formats) ;
|
||||
DXGI_FORMAT *d3d11_formats,
|
||||
cl_uint *num_texture_formats) ;
|
||||
|
||||
#endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ typedef cl_uint cl_dx9_media_adapter_set_khr;
|
||||
|
||||
#if defined(_WIN32)
|
||||
typedef struct _cl_dx9_surface_info_khr {
|
||||
IDirect3DSurface9* resource;
|
||||
IDirect3DSurface9 *resource;
|
||||
HANDLE shared_handle;
|
||||
} cl_dx9_surface_info_khr;
|
||||
|
||||
@@ -114,12 +114,12 @@ typedef cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromDX9MediaAdapterKHR_t(
|
||||
cl_platform_id platform,
|
||||
cl_uint num_media_adapters,
|
||||
cl_dx9_media_adapter_type_khr* media_adapter_type,
|
||||
void* media_adapters,
|
||||
cl_dx9_media_adapter_type_khr *media_adapter_type,
|
||||
void *media_adapters,
|
||||
cl_dx9_media_adapter_set_khr media_adapter_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices);
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices);
|
||||
|
||||
typedef clGetDeviceIDsFromDX9MediaAdapterKHR_t *
|
||||
clGetDeviceIDsFromDX9MediaAdapterKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -129,9 +129,9 @@ clCreateFromDX9MediaSurfaceKHR_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
cl_dx9_media_adapter_type_khr adapter_type,
|
||||
void* surface_info,
|
||||
void *surface_info,
|
||||
cl_uint plane,
|
||||
cl_int* errcode_ret);
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromDX9MediaSurfaceKHR_t *
|
||||
clCreateFromDX9MediaSurfaceKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -140,10 +140,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueAcquireDX9MediaSurfacesKHR_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueAcquireDX9MediaSurfacesKHR_t *
|
||||
clEnqueueAcquireDX9MediaSurfacesKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -152,10 +152,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueReleaseDX9MediaSurfacesKHR_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueReleaseDX9MediaSurfacesKHR_t *
|
||||
clEnqueueReleaseDX9MediaSurfacesKHR_fn CL_API_SUFFIX__VERSION_1_2;
|
||||
@@ -166,39 +166,39 @@ extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromDX9MediaAdapterKHR(
|
||||
cl_platform_id platform,
|
||||
cl_uint num_media_adapters,
|
||||
cl_dx9_media_adapter_type_khr* media_adapter_type,
|
||||
void* media_adapters,
|
||||
cl_dx9_media_adapter_type_khr *media_adapter_type,
|
||||
void *media_adapters,
|
||||
cl_dx9_media_adapter_set_khr media_adapter_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_2;
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromDX9MediaSurfaceKHR(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
cl_dx9_media_adapter_type_khr adapter_type,
|
||||
void* surface_info,
|
||||
void *surface_info,
|
||||
cl_uint plane,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueAcquireDX9MediaSurfacesKHR(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_2;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueReleaseDX9MediaSurfacesKHR(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_2;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_2;
|
||||
|
||||
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
||||
|
||||
@@ -248,11 +248,11 @@ typedef cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromDX9INTEL_t(
|
||||
cl_platform_id platform,
|
||||
cl_dx9_device_source_intel dx9_device_source,
|
||||
void* dx9_object,
|
||||
void *dx9_object,
|
||||
cl_dx9_device_set_intel dx9_device_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices);
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices);
|
||||
|
||||
typedef clGetDeviceIDsFromDX9INTEL_t *
|
||||
clGetDeviceIDsFromDX9INTEL_fn CL_API_SUFFIX__VERSION_1_1;
|
||||
@@ -261,10 +261,10 @@ typedef cl_mem CL_API_CALL
|
||||
clCreateFromDX9MediaSurfaceINTEL_t(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
IDirect3DSurface9* resource,
|
||||
IDirect3DSurface9 *resource,
|
||||
HANDLE sharedHandle,
|
||||
UINT plane,
|
||||
cl_int* errcode_ret);
|
||||
cl_int *errcode_ret);
|
||||
|
||||
typedef clCreateFromDX9MediaSurfaceINTEL_t *
|
||||
clCreateFromDX9MediaSurfaceINTEL_fn CL_API_SUFFIX__VERSION_1_1;
|
||||
@@ -273,10 +273,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueAcquireDX9ObjectsINTEL_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueAcquireDX9ObjectsINTEL_t *
|
||||
clEnqueueAcquireDX9ObjectsINTEL_fn CL_API_SUFFIX__VERSION_1_1;
|
||||
@@ -285,10 +285,10 @@ typedef cl_int CL_API_CALL
|
||||
clEnqueueReleaseDX9ObjectsINTEL_t(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
cl_mem* mem_objects,
|
||||
cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event);
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event);
|
||||
|
||||
typedef clEnqueueReleaseDX9ObjectsINTEL_t *
|
||||
clEnqueueReleaseDX9ObjectsINTEL_fn CL_API_SUFFIX__VERSION_1_1;
|
||||
@@ -299,38 +299,38 @@ extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clGetDeviceIDsFromDX9INTEL(
|
||||
cl_platform_id platform,
|
||||
cl_dx9_device_source_intel dx9_device_source,
|
||||
void* dx9_object,
|
||||
void *dx9_object,
|
||||
cl_dx9_device_set_intel dx9_device_set,
|
||||
cl_uint num_entries,
|
||||
cl_device_id* devices,
|
||||
cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_1;
|
||||
cl_device_id *devices,
|
||||
cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_1;
|
||||
|
||||
extern CL_API_ENTRY cl_mem CL_API_CALL
|
||||
clCreateFromDX9MediaSurfaceINTEL(
|
||||
cl_context context,
|
||||
cl_mem_flags flags,
|
||||
IDirect3DSurface9* resource,
|
||||
IDirect3DSurface9 *resource,
|
||||
HANDLE sharedHandle,
|
||||
UINT plane,
|
||||
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1;
|
||||
cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_1;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueAcquireDX9ObjectsINTEL(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
const cl_mem* mem_objects,
|
||||
const cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_1;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_1;
|
||||
|
||||
extern CL_API_ENTRY cl_int CL_API_CALL
|
||||
clEnqueueReleaseDX9ObjectsINTEL(
|
||||
cl_command_queue command_queue,
|
||||
cl_uint num_objects,
|
||||
cl_mem* mem_objects,
|
||||
cl_mem *mem_objects,
|
||||
cl_uint num_events_in_wait_list,
|
||||
const cl_event* event_wait_list,
|
||||
cl_event* event) CL_API_SUFFIX__VERSION_1_1;
|
||||
const cl_event *event_wait_list,
|
||||
cl_event *event) CL_API_SUFFIX__VERSION_1_1;
|
||||
|
||||
#endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
||||
|
||||
@@ -350,8 +350,8 @@ clGetSupportedDX9MediaSurfaceFormatsINTEL_t(
|
||||
cl_mem_object_type image_type,
|
||||
cl_uint plane,
|
||||
cl_uint num_entries,
|
||||
D3DFORMAT* dx9_formats,
|
||||
cl_uint* num_surface_formats);
|
||||
D3DFORMAT *dx9_formats,
|
||||
cl_uint *num_surface_formats);
|
||||
|
||||
typedef clGetSupportedDX9MediaSurfaceFormatsINTEL_t *
|
||||
clGetSupportedDX9MediaSurfaceFormatsINTEL_fn ;
|
||||
@@ -365,8 +365,8 @@ clGetSupportedDX9MediaSurfaceFormatsINTEL(
|
||||
cl_mem_object_type image_type,
|
||||
cl_uint plane,
|
||||
cl_uint num_entries,
|
||||
D3DFORMAT* dx9_formats,
|
||||
cl_uint* num_surface_formats) ;
|
||||
D3DFORMAT *dx9_formats,
|
||||
cl_uint *num_surface_formats) ;
|
||||
|
||||
#endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user