diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 822b4beab..ec4770927 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1122,10 +1122,6 @@ static void PacketReceived(PacketCommandNG *packet) { em4x50_login((uint32_t *)packet->data.asBytes); break; } - case CMD_LF_EM4X50_RESET: { - em4x50_reset(); - break; - } case CMD_LF_EM4X50_RESTORE: { em4x50_restore((em4x50_data_t *)packet->data.asBytes); break; diff --git a/armsrc/em4x50.c b/armsrc/em4x50.c index 69b1d6919..905b935c0 100644 --- a/armsrc/em4x50.c +++ b/armsrc/em4x50.c @@ -1005,22 +1005,6 @@ static int reset(void) { return PM3_EFAILED; } -void em4x50_reset(void) { - - // reset EM4x50 - - uint8_t status = PM3_EFAILED; - - em4x50_setup_read(); - - // set gHigh and gLow - if (get_signalproperties() && find_em4x50_tag()) - status = reset(); - - lf_finalize(); - reply_ng(CMD_LF_EM4X50_RESET, status, 0, 0); -} - //============================================================================== // read functions //============================================================================== diff --git a/armsrc/em4x50.h b/armsrc/em4x50.h index 979d9bca7..1169bb986 100644 --- a/armsrc/em4x50.h +++ b/armsrc/em4x50.h @@ -18,14 +18,12 @@ int em4x50_standalone_brute(uint32_t start, uint32_t stop, uint32_t *pwd); bool em4x50_sim_send_listen_window(void); bool em4x50_sim_send_word(uint32_t word); - void em4x50_info(em4x50_data_t *etd); void em4x50_write(em4x50_data_t *etd); void em4x50_writepwd(em4x50_data_t *etd); void em4x50_read(em4x50_data_t *etd); void em4x50_brute(em4x50_data_t *etd); void em4x50_login(uint32_t *password); -void em4x50_reset(void); void em4x50_restore(em4x50_data_t *etd); void em4x50_sim(void); void em4x50_reader(void); diff --git a/client/src/cmdlfem4x.c b/client/src/cmdlfem4x.c index 06e8b8a03..83af74333 100644 --- a/client/src/cmdlfem4x.c +++ b/client/src/cmdlfem4x.c @@ -660,7 +660,6 @@ static command_t CommandTable[] = { {"4x50_wipe", CmdEM4x50Wipe, IfPm3EM4x50, "wipe EM4x50 tag"}, {"4x50_brute", CmdEM4x50Brute, IfPm3EM4x50, "guess password of EM4x50"}, {"4x50_login", CmdEM4x50Login, IfPm3EM4x50, "login into EM4x50"}, - {"4x50_reset", CmdEM4x50Reset, IfPm3EM4x50, "reset EM4x50"}, {"4x50_restore",CmdEM4x50Restore, IfPm3EM4x50, "restore EM4x50 dump to tag"}, {"4x50_sim", CmdEM4x50Sim, IfPm3EM4x50, "simulate EM4x50 tag"}, {"4x50_reader", CmdEM4x50Reader, IfPm3EM4x50, "show standard read mode data of EM4x50"}, diff --git a/client/src/cmdlfem4x50.c b/client/src/cmdlfem4x50.c index dc33e05fc..cab5c1452 100644 --- a/client/src/cmdlfem4x50.c +++ b/client/src/cmdlfem4x50.c @@ -562,42 +562,6 @@ int CmdEM4x50Chk(const char *Cmd) { return PM3_SUCCESS; } -//============================================================================== -// reset functions -//============================================================================== - -int CmdEM4x50Reset(const char *Cmd) { - - PacketResponseNG resp; - - CLIParserContext *ctx; - CLIParserInit(&ctx, "lf em 4x50_reset", - "Reseta EM4x50 tag.", - "lf em 4x50_reset\n" - ); - - void *argtable[] = { - arg_param_begin, - arg_param_end - }; - - CLIExecWithReturn(ctx, Cmd, argtable, true); - CLIParserFree(ctx); - - // start - clearCommandBuffer(); - SendCommandNG(CMD_LF_EM4X50_RESET, 0, 0); - WaitForResponse(CMD_LF_EM4X50_RESET, &resp); - - // print response - if (resp.status == PM3_SUCCESS) - PrintAndLogEx(SUCCESS, "Reset " _GREEN_("ok")); - else - PrintAndLogEx(FAILED, "Reset " _RED_("failed")); - - return resp.status; -} - //============================================================================== // read functions //============================================================================== diff --git a/client/src/cmdlfem4x50.h b/client/src/cmdlfem4x50.h index fe45a16f6..2b76cb7ef 100644 --- a/client/src/cmdlfem4x50.h +++ b/client/src/cmdlfem4x50.h @@ -25,7 +25,6 @@ int CmdEM4x50Dump(const char *Cmd); int CmdEM4x50Wipe(const char *Cmd); int CmdEM4x50Brute(const char *Cmd); int CmdEM4x50Login(const char *Cmd); -int CmdEM4x50Reset(const char *Cmd); int CmdEM4x50Restore(const char *Cmd); int CmdEM4x50Sim(const char *Cmd); int CmdEM4x50Reader(const char *Cmd); diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h index 9d6bf90ad..f929bca41 100644 --- a/include/pm3_cmd.h +++ b/include/pm3_cmd.h @@ -511,7 +511,6 @@ typedef struct { #define CMD_LF_EM4X50_READ 0x0243 #define CMD_LF_EM4X50_BRUTE 0x0245 #define CMD_LF_EM4X50_LOGIN 0x0246 -#define CMD_LF_EM4X50_RESET 0x0247 #define CMD_LF_EM4X50_RESTORE 0x0249 #define CMD_LF_EM4X50_SIM 0x0250 #define CMD_LF_EM4X50_READER 0x0251