CHG: `lf em` - some minor refactoring in 4x50 commands

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 3db56845df0ba73ff5346db3cc0fad611a9bcb73..3ba9dd68eb3b9ff8c4eb00a9aa5e166313fc7805 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1005,10 +1005,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_EM4X_READ_WORD:
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_EM4X_READ_WORD:

-                       EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
+                       EM4xReadWord(c->arg[0], c->arg[1], c->arg[2]);

                        break;
                case CMD_EM4X_WRITE_WORD:
                        break;
                case CMD_EM4X_WRITE_WORD:

-                       EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+                       EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);

                        break;
                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
                        break;
                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);


@@ -1228,6 +1228,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
             break;
         case CMD_EMV_DUMP_CARD:
             EMVdumpcard();
             break;
         case CMD_EMV_DUMP_CARD:
             EMVdumpcard();

+                       break;

 #endif
 #ifdef WITH_ICLASS
                // Makes use of ISO14443a FPGA Firmware
 #endif
 #ifdef WITH_ICLASS
                // Makes use of ISO14443a FPGA Firmware