More CRLF -> LF

[proxmark3-svn] / include / proxmark3.h

diff --git a/include/proxmark3.h b/include/proxmark3.h
index f1894f999eecc391e9841cf1f2812a6aae06a53a..41cf3f563b299fde89a075a45f99a574dbe53e1f 100644 (file)
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -16,6 +16,10 @@
 #define PWM_CHANNEL(x)                                                 (1<<(x))\r
 \r
 #define TC_CMR_TCCLKS_TIMER_CLOCK1                             (0<<0)\r
+#define TC_CMR_TCCLKS_TIMER_CLOCK2                             (1<<0)\r
+#define TC_CMR_TCCLKS_TIMER_CLOCK3                             (2<<0)\r
+#define TC_CMR_TCCLKS_TIMER_CLOCK4                             (3<<0)\r
+#define TC_CMR_TCCLKS_TIMER_CLOCK5                             (4<<0)\r
 \r
 #define ADC_CHAN_LF                                                            4\r
 #define ADC_CHAN_HF                                                            5\r
@@ -32,6 +36,8 @@
 \r
 #define MC_FLASH_COMMAND_KEY                                   ((0x5a)<<24)\r
 #define MC_FLASH_STATUS_READY                                  (1<<0)\r
+#define MC_FLASH_STATUS_LOCKE                                  (1<<2)\r
+#define MC_FLASH_STATUS_PROGE                                  (1<<3)\r
 #define MC_FLASH_MODE_FLASH_WAIT_STATES(x)             ((x)<<8)\r
 #define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x)             ((x)<<16)\r
 #define MC_FLASH_COMMAND_PAGEN(x)                              ((x)<<8)\r
@@ -74,7 +80,7 @@ typedef signed short SWORD;
 \r
 #include <usb_cmd.h>\r
 \r
-#define PACKED __attribute__((__packed__))\r
+//#define PACKED __attribute__((__packed__))\r
 \r
 #define USB_D_PLUS_PULLUP_ON() { \\r
                HIGH(GPIO_USB_PU); \\r