autodetect passive nfc operation or usb operation

fido2/ctap.c

@@ -1536,7 +1536,7 @@ static void ctap_state_init()
     ctap_reset_rk();
 }
 
-void ctap_init(int init_pin)
+void ctap_init()
 {
     crypto_ecc256_init();
 
@@ -1591,7 +1591,7 @@ void ctap_init(int init_pin)
         exit(1);
     }
 
-    if (init_pin)
+    if (! device_is_nfc())
     {
         crypto_ecc256_make_key_pair(KEY_AGREEMENT_PUB, KEY_AGREEMENT_PRIV);
     }

fido2/ctap.h

@@ -267,7 +267,7 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp);
 int ctap_encode_der_sig(uint8_t const * const in_sigbuf, uint8_t * const out_sigder);
 
 // Run ctap related power-up procedures (init pinToken, generate shared secret)
-void ctap_init(int init_pin);
+void ctap_init();
 
 // Resets state between different accesses of different applications
 void ctap_reset_state();

targets/stm32l432/src/ams.c

@@ -6,6 +6,7 @@
 #include "log.h"
 #include "util.h"
 #include "device.h"
+#include "nfc.h"
 
 static void flush_rx()
 {
@@ -269,11 +270,8 @@ void ams_print_int1(uint8_t int0)
 #endif
 }
 
-
-bool ams_init()
+void ams_init()
 {
-    uint8_t block[4];
-
     LL_GPIO_SetPinMode(SOLO_AMS_CS_PORT,SOLO_AMS_CS_PIN,LL_GPIO_MODE_OUTPUT);
     LL_GPIO_SetOutputPin(SOLO_AMS_CS_PORT,SOLO_AMS_CS_PIN);
 
@@ -284,18 +282,19 @@ bool ams_init()
 
     // delay(10);
     SELECT();
-    delay(2);
+    delay(1);
+}
 
-    // Needs to be disabled for passive operation
-    if (0)
-    // if (1)
+void ams_configure()
 {
+    // Should not be used during passive operation.
+    uint8_t block[4];
+
 	// check connection
 	uint8_t productType = ams_read_reg(AMS_REG_PRODUCT_TYPE);
 	if (productType != 0x14)
 	{
-    		printf1(TAG_NFC, "Have wrong product type [0x%02x]. AMS3956 connection error.\n", productType);
-    		return false;
+		printf1(TAG_ERR, "Have wrong product type [0x%02x]. AMS3956 connection error.\n", productType);
 	}
 
 	printf1(TAG_NFC,"AMS3956 product type 0x%02x.\n", productType);
@@ -362,7 +361,6 @@ bool ams_init()
         ams_read_eeprom_block(0x7F, block);
         printf1(TAG_NFC,"conf1: "); dump_hex1(TAG_NFC,block,4);
     }
-    }
 
-	return true;
+
 }

targets/stm32l432/src/ams.h

@@ -39,7 +39,8 @@ typedef union
 #define SELECT() LL_GPIO_ResetOutputPin(SOLO_AMS_CS_PORT,SOLO_AMS_CS_PIN)
 #define UNSELECT() LL_GPIO_SetOutputPin(SOLO_AMS_CS_PORT,SOLO_AMS_CS_PIN)
 
-bool ams_init();
+void ams_init();
+void ams_configure();
 
 void ams_read_buffer(uint8_t * data, int len);
 void ams_write_buffer(uint8_t * data, int len);

targets/stm32l432/src/app.h

@@ -30,7 +30,7 @@
 // #define DISABLE_CTAPHID_WINK
 // #define DISABLE_CTAPHID_CBOR
 
-// #define ENABLE_SERIAL_PRINTING
+#define ENABLE_SERIAL_PRINTING
 
 #if defined(SOLO_HACKER)
 #define SOLO_PRODUCT_NAME "Solo Hacker " SOLO_VERSION

targets/stm32l432/src/device.c

@@ -60,7 +60,7 @@ void TIM6_DAC_IRQHandler()
     }
 #ifndef IS_BOOTLOADER
 	// NFC sending WTX if needs
-	if (haveNFC)
+	if (device_is_nfc())
 	{
 		WTX_timer_exec();
 	}
@@ -113,26 +113,32 @@ void device_init()
     hw_init(LOW_FREQUENCY);
     isLowFreq = 1;
 
-    printf1(TAG_NFC,"PWR->CR1: %04x\r\n", LL_PWR_GetRegulVoltageScaling());
+    haveNFC = nfc_init();
 
-    // hw_init(HIGH_FREQUENCY);
-    // isLowFreq = 0;
+    if (haveNFC)
+    {
+        printf1(TAG_NFC, "Have NFC\r\n");
+    }
+    else
+    {
+        printf1(TAG_NFC, "Have NO NFC\r\n");
+        hw_init(HIGH_FREQUENCY);
+
+        isLowFreq = 0;
+    }
 
     usbhid_init();
 
     ctaphid_init();
 
-    ctap_init( 0 );
+    ctap_init( !haveNFC );
 
-#ifndef IS_BOOTLOADER
 #if BOOT_TO_DFU
     flash_option_bytes_init(1);
 #else
     flash_option_bytes_init(0);
 #endif
-    printf1(TAG_GEN,"init nfc\n");
-    haveNFC = nfc_init();
-#endif
+
 
 }
 
@@ -430,7 +436,7 @@ void device_manage()
     }
 #endif
 #ifndef IS_BOOTLOADER
-	if(haveNFC)
+	// if(device_is_nfc())
 		nfc_loop();
 #endif
 }

targets/stm32l432/src/init.c

@@ -808,6 +808,8 @@ void init_debug_uart(void)
   /* Peripheral clock enable */
   LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART1);
 
+
+  LL_USART_DeInit(USART1);
   /**USART1 GPIO Configuration
   PB6   ------> USART1_TX
   PB7   ------> USART1_RX

targets/stm32l432/src/nfc.c

@@ -57,8 +57,23 @@ void nfc_state_init()
 
 bool nfc_init()
 {
+    uint32_t t1;
     nfc_state_init();
-    return ams_init();
+    ams_init();
+
+    // Detect if we are powered by NFC field by listening for a message for
+    // first 25 ms.
+    t1 = millis();
+    while ((millis() - t1) < 25)
+    {
+        if (nfc_loop() > 0)
+            return 1;
+    }
+
+    // Under USB power.  Configure AMS chip.
+    ams_configure();
+
+    return 0;
 }
 
 void process_int0(uint8_t int0)
@@ -699,22 +714,20 @@ void nfc_process_block(uint8_t * buf, unsigned int len)
     }
 }
 
-void nfc_loop()
+int nfc_loop()
 {
     uint8_t buf[32];
     AMS_DEVICE ams;
     int len = 0;
 
 
-    if (1)
-    {
     read_reg_block(&ams);
     uint8_t state = AMS_STATE_MASK & ams.regs.rfid_status;
 
     if (state != AMS_STATE_SELECTED && state != AMS_STATE_SELECTEDX)
     {
         // delay(1);  // sleep ?
-            return;
+        return 0;
     }
 
     if (ams.regs.rfid_status)
@@ -781,6 +794,6 @@ void nfc_loop()
 
     }
 
-    }
+    return len;
 
 }

targets/stm32l432/src/nfc.h

@@ -5,7 +5,9 @@
 #include <stdbool.h>
 #include "apdu.h"
 
-void nfc_loop();
+// Return number of bytes read if any.
+int nfc_loop();
+
 bool nfc_init();
 
 typedef struct