Build only 'reasonable' combinations of APP/MEMORY

There's no point in building a DFU loeader that is to be flashed via DFU - nor is there really any need for regular cardem/trace that can be flahsed directly without DFU. If anyone needs those, they can still build them - but let's not confuse the average other user. Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18 Closes: OS#4087
Patch actual board name into the USB iProduct string descriptor
2026-03-17 21:58:33 +03:00 · 2019-12-06 20:08:33 +01:00 · 2019-12-06 19:19:23 +01:00 · 2019-12-06 19:19:23 +01:00 · 2019-12-06 18:47:25 +01:00 · 2019-12-03 15:51:52 +00:00
22 changed files with 79 additions and 73 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ host/simtrace2-list
 host/simtrace2-remsim
 host/simtrace2-remsim-usb2udp
 usb_strings_generated.h
+firmware/usbstring/usbstring
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -37,12 +37,14 @@ GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
 CHIP  ?= sam3s4
 BOARD ?= qmod
+APP ?= dfu

 # Defines which are the available memory targets for the SAM3S-EK board.
-MEMORIES ?= flash dfu
-
-# Output file basename
-APP ?= dfu
+ifeq ($(APP), dfu)
+MEMORIES ?= flash
+else
+MEMORIES ?= dfu
+endif

 # Output directories and filename
 OUTPUT = $(BOARD)-$(APP)
@@ -100,7 +102,7 @@ C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c
 C_LIBCOMMON  = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c

 C_BOARD      = $(notdir $(wildcard libboard/common/source/*.c))
-C_BOARD	    += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))
+C_BOARD     += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))

 C_APPLEVEL = $(notdir $(wildcard apps/$(APP)/*.c))

@@ -195,7 +197,11 @@ $(BIN) $(OBJ):
 usbstring/usbstring: usbstring/usbstring.c
 	gcc $^ -o $@

-apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring
+.PHONY: apps/$(APP)/usb_strings.txt.patched
+apps/$(APP)/usb_strings.txt.patched: apps/$(APP)/usb_strings.txt
+	sed "s/PRODUCT_STRING/$(shell cat libboard/$(BOARD)/product_string.txt)/" $< > $@
+
+apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstring/usbstring
 	cat $< | usbstring/usbstring > $@

 define RULES
@@ -231,10 +237,11 @@ program:

 SERIAL ?= /dev/ttyUSB0
 log:
-	stty -F $(SERIAL) 115200
+	stty -F $(SERIAL) 921600
 	lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts )

 clean:
+	-rm -f apps/$(APP)/usb_strings.txt.patched
 	-rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p`

 install:
--- a/firmware/apps/cardem/main.c
+++ b/firmware/apps/cardem/main.c
@@ -1,7 +1,7 @@
 /* SIMtrace 2 firmware card emulation application
 *
 * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -158,7 +158,8 @@ extern int main(void)

 		printf("\n\r\n\r"
 		"=============================================================================\n\r"
-		"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"
+		"SIMtrace2 firmware " GIT_VERSION "\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
 		"=============================================================================\n\r");

 #if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
--- a/firmware/apps/cardem/usb_strings.txt
+++ b/firmware/apps/cardem/usb_strings.txt
@@ -1,8 +1,8 @@
 sysmocom - s.f.m.c. GmbH
-SIMtrace 2 compatible device
+PRODUCT_STRING
 SIMtrace Sniffer
 SIMtrace CCID
-SIMtrace Phone
+SIMtrace Card Emulation
 SIMtrace MITM
 CardEmulator Modem 1
 CardEmulator Modem 2
--- a/firmware/apps/dfu/main.c
+++ b/firmware/apps/dfu/main.c
@@ -1,7 +1,7 @@
 /* SIMtrace 2 firmware USB DFU bootloader
 *
 * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
+ * (C) 2018-2019 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -66,7 +66,11 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		WDT_Restart(WDT);
 	}

-	printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
+#if TRACE_LEVEL >= TRACE_LEVEL_INFO
+	TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
+#else
+	printf("DL off=%u\n\r", offset);
+#endif

 #ifdef PINS_LEDS
 	PIO_Clear(&pinsLeds[LED_NUM_RED]);
@@ -248,7 +252,8 @@ extern int main(void)

 	printf("\n\r\n\r"
 		"=============================================================================\n\r"
-		"DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\n\r"
+		"DFU bootloader %s for board %s\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
 		"=============================================================================\n\r",
 		manifest_revision, manifest_board);

@@ -295,17 +300,16 @@ extern int main(void)

 	TRACE_INFO("USB init...\n\r");
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
+	USBD_Disconnect();
 #ifdef PIN_USB_PULLUP
 	const Pin usb_dp_pullup = PIN_USB_PULLUP;
 	PIO_Configure(&usb_dp_pullup, 1);
 	PIO_Set(&usb_dp_pullup);
 #endif
-	USBD_HAL_Suspend();
-	mdelay(20);
+	mdelay(50);
 #ifdef PIN_USB_PULLUP
 	PIO_Clear(&usb_dp_pullup);
 #endif
-	USBD_HAL_Activate();

 	USBDFU_Initialize(&dfu_descriptors);

@@ -314,8 +318,8 @@ extern int main(void)
 		check_exec_dbg_cmd();
 #if 1
 		if (i >= MAX_USB_ITER * 3) {
-			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\n\r");
+			TRACE_ERROR("Resetting board (USB could not be configured)\n\r");
+			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
--- a/firmware/apps/dfu/usb_strings.txt
+++ b/firmware/apps/dfu/usb_strings.txt
@@ -1,5 +1,5 @@
 sysmocom - s.f.m.c. GmbH
-SIMtrace 2 compatible device
+PRODUCT_STRING
 DFU (Device Firmware Upgrade)
 RAM
 Flash (Application Partition)
--- a/firmware/apps/freq_ctr/usb_strings.txt
+++ b/firmware/apps/freq_ctr/usb_strings.txt
@@ -1,8 +1,8 @@
 sysmocom - s.f.m.c. GmbH
-SIMtrace 2 compatible device
+PRODUCT_STRING
 SIMtrace Sniffer
 SIMtrace CCID
-SIMtrace Phone
+SIMtrace Card Emulation
 SIMtrace MITM
 CardEmulator Modem 1
 CardEmulator Modem 2
--- a/firmware/apps/gpio_test/usb_strings.txt
+++ b/firmware/apps/gpio_test/usb_strings.txt
@@ -1,8 +1,8 @@
 sysmocom - s.f.m.c. GmbH
-SIMtrace 2 compatible device
+PRODUCT_STRING
 SIMtrace Sniffer
 SIMtrace CCID
-SIMtrace Phone
+SIMtrace Card Emulation
 SIMtrace MITM
 CardEmulator Modem 1
 CardEmulator Modem 2
--- a/firmware/apps/trace/usb_strings.txt
+++ b/firmware/apps/trace/usb_strings.txt
@@ -1,8 +1,8 @@
 sysmocom - s.f.m.c. GmbH
-SIMtrace 2 compatible device
+PRODUCT_STRING
 SIMtrace Sniffer
 SIMtrace CCID
-SIMtrace Phone
+SIMtrace Card Emulation
 SIMtrace MITM
 CardEmulator Modem 1
 CardEmulator Modem 2
--- a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c
+++ b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c
@@ -251,7 +251,7 @@ static void GetDescriptor(
    switch (type) {

        case USBGenericDescriptor_DEVICE:
-            TRACE_INFO_WP("Dev ");
+            TRACE_DEBUG_WP("Dev ");

            /* Adjust length and send descriptor */

@@ -263,7 +263,7 @@ static void GetDescriptor(
            break;

        case USBGenericDescriptor_CONFIGURATION:
-            TRACE_INFO_WP("Cfg ");
+            TRACE_DEBUG_WP("Cfg ");

            /* Adjust length and send descriptor */

@@ -280,7 +280,7 @@ static void GetDescriptor(
            break;

        case USBGenericDescriptor_DEVICEQUALIFIER:
-            TRACE_INFO_WP("Qua ");
+            TRACE_DEBUG_WP("Qua ");

            /* Check if descriptor exists */

@@ -301,7 +301,7 @@ static void GetDescriptor(
            break;

        case USBGenericDescriptor_OTHERSPEEDCONFIGURATION:
-            TRACE_INFO_WP("OSC ");
+            TRACE_DEBUG_WP("OSC ");

            /* Check if descriptor exists */

@@ -327,7 +327,7 @@ static void GetDescriptor(
            break;

        case USBGenericDescriptor_STRING:
-            TRACE_INFO_WP("Str%d ", indexRDesc);
+            TRACE_DEBUG_WP("Str%d ", indexRDesc);

            /* Check if descriptor exists */

@@ -504,13 +504,13 @@ void USBDDriver_RequestHandler(
    uint32_t length;
    uint32_t address;

-    TRACE_INFO_WP("Std ");
+    TRACE_DEBUG_WP("Std ");

    /* Check request code */
    switch (USBGenericRequest_GetRequest(pRequest)) {

        case USBGenericRequest_GETDESCRIPTOR:
-            TRACE_INFO_WP("gDesc ");
+            TRACE_DEBUG_WP("gDesc ");

            /* Send the requested descriptor */
            type = USBGetDescriptorRequest_GetDescriptorType(pRequest);
@@ -520,7 +520,7 @@ void USBDDriver_RequestHandler(
            break;

        case USBGenericRequest_SETADDRESS:
-            TRACE_INFO_WP("sAddr ");
+            TRACE_DEBUG_WP("sAddr ");

            /* Sends a zero-length packet and then set the device address */
            address = USBSetAddressRequest_GetAddress(pRequest);
@@ -528,7 +528,7 @@ void USBDDriver_RequestHandler(
            break;

        case USBGenericRequest_SETCONFIGURATION:
-            TRACE_INFO_WP("sCfg ");
+            TRACE_DEBUG_WP("sCfg ");

            /* Set the requested configuration */
            cfgnum = USBSetConfigurationRequest_GetConfiguration(pRequest);
@@ -536,27 +536,27 @@ void USBDDriver_RequestHandler(
            break;

        case USBGenericRequest_GETCONFIGURATION:
-            TRACE_INFO_WP("gCfg ");
+            TRACE_DEBUG_WP("gCfg ");

            /* Send the current configuration number */
            GetConfiguration(pDriver);
            break;

        case USBGenericRequest_GETSTATUS:
-            TRACE_INFO_WP("gSta ");
+            TRACE_DEBUG_WP("gSta ");

            /* Check who is the recipient */
            switch (USBGenericRequest_GetRecipient(pRequest)) {

                case USBGenericRequest_DEVICE:
-                    TRACE_INFO_WP("Dev ");
+                    TRACE_DEBUG_WP("Dev ");

                    /* Send the device status */
                    GetDeviceStatus(pDriver);
                    break;

                case USBGenericRequest_ENDPOINT:
-                    TRACE_INFO_WP("Ept ");
+                    TRACE_DEBUG_WP("Ept ");

                    /* Send the endpoint status */
                    eptnum = USBGenericRequest_GetEndpointNumber(pRequest);
@@ -572,13 +572,13 @@ void USBDDriver_RequestHandler(
            break;

        case USBGenericRequest_CLEARFEATURE:
-            TRACE_INFO_WP("cFeat ");
+            TRACE_DEBUG_WP("cFeat ");

            /* Check which is the requested feature */
            switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {

                case USBFeatureRequest_ENDPOINTHALT:
-                    TRACE_INFO_WP("Hlt ");
+                    TRACE_DEBUG_WP("Hlt ");

                    /* Unhalt endpoint and send a zero-length packet */
                    USBD_Unhalt(USBGenericRequest_GetEndpointNumber(pRequest));
@@ -586,7 +586,7 @@ void USBDDriver_RequestHandler(
                    break;

                case USBFeatureRequest_DEVICEREMOTEWAKEUP:
-                    TRACE_INFO_WP("RmWU ");
+                    TRACE_DEBUG_WP("RmWU ");

                    /* Disable remote wake-up and send a zero-length packet */
                    pDriver->isRemoteWakeUpEnabled = 0;
@@ -602,13 +602,13 @@ void USBDDriver_RequestHandler(
            break;

    case USBGenericRequest_SETFEATURE:
-        TRACE_INFO_WP("sFeat ");
+        TRACE_DEBUG_WP("sFeat ");

        /* Check which is the selected feature */
        switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {

            case USBFeatureRequest_DEVICEREMOTEWAKEUP:
-                TRACE_INFO_WP("RmWU ");
+                TRACE_DEBUG_WP("RmWU ");

                /* Enable remote wake-up and send a ZLP */
                pDriver->isRemoteWakeUpEnabled = 1;
@@ -616,25 +616,25 @@ void USBDDriver_RequestHandler(
                break;

            case USBFeatureRequest_ENDPOINTHALT:
-                TRACE_INFO_WP("Halt ");
+                TRACE_DEBUG_WP("Halt ");
                /* Halt endpoint */
                USBD_Halt(USBGenericRequest_GetEndpointNumber(pRequest));
                USBD_Write(0, 0, 0, 0, 0);
                break;
            case USBFeatureRequest_OTG_B_HNP_ENABLE:
-                    TRACE_INFO_WP("OTG_B_HNP_ENABLE ");
+                    TRACE_DEBUG_WP("OTG_B_HNP_ENABLE ");
                    pDriver->otg_features_supported |=
                        1<<USBFeatureRequest_OTG_B_HNP_ENABLE;
                    USBD_Write(0, 0, 0, 0, 0);
                break;
            case USBFeatureRequest_OTG_A_HNP_SUPPORT:
-                    TRACE_INFO_WP("OTG_A_HNP_SUPPORT ");
+                    TRACE_DEBUG_WP("OTG_A_HNP_SUPPORT ");
                    pDriver->otg_features_supported |=
                        1<<USBFeatureRequest_OTG_A_HNP_SUPPORT;
                    USBD_Write(0, 0, 0, 0, 0);
                break;
            case USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT:
-                    TRACE_INFO_WP("OTG_A_ALT_HNP_SUPPORT ");
+                    TRACE_DEBUG_WP("OTG_A_ALT_HNP_SUPPORT ");
                    pDriver->otg_features_supported |=
                        1<<USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT;
                    USBD_Write(0, 0, 0, 0, 0);
@@ -649,7 +649,7 @@ void USBDDriver_RequestHandler(
        break;

    case USBGenericRequest_SETINTERFACE:
-        TRACE_INFO_WP("sInterface ");
+        TRACE_DEBUG_WP("sInterface ");

        infnum = USBInterfaceRequest_GetInterface(pRequest);
        setting = USBInterfaceRequest_GetAlternateSetting(pRequest);
@@ -657,7 +657,7 @@ void USBDDriver_RequestHandler(
        break;

    case USBGenericRequest_GETINTERFACE:
-        TRACE_INFO_WP("gInterface ");
+        TRACE_DEBUG_WP("gInterface ");

        infnum = USBInterfaceRequest_GetInterface(pRequest);
        GetInterface(pDriver, infnum);
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c
+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c
@@ -208,7 +208,7 @@ void DFURT_SwitchToDFU(void)
 	 * activate itself, rather than boot into the application */
 	g_dfu->magic = USB_DFU_MAGIC;

-	/* Disconnect the USB by remoting the pull-up */
+	/* Disconnect the USB by removing the pull-up */
 	USBD_Disconnect();
 	__disable_irq();

--- a/firmware/libboard/octsimtest/product_string.txt
+++ b/firmware/libboard/octsimtest/product_string.txt
@@ -0,0 +1 @@
+sysmoOCTSIM-Tester
--- a/firmware/libboard/owhw/product_string.txt
+++ b/firmware/libboard/owhw/product_string.txt
@@ -0,0 +1 @@
+OWHW
--- a/firmware/libboard/qmod/product_string.txt
+++ b/firmware/libboard/qmod/product_string.txt
@@ -0,0 +1 @@
+sysmoQMOD (Quad Modem)
--- a/firmware/libboard/qmod/source/board_qmod.c
+++ b/firmware/libboard/qmod/source/board_qmod.c
@@ -332,11 +332,13 @@ void board_main_top(void)
 		TRACE_INFO("Detected Quad-Modem ST12\n\r");
 	} else {
 		TRACE_INFO("Detected Quad-Modem ST34\n\r");
+#ifndef APPLICATION_dfu
 		/* make sure we use the second set of USB Strings
 		 * calling the interfaces "Modem 3" and "Modem 4" rather
 		 * than 1+2 */
 		usb_strings[7] = usb_strings[9];
 		usb_strings[8] = usb_strings[10];
+#endif
 	}

 	/* Obtain the circuit board version (currently just prints voltage */
--- a/firmware/libboard/simtrace/include/board.h
+++ b/firmware/libboard/simtrace/include/board.h
@@ -74,9 +74,9 @@

 /** Phone connection **/
 /* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
-#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
+#define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
 /* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
-#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
 /* Phone I/O data signal input/output (I/O_PHONE in schematic) */
 #define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Phone CLK clock input (CLK_PHONE in schematic) */
--- a/firmware/libboard/simtrace/product_string.txt
+++ b/firmware/libboard/simtrace/product_string.txt
@@ -0,0 +1 @@
+SIMtrace 2
--- a/firmware/libcommon/source/card_emu.c
+++ b/firmware/libcommon/source/card_emu.c
@@ -1151,8 +1151,8 @@ void tc_etu_wtime_expired(void *handle)
 	}
 }

-/* shortest ATR found in smartcard_list.txt */
-static const uint8_t default_atr[] = { 0x3B, 0x02, 0x14, 0x50 };
+/* shortest ATR possible (uses default speed and no options) */
+static const uint8_t default_atr[] = { 0x3B, 0x00 };

 static struct card_handle card_handles[NUM_SLOTS];

--- a/firmware/libcommon/source/simtrace_iso7816.c
+++ b/firmware/libcommon/source/simtrace_iso7816.c
@@ -80,7 +80,7 @@ void ISR_PhoneRST(const Pin * pPin)
 }

 /*
- *  char_stat is zero if no error occured.
+ *  char_stat is zero if no error occurred.
 *  Otherwise it is filled with the content of the status register.
 */
 void mode_trace_usart1_irq(void)
@@ -110,7 +110,7 @@ void mode_trace_usart1_irq(void)
 			rbuf_write(&sim_rcv_buf, c);
 		} else {
 			TRACE_DEBUG("e %x st: %x\n", c, stat);
-		}		/* else: error occured */
+		}		/* else: error occurred */

 		char_stat = stat;
 	}
--- a/firmware/libcommon/source/sniffer.c
+++ b/firmware/libcommon/source/sniffer.c
@@ -214,8 +214,8 @@ static void update_wt(uint8_t wi, uint8_t d)
 	if (0 != d) {
 		wt_d = d;
 	}
-	wt = wt_wi*960UL*wt_d;
-	TRACE_INFO("WT updated to %lu\n\r", wt);
+	wt = wt_wi * 960UL * wt_d;
+	TRACE_INFO("WT updated to %lu ETU\n\r", wt);
 }

 /*! Allocate USB buffer and push + initialize simtrace_msg_hdr
--- a/host/lib/simtrace2_api.c
+++ b/host/lib/simtrace2_api.c
@@ -38,11 +38,8 @@

 #include <libusb.h>

-//#include <osmocom/simtrace2/libusb_util.h>
 #include <osmocom/simtrace2/simtrace_prot.h>
 #include <osmocom/simtrace2/simtrace2_api.h>
-//#include "apdu_dispatch.h"
-//#include "simtrace2-discovery.h"

 #include <osmocom/core/utils.h>
 #include <osmocom/core/socket.h>
@@ -60,14 +57,6 @@ static struct msgb *st_msgb_alloc(void)
 	return msgb_alloc_headroom(1024+32, 32, "SIMtrace");
 }

-#if 0
-static void apdu_out_cb(uint8_t *buf, unsigned int len, void *user_data)
-{
-	printf("APDU: %s\n", osmo_hexdump(buf, len));
-	gsmtap_send_sim(buf, len);
-}
-#endif
-
 /*! \brief Transmit a given command to the SIMtrace2 device */
 int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg)
 {
--- a/host/src/simtrace2-remsim.c
+++ b/host/src/simtrace2-remsim.c
@@ -432,9 +432,7 @@ int main(int argc, char **argv)

 		if (!skip_atr) {
 			/* set the ATR */
-			uint8_t real_atr[] = {  0x3B, 0x9F, 0x96, 0x80, 0x1F, 0xC7, 0x80, 0x31,
-						0xA0, 0x73, 0xBE, 0x21, 0x13, 0x67, 0x43, 0x20,
-						0x07, 0x18, 0x00, 0x00, 0x01, 0xA5 };
+			uint8_t real_atr[] = {  0x3B, 0x00 }; // the simplest ATR
 			atr_update_csum(real_atr, sizeof(real_atr));
 			osmo_st2_cardem_request_set_atr(ci, real_atr, sizeof(real_atr));
 		}
Author	SHA1	Message	Date
Harald Welte	87940f1f83	Build only 'reasonable' combinations of APP/MEMORY There's no point in building a DFU loeader that is to be flashed via DFU - nor is there really any need for regular cardem/trace that can be flahsed directly without DFU. If anyone needs those, they can still build them - but let's not confuse the average other user. Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18 Closes: OS#4087	2019-12-06 20:08:33 +01:00
Harald Welte	36f888f8b5	Patch actual board name into the USB iProduct string descriptor "SIMtrace 2 compatible device" is pretty generic. Let's have the actual board name inside the string descriptors, giving a more user friendly experience in case users are issuing 'lsusb' and the like. Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a	2019-12-06 19:19:23 +01:00
Harald Welte	0a7c691b90	usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ This string dates back to some very early naming; let's reflect how we have been calling this in reality for quite some time now. Change-Id: I5a7497188385706a1e924784073c619fa9bfdd60	2019-12-06 19:19:23 +01:00
Harald Welte	c9af72dccb	qmod DFU: Don't overwrite memory beyond end of usb_strings[] The code in board_main_top() for QMOD blindly re-assigned some members of the usb_strings[] array, writing to index 7 and 8. However, that array only has those entries in the main firmware, while in DFU that array has only 6 entries. Depending on whatever the linker has decided to put in the next memory location after that array, we would overwrite that very early during boot-up. Change-Id: I59e4e1a54e819808d5a8259a6d14f4b970a90020 Related: OS#4302	2019-12-06 18:47:25 +01:00
Kévin Redon	d70836f965	DFU: restart bootloader when USB conf failed when starting the DFU bootloader, but USB configuration (e.g. enumeration) failed, the MCU restarted in the main application. this occured after a DFU detach and were the USB host missed the USB reset. now after MCU reset, the bootloader is started again, since this is what was requested to begin with. the bootloader will always restart in the bootloader until USB enumeration succeeded. this boot loop can be stopped by unplugging/removing power from the device. Change-Id: I4062a7d8a7934af2119c169759b614dc45990651	2019-12-03 15:51:52 +00:00
Kévin Redon	ed3ceec56f	DFU: increase USB reset duration to 50 ms the specification requires a reset duration of at least 10 ms. reset is indicated by the device to the host by removing the pull-up on D+ (host to device reset is a USB packet). we used 20 ms, but on some setups (USB host, stack, hub, and load dependent), this does not seem to be enough (no USB enumeration was performed afterward, at least for the DFU bootloader). increasing to 50 ms solved the issue on the affected setups. instead of USB suspend, the more proper USB disconnect is used. this mainly disables the pull-up provided by the USB peripheral. USB activate is not required since the follow up initialisation takes care of it. Change-Id: If5ceb3b8f7a8f134d4439fdd138dd12b46589f97	2019-12-03 15:51:52 +00:00
Kévin Redon	15f48b2e89	minor: fix typo Change-Id: I462291078fe9b05bfdf6fb7ab0f96b1edeecdac6	2019-12-03 15:48:51 +00:00
Kévin Redon	503e184157	cardem: use simplest ATR as default ATR This is the shortest and simplest ATR possible according to the ISO 7816-3 spec. It does not offer any non-default parameters (F, D, WI, ...) Change-Id: I4ff41b5120bcadca652296f9d3691f7606be2bd2	2019-12-02 19:38:45 +01:00
Kévin Redon	24c6fe21ab	simtrace2-remsim: Use simplest ATR this ATR does not encode any data and uses all defaults. the lower default speed is also better handled by the hardware. handling faster speeds is upcoming. Change-Id: I5a4f2f94bea1a15aedbef5a6f2f49344387dc11d	2019-12-02 19:35:45 +01:00
Kévin Redon	8cbede7067	minor: ignore usbstring binary Change-Id: I18fc3179f8b7f3f1272d26853007876156fc1e03	2019-12-02 19:30:37 +01:00
Kévin Redon	8b6991c18c	better detect VCC and nRST changes on simtrace2 board monitoring the state changes of the VCC and nRST lines is required to correctly detect warm and cold reset Change-Id: I72099956332724f84226e1495fdc5a5b1a034695	2019-12-02 19:28:52 +01:00
Kévin Redon	1cfc25e8c1	minor : fix typo in comment Change-Id: Ie310143fe713a51fa1adf8bf7599374282341f2e	2019-12-02 19:28:07 +01:00
Kévin Redon	3864a794b4	minor: improve debug output Change-Id: Ibfc22b95c0be3ac78bd50a40e31cc7d8546d81d9	2019-12-02 19:28:00 +01:00
Kévin Redon	e051ddd1f3	minor: move USB debug output from info to debug level else it's too nosy while debugging other components, not often used, and break the flow since it does not and a line. Change-Id: I8920ff7c33b4c9fb174bb31a29334a63fcbede43	2019-12-02 19:27:19 +01:00
Kévin Redon	98fbf23897	dfu: minor: make debug output only verbose in info level the longer output is to fast and often incomplete. the shorter version is enough to view the progress when not debugging. Change-Id: I97bb84da68d1f3bc14fb7c05400edf1748f55460	2019-12-02 19:26:56 +01:00
Kévin Redon	9b367872c8	minor: updated copyright years Change-Id: I9254b1ddf6436b5a4964b9124a36ae17bfc22886	2019-12-02 19:26:11 +01:00
Harald Welte	0b7e5f3af0	fix baudrate of 'make log' Change-Id: Id186a594b1ce3ea0cd38f0cb82a99e5d87101433	2019-12-02 19:25:55 +01:00
Kévin Redon	72a62cfdb9	minor: fix spacing Change-Id: I2f3127c7b276c9726fd0242e3e29be22f9d6255c	2019-12-02 19:25:37 +01:00
Harald Welte	483a3203fb	simtrace2_api: Remove dead code Change-Id: Iab393a6cf9ae1218e1554d9c0bfb7aab2cc3c35e	2019-12-02 11:23:51 +01:00