github/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-09 03:00:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'RfidResearchGroup:master' into master

Browse Source
This commit is contained in:
bthedorff
2022-01-17 18:58:30 -05:00
committed by GitHub
parent f43e5f0de7 a6a75b6429
commit e6d4d9af49
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/include/pm3.h
View File

@@ -18,8 +18,8 @@
typedef struct pm3_device pm3;
pm3 *pm3_open(char *port);
int pm3_console(pm3 *dev, char *cmd);
pm3 *pm3_open(const char *port);
int pm3_console(pm3 *dev, const char *cmd);
const char *pm3_name_get(pm3 *dev);
void pm3_close(pm3 *dev);
pm3 *pm3_get_current_dev(void);

2
client/src/cmdmain.c
View File

@@ -351,7 +351,7 @@ static int CmdHelp(const char *Cmd) {
// Entry point into our code: called whenever the user types a command and
// then presses Enter, which the full command line that they typed.
//-----------------------------------------------------------------------------
int CommandReceived(char *Cmd) {
int CommandReceived(const char *Cmd) {
return CmdsParse(CommandTable, Cmd);
}

2
client/src/cmdmain.h
View File

@@ -22,7 +22,7 @@
#include "common.h"
#include "cmdparser.h" // command_t
int CommandReceived(char *Cmd);
int CommandReceived(const char *Cmd);
int CmdRem(const char *Cmd);
command_t *getTopLevelCommandTable(void);

2
client/src/comms.c
View File

@@ -549,7 +549,7 @@ bool IsCommunicationThreadDead(void) {
return ret;
}
bool OpenProxmark(pm3_device_t **dev, char *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed) {
bool OpenProxmark(pm3_device_t **dev, const char *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed) {
if (!wait_for_port) {
PrintAndLogEx(INFO, "Using UART port " _YELLOW_("%s"), port);

2
client/src/comms.h
View File

@@ -84,7 +84,7 @@ void clearCommandBuffer(void);
#define FLASHMODE_SPEED 460800
bool IsCommunicationThreadDead(void);
bool OpenProxmark(pm3_device_t **dev, char *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
bool OpenProxmark(pm3_device_t **dev, const char *port, bool wait_for_port, int timeout, bool flash_mode, uint32_t speed);
int TestProxmark(pm3_device_t *dev);
void CloseProxmark(pm3_device_t *dev);

4
client/src/pm3.c
View File

@@ -27,7 +27,7 @@
#include "util_posix.h"
#include "comms.h"
pm3_device_t *pm3_open(char *port) {
pm3_device_t *pm3_open(const char *port) {
pm3_init();
OpenProxmark(&g_session.current_device, port, false, 20, false, USART_BAUD_RATE);
if (g_session.pm3_present && (TestProxmark(g_session.current_device) != PM3_SUCCESS)) {
@@ -54,7 +54,7 @@ void pm3_close(pm3_device_t *dev) {
}
}
int pm3_console(pm3_device_t *dev, char *cmd) {
int pm3_console(pm3_device_t *dev, const char *cmd) {
// For now, there is no real device context:
(void) dev;
return CommandReceived(cmd);