#include "comms.h"
#include <pthread.h>
-#ifdef __linux__
+#if defined(__linux__) && !defined(NO_UNLINK)
#include <unistd.h> // for unlink()
#endif
#include "uart.h"
#include "ui.h"
#include "common.h"
+#include "util_darwin.h"
#include "util_posix.h"
UsbCommand rx;
UsbCommand *prx = ℞
+#if defined(__MACH__) && defined(__APPLE__)
+ disableAppNap("Proxmark3 polling UART");
+#endif
+
while (conn->run) {
rxlen = 0;
bool ACK_received = false;
pthread_mutex_unlock(&txBufferMutex);
}
+#if defined(__MACH__) && defined(__APPLE__)
+ enableAppNap();
+#endif
+
pthread_exit(NULL);
return NULL;
}
}
+bool GetFromFpgaRAM(uint8_t *dest, int bytes)
+{
+ UsbCommand c = {CMD_HF_PLOT, {0, 0, 0}};
+ SendCommand(&c);
+
+ uint64_t start_time = msclock();
+
+ UsbCommand response;
+
+ int bytes_completed = 0;
+ bool show_warning = true;
+ while(true) {
+ if (getCommand(&response)) {
+ if (response.cmd == CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) {
+ int copy_bytes = MIN(bytes - bytes_completed, response.arg[1]);
+ memcpy(dest + response.arg[0], response.d.asBytes, copy_bytes);
+ bytes_completed += copy_bytes;
+ } else if (response.cmd == CMD_ACK) {
+ return true;
+ }
+ }
+
+ if (msclock() - start_time > 2000 && show_warning) {
+ PrintAndLog("Waiting for a response from the proxmark...");
+ PrintAndLog("You can cancel this operation by pressing the pm3 button");
+ show_warning = false;
+ }
+ }
+
+ return false;
+}
+
+
bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode) {
char *portname = (char *)port;
if (!wait_for_port) {
void CloseProxmark(void) {
conn.run = false;
+
+#ifdef __BIONIC__
+ // In Android O and later, if an invalid pthread_t is passed to pthread_join, it calls fatal().
+ // https://github.com/aosp-mirror/platform_bionic/blob/ed16b344e75f422fb36fbfd91fb30de339475880/libc/bionic/pthread_internal.cpp#L116-L128
+ //
+ // In Bionic libc, pthread_t is an integer.
+
+ if (USB_communication_thread != 0) {
+ pthread_join(USB_communication_thread, NULL);
+ }
+#else
+ // pthread_t is a struct on other libc, treat as an opaque memory reference
pthread_join(USB_communication_thread, NULL);
+#endif
if (sp) {
uart_close(sp);
}
-#ifdef __linux__
+#if defined(__linux__) && !defined(NO_UNLINK)
// Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
+ //
+ // This may be disabled at compile-time with -DNO_UNLINK (used for a JNI-based serial port on Android).
if (serial_port_name) {
unlink(serial_port_name);
}
// Clean up our state
sp = NULL;
serial_port_name = NULL;
+#ifdef __BIONIC__
+ memset(&USB_communication_thread, 0, sizeof(pthread_t));
+#endif
}