fix newline \n\r with \r\n

reduce debugging output on the serial
gitignore: add missing entries binaries
2026-03-17 13:48:32 +03:00 · 2022-01-24 11:44:35 +01:00 · 2022-01-24 10:58:51 +01:00 · 2022-01-11 17:09:38 +00:00 · 2022-01-11 13:10:34 +00:00 · 2022-01-10 18:06:45 -05:00
140 changed files with 2898 additions and 826 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,563 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# clang-format configuration file. Intended for clang-format >= 4.
+#
+# For more information, see:
+#
+#   Documentation/process/clang-format.rst
+#   https://clang.llvm.org/docs/ClangFormat.html
+#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#
+---
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left # Unknown to clang-format-4.0
+AlignOperands: true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  #AfterExternBlock: false # Unknown to clang-format-5.0
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  #SplitEmptyFunction: true # Unknown to clang-format-4.0
+  #SplitEmptyRecord: true # Unknown to clang-format-4.0
+  #SplitEmptyNamespace: true # Unknown to clang-format-4.0
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit: 120
+CommentPragmas: '^ IWYU pragma:'
+#CompactNamespaces: false # Unknown to clang-format-4.0
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 8
+ContinuationIndentWidth: 8
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: false # Unknown to clang-format-4.0
+
+# Taken from:
+#   git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \
+#   | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$,  - '\1'," \
+#   | sort | uniq
+ForEachMacros:
+  - 'apei_estatus_for_each_section'
+  - 'ata_for_each_dev'
+  - 'ata_for_each_link'
+  - '__ata_qc_for_each'
+  - 'ata_qc_for_each'
+  - 'ata_qc_for_each_raw'
+  - 'ata_qc_for_each_with_internal'
+  - 'ax25_for_each'
+  - 'ax25_uid_for_each'
+  - '__bio_for_each_bvec'
+  - 'bio_for_each_bvec'
+  - 'bio_for_each_bvec_all'
+  - 'bio_for_each_integrity_vec'
+  - '__bio_for_each_segment'
+  - 'bio_for_each_segment'
+  - 'bio_for_each_segment_all'
+  - 'bio_list_for_each'
+  - 'bip_for_each_vec'
+  - 'bitmap_for_each_clear_region'
+  - 'bitmap_for_each_set_region'
+  - 'blkg_for_each_descendant_post'
+  - 'blkg_for_each_descendant_pre'
+  - 'blk_queue_for_each_rl'
+  - 'bond_for_each_slave'
+  - 'bond_for_each_slave_rcu'
+  - 'bpf_for_each_spilled_reg'
+  - 'btree_for_each_safe128'
+  - 'btree_for_each_safe32'
+  - 'btree_for_each_safe64'
+  - 'btree_for_each_safel'
+  - 'card_for_each_dev'
+  - 'cgroup_taskset_for_each'
+  - 'cgroup_taskset_for_each_leader'
+  - 'cpufreq_for_each_entry'
+  - 'cpufreq_for_each_entry_idx'
+  - 'cpufreq_for_each_valid_entry'
+  - 'cpufreq_for_each_valid_entry_idx'
+  - 'css_for_each_child'
+  - 'css_for_each_descendant_post'
+  - 'css_for_each_descendant_pre'
+  - 'device_for_each_child_node'
+  - 'displayid_iter_for_each'
+  - 'dma_fence_chain_for_each'
+  - 'do_for_each_ftrace_op'
+  - 'drm_atomic_crtc_for_each_plane'
+  - 'drm_atomic_crtc_state_for_each_plane'
+  - 'drm_atomic_crtc_state_for_each_plane_state'
+  - 'drm_atomic_for_each_plane_damage'
+  - 'drm_client_for_each_connector_iter'
+  - 'drm_client_for_each_modeset'
+  - 'drm_connector_for_each_possible_encoder'
+  - 'drm_for_each_bridge_in_chain'
+  - 'drm_for_each_connector_iter'
+  - 'drm_for_each_crtc'
+  - 'drm_for_each_crtc_reverse'
+  - 'drm_for_each_encoder'
+  - 'drm_for_each_encoder_mask'
+  - 'drm_for_each_fb'
+  - 'drm_for_each_legacy_plane'
+  - 'drm_for_each_plane'
+  - 'drm_for_each_plane_mask'
+  - 'drm_for_each_privobj'
+  - 'drm_mm_for_each_hole'
+  - 'drm_mm_for_each_node'
+  - 'drm_mm_for_each_node_in_range'
+  - 'drm_mm_for_each_node_safe'
+  - 'flow_action_for_each'
+  - 'for_each_acpi_dev_match'
+  - 'for_each_active_dev_scope'
+  - 'for_each_active_drhd_unit'
+  - 'for_each_active_iommu'
+  - 'for_each_aggr_pgid'
+  - 'for_each_available_child_of_node'
+  - 'for_each_bio'
+  - 'for_each_board_func_rsrc'
+  - 'for_each_bvec'
+  - 'for_each_card_auxs'
+  - 'for_each_card_auxs_safe'
+  - 'for_each_card_components'
+  - 'for_each_card_dapms'
+  - 'for_each_card_pre_auxs'
+  - 'for_each_card_prelinks'
+  - 'for_each_card_rtds'
+  - 'for_each_card_rtds_safe'
+  - 'for_each_card_widgets'
+  - 'for_each_card_widgets_safe'
+  - 'for_each_cgroup_storage_type'
+  - 'for_each_child_of_node'
+  - 'for_each_clear_bit'
+  - 'for_each_clear_bit_from'
+  - 'for_each_cmsghdr'
+  - 'for_each_compatible_node'
+  - 'for_each_component_dais'
+  - 'for_each_component_dais_safe'
+  - 'for_each_comp_order'
+  - 'for_each_console'
+  - 'for_each_cpu'
+  - 'for_each_cpu_and'
+  - 'for_each_cpu_not'
+  - 'for_each_cpu_wrap'
+  - 'for_each_dapm_widgets'
+  - 'for_each_dev_addr'
+  - 'for_each_dev_scope'
+  - 'for_each_dma_cap_mask'
+  - 'for_each_dpcm_be'
+  - 'for_each_dpcm_be_rollback'
+  - 'for_each_dpcm_be_safe'
+  - 'for_each_dpcm_fe'
+  - 'for_each_drhd_unit'
+  - 'for_each_dss_dev'
+  - 'for_each_dtpm_table'
+  - 'for_each_efi_memory_desc'
+  - 'for_each_efi_memory_desc_in_map'
+  - 'for_each_element'
+  - 'for_each_element_extid'
+  - 'for_each_element_id'
+  - 'for_each_endpoint_of_node'
+  - 'for_each_evictable_lru'
+  - 'for_each_fib6_node_rt_rcu'
+  - 'for_each_fib6_walker_rt'
+  - 'for_each_free_mem_pfn_range_in_zone'
+  - 'for_each_free_mem_pfn_range_in_zone_from'
+  - 'for_each_free_mem_range'
+  - 'for_each_free_mem_range_reverse'
+  - 'for_each_func_rsrc'
+  - 'for_each_hstate'
+  - 'for_each_if'
+  - 'for_each_iommu'
+  - 'for_each_ip_tunnel_rcu'
+  - 'for_each_irq_nr'
+  - 'for_each_link_codecs'
+  - 'for_each_link_cpus'
+  - 'for_each_link_platforms'
+  - 'for_each_lru'
+  - 'for_each_matching_node'
+  - 'for_each_matching_node_and_match'
+  - 'for_each_member'
+  - 'for_each_memcg_cache_index'
+  - 'for_each_mem_pfn_range'
+  - '__for_each_mem_range'
+  - 'for_each_mem_range'
+  - '__for_each_mem_range_rev'
+  - 'for_each_mem_range_rev'
+  - 'for_each_mem_region'
+  - 'for_each_migratetype_order'
+  - 'for_each_msi_entry'
+  - 'for_each_msi_entry_safe'
+  - 'for_each_msi_vector'
+  - 'for_each_net'
+  - 'for_each_net_continue_reverse'
+  - 'for_each_netdev'
+  - 'for_each_netdev_continue'
+  - 'for_each_netdev_continue_rcu'
+  - 'for_each_netdev_continue_reverse'
+  - 'for_each_netdev_feature'
+  - 'for_each_netdev_in_bond_rcu'
+  - 'for_each_netdev_rcu'
+  - 'for_each_netdev_reverse'
+  - 'for_each_netdev_safe'
+  - 'for_each_net_rcu'
+  - 'for_each_new_connector_in_state'
+  - 'for_each_new_crtc_in_state'
+  - 'for_each_new_mst_mgr_in_state'
+  - 'for_each_new_plane_in_state'
+  - 'for_each_new_private_obj_in_state'
+  - 'for_each_node'
+  - 'for_each_node_by_name'
+  - 'for_each_node_by_type'
+  - 'for_each_node_mask'
+  - 'for_each_node_state'
+  - 'for_each_node_with_cpus'
+  - 'for_each_node_with_property'
+  - 'for_each_nonreserved_multicast_dest_pgid'
+  - 'for_each_of_allnodes'
+  - 'for_each_of_allnodes_from'
+  - 'for_each_of_cpu_node'
+  - 'for_each_of_pci_range'
+  - 'for_each_old_connector_in_state'
+  - 'for_each_old_crtc_in_state'
+  - 'for_each_old_mst_mgr_in_state'
+  - 'for_each_oldnew_connector_in_state'
+  - 'for_each_oldnew_crtc_in_state'
+  - 'for_each_oldnew_mst_mgr_in_state'
+  - 'for_each_oldnew_plane_in_state'
+  - 'for_each_oldnew_plane_in_state_reverse'
+  - 'for_each_oldnew_private_obj_in_state'
+  - 'for_each_old_plane_in_state'
+  - 'for_each_old_private_obj_in_state'
+  - 'for_each_online_cpu'
+  - 'for_each_online_node'
+  - 'for_each_online_pgdat'
+  - 'for_each_pci_bridge'
+  - 'for_each_pci_dev'
+  - 'for_each_pci_msi_entry'
+  - 'for_each_pcm_streams'
+  - 'for_each_physmem_range'
+  - 'for_each_populated_zone'
+  - 'for_each_possible_cpu'
+  - 'for_each_present_cpu'
+  - 'for_each_prime_number'
+  - 'for_each_prime_number_from'
+  - 'for_each_process'
+  - 'for_each_process_thread'
+  - 'for_each_prop_codec_conf'
+  - 'for_each_prop_dai_codec'
+  - 'for_each_prop_dai_cpu'
+  - 'for_each_prop_dlc_codecs'
+  - 'for_each_prop_dlc_cpus'
+  - 'for_each_prop_dlc_platforms'
+  - 'for_each_property_of_node'
+  - 'for_each_registered_fb'
+  - 'for_each_requested_gpio'
+  - 'for_each_requested_gpio_in_range'
+  - 'for_each_reserved_mem_range'
+  - 'for_each_reserved_mem_region'
+  - 'for_each_rtd_codec_dais'
+  - 'for_each_rtd_components'
+  - 'for_each_rtd_cpu_dais'
+  - 'for_each_rtd_dais'
+  - 'for_each_set_bit'
+  - 'for_each_set_bit_from'
+  - 'for_each_set_clump8'
+  - 'for_each_sg'
+  - 'for_each_sg_dma_page'
+  - 'for_each_sg_page'
+  - 'for_each_sgtable_dma_page'
+  - 'for_each_sgtable_dma_sg'
+  - 'for_each_sgtable_page'
+  - 'for_each_sgtable_sg'
+  - 'for_each_sibling_event'
+  - 'for_each_subelement'
+  - 'for_each_subelement_extid'
+  - 'for_each_subelement_id'
+  - '__for_each_thread'
+  - 'for_each_thread'
+  - 'for_each_unicast_dest_pgid'
+  - 'for_each_vsi'
+  - 'for_each_wakeup_source'
+  - 'for_each_zone'
+  - 'for_each_zone_zonelist'
+  - 'for_each_zone_zonelist_nodemask'
+  - 'fwnode_for_each_available_child_node'
+  - 'fwnode_for_each_child_node'
+  - 'fwnode_graph_for_each_endpoint'
+  - 'gadget_for_each_ep'
+  - 'genradix_for_each'
+  - 'genradix_for_each_from'
+  - 'hash_for_each'
+  - 'hash_for_each_possible'
+  - 'hash_for_each_possible_rcu'
+  - 'hash_for_each_possible_rcu_notrace'
+  - 'hash_for_each_possible_safe'
+  - 'hash_for_each_rcu'
+  - 'hash_for_each_safe'
+  - 'hctx_for_each_ctx'
+  - 'hlist_bl_for_each_entry'
+  - 'hlist_bl_for_each_entry_rcu'
+  - 'hlist_bl_for_each_entry_safe'
+  - 'hlist_for_each'
+  - 'hlist_for_each_entry'
+  - 'hlist_for_each_entry_continue'
+  - 'hlist_for_each_entry_continue_rcu'
+  - 'hlist_for_each_entry_continue_rcu_bh'
+  - 'hlist_for_each_entry_from'
+  - 'hlist_for_each_entry_from_rcu'
+  - 'hlist_for_each_entry_rcu'
+  - 'hlist_for_each_entry_rcu_bh'
+  - 'hlist_for_each_entry_rcu_notrace'
+  - 'hlist_for_each_entry_safe'
+  - 'hlist_for_each_entry_srcu'
+  - '__hlist_for_each_rcu'
+  - 'hlist_for_each_safe'
+  - 'hlist_nulls_for_each_entry'
+  - 'hlist_nulls_for_each_entry_from'
+  - 'hlist_nulls_for_each_entry_rcu'
+  - 'hlist_nulls_for_each_entry_safe'
+  - 'i3c_bus_for_each_i2cdev'
+  - 'i3c_bus_for_each_i3cdev'
+  - 'ide_host_for_each_port'
+  - 'ide_port_for_each_dev'
+  - 'ide_port_for_each_present_dev'
+  - 'idr_for_each_entry'
+  - 'idr_for_each_entry_continue'
+  - 'idr_for_each_entry_continue_ul'
+  - 'idr_for_each_entry_ul'
+  - 'in_dev_for_each_ifa_rcu'
+  - 'in_dev_for_each_ifa_rtnl'
+  - 'inet_bind_bucket_for_each'
+  - 'inet_lhash2_for_each_icsk_rcu'
+  - 'key_for_each'
+  - 'key_for_each_safe'
+  - 'klp_for_each_func'
+  - 'klp_for_each_func_safe'
+  - 'klp_for_each_func_static'
+  - 'klp_for_each_object'
+  - 'klp_for_each_object_safe'
+  - 'klp_for_each_object_static'
+  - 'kunit_suite_for_each_test_case'
+  - 'kvm_for_each_memslot'
+  - 'kvm_for_each_vcpu'
+  - 'list_for_each'
+  - 'list_for_each_codec'
+  - 'list_for_each_codec_safe'
+  - 'list_for_each_continue'
+  - 'list_for_each_entry'
+  - 'list_for_each_entry_continue'
+  - 'list_for_each_entry_continue_rcu'
+  - 'list_for_each_entry_continue_reverse'
+  - 'list_for_each_entry_from'
+  - 'list_for_each_entry_from_rcu'
+  - 'list_for_each_entry_from_reverse'
+  - 'list_for_each_entry_lockless'
+  - 'list_for_each_entry_rcu'
+  - 'list_for_each_entry_reverse'
+  - 'list_for_each_entry_safe'
+  - 'list_for_each_entry_safe_continue'
+  - 'list_for_each_entry_safe_from'
+  - 'list_for_each_entry_safe_reverse'
+  - 'list_for_each_entry_srcu'
+  - 'list_for_each_prev'
+  - 'list_for_each_prev_safe'
+  - 'list_for_each_safe'
+  - 'llist_for_each'
+  - 'llist_for_each_entry'
+  - 'llist_for_each_entry_safe'
+  - 'llist_for_each_safe'
+  - 'mci_for_each_dimm'
+  - 'media_device_for_each_entity'
+  - 'media_device_for_each_intf'
+  - 'media_device_for_each_link'
+  - 'media_device_for_each_pad'
+  - 'nanddev_io_for_each_page'
+  - 'netdev_for_each_lower_dev'
+  - 'netdev_for_each_lower_private'
+  - 'netdev_for_each_lower_private_rcu'
+  - 'netdev_for_each_mc_addr'
+  - 'netdev_for_each_uc_addr'
+  - 'netdev_for_each_upper_dev_rcu'
+  - 'netdev_hw_addr_list_for_each'
+  - 'nft_rule_for_each_expr'
+  - 'nla_for_each_attr'
+  - 'nla_for_each_nested'
+  - 'nlmsg_for_each_attr'
+  - 'nlmsg_for_each_msg'
+  - 'nr_neigh_for_each'
+  - 'nr_neigh_for_each_safe'
+  - 'nr_node_for_each'
+  - 'nr_node_for_each_safe'
+  - 'of_for_each_phandle'
+  - 'of_property_for_each_string'
+  - 'of_property_for_each_u32'
+  - 'pci_bus_for_each_resource'
+  - 'pcl_for_each_chunk'
+  - 'pcl_for_each_segment'
+  - 'pcm_for_each_format'
+  - 'ping_portaddr_for_each_entry'
+  - 'plist_for_each'
+  - 'plist_for_each_continue'
+  - 'plist_for_each_entry'
+  - 'plist_for_each_entry_continue'
+  - 'plist_for_each_entry_safe'
+  - 'plist_for_each_safe'
+  - 'pnp_for_each_card'
+  - 'pnp_for_each_dev'
+  - 'protocol_for_each_card'
+  - 'protocol_for_each_dev'
+  - 'queue_for_each_hw_ctx'
+  - 'radix_tree_for_each_slot'
+  - 'radix_tree_for_each_tagged'
+  - 'rb_for_each'
+  - 'rbtree_postorder_for_each_entry_safe'
+  - 'rdma_for_each_block'
+  - 'rdma_for_each_port'
+  - 'rdma_umem_for_each_dma_block'
+  - 'resource_list_for_each_entry'
+  - 'resource_list_for_each_entry_safe'
+  - 'rhl_for_each_entry_rcu'
+  - 'rhl_for_each_rcu'
+  - 'rht_for_each'
+  - 'rht_for_each_entry'
+  - 'rht_for_each_entry_from'
+  - 'rht_for_each_entry_rcu'
+  - 'rht_for_each_entry_rcu_from'
+  - 'rht_for_each_entry_safe'
+  - 'rht_for_each_from'
+  - 'rht_for_each_rcu'
+  - 'rht_for_each_rcu_from'
+  - '__rq_for_each_bio'
+  - 'rq_for_each_bvec'
+  - 'rq_for_each_segment'
+  - 'scsi_for_each_prot_sg'
+  - 'scsi_for_each_sg'
+  - 'sctp_for_each_hentry'
+  - 'sctp_skb_for_each'
+  - 'shdma_for_each_chan'
+  - '__shost_for_each_device'
+  - 'shost_for_each_device'
+  - 'sk_for_each'
+  - 'sk_for_each_bound'
+  - 'sk_for_each_entry_offset_rcu'
+  - 'sk_for_each_from'
+  - 'sk_for_each_rcu'
+  - 'sk_for_each_safe'
+  - 'sk_nulls_for_each'
+  - 'sk_nulls_for_each_from'
+  - 'sk_nulls_for_each_rcu'
+  - 'snd_array_for_each'
+  - 'snd_pcm_group_for_each_entry'
+  - 'snd_soc_dapm_widget_for_each_path'
+  - 'snd_soc_dapm_widget_for_each_path_safe'
+  - 'snd_soc_dapm_widget_for_each_sink_path'
+  - 'snd_soc_dapm_widget_for_each_source_path'
+  - 'tb_property_for_each'
+  - 'tcf_exts_for_each_action'
+  - 'udp_portaddr_for_each_entry'
+  - 'udp_portaddr_for_each_entry_rcu'
+  - 'usb_hub_for_each_child'
+  - 'v4l2_device_for_each_subdev'
+  - 'v4l2_m2m_for_each_dst_buf'
+  - 'v4l2_m2m_for_each_dst_buf_safe'
+  - 'v4l2_m2m_for_each_src_buf'
+  - 'v4l2_m2m_for_each_src_buf_safe'
+  - 'virtio_device_for_each_vq'
+  - 'while_for_each_ftrace_op'
+  - 'xa_for_each'
+  - 'xa_for_each_marked'
+  - 'xa_for_each_range'
+  - 'xa_for_each_start'
+  - 'xas_for_each'
+  - 'xas_for_each_conflict'
+  - 'xas_for_each_marked'
+  - 'xbc_array_for_each_value'
+  - 'xbc_for_each_key_value'
+  - 'xbc_node_for_each_array_value'
+  - 'xbc_node_for_each_child'
+  - 'xbc_node_for_each_key_value'
+  - 'zorro_for_each_dev'
+  - 'for_each_line'
+  - 'for_each_non_empty_line'
+
+#IncludeBlocks: Preserve # Unknown to clang-format-5.0
+IncludeCategories:
+  - Regex: '.*'
+    Priority: 1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+#IndentPPDirectives: None # Unknown to clang-format-5.0
+IndentWidth: 8
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
+ObjCBlockIndentWidth: 8
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+
+# Taken from git's rules
+#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 10
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 60
+
+PointerAlignment: Right
+ReflowComments: false
+SortIncludes: false
+#SortUsingDeclarations: false # Unknown to clang-format-4.0
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
+#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
+SpaceBeforeParens: ControlStatements
+#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp03
+TabWidth: 8
+UseTab: Always
+...
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,9 @@ tags
 host/simtrace2-list
 host/simtrace2-cardem-pcsc
 host/contrib/simtrace2.spec
+host/src/simtrace2-tool
+host/tests
 usb_strings_generated.h
 firmware/usbstring/usbstring
 firmware/apps/*/usb_strings.txt.patched
+firmware/misc/crctool
--- a/.gitreview
+++ b/.gitreview
@@ -0,0 +1,3 @@
+[gerrit]
+host=gerrit.osmocom.org
+project=simtrace2
--- a/14
+++ b/14
@@ -8,13 +8,23 @@ fw-$(1)-$(2)-clean:
 endef

 $(eval $(call RULES,simtrace,dfu))
+$(eval $(call RULES,simtrace,blupdate))
 $(eval $(call RULES,simtrace,trace))
 $(eval $(call RULES,simtrace,cardem))
 $(eval $(call RULES,qmod,dfu))
+$(eval $(call RULES,qmod,blupdate))
 $(eval $(call RULES,qmod,cardem))
+$(eval $(call RULES,ngff_cardem,dfu))
+$(eval $(call RULES,ngff_cardem,blupdate))
+$(eval $(call RULES,ngff_cardem,trace))
+$(eval $(call RULES,ngff_cardem,cardem))

-fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw-qmod-dfu-clean fw-qmod-cardem-clean
-fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem
+fw-clean: fw-simtrace-dfu-clean fw-simtrace-blupdate-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean \
+	fw-qmod-dfu-clean fw-qmod-blupdate-clean fw-qmod-cardem-clean \
+	fw-ngff_cardem-dfu-clean fw-ngff_cardem-blupdate-clean fw-ngff_cardem-trace-clean fw-ngff_cardem-cardem-clean
+fw: fw-simtrace-dfu fw-simtrace-blupdate fw-simtrace-trace fw-simtrace-cardem \
+	fw-qmod-dfu fw-qmod-blupdate fw-qmod-cardem \
+	fw-ngff_cardem-dfu fw-ngff_cardem-blupdate fw-ngff_cardem-trace fw-ngff_cardem-cardem

 utils:
 	(cd host && \
--- a/contrib/flash.py
+++ b/contrib/flash.py
@@ -27,7 +27,9 @@ class Device(NamedTuple):
 DEVICE_SIMTRACE = Device(usb_vendor_id=0x1d50, usb_product_id=0x60e3, name="SIMtrace 2", url={"trace": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/simtrace-trace-dfu-latest.bin", "cardem": "https://osmocom.org/attachments/download/3868/simtrace-cardem-dfu.bin"})
 DEVICE_QMOD = Device(usb_vendor_id=0x1d50, usb_product_id=0x4004, name="sysmoQMOD (Quad Modem)", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/qmod-cardem-dfu-latest.bin"})
 DEVICE_OWHW = Device(usb_vendor_id=0x1d50, usb_product_id=0x4001, name="OWHW", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/owhw-cardem-dfu-latest.bin"})
-DEVICES = [DEVICE_SIMTRACE, DEVICE_QMOD]
+DEVICE_OCTSIMTEST = Device(usb_vendor_id=0x1d50, usb_product_id=0x616d, name="OCTSIMTEST", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/octsimtest-cardem-dfu-latest.bin"})
+DEVICE_NGFF_CARDEM = Device(usb_vendor_id=0x1d50, usb_product_id=0x616e, name="ngff-cardem", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/ngff_cardem-cardem-dfu-latest.bin"})
+DEVICES = [DEVICE_SIMTRACE, DEVICE_QMOD, DEVICE_OCTSIMTEST, DEVICE_NGFF_CARDEM]

 # which firmware does the SIMtrace USN interface subclass correspond
 FIRMWARE_SUBCLASS = {1: "trace", 2: "cardem"}
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -28,10 +28,11 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"

 BUILDS=""
-BUILDS+="simtrace/dfu simtrace/trace simtrace/cardem "
-BUILDS+="qmod/dfu qmod/cardem "
-BUILDS+="owhw/dfu owhw/cardem "
+BUILDS+="simtrace/dfu simtrace/blupdate simtrace/trace simtrace/cardem "
+BUILDS+="qmod/dfu qmod/blupdate qmod/cardem "
+BUILDS+="owhw/dfu owhw/blupdate owhw/cardem "
 BUILDS+="octsimtest/cardem "
+BUILDS+="ngff_cardem/dfu ngff_cardem/blupdate ngff_cardem/cardem ngff_cardem/trace "

 cd $TOPDIR/firmware
 for build in $BUILDS; do
--- a/contrib/prepare_upload.sh
+++ b/contrib/prepare_upload.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 # Create copies of binaries with -latest, -$GIT_VERSION (OS#4413, OS#3452)
 cd "$(dirname "$0")/.."

@@ -9,8 +9,10 @@ echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..."
 cd firmware/bin
 for ext in bin elf; do
 	for file in *."$ext"; do
-		without_ext="${file%.*}"
-		cp -v "$file" "$without_ext-latest.$ext"
-		cp -v "$file" "$without_ext-$GIT_VERSION.$ext"
+		if ! [[ "$file" =~ ^(.*padded.*|.*nocrcstub.*)$ ]];then
+			without_ext="${file%.*}"
+			cp -v "$file" "$without_ext-latest.$ext"
+			cp -v "$file" "$without_ext-$GIT_VERSION.$ext"
+		fi
 	done
 done
--- a/contrib/simtrace.lua
+++ b/contrib/simtrace.lua
@@ -36,9 +36,111 @@ local reserved  = ProtoField.uint16("usb_simtrace.reserved", "reserved", base.HE
 local payloadlen  = ProtoField.uint16("usb_simtrace.length", "length", base.HEX_DEC)
 local payload  = ProtoField.bytes("usb_simtrace.payload", "Data")

-usb_simtrace_protocol.fields = {
-  msgtype, seqnr, slotnr, reserved, payloadlen, payload
+local pb_and_rx  = ProtoField.uint32("usb_simtrace.pb_and_rx", "pb_and_rx", base.HEX_DEC, NULL, 0x8)
+local pb_and_tx  = ProtoField.uint32("usb_simtrace.pb_and_tx", "pb_and_tx", base.HEX_DEC, NULL, 0x4)
+local final  = ProtoField.uint32("usb_simtrace.final", "final", base.HEX_DEC, NULL, 0x2)
+local tpdu_hdr  = ProtoField.uint32("usb_simtrace.tpdu_hdr", "tpdu_hdr", base.HEX_DEC, NULL, 0x1)
+local rxtxdatalen  = ProtoField.uint16("usb_simtrace.rxtxdatalen", "rx/tx data length", base.HEX_DEC)
+local rxtxdata  = ProtoField.bytes("usb_simtrace.rxtxdata", "rx/tx (data)")
+
+local CEMU_STATUS_F_VCC_PRESENT  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_VCC_PRESENT", "VCC_PRESENT", base.HEX_DEC, NULL, 0x00000001)
+local CEMU_STATUS_F_CLK_ACTIVE  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_CLK_ACTIVE", "CLK_ACTIVE", base.HEX_DEC, NULL, 0x00000002)
+local CEMU_STATUS_F_RCEMU_ACTIVE  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_RCEMU_ACTIVE", "CEMU_ACTIVE", base.HEX_DEC, NULL, 0x00000004)
+local CEMU_STATUS_F_CARD_INSERT  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_CARD_INSERT", "CARD_INSERT", base.HEX_DEC, NULL, 0x00000008)
+local CEMU_STATUS_F_RESET_ACTIVE  = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_RESET_ACTIVE", "RESET_ACTIVE", base.HEX_DEC, NULL, 0x00000010)
+
+local modem_reset_types = {
+    [0x00] = "de-assert",
+    [0x01] = "assert",
+    [0x02] = "pulse"
 }
+local modem_reset_status = ProtoField.uint8("usb_simtrace.modem.reset_type", "modem reset type", base.HEX, modem_reset_types, 0xf)
+local modem_reset_len = ProtoField.uint8("usb_simtrace.modem.reset_len", "modem reset length (ms)", base.DEC)
+
+usb_simtrace_protocol.fields = {
+  msgtype, seqnr, slotnr, reserved, payloadlen, payload,
+  pb_and_rx, pb_and_tx, final, tpdu_hdr, rxtxdatalen, rxtxdata,
+  CEMU_STATUS_F_VCC_PRESENT, CEMU_STATUS_F_CLK_ACTIVE, CEMU_STATUS_F_RCEMU_ACTIVE, CEMU_STATUS_F_CARD_INSERT, CEMU_STATUS_F_RESET_ACTIVE,
+  modem_reset_status, modem_reset_len
+}
+
+local is_hdr = Field.new("usb_simtrace.tpdu_hdr")
+local is_pbrx = Field.new("usb_simtrace.pb_and_rx")
+local is_pbtx = Field.new("usb_simtrace.pb_and_tx")
+local is_final= Field.new("usb_simtrace.final")
+
+function dissect_rxtx(payload_data,pinfo,tree)
+
+  local headerSubtree = tree:add(usb_simtrace_protocol, payload_data, "rx/tx data")
+  local len  = payload_data(4,2):le_uint();
+  local cmd32 =  payload_data(0,4):le_uint();
+
+  headerSubtree:add(pb_and_rx, cmd32)
+  headerSubtree:add(pb_and_tx, cmd32)
+  headerSubtree:add(final, cmd32)
+  headerSubtree:add(tpdu_hdr, cmd32)
+
+  headerSubtree:add(rxtxdatalen, len)
+  headerSubtree:add_le(rxtxdata, payload_data(6,len))
+
+  -- ghetto dissection does not work due to mixed in procedure bytes
+  --if pinfo.visited == false then
+  -- Dissector.get("iso7816"):call(payload_data(6):tvb(), pinfo, tree)
+
+-- local offs = 0
+-- if (is_pbrx().value == 1 or is_pbtx().value == 1) and is_final().value == 0 then
+--    offs = 1
+-- else
+--  offs = 0
+-- end
+--
+-- if is_hdr().value == 1 then
+--   Dissector.get("gsm_sim"):call(concatss:tvb(), pinfo, tree)
+--   concatss =  payload_data(6):bytes()
+--  else
+--   concatss = concatss .. payload_data(6+offs):bytes()
+--  end
+
+--end
+
+end
+
+function dissect_status(payload_data,pinfo,tree)
+
+  local headerSubtree = tree:add(usb_simtrace_protocol, payload_data, "status message")
+  local cmd32 =  payload_data(0,4):le_uint();
+
+  headerSubtree:add(CEMU_STATUS_F_VCC_PRESENT, cmd32)
+  headerSubtree:add(CEMU_STATUS_F_CLK_ACTIVE, cmd32)
+  headerSubtree:add(CEMU_STATUS_F_RCEMU_ACTIVE, cmd32)
+  headerSubtree:add(CEMU_STATUS_F_CARD_INSERT, cmd32)
+  headerSubtree:add(CEMU_STATUS_F_RESET_ACTIVE, cmd32)
+
+  pinfo.cols.info:append(" VCC:" .. payload_data(0,1):bitfield(7, 1) .. " CLK:" .. payload_data(0,1):bitfield(6, 1) .. " RESET:" .. payload_data(0,1):bitfield(3, 1))
+end
+
+function dissect_atr(payload_data,pinfo,tree)
+
+  local len  = payload_data(0,1):le_uint()
+  Dissector.get("iso7816.atr"):call(payload_data(1):tvb(), pinfo, tree)
+end
+
+function dissect_modem_reset(payload_data,pinfo,tree)
+
+  local headerSubtree = tree:add(usb_simtrace_protocol, payload_data, "modem reset")
+  local cmd8 =  payload_data(0,1):le_uint();
+
+  headerSubtree:add(modem_reset_status, cmd8)
+  pinfo.cols.info:append(" reset type:" .. modem_reset_types[cmd8]);
+
+  if(cmd8 == 2) then
+    local duration = payload_data(1,2):le_uint()
+    headerSubtree:add(modem_reset_len, duration)
+    pinfo.cols.info:append(" duration:" ..  duration .. "ms")
+  end
+
+
+end

 function usb_simtrace_protocol.dissector(buffer, pinfo, tree)
  length = buffer:len()
@@ -54,7 +156,18 @@ function usb_simtrace_protocol.dissector(buffer, pinfo, tree)
  subtree:add(slotnr, buffer(3,1))
  subtree:add_le(payloadlen, buffer(6,2))
  pinfo.cols.info = string.format("Cmd 0x%04X : %s", command, control_commands[command])
-  subtree:add(payload, buffer(8,length-8))
+  local payload_data = buffer(8,length-8)
+  if(command == 0x0101 or command == 0x0106) then
+    return dissect_rxtx(payload_data(),pinfo,subtree)
+  elseif(command == 0x0104) then
+	return dissect_status(payload_data(),pinfo,subtree)
+  elseif(command == 0x0102) then
+	return dissect_atr(payload_data(),pinfo,subtree)
+  elseif(command == 0x0201) then
+	return dissect_modem_reset(payload_data(),pinfo,subtree)
+  else
+    subtree:add(payload, payload_data)
+  end

 end

@@ -62,6 +175,8 @@ end
 function usb_simtrace_protocol.init()
 local usb_product_dissectors = DissectorTable.get("usb.product")
 usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol)
-
-- DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol)
+usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol)
+DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol)
+DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol)
+--concatss =  ByteArray.new()
 end
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,211 @@
-simtrace2 (0.5.2) UNRELEASED; urgency=medium
+simtrace2 (0.8.1) unstable; urgency=medium

+  * host/contrib/simtrace2.spec.in: fix soname
+
+ -- Oliver Smith <osmith@sysmocom.de>  Fri, 10 Dec 2021 10:04:28 +0100
+
+simtrace2 (0.8.0) unstable; urgency=medium
+
+  [ Harald Welte ]
  * adapt to host tools in autotools
+  * simtrace2_api: Remove dead code
+  * fix baudrate of 'make log'
+  * qmod DFU: Don't overwrite memory beyond end of usb_strings[]
+  * usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/
+  * Patch actual board name into the USB iProduct string descriptor
+  * Build only 'reasonable' combinations of APP/MEMORY
+  * stdio: Add support for %p format string (pointer address)
+  * Fix format string related warnings (int vs. long)
+  * Add missing CR to achieve CRLF at end of log lines
+  * more comments in host_communication.c.
+  * usb_buf: count number of elements in queue
+  * usb_buf: Limit the maximum queue length to 3 elements
+  * qmod: Don't print EEPROM operations in help when not supported
+  * cosmetic: board_qmod: Annotate #endif with comments
+  * qmod: Document '!' and '@' commands on UART
+  * implement minimalistic talloc_report(); add 't' command on UART
+  * update copyright statement
+  * cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT
+  * usb_buf: Actually limit queue to 3 elements, not 4
+  * USBD_HAL: Don't disable UDP peripheral clock on suspend
+  * usb_buf: Properly initialize buffered_endpoint->ep number
+  * pseudo_talloc: Increment number of buffers from 10 to 20
+  * card_emu: Factor out card_handle_reset() from card_emu_init()
+  * cardem: Move card_emu_io_statechg() calls out of interrupt context
+  * cardem: RST resets all state (including release of buffers)
+  * host_communication: Send zero-length-packet on wMaxPacketSize
+  * card_emu: Initialize PTSS state every time we start PTS
+  * card_emu: Avoid recursive calls to card_set_state()
+  * card_emu: Always print state names in string representation
+  * card_emu: Remove extraneous code
+  * card_emu: Remove extraneous initialization of ch->pts.state
+  * cardem: Make card_emu_report_status() optionally use IRQ endpoint
+  * cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG
+  * cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ
+  * simtrace2-sniff: Reformat value_string to pass our validation scripts
+  * firmware: Reformat value_string to pass our validation scripts
+  * jenkins.sh: Add verify_value_string_arrays_are_terminated.py
+  * [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly
+  * [lib] apdu_dispatch: Don't print APDU state to stdout
+  * OSMO_ASSERT() on double-free or invalid pointer
+  * Update .gitignore file for host
+  * migrate to libosmousb
+  * library: Add osmo_st2_compatible_dev_idsp[]
+  * firmware: move printing of welcome banner to common function print_banner()
+  * firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c
+  * host: Add COPYING file for host software (GPLv2)
+  * host/lib/gsmtap.c: Add GPLv2 disclaimer
+  * increase ringbuffer size from 512 to 1024 bytes
+  * simtrace2_api: Add osmo_st2_cardem_request_config()
+  * Disable interrupts during EEFC_ReadUniqueID()
+  * cardem: Fix infinite loop + watchdog reset on long OUT message
+  * extend osmo_st2_cardem_inst with fields required by osmo-remsim
+  * cosmetic: Add missing CR to LF in dispatch_received_usb_msg()
+  * USBD.c: Don't reset EP0 on SetConfiguration(0)
+  * pio_it.c: Permit repeated calls to PIO_ConfigureIt()
+  * simtrace2_siff: getopt_long() returns int, not char
+  * Introduce support for asynchronous USB transmission
+  * firmware: fix builds with gcc stack smashing protection enabled
+  * dfu: Shrink code by 144 bytes (by not calling PIO_InitializeInterrupts)
+  * dfu: Save another 60 bytes by changing the way we print horizontal lines
+  * migrate from BSC_FD_* to OSMO_FD_*
+  * remove usb2udp
+  * rename simtrace2-remsim to simtrace2-cardem-pcsc
+  * Update README
+  * remove old pre-autoconf makefile
+  * simtrace2-cardem-pcsc: Make it work again
+  * Revert "add ISO 7816-3 library to remsim project"
+  * Revert "add library providing ISO 7816-3 utilities"
+  * card_emu: waiting_time is stored in etu, not clocks.
+  * card_emu: Rename fi to Fi and di to Di
+  * card_emu: Clarify and differentiate F/Fi/F_index/Fi_index
+  * iso7816_fidi: Add iso7816_3_ prefix to symbols; fix terminology
+  * card_emu: improve reset detection conditions
+  * card_emu: explicitly initialize PTS and TPDU states
+  * card_emu: Use USART timeout for waiting time
+  * card_emu: Fix USART timer, particularly in re-start situations
+  * card_emu: Fix computation of waiting time
+  * contrib/jenkins.sh: Switch from rita -> ftp.osmocom.org
+  * st2-cardem-pcsc: Fix goto-in-while mess
+  * st2-cardem-pcsc: Use ATR of real card by default
+  * simtrace board.h: Enable HAVE_CARDEM if we build the cardem firmware
+  * jenkins.sh: build 'cardem' firmware also for simtrace board
+  * Revert "cardem: disable upload for simtrace2"
+  * simtrace2-cardem-pcsc: Decode STATUS flags to strings
+  * simtrace2-cardem-pcsc: Reset the real card if reader resets cardem
+  * assert: Use printf_sync() to ensure printing of assert / panic
+  * Add usb product ID of sysmoOCTSIMTEST
+  * octsimtest: remove lots of unused #defines
+  * octsimtest: most code for support of this new board
+  * octsimtest: Switch direction of I/O level shifter depending on uart tx / rx
+  * cardem-pcsc: initialize libosmocore logging
+  * octsimtest: Adjust VCC voltage thresholds (resistive VCC divider)
+  * contrib/jenkins.sh: Build 'cardem' app for 'octsimtest' board
+  * firmware: octsimtest: Fix IO_DIR pin definition
+  * firmware: octsimtest: Make slot mux configurable via USB
+  * firmware: octsimtest: mcp23017 initializaiton
+  * firmware: cardem: re-factor CARDINSERT command processing
+  * firmware: octsimtest: Support SIMTRACE_MSGT_DT_CEMU_CARDINSERT
+  * firmware: octsimtest: use TRACE_* macros instead of direct printf
+  * firmware: octsimtest: Fix disabling the card_insert signal
+  * firmware: octsimtest: Add i/I command for setting card-insert via I2C GPIO
+  * firmware: octsimtest: ensure all card_insert GPIO are 0 after reset
+  * don't printf() directly from library code, go via libosmocore logging
+  * simtrace2-list: Use osmo_st2_compatible_dev_ids[]
+  * board_gpio.gnumeric: Add ngff-cardem pin-out
+  * 99-simtrace2.rules: Add OCTSIMTEST
+  * contrib/flash.py: Add OCTSIMTEST support
+  * Introduce simtrace2-tool
+  * introduce support for new ngff_cardem board
+  * simtrace2.spec: Add simtrace2-tool binary to package
+  * contrib/jenkins.sh: Build APP=cardem for BOARD=ngff_cardem
+  * jenkins.sh: Build 'trace' firmware for ngff_cardem
+  * Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}()
+  * simtrace2-cardem-pcsc: Remove double libusb initialization
+  * simtrace2-tool: Initialize logging to avoid error on first log output
+  * cardem-pcsc: Fix return of uninitialized variable
+  * host: Upgrade libosmocore dependency to 1.4.0

- -- Harald Welte <lafore@gnumonks.org>  Thu, 28 Nov 2019 00:44:57 +0100
+  [ Kévin Redon ]
+  * minor: fix spacing
+  * minor: updated copyright years
+  * dfu: minor: make debug output only verbose in info level
+  * minor: move USB debug output from info to debug level
+  * minor: improve debug output
+  * minor : fix typo in comment
+  * better detect VCC and nRST changes on simtrace2 board
+  * minor: ignore usbstring binary
+  * simtrace2-remsim: Use simplest ATR
+  * cardem: use simplest ATR as default ATR
+  * minor: fix typo
+  * DFU: increase USB reset duration to 50 ms
+  * DFU: restart bootloader when USB conf failed
+  * Makefile: add linker option showing memory usage
+  * improve shared bootloader/application memory
+  * minor: improve trace output
+  * DFU: add DFU application
+  * add script to flash latest firmware
+  * minor: use same LED pattern for cardem as other applications
+  * cardem: currently simtrace does not support cardem
+  * add library providing ISO 7816-3 utilities
+  * add ISO 7816-3 library to remsim project
+  * rename PIN_PHONE_{CLK,IO} to PIN_USIM1_{CLK,IO}
+  * minor add comments
+  * make sim switch board specific
+
+  [ Eric Wild ]
+  * remsim: allow selecting pcsc reader number
+  * cardem: disable upload for simtrace2
+  * firmware: do not allow undefined symbols
+  * firmware: allow verbose builds
+  * cardem: choose a more reasonable default ATR
+  * contrib: add a basic simtrace lua dissector for wireshark
+  * cardem: free the buf
+  * cardemu: support 1v8 for the tester
+  * firmware: data sections
+  * firmware: proper makefile deps
+  * firmware: make the ngff beakout blink
+  * simtrace2-cardem: use local sim on exit
+  * contrib: more cardem dissection
+  * firmware: trace for ngff
+  * cardem: fix spurious NULL bytes during transfers
+  * contrib/jenkins.sh: build ngff_Cardem dfu bootloader
+  * contrib: allow manually forcing bulk simtrace dissection
+  * contrib/jenkins.sh: lower trace to make bl fit
+  * Revert "firmware: data sections"
+  * add the ngff cardem to default build targets
+  * drop unused exidx sections when linking
+  * clang build support
+  * fix bootloader led config crash
+  * firmware: add bootloader update "app"
+  * firmware: remove usb pullup that dates back to simtrace1
+  * firmware: increase reset delay before usb reattach
+  * firmware: drop cref printing
+  * add our default clang-format file
+  * firmware: add missing usb strings to blupdate that prevented building it
+  * jenkins: build bootloader updater
+  * firmware: remove dfu-dfu default target
+
+  [ Oliver Smith ]
+  * contrib: import RPM spec
+  * contrib: integrate RPM spec
+  * d/source/format: new file
+  * firmware/Makefile: fix UNKNOWN in OBS packages
+  * host: use git-version-gen/tarball-v. from topdir
+  * gitignore: add firmware/apps/*/usb_strings.txt.patched
+  * firmware: create duplicate files for upload only
+  * contrib/prepare_upload.sh: fix cd problems
+  * firmware: qmod-dfu: disable stack protector
+  * firmware: disable stack protector by default
+  * gitreview: new file
+
+  [ Leonard Hübner ]
+  * remsim: adding cli argument to set the atr
+
+  [ Eric ]
+  * dfu: let the device reset itself
+
+ -- Harald Welte <laforge@osmocom.org>  Thu, 09 Dec 2021 08:12:56 +0100

 simtrace2 (0.5.1) unstable; urgency=medium

--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9),
               pkg-config,
               git,
               dh-autoreconf,
-               libosmocore-dev,
+               libosmocore-dev (>= 1.4.0),
               libpcsclite-dev,
               libnewlib-arm-none-eabi,
               libusb-1.0-0-dev,
@@ -33,11 +33,11 @@ Package: simtrace2-utils
 Section: devel
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libosmo-simtrace2-0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libosmo-simtrace2-1
 Recommends: simtrace2-firmware
 Description: Host utilities to communicate with SIMtrace2 USB Devices.

-Package: libosmo-simtrace2-0
+Package: libosmo-simtrace2-1
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -52,7 +52,7 @@ Package: libosmo-simtrace2-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libosmo-simtrace2-0, ${misc:Depends}
+Depends: libosmo-simtrace2-1, ${misc:Depends}
 Description: Development headers for Osmocom SIMtrace2 library
  This library contains core "driver" functionality to interface with the
  Osmocom SIMtrace2 (and compatible) USB device firmware.  It enables
--- a/debian/libosmo-simtrace2-1.install
+++ b/debian/libosmo-simtrace2-1.install
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -49,7 +49,8 @@ APP ?= dfu

 # Defines which are the available memory targets for the SAM3S-EK board.
 ifeq ($(APP), dfu)
-MEMORIES ?= flash dfu
+MEMORIES ?= flash
+TRACE_LEVEL ?= 0
 else
 MEMORIES ?= dfu
 endif
@@ -72,12 +73,20 @@ AT91LIB_USB_DFU_PATH = $(AT91LIB)/usb/device/dfu
 # Tool suffix when cross-compiling
 CROSS_COMPILE = arm-none-eabi-

-LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib
-
-# Compilation tools
+USE_CLANG ?= 0
+ifneq ("$(USE_CLANG)","0")
+# --target=thumbv7m-none-eabi
+CC = clang
+LD = ld.lld
+SIZE = llvm-size
+LIBS = -nostdlib
+else
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 SIZE = $(CROSS_COMPILE)size
+LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib
+endif
+
 STRIP = $(CROSS_COMPILE)strip
 OBJCOPY = $(CROSS_COMPILE)objcopy
 GDB = $(CROSS_COMPILE)gdb
@@ -108,7 +117,7 @@ C_LIBUSB     = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.
 C_LIBUSB_RT  = dfu.c dfu_runtime.c
 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 \
-	       main_common.c stack_check.c
+	       main_common.c stack_check.c crcstub.c

 C_BOARD      = $(notdir $(wildcard libboard/common/source/*.c))
 C_BOARD     += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))
@@ -138,7 +147,11 @@ ALLOW_PEER_ERASE?=0
 #CFLAGS+=-DUSB_NO_DEBUG=1

 # Optimization level, put in comment for debugging
+ifneq ("$(USE_CLANG)","0")
+OPTIMIZATION ?= -Oz
+else
 OPTIMIZATION ?= -Os
+endif

 # Flags
 INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)
@@ -152,6 +165,11 @@ INCLUDES += -Ilibosmocore/include
 INCLUDES += -Isrc_simtrace -Iinclude
 INCLUDES += -Iapps/$(APP)

+ifneq ("$(USE_CLANG)","0")
+CFLAGS += -Wno-unknown-warning-option -Wno-empty-body -fno-exceptions -fno-unwind-tables --config armv7em_soft_nofp_nosys
+else
+CFLAGS += -Wno-suggest-attribute=noreturn --param max-inline-insns-single=500
+endif
 CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2
 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
 CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused
@@ -164,16 +182,16 @@ CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long
 CFLAGS += -Wunreachable-code
 #CFLAGS += -Wcast-align
 #CFLAGS += -std=c11
-CFLAGS += -Wmissing-noreturn
+#CFLAGS += -Wmissing-noreturn
 #CFLAGS += -Wconversion
 CFLAGS += -Wno-unused-but-set-variable -Wno-unused-variable
-CFLAGS += -Wno-suggest-attribute=noreturn
+

 # -mlong-calls  -Wall
 #CFLAGS += -save-temps -fverbose-asm
 #CFLAGS += -Wa,-a,-ad
 CFLAGS += -D__ARM -fno-builtin
-CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
+CFLAGS += -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
 CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE)
 CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD)
@@ -187,7 +205,10 @@ CFLAGS += -fno-stack-protector
 endif

 ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__
-LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--print-memory-usage -Wl,--no-undefined $(LIB)
+LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--no-undefined $(LIB)
+ifeq ("$(USE_CLANG)","0")
+LDFLAGS += -Wl,--warn-section-align -Wl,--print-memory-usage
+endif
 #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats

 # Append BIN directories to output filename
@@ -197,7 +218,7 @@ OUTPUT := $(BIN)/$(OUTPUT)
 #		Rules
 #-------------------------------------------------------------------------------

-all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES)
+all: $(BIN) $(OBJ) $(MEMORIES)

 combined: $(OUTPUT)-combined.bin

@@ -208,12 +229,15 @@ $(BIN)/$(BOARD)-dfu-flash-padded.bin: $(BIN)/$(BOARD)-dfu-flash.bin
 $(OUTPUT)-combined.bin: $(BIN)/$(BOARD)-dfu-flash-padded.bin $(OUTPUT)-dfu.bin
 	cat $^ > $@

-$(BIN) $(OBJ):
+$(BIN) $(OBJ): apps/$(APP)/usb_strings_generated.h misc/crctool
 	mkdir -p $@

 usbstring/usbstring: usbstring/usbstring.c
 	gcc $^ -o $@

+misc/crctool: misc/crctool.c
+	gcc $^ -o $@
+
 .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)/" $< > $@
@@ -224,29 +248,70 @@ apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstri
 define RULES
 C_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(C_OBJECTS))
 ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
+EXTRA_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(EXTRA_OBJECTS))

-$(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
-	$(SILENT)$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
-	$(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
-	$(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
-	$(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf
+build_$(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) $$(EXTRA_OBJECTS_$(1))
+	$(SILENT)$(CC) $(CFLAGS) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$(1).ld" -Wl,-Map,$(OUTPUT)-$(1).map -o $(OUTPUT)-$(1).elf $$^ $(LIBS)
+	$(SILENT)$(NM) $(OUTPUT)-$(1).elf >$(OUTPUT)-$(1).elf.txt
+	$(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$(1).elf $(OUTPUT)-$(1).bin

 $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
 	@echo [COMPILING $$<]
-	$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
+	$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<

 $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
 	@echo [ASSEMBLING $$@]
-	$(SILENT)@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
+	$(SILENT)$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<

-debug_$(1): $(1)
-	$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
 endef

-$(foreach MEMORY, $(MEMORIES), $(eval $(call RULES,$(MEMORY))))
+ALL_MEMORIES = flash ram
+$(foreach MEMORY, $(ALL_MEMORIES), $(eval $(call RULES,$(MEMORY))))
+
+# files with those names do exist..
+.PHONY: dfu
+dfu: $(OUTPUT)-dfu.bin
+.PHONY: ram
+ram: build_ram
+.PHONY: flash
+flash: build_flash
+#alternate way of embedding: obj file
+#ifeq ($(APP), dfu)
+#	$(info bootloader bin file to obj..)
+#	$(SILENT)$(OBJCOPY) --rename-section .data=.fwupdate -I binary -O elf32-littlearm bin/$(BOARD)-dfu-flash.bin $(OBJ)/flash_fwupdate.o
+#endif
+
+C_OBJECTS_dfu = $(addprefix $(OBJ)/dfu_, $(C_OBJECTS))
+ASM_OBJECTS_dfu = $(addprefix $(OBJ)/dfu_, $(ASM_OBJECTS))
+EXTRA_OBJECTS_dfu = $(addprefix $(OBJ)/dfu_, $(EXTRA_OBJECTS))
+
+$(OUTPUT)-dfu.bin: $(OUTPUT)-dfu_nocrcstub.bin
+	$(info updating app with crc..)
+	$(SILENT)cp $< $@.temp
+	$(SILENT)misc/crctool 512 $@.temp
+	$(SILENT)mv $@.temp $@
+
+$(OUTPUT)-dfu_nocrcstub.bin: $(OUTPUT)-dfu_nocrcstub.elf
+ifeq ($(APP), blupdate)
+	$(info updating updater section with padded bootloader file..)
+	$(SILENT)dd status=none if=/dev/zero bs=16384 count=1 of=$(BIN)/$(BOARD)-dfu-flash-padded.bin
+	$(SILENT)dd status=none if=$(BIN)/$(BOARD)-dfu-flash.bin conv=notrunc of=$(BIN)/$(BOARD)-dfu-flash-padded.bin
+	$(SILENT)$(OBJCOPY) --update-section .blupdate=bin/$(BOARD)-dfu-flash-padded.bin $<
+endif
+	$(SILENT)$(OBJCOPY) -O binary $< $@
+
+$(OUTPUT)-dfu_nocrcstub.elf: $(ASM_OBJECTS_dfu) $(C_OBJECTS_dfu) $(EXTRA_OBJECTS_dfu)
+	$(SILENT)$(CC) $(CFLAGS) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/dfu.ld" -Wl,-Map,$(OUTPUT)-dfu_nocrcstub.map -o $@ $^ $(LIBS)
+	$(SILENT)$(NM) $@ >$@.txt
+
+$(C_OBJECTS_dfu): $(OBJ)/dfu_%.o: %.c Makefile $(OBJ) $(BIN)
+	@echo [COMPILING $<]
+	$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_dfu -DENVIRONMENT=\"dfu\" -c -o $@ $<
+
+$(ASM_OBJECTS_dfu): $(OBJ)/dfu_%.o: %.S Makefile $(OBJ) $(BIN)
+	@echo [ASSEMBLING $@]
+	$(SILENT)$(CC) $(ASFLAGS) -DENVIRONMENT_dfu -DENVIRONMENT=\"dfu\" -c -o$@ $<

-program:
-	openocd -f openocd/openocd.cfg -c "init" -c "halt" -c "flash write_bank 0 ./bin/project-flash.bin 0" -c "reset" -c "shutdown"

 SERIAL ?= /dev/ttyUSB0
 log:
--- a/firmware/apps/blupdate/Makefile
+++ b/firmware/apps/blupdate/Makefile
@@ -0,0 +1,12 @@
+
+C_FILES += $(C_LIBUSB_DFU)
+
+# Trace level used for compilation
+# (can be overridden by adding TRACE_LEVEL=#number to the command-line)
+# TRACE_LEVEL_DEBUG      5
+# TRACE_LEVEL_INFO       4
+# TRACE_LEVEL_WARNING    3
+# TRACE_LEVEL_ERROR      2
+# TRACE_LEVEL_FATAL      1
+# TRACE_LEVEL_NO_TRACE   0
+TRACE_LEVEL ?= 3
--- a/firmware/apps/blupdate/main.c
+++ b/firmware/apps/blupdate/main.c
@@ -0,0 +1,136 @@
+/* SIMtrace 2 firmware USB DFU bootloader
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include "board.h"
+#include "core_cm3.h"
+#include "flashd.h"
+#include "utils.h"
+#include "usb/device/dfu/dfu.h"
+#include "usb/common/dfu/usb_dfu.h"
+#include "manifest.h"
+#include "USBD_HAL.h"
+
+#include <osmocom/core/timer.h>
+
+/* actual section content must be replaced with the padded bootloader by running objcopy! */
+const uint32_t bl_update_data[BOARD_DFU_BOOT_SIZE / sizeof(uint32_t)] __attribute__((section(".fwupdate"))) = { 0xFF };
+
+unsigned int g_unique_id[4];
+/* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */
+static bool watchdog_configured = false;
+
+extern uint32_t _end;
+extern uint32_t _srelocate;
+extern uint32_t _etext;
+
+void DFURT_SwitchToDFU(void)
+{
+}
+void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
+{
+}
+int USBDFU_handle_dnload(uint8_t altif, unsigned int offset, uint8_t *data, unsigned int len)
+{
+	return 0;
+}
+int USBDFU_handle_upload(uint8_t altif, unsigned int offset, uint8_t *data, unsigned int req_len)
+{
+	return 0;
+}
+int USBDFU_OverrideEnterDFU(void)
+{
+	return 0;
+}
+
+__attribute__((section(".ramfunc"), noinline)) static uint32_t flash_wait_ready()
+{
+	Efc *efc = EFC;
+	uint32_t dwStatus;
+
+	do {
+		dwStatus = efc->EEFC_FSR;
+	} while ((dwStatus & EEFC_FSR_FRDY) != EEFC_FSR_FRDY);
+	return (dwStatus & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE));
+}
+
+__attribute__((section(".ramfunc"), noinline)) static void flash_cmd(uint32_t dwCommand, uint32_t dwArgument)
+{
+	Efc *efc = EFC;
+	uint32_t dwStatus;
+	efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand);
+}
+
+__attribute__((section(".ramfunc"), noinline, noreturn)) static void erase_first_app_sector()
+{
+	/* page 64 */
+	uint32_t first_app_page = (BOARD_DFU_BOOT_SIZE / IFLASH_PAGE_SIZE);
+	uint32_t *first_app_address = (uint32_t *)(IFLASH_ADDR + first_app_page * IFLASH_PAGE_SIZE + 0);
+
+#if 1
+	/* overwrite first app sector so we don't keep booting this */
+	for (int i = 0; i < IFLASH_PAGE_SIZE / 4; i++)
+		first_app_address[i] = 0xffffffff;
+
+	flash_cmd(EFC_FCMD_EWP, first_app_page);
+#else
+	/* why does erasing the whole flash with a protected bootloader not work at all? */
+	flash_cmd(EFC_FCMD_EA, 0);
+#endif
+	flash_wait_ready();
+	for (;;) {
+		/* no functon call, since NVIC_SystemReset() might not be inlined! */
+		SCB->AIRCR = ((0x5FA << SCB_AIRCR_VECTKEY_Pos) | (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) |
+			      SCB_AIRCR_SYSRESETREQ_Msk);
+		__DSB();
+		while (1)
+			;
+	}
+}
+
+#define MAX_USB_ITER BOARD_MCK / 72 // This should be around a second
+extern int main(void)
+{
+	uint8_t isUsbConnected = 0;
+	unsigned int i = 0;
+	uint32_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;
+
+	/* Enable watchdog for 2000ms, with no window */
+	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT | (WDT_GetPeriod(2000) << 16) |
+				WDT_GetPeriod(2000));
+	watchdog_configured = true;
+
+	EEFC_ReadUniqueID(g_unique_id);
+
+	printf("\r\n\r\n");
+	printf("bootloader updater %s for board %s\r\n"
+	       "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\r\n",
+	       manifest_revision, manifest_board);
+
+	/* clear g_dfu on power-up reset */
+	memset(g_dfu, 0, sizeof(*g_dfu));
+
+	TRACE_INFO("USB init...\r\n");
+	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
+	USBD_Disconnect();
+
+	/* Initialize the flash to be able to write it, using the IAP ROM code */
+	FLASHD_Initialize(BOARD_MCK, 1);
+
+	__disable_irq();
+	FLASHD_Unlock(IFLASH_ADDR, IFLASH_ADDR + IFLASH_SIZE - 1, 0, 0);
+	FLASHD_Write(IFLASH_ADDR, bl_update_data, BOARD_DFU_BOOT_SIZE);
+
+	erase_first_app_sector();
+}
--- a/firmware/apps/blupdate/usb_strings.txt
+++ b/firmware/apps/blupdate/usb_strings.txt
@@ -0,0 +1,6 @@
+sysmocom - s.f.m.c. GmbH
+PRODUCT_STRING
+bootloader updater
+RAM
+Flash (Application Partition)
+Flash (Bootloader Partition)
--- a/firmware/apps/cardem/main.c
+++ b/firmware/apps/cardem/main.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 /*------------------------------------------------------------------------------
 *          Headers
@@ -71,8 +67,13 @@ static const conf_func config_func_ptrs[] = {
 		.init = mode_cardemu_init,
 		.exit = mode_cardemu_exit,
 		.run = mode_cardemu_run,
+#if defined (ngff_cardem)
+		.usart0_irq = mode_cardemu_usart1_irq,
+		.usart1_irq = mode_cardemu_usart0_irq,
+#else
 		.usart0_irq = mode_cardemu_usart0_irq,
 		.usart1_irq = mode_cardemu_usart1_irq,
+#endif
 	},
 #endif
 #ifdef HAVE_MITM
@@ -159,7 +160,7 @@ extern int main(void)
 	print_banner();
 	board_main_top();

-	TRACE_INFO("USB init...\n\r");
+	TRACE_INFO("USB init...\r\n");
 	SIMtrace_USB_Initialize();

 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -168,7 +169,7 @@ extern int main(void)
 #if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\n\r");
+				    "not be configured)\r\n");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
@@ -176,19 +177,19 @@ extern int main(void)
 		i++;
 	}

-	TRACE_INFO("calling configure of all configurations...\n\r");
+	TRACE_INFO("calling configure of all configurations...\r\n");
 	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}

-	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
+	TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
 	if (config_func_ptrs[simtrace_config].init) {
 		config_func_ptrs[simtrace_config].init();
 	}
 	last_simtrace_config = simtrace_config;

-	TRACE_INFO("entering main loop...\n\r");
+	TRACE_INFO("entering main loop...\r\n");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -206,12 +207,12 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\n\r");
+			TRACE_INFO("USB is now configured\r\n");

 			isUsbConnected = 1;
 		}
 		if (last_simtrace_config != simtrace_config) {
-			TRACE_INFO("USB config chg %u -> %u\n\r",
+			TRACE_INFO("USB config chg %u -> %u\r\n",
 				   last_simtrace_config, simtrace_config);
 			if (config_func_ptrs[last_simtrace_config].exit) {
 				config_func_ptrs[last_simtrace_config].exit();
--- a/firmware/apps/dfu/main.c
+++ b/firmware/apps/dfu/main.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 #include "board.h"
 #include "utils.h"
@@ -82,9 +78,9 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 	}

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

 #ifdef PINS_LEDS
@@ -117,19 +113,19 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		}
 		rc = FLASHD_Unlock(addr, addr + len, 0, 0);
 		if (rc != 0) {
-			TRACE_ERROR("DFU download flash unlock failed\n\r");
+			TRACE_ERROR("DFU download flash unlock failed\r\n");
 			rc =  DFU_RET_STALL;
 			break;
 		}
 		rc = FLASHD_Write(addr, data, len);
 		if (rc != 0) {
-			TRACE_ERROR("DFU download flash erase failed\n\r");
+			TRACE_ERROR("DFU download flash erase failed\r\n");
 			rc = DFU_RET_STALL;
 			break;
 		}
 		for (i = 0; i < len; i++) {
 			if (((uint8_t*)addr)[i]!=data[i]) {
-				TRACE_ERROR("DFU download flash data written not correct\n\r");
+				TRACE_ERROR("DFU download flash data written not correct\r\n");
 				rc = DFU_RET_STALL;
 				break;
 			}
@@ -137,7 +133,7 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset,
 		rc = DFU_RET_ZLP;
 		break;
 	default:
-		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
+		TRACE_ERROR("DFU download for unknown AltIf %d\r\n", altif);
 		rc = DFU_RET_STALL;
 		break;
 	}
@@ -183,11 +179,11 @@ int USBDFU_handle_upload(uint8_t altif, unsigned int offset,
 		memcpy(data, (void *)addr, req_len);
 		break;
 	default:
-		TRACE_ERROR("DFU upload for unknown AltIf %d\n\r", altif);
+		TRACE_ERROR("DFU upload for unknown AltIf %d\r\n", altif);
 		/* FIXME: set error codes */
 		return -1;
 	}
-	printf("=%u\n\r", req_len);
+	printf("=%u\r\n", req_len);
 	return req_len;
 }

@@ -271,23 +267,23 @@ extern int main(void)

 #ifdef PINS_LEDS
 	/* Configure LED */
-	PIO_Configure(pinsLeds, sizeof(pinsLeds));
+	PIO_Configure(pinsLeds, PIO_LISTSIZE(pinsLeds));
 	PIO_Set(&pinsLeds[LED_NUM_RED]);
 	PIO_Clear(&pinsLeds[LED_NUM_GREEN]);
 #endif

 	EEFC_ReadUniqueID(g_unique_id);

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

 #if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
-	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
-	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",
+	TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\r\n", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);
+	TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
 	static const char* reset_causes[] = {
@@ -298,9 +294,9 @@ extern int main(void)
 		"user reset (NRST pin detected low)",
 	};
 	if (reset_cause < ARRAY_SIZE(reset_causes)) {
-		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
+		TRACE_INFO("Reset Cause: %s\r\n", reset_causes[reset_cause]);
 	} else {
-		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+		TRACE_INFO("Reset Cause: 0x%lx\r\n", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
 	}
 #endif

@@ -310,25 +306,25 @@ extern int main(void)
 	switch (USBDFU_OverrideEnterDFU()) {
 	case 0:
 		if (SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-			TRACE_INFO_WP("unknown\n\r");
+			TRACE_INFO_WP("unknown\r\n");
 		} else {
-			TRACE_INFO_WP("DFU is the main application\n\r");
+			TRACE_INFO_WP("DFU is the main application\r\n");
 		}
 		break;
 	case 1:
-		TRACE_INFO_WP("DFU switch requested by main application\n\r");
+		TRACE_INFO_WP("DFU switch requested by main application\r\n");
 		break;
 	case 2:
-		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");
+		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\r\n");
 		break;
 	case 3:
-		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");
+		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\r\n");
 		break;
 	case 4: // the is no reason
-		TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");
+		TRACE_INFO_WP("reset vector (second application word) does no point in flash\r\n");
 		break;
 	default:
-		TRACE_INFO_WP("unknown\n\r");
+		TRACE_INFO_WP("unknown\r\n");
 		break;
 	}
 #endif
@@ -339,19 +335,10 @@ extern int main(void)

 	board_main_top();

-	TRACE_INFO("USB init...\n\r");
+	TRACE_INFO("USB init...\r\n");
 	/* 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
-	mdelay(50);
-#ifdef PIN_USB_PULLUP
-	PIO_Clear(&usb_dp_pullup);
-#endif
-
+	mdelay(500);
 	USBDFU_Initialize(&dfu_descriptors);

 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -359,7 +346,7 @@ 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)\r\n");
 			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
 			USBD_Disconnect();
 			NVIC_SystemReset();
@@ -371,7 +358,7 @@ extern int main(void)
 	/* Initialize the flash to be able to write it, using the IAP ROM code */
 	FLASHD_Initialize(BOARD_MCK, 1);

-	TRACE_INFO("entering main loop...\n\r");
+	TRACE_INFO("entering main loop...\r\n");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -391,7 +378,7 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\n\r");
+			TRACE_INFO("USB is now configured\r\n");

 			isUsbConnected = 1;
 		}
--- a/firmware/apps/freq_ctr/main.c
+++ b/firmware/apps/freq_ctr/main.c
@@ -32,17 +32,17 @@ extern int main(void)
 	PIO_InitializeInterrupts(0);


-	printf("\n\r\n\r"
-		"=============================================================================\n\r"
-		"Freq Ctr firmware " GIT_VERSION " (C) 2019 by Harald Welte\n\r"
-		"=============================================================================\n\r");
+	printf("\r\n\r\n"
+		"=============================================================================\r\n"
+		"Freq Ctr firmware " GIT_VERSION " (C) 2019 by Harald Welte\r\n"
+		"=============================================================================\r\n");

 	board_main_top();

-	TRACE_INFO("starting frequency counter...\n\r");
+	TRACE_INFO("starting frequency counter...\r\n");
 	freq_ctr_init();

-	TRACE_INFO("entering main loop...\n\r");
+	TRACE_INFO("entering main loop...\r\n");
 	while (1) {
 		WDT_Restart(WDT);

--- a/firmware/apps/gpio_test/gpio_test.c
+++ b/firmware/apps/gpio_test/gpio_test.c
@@ -4,5 +4,5 @@

 void gpio_test_init(void)
 {
-	printf("FIXME run tests here\n\r");
+	printf("FIXME run tests here\r\n");
 }
--- a/firmware/apps/gpio_test/main.c
+++ b/firmware/apps/gpio_test/main.c
@@ -32,17 +32,17 @@ extern int main(void)
 	PIO_InitializeInterrupts(0);


-	printf("\n\r\n\r"
-		"=============================================================================\n\r"
-		"GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\n\r"
-		"=============================================================================\n\r");
+	printf("\r\n\r\n"
+		"=============================================================================\r\n"
+		"GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\r\n"
+		"=============================================================================\r\n");

 	board_main_top();

-	TRACE_INFO("starting gpio test...\n\r");
+	TRACE_INFO("starting gpio test...\r\n");
 	gpio_test_init();

-	TRACE_INFO("entering main loop...\n\r");
+	TRACE_INFO("entering main loop...\r\n");
 	while (1) {
 		WDT_Restart(WDT);

--- a/firmware/apps/trace/main.c
+++ b/firmware/apps/trace/main.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 /*------------------------------------------------------------------------------
 *          Headers
@@ -160,7 +156,7 @@ extern int main(void)
 	print_banner();
 	board_main_top();

-	TRACE_INFO("USB init...\n\r");
+	TRACE_INFO("USB init...\r\n");
 	SIMtrace_USB_Initialize();

 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -169,7 +165,7 @@ extern int main(void)
 #if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\n\r");
+				    "not be configured)\r\n");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
@@ -177,17 +173,17 @@ extern int main(void)
 		i++;
 	}

-	TRACE_INFO("calling configure of all configurations...\n\r");
+	TRACE_INFO("calling configure of all configurations...\r\n");
 	for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
 		if (config_func_ptrs[i].configure)
 			config_func_ptrs[i].configure();
 	}

-	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
+	TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
 	config_func_ptrs[simtrace_config].init();
 	last_simtrace_config = simtrace_config;

-	TRACE_INFO("entering main loop...\n\r");
+	TRACE_INFO("entering main loop...\r\n");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -205,12 +201,12 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\n\r");
+			TRACE_INFO("USB is now configured\r\n");

 			isUsbConnected = 1;
 		}
 		if (last_simtrace_config != simtrace_config) {
-			TRACE_INFO("USB config chg %u -> %u\n\r",
+			TRACE_INFO("USB config chg %u -> %u\r\n",
 				   last_simtrace_config, simtrace_config);
 			config_func_ptrs[last_simtrace_config].exit();
 			config_func_ptrs[simtrace_config].init();
--- a/firmware/apps/triple_play/main.c
+++ b/firmware/apps/triple_play/main.c
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 /*------------------------------------------------------------------------------
 *          Headers
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
@@ -767,7 +767,7 @@ static void UDP_EndpointHandler(uint8_t bEndpoint)
        }
        else {
            // Acknowledge interrupt
-            TRACE_ERROR("Error Wr%d, %x\n\r", bEndpoint, pEndpoint->state);
+            TRACE_ERROR("Error Wr%d, %x\r\n", bEndpoint, pEndpoint->state);
            CLEAR_CSR(bEndpoint, UDP_CSR_TXCOMP);
        }
    }
@@ -914,11 +914,11 @@ static inline uint8_t UDP_Write(uint8_t    bEndpoint,
 /*    int i;
    for (i = 0; i < dLength; i++) {
       if (!(i%16)) {
-            printf("\n\r");
+            printf("\r\n");
        }
        printf("0x%x ", ((uint8_t*)pData)[i]);
    }
-    printf("\n\r");
+    printf("\r\n");
 */

    /* Setup the transfer descriptor */
@@ -1053,11 +1053,11 @@ static inline uint8_t UDP_Read(uint8_t  bEndpoint,
 /*    int i;
    for (i = 0; i < dLength; i++) {
        if (!(i%16)) {
-            printf("\n\r");
+            printf("\r\n");
        }
        printf("0x%x ", ((uint8_t*)pData)[i]);
    }
-    printf("\n\r");
+    printf("\r\n");
 */

    /* Set the transfer descriptor */
@@ -1114,7 +1114,7 @@ void USBD_IrqHandler(void)
    /* Return immediately if there is no interrupt to service */
    if (status == 0) {

-        TRACE_DEBUG_WP(".\n\r");
+        TRACE_DEBUG_WP(".\r\n");
        return;
    }

@@ -1212,7 +1212,7 @@ void USBD_IrqHandler(void)

                if (status != 0) {

-                    TRACE_DEBUG_WP("\n\r  - ");
+                    TRACE_DEBUG_WP("\r\n  - ");
                }
            }
            eptnum++;
@@ -1221,7 +1221,7 @@ void USBD_IrqHandler(void)

    /* Toggle LED back to its previous state */
    TRACE_DEBUG_WP("!");
-    TRACE_DEBUG_WP("\n\r");
+    TRACE_DEBUG_WP("\r\n");
    if (USBD_GetState() >= USBD_STATE_POWERED) {

        //LED_Clear(USBD_LEDUSB);
@@ -1581,7 +1581,7 @@ void USBD_HAL_SetConfiguration(uint8_t cfgnum)
 */
 void USBD_HAL_Init(void)
 {
-    TRACE_DEBUG("%s\n\r", "USBD_HAL_Init");
+    TRACE_DEBUG("%s\r\n", "USBD_HAL_Init");

    /* Must before USB & TXVC access! */
    UDP_EnablePeripheralClock();
@@ -1610,7 +1610,7 @@ uint8_t USBD_HAL_Stall(uint8_t bEP)

    /* Check that endpoint is in Idle state */
    if (pEndpoint->state != UDP_ENDPOINT_IDLE) {
-        TRACE_WARNING("UDP_Stall: EP%d locked\n\r", bEP);
+        TRACE_WARNING("UDP_Stall: EP%d locked\r\n", bEP);
        return USBD_STATUS_LOCKED;
    }
    /* STALL endpoint */
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c
@@ -163,7 +163,7 @@ extern void EFC_TranslateAddress( Efc** ppEfc, uint32_t dwAddress, uint16_t* pwP
    wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;
    wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;

-    TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
+    TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\r\n", dwAddress, wPage, wOffset ) ;
    /* Store values */
    if ( pEfc )
    {
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c
@@ -151,8 +151,7 @@ WEAK void HardFault_Handler( void )
 		" mrseq r0, msp		\n"
 		" mrsne r0, psp		\n"
 		//" ldr r1, [r0, #24] 	\n"
-		" b hard_fault_handler_c\n"
-		".syntax divided	\n");
+		" b hard_fault_handler_c\n");
 }

 /**
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
@@ -134,7 +134,7 @@ static void ComputeLockRange( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwAct
    // Store actual page numbers
    EFC_ComputeAddress( pStartEfc, wActualStartPage, 0, pdwActualStart ) ;
    EFC_ComputeAddress( pEndEfc, wActualEndPage, 0, pdwActualEnd ) ;
-    TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\n\r", *pdwActualStart, *pdwActualEnd ) ;
+    TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\r\n", *pdwActualStart, *pdwActualEnd ) ;
 }


--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c
@@ -104,7 +104,7 @@ extern void PioInterruptHandler( uint32_t id, Pio *pPio )
    /* Check pending events */
    if ( status != 0 )
    {
-        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", id ) ;
+        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\r\n", id ) ;

        /* Find triggering source */
        i = 0;
@@ -119,7 +119,7 @@ extern void PioInterruptHandler( uint32_t id, Pio *pPio )
                /* Source has PIOs whose statuses have changed */
                if ( (status & _aIntSources[i].pPin->mask) != 0 )
                {
-                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", i ) ;
+                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\r\n", i ) ;

                    _aIntSources[i].handler(_aIntSources[i].pPin);
                    status &= ~(_aIntSources[i].pPin->mask);
@@ -177,13 +177,13 @@ extern void PIOC_IrqHandler( void )
 */
 extern void PIO_InitializeInterrupts( uint32_t dwPriority )
 {
-    TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize()\r\n" ) ;

    /* Reset sources */
    _dwNumSources = 0 ;

    /* Configure PIO interrupt sources */
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\r\n" ) ;
    PMC_EnablePeripheral( ID_PIOA ) ;
    PIOA->PIO_ISR ;
    PIOA->PIO_IDR = 0xFFFFFFFF ;
@@ -192,7 +192,7 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
    NVIC_SetPriority( PIOA_IRQn, dwPriority ) ;
    NVIC_EnableIRQ( PIOA_IRQn ) ;

-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\r\n" ) ;
    PMC_EnablePeripheral( ID_PIOB ) ;
    PIOB->PIO_ISR ;
    PIOB->PIO_IDR = 0xFFFFFFFF ;
@@ -201,7 +201,7 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
    NVIC_SetPriority( PIOB_IRQn, dwPriority ) ;
    NVIC_EnableIRQ( PIOB_IRQn ) ;

-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\r\n" ) ;
    PMC_EnablePeripheral( ID_PIOC ) ;
    PIOC->PIO_ISR ;
    PIOC->PIO_IDR = 0xFFFFFFFF ;
@@ -234,7 +234,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
    Pio* pio ;
    InterruptSource* pSource ;

-    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
+    TRACE_DEBUG( "PIO_ConfigureIt()\r\n" ) ;

    assert( pPin ) ;
    pio = pPin->pio ;
@@ -242,7 +242,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
    pSource = find_intsource4pin(pPin);
    if (!pSource) {
        /* Define new source */
-        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
+        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\r\n",  _dwNumSources ) ;
        assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
        pSource = &(_aIntSources[_dwNumSources]) ;
        pSource->pPin = pPin ;
@@ -288,7 +288,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
 */
 extern void PIO_EnableIt( const Pin *pPin )
 {
-    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
+    TRACE_DEBUG( "PIO_EnableIt()\r\n" ) ;

    assert( pPin != NULL ) ;

@@ -320,7 +320,7 @@ extern void PIO_DisableIt( const Pin *pPin )
 {
    assert( pPin != NULL ) ;

-    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
+    TRACE_DEBUG( "PIO_DisableIt()\r\n" ) ;

    pPin->pio->PIO_IDR = pPin->mask;
 }
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c
@@ -63,7 +63,7 @@ extern void PMC_EnablePeripheral( uint32_t dwId )
    {
        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId) )
        {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\r\n", dwId ) ;
        }
        else
        {
@@ -75,7 +75,7 @@ extern void PMC_EnablePeripheral( uint32_t dwId )
        dwId -= 32;
        if ((PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId))
        {
-            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\r\n", dwId + 32 ) ;
        }
        else
        {
@@ -100,7 +100,7 @@ extern void PMC_DisablePeripheral( uint32_t dwId )
    {
        if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
        {
-            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId ) ;
+            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\r\n", dwId ) ;
        }
        else
        {
@@ -112,7 +112,7 @@ extern void PMC_DisablePeripheral( uint32_t dwId )
        dwId -= 32 ;
        if ( (PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
        {
-            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\r\n", dwId + 32 ) ;
        }
        else
        {
@@ -132,7 +132,7 @@ extern void PMC_EnableAllPeripherals( void )
    PMC->PMC_PCER1 = MASK_STATUS1 ;
    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != MASK_STATUS1 ) ;

-    TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
+    TRACE_DEBUG( "Enable all periph clocks\r\n" ) ;
 }

 /**
@@ -146,7 +146,7 @@ extern void PMC_DisableAllPeripherals( void )
    PMC->PMC_PCDR1 = MASK_STATUS1 ;
    while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != 0 ) ;

-    TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
+    TRACE_DEBUG( "Disable all periph clocks\r\n" ) ;
 }

 /**
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c
@@ -198,7 +198,7 @@ void USART_Write(

            if (timeOut == 0) {

-                TRACE_ERROR("USART_Write: Timed out.\n\r");
+                TRACE_ERROR("USART_Write: Timed out.\r\n");
                return;
            }
            timeOut--;
@@ -269,7 +269,7 @@ uint16_t USART_Read(

            if (timeOut == 0) {

-                TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
+                TRACE_ERROR( "USART_Read: Timed out.\r\n" ) ;
                return 0;
            }
            timeOut--;
--- a/firmware/atmel_softpack_libraries/usb/device/core/USBD.c
+++ b/firmware/atmel_softpack_libraries/usb/device/core/USBD.c
@@ -140,7 +140,7 @@ void USBD_ResetHandler()
 void USBD_RequestHandler(uint8_t bEndpoint,
                         const USBGenericRequest* pRequest)
 {
-    TRACE_DEBUG("%s\n\r", "USBD_RequestHandler");
+    TRACE_DEBUG("%s\r\n", "USBD_RequestHandler");
    if (bEndpoint != 0) {
        TRACE_WARNING("EP%d request not supported, default EP only",
                      bEndpoint);
@@ -316,7 +316,7 @@ void USBD_RemoteWakeUp(void)
    /* Device is NOT suspended */
    if (deviceState != USBD_STATE_SUSPENDED) {

-        TRACE_INFO("USBD_RemoteWakeUp: Device is not suspended\n\r");
+        TRACE_INFO("USBD_RemoteWakeUp: Device is not suspended\r\n");
        return;
    }
    USBD_HAL_Activate();
@@ -356,7 +356,7 @@ void USBD_Disconnect(void)
 */
 void USBD_Init(void)
 {
-    TRACE_INFO_WP("USBD_Init\n\r");
+    TRACE_INFO_WP("USBD_Init\r\n");

    /* HW Layer Initialize */
    USBD_HAL_Init();
@@ -367,7 +367,7 @@ void USBD_Init(void)

    /* Upper Layer Initialize */
    USBDCallbacks_Initialized();
-    TRACE_DEBUG("%s\n\r", "..");
+    TRACE_DEBUG("%s\r\n", "..");
 }

 /**
--- a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c
+++ b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c
@@ -83,7 +83,7 @@ static void SetConfiguration(USBDDriver *pDriver, uint8_t cfgnum)
    const USBConfigurationDescriptor *pConfiguration;

    /* Use different descriptor depending on device speed */
-    TRACE_DEBUG("%s\n\r", "SetConfiguration");
+    TRACE_DEBUG("%s\r\n", "SetConfiguration");

    if (USBD_IsHighSpeed()) {

@@ -361,7 +361,7 @@ static void GetDescriptor(

        default:
            TRACE_WARNING(
-                      "USBDDriver_GetDescriptor: Unknown descriptor type (%d)\n\r",
+                      "USBDDriver_GetDescriptor: Unknown descriptor type (%d)\r\n",
                      type);
            USBD_Stall(0);
    }
@@ -565,7 +565,7 @@ void USBDDriver_RequestHandler(

                default:
                    TRACE_WARNING(
-                              "USBDDriver_RequestHandler: Unknown recipient (%d)\n\r",
+                              "USBDDriver_RequestHandler: Unknown recipient (%d)\r\n",
                              USBGenericRequest_GetRecipient(pRequest));
                    USBD_Stall(0);
            }
@@ -595,7 +595,7 @@ void USBDDriver_RequestHandler(

                default:
                    TRACE_WARNING(
-                              "USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
+                              "USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
                              USBFeatureRequest_GetFeatureSelector(pRequest));
                    USBD_Stall(0);
            }
@@ -642,7 +642,7 @@ void USBDDriver_RequestHandler(

            default:
                TRACE_WARNING(
-                          "USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
+                          "USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
                          USBFeatureRequest_GetFeatureSelector(pRequest));
                USBD_Stall(0);
        }
@@ -665,7 +665,7 @@ void USBDDriver_RequestHandler(

    default:
        TRACE_WARNING(
-                  "USBDDriver_RequestHandler: Unknown request code (%d)\n\r",
+                  "USBDDriver_RequestHandler: Unknown request code (%d)\r\n",
                  USBGenericRequest_GetRequest(pRequest));
        USBD_Stall(0);
    }
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c
+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c
@@ -14,10 +14,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
 */

 #include <unistd.h>
@@ -53,7 +49,7 @@ struct dfudata *g_dfu = &_g_dfu;

 WEAK void dfu_drv_updstatus(void)
 {
-	TRACE_INFO("DFU: updstatus()\n\r");
+	TRACE_INFO("DFU: updstatus()\r\n");

 	/* we transition immediately from MANIFEST_SYNC to MANIFEST,
 	 * as the flash-writing is not asynchronous in this
@@ -76,7 +72,7 @@ static __dfufunc void handle_getstatus(void)
 	dstat.iString = 0;
 	memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));

-	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
+	TRACE_DEBUG("handle_getstatus(%u, %u)\r\n", dstat.bStatus, dstat.bState);

 	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
 }
@@ -85,7 +81,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;

-	TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%ld)\r\n", g_dfu->state);

 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -110,10 +106,10 @@ static void dnload_cb(void *arg, unsigned char status, unsigned long int transfe
 {
 	int rc;

-	TRACE_DEBUG("COMPLETE\n\r");
+	TRACE_DEBUG("COMPLETE\r\n");

 	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USBD download callback status %d\n\r", status);
+		TRACE_ERROR("USBD download callback status %d\r\n", status);
 		USBD_Stall(0);
 		return;
 	}
@@ -140,14 +136,14 @@ static int handle_dnload(uint16_t val, uint16_t len, int first)
 	int rc;

 	if (len > BOARD_DFU_PAGE_SIZE) {
-		TRACE_ERROR("DFU length exceeds flash page size\n\r");
+		TRACE_ERROR("DFU length exceeds flash page size\r\n");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
 	}

 	if (len & 0x03) {
-		TRACE_ERROR("DFU length not four-byte-aligned\n\r");
+		TRACE_ERROR("DFU length not four-byte-aligned\r\n");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
@@ -157,7 +153,7 @@ static int handle_dnload(uint16_t val, uint16_t len, int first)
 		g_dfu->total_bytes = 0;

 	if (len == 0) {
-		TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\n\r");
+		TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\r\n");
 		g_dfu->state = DFU_STATE_dfuMANIFEST_SYNC;
 		return DFU_RET_ZLP;
 	}
@@ -176,10 +172,10 @@ static void upload_cb(void *arg, unsigned char status, unsigned long int transfe
 {
 	int rc;

-	TRACE_DEBUG("COMPLETE\n\r");
+	TRACE_DEBUG("COMPLETE\r\n");

 	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USBD upload callback status %d\n\r", status);
+		TRACE_ERROR("USBD upload callback status %d\r\n", status);
 		USBD_Stall(0);
 		return;
 	}
@@ -195,7 +191,7 @@ static int handle_upload(uint16_t val, uint16_t len, int first)
 		g_dfu->total_bytes = 0;

 	if (len > BOARD_DFU_PAGE_SIZE) {
-		TRACE_ERROR("DFU length exceeds flash page size\n\r");
+		TRACE_ERROR("DFU length exceeds flash page size\r\n");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
@@ -203,7 +199,7 @@ static int handle_upload(uint16_t val, uint16_t len, int first)

 	rc = USBDFU_handle_upload(if_altsettings[0], g_dfu->total_bytes, dfu_buf, len);
 	if (rc < 0) {
-		TRACE_ERROR("application handle_upload() returned %d\n\r", rc);
+		TRACE_ERROR("application handle_upload() returned %d\r\n", rc);
 		return DFU_RET_STALL;
 	}

@@ -221,7 +217,7 @@ void USBDFU_DFU_RequestHandler(const USBGenericRequest *request)
 	uint16_t val = USBGenericRequest_GetValue(request);
 	int rc, ret = DFU_RET_NOTHING;

-	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\r\n",
 			USBGenericRequest_GetType(request),
 			USBGenericRequest_GetRecipient(request),
 			val, len);
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c
+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c
@@ -15,10 +15,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
 */

 #include <board.h>
@@ -59,7 +55,7 @@ static __dfufunc void handle_getstatus(void)
 	dstat.iString = 0;
 	memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));

-	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
+	TRACE_DEBUG("handle_getstatus(%u, %u)\r\n", dstat.bStatus, dstat.bState);

 	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
 }
@@ -68,7 +64,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;

-	TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%lu)\r\n", g_dfu->state);

 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -114,7 +110,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 	uint16_t val = USBGenericRequest_GetValue(request);
 	int rc, ret = DFU_RET_NOTHING;

-	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\r\n",
 			USBGenericRequest_GetType(request),
 			USBGenericRequest_GetRecipient(request),
 			val, len);
@@ -163,7 +159,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
 			/* we switch it DETACH state, send a ZLP and
 			 * return.  The next USB reset in this state
 			 * will then trigger DFURT_SwitchToDFU() below */
-			TRACE_DEBUG("\r\n====dfu_detach\n\r");
+			TRACE_DEBUG("\r\n====dfu_detach\r\n");
 			g_dfu->state = DFU_STATE_appDETACH;
 			USBD_Write(0, 0, 0, 0, 0);
 			DFURT_SwitchToDFU();
--- a/firmware/libboard/common/include/board_common.h
+++ b/firmware/libboard/common/include/board_common.h
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #ifndef _BOARD_
 #define _BOARD_
--- a/firmware/libboard/common/include/boardver_adc.h
+++ b/firmware/libboard/common/include/boardver_adc.h
@@ -7,10 +7,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/common/include/led.h
+++ b/firmware/libboard/common/include/led.h
@@ -7,10 +7,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

@@ -31,7 +27,8 @@ enum led_pattern {
 	BLINK_200O_F		= 7,
 	BLINK_600O_F		= 8,
 	BLINK_CUSTOM		= 9,
-	BLINK_2F_O,
+	BLINK_2F_O		= 10,
+	BLINK_5O_5F		= 11,
 	_NUM_LED_BLINK
 };

--- a/firmware/libboard/common/include/manifest.h
+++ b/firmware/libboard/common/include/manifest.h
@@ -7,10 +7,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #ifndef _MANIFEST_H
 #define _MANIFEST_H
--- a/firmware/libboard/common/include/sim_switch.h
+++ b/firmware/libboard/common/include/sim_switch.h
@@ -7,10 +7,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/common/resources/sam3s4/dfu.ld
+++ b/firmware/libboard/common/resources/sam3s4/dfu.ld
@@ -39,7 +39,8 @@ SEARCH_DIR(.)
 MEMORY
 {
 	/* reserve the first 16k (= 0x4000) for the DFU bootloader */
-	rom (rx)  : ORIGIN = 0x00400000 + 16K, LENGTH = 256K - 16K /* flash, 256K */
+	crcstub (rx)  : ORIGIN = 0x00400000 + 16K, LENGTH = 512 /* crcstub part */
+	rom (rx)  : ORIGIN = 0x00400000 + 16K + 512, LENGTH = 256K - 16K - 512 /* flash, 256K */
 	/* note: dfudata will be at the start */
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */
 }
@@ -47,9 +48,17 @@ MEMORY
 /* Section Definitions */ 
 SECTIONS 
 { 
-    .text : 
-    { 
+    .crcstub :
+    {
        . = ALIGN(4);
+        KEEP(*(.crcstub_table))
+        KEEP(*(.crcstub_code))
+    } > crcstub = 0xff
+
+    .text :
+    {
+
+        . = ALIGN(512);
        _sfixed = .;
        KEEP(*(.vectors .vectors.*))
        *(.text .text.* .gnu.linkonce.t.*) 	      
@@ -94,15 +103,20 @@ SECTIONS

        . = ALIGN(4);
        _efixed = .;            /* End of text section */
-    } > rom
+    } > rom = 0xff

-    /* .ARM.exidx is sorted, so has to go in its own output section.  */
-    PROVIDE_HIDDEN (__exidx_start = .);
-    .ARM.exidx :
+    /DISCARD/ :
    {
-      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+        *(.ARM.exidx)
+    }
+
+    .blupdate :
+    {
+        . = ALIGN(4);
+        _blupdate_start = .;
+        KEEP(*(.fwupdate .fwupdate.*));
+        _blupdate_end = .;
    } > rom
-    PROVIDE_HIDDEN (__exidx_end = .);

    . = ALIGN(4); 
    _etext = .;
--- a/firmware/libboard/common/resources/sam3s4/flash.ld
+++ b/firmware/libboard/common/resources/sam3s4/flash.ld
@@ -94,13 +94,12 @@ SECTIONS
        _efixed = .;            /* End of text section */
    } > rom

-    /* .ARM.exidx is sorted, so has to go in its own output section.  */
-    PROVIDE_HIDDEN (__exidx_start = .);
-    .ARM.exidx :
+    /DISCARD/ :
    {
-      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-    } > rom
-    PROVIDE_HIDDEN (__exidx_end = .);
+        *(.ARM.exidx)
+        *(.crcstub_table)
+        *(.crcstub_code)
+    }

    . = ALIGN(4); 
    _etext = .;
--- a/firmware/libboard/common/source/board_lowlevel.c
+++ b/firmware/libboard/common/source/board_lowlevel.c
@@ -147,7 +147,7 @@ extern WEAK void LowLevelInit( void )
 	}
 */

-#ifndef qmod
+#ifndef BOARD_MAINOSC_BYPASS
 	/* Initialize main oscillator */
 	if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) )
 	{
@@ -165,11 +165,11 @@ extern WEAK void LowLevelInit( void )
 	timeout = 0;
 	while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));
 #else
-	/* QMOD has external 12MHz clock source */
+	/* Board has external clock, not a crystal oscillator */
 	PIOB->PIO_PDR = (1 << 9);
 	PIOB->PIO_PUDR = (1 << 9);
 	PIOB->PIO_PPDDR = (1 << 9);
-	PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY| CKGR_MOR_MOSCSEL;
+	PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY | CKGR_MOR_MOSCSEL;
 #endif

 	/* disable the red LED after main clock initialization */
--- a/firmware/libboard/common/source/boardver_adc.c
+++ b/firmware/libboard/common/source/boardver_adc.c
@@ -7,10 +7,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "boardver_adc.h"
--- a/firmware/libboard/common/source/led.c
+++ b/firmware/libboard/common/source/led.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include <stdint.h>
 #include <string.h>
@@ -58,6 +54,10 @@ static const struct blink_state bs_on[] = {
 	{ 0, 1 }
 };

+static const struct blink_state bs_5on_5off[] = {
+	{ 500, 1 }, { 500, 0 }
+};
+
 static const struct blink_state bs_3on_5off[] = {
 	{ 300, 1 }, { 500, 0 }
 };
@@ -107,6 +107,10 @@ static const struct blink_pattern patterns[] = {
 		.states = bs_on,
 		.size = ARRAY_SIZE(bs_on),
 	},
+	[BLINK_5O_5F] = {
+		.states = bs_5on_5off,
+		.size = ARRAY_SIZE(bs_5on_5off),
+	},
 	[BLINK_3O_5F] = {
 		.states = bs_3on_5off,
 		.size = ARRAY_SIZE(bs_3on_5off),
--- a/firmware/libboard/common/source/manifest.c
+++ b/firmware/libboard/common/source/manifest.c
@@ -7,10 +7,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "manifest.h"

--- a/firmware/libboard/common/source/uart_console.c
+++ b/firmware/libboard/common/source/uart_console.c
@@ -238,7 +238,7 @@ extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize )
 		printf( "%02X ", pucFrame[dw] ) ;
 	}

-	printf( "\n\r" ) ;
+	printf( "\r\n" ) ;
 }

 /**
@@ -273,7 +273,7 @@ extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAdd
 			UART_PutChar( *pucTmp++ ) ;
 		}

-		printf( "\n\r" ) ;
+		printf( "\r\n" ) ;
 	}

 	if ( (dwSize%16) != 0 )
@@ -304,7 +304,7 @@ extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAdd
 			UART_PutChar( pucBuffer[j] ) ;
 		}

-		printf( "\n\r" ) ;
+		printf( "\r\n" ) ;
 	}
 }

@@ -335,12 +335,12 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 			{
 				if ( ucNbNb == 0 )
 				{
-					printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
+					printf( "\r\nWrite a number and press ENTER or SPACE!\r\n" ) ;
 					return 0 ;
 				}
 				else
 				{
-					printf( "\n\r" ) ;
+					printf( "\r\n" ) ;
 					*pdwValue=dwValue ;

 					return 1 ;
@@ -348,7 +348,7 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 			}
 			else
 			{
-				printf( "\n\r'%c' not a number!\n\r", ucKey ) ;
+				printf( "\r\n'%c' not a number!\r\n", ucKey ) ;

 				return 0 ;
 			}
@@ -375,12 +375,12 @@ extern uint32_t UART_GetIntegerMinMax( uint32_t* pdwValue, uint32_t dwMin, uint3

 	if ( dwValue < dwMin || dwValue > dwMax )
 {
-		printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
+		printf( "\r\nThe number have to be between %d and %d\r\n", (int)dwMin, (int)dwMax ) ;

 		return 0 ;
 	}

-	printf( "\n\r" ) ;
+	printf( "\r\n" ) ;

 	*pdwValue = dwValue ;

@@ -421,7 +421,7 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 				}
 				else
 				{
-					printf( "\n\rIt is not a hexa character!\n\r" ) ;
+					printf( "\r\nIt is not a hexa character!\r\n" ) ;

 					return 0 ;
 				}
@@ -429,7 +429,7 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 		}
 	}

-	printf("\n\r" ) ;
+	printf("\r\n" ) ;
 	*pdwValue = dwValue ;

 	return 1 ;
--- a/firmware/libboard/ngff_cardem/include/board.h
+++ b/firmware/libboard/ngff_cardem/include/board.h
@@ -0,0 +1,162 @@
+/* Osmocom ngff-cardem board definition
+ *
+ * (C) 2021 by Harald Welte <laforge@osmocom.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#pragma once
+#include "board_common.h"
+#include "simtrace_usb.h"
+
+/** Name of the board */
+#define BOARD_NAME "NGFF-CARDEM"
+/** Board definition */
+#define ngff_cardem
+
+/** oscillator used as main clock source (in Hz) */
+#define BOARD_MAINOSC 12000000
+/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
+#define BOARD_MCK 58000000 // 12.000 * 29 / 6
+
+/** MCU pin connected to red LED */
+#define PIO_LED_RED     PIO_PA17
+/** MCU pin connected to green LED */
+#define PIO_LED_GREEN   PIO_PA18
+/** red LED pin definition */
+#define PIN_LED_RED     {PIO_LED_RED, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** green LED pin definition */
+#define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/** LEDs pin definition */
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+/** index for red LED in LEDs pin definition array */
+#define LED_NUM_RED     0
+/** index for green LED in LEDs pin definition array */
+#define LED_NUM_GREEN   1
+/** the green LED is actually red and used as indication for USIM1 */
+#define LED_USIM1	LED_GREEN
+
+/* USIM 2 interface (USART) */
+#define PIN_USIM2_CLK		{PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+#define PIN_USIM2_IO		{PIO_PA6, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+#define PINS_ISO7816_USIM2	PIN_USIM2_CLK, PIN_USIM2_IO
+
+/* USIM 2 interface (TC) */
+#define PIN_USIM2_IO_TC		{PIO_PA1, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+#define PIN_USIM2_CLK_TC	{PIO_PA4, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+#define PINS_TC_USIM2		PIN_USIM2_IO_TC, PIN_USIM2_CLK_TC
+
+/* USIM 1 interface (USART) */
+#define PIN_USIM1_IO		{PIO_PA22, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+#define PIN_USIM1_CLK		{PIO_PA23, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+#define PINS_ISO7816_USIM1	PIN_USIM1_CLK, PIN_USIM1_IO
+
+/* USIM 1 interface (TC) */
+#define PIN_USIM1_IO_TC		{PIO_PA27, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+#define PIN_USIM1_CLK_TC	{PIO_PA29, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+#define PINS_TC_USIM1		PIN_USIM1_IO_TC, PIN_USIM1_CLK_TC
+
+#define PIN_USIM1_nRST		{PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
+#define PIN_USIM1_VCC		{PIO_PB3, PIOB, ID_PIOB, PIO_INPUT, PIO_DEFAULT}
+
+#define PIN_USIM2_nRST		{PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
+//#define PIN_USIM2_VCC		{PIO_PB2, PIOB, ID_PIOB, PIO_INPUT, PIO_DEFAULT}
+
+#define PINS_USIM1		PINS_TC_USIM1, PINS_ISO7816_USIM1, PIN_USIM1_nRST
+#define PINS_USIM2		PINS_TC_USIM2, PINS_ISO7816_USIM2, PIN_USIM2_nRST
+
+/* from v3 and onwards only (!) */
+#define PIN_DET_USIM1_PRES	{PIO_PA8, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
+
+/* inputs reading the WWAN LED level */
+#define PIN_WWAN1		{PIO_PA15, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEGLITCH | PIO_IT_EDGE}
+#define PINS_WWAN_IN		{ PIN_WWAN1 }
+
+#define PIN_MODEM_EN {PIO_PA11, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define PIN_N_MODEM_PWR_ON {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+
+/* outputs controlling RESET input of modems */
+#define PIN_PERST1		{PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define PINS_PERST		{ PIN_PERST1 }
+
+#define PIN_VERSION_DET		{PIO_PA19, PIOA, ID_PIOA, PIO_PERIPH_D, PIO_DEFAULT}
+
+/* GPIO towards SPDT switches between real SIM and SAM3 */
+//#define PIN_SIM_SWITCH1 {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+//#define PIN_SIM_SWITCH2 {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+
+#define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_SELFPOWERED_NORWAKEUP
+
+#define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
+#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_NGFF_CARDEM
+#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_NGFF_CARDEM
+#define BOARD_USB_RELEASE	0x010
+
+#define DETECT_VCC_BY_ADC
+#define VCC_UV_THRESH_1V8	1500000
+#define VCC_UV_THRESH_3V	VCC_UV_THRESH_1V8
+
+#ifdef APPLICATION_cardem
+#define HAVE_CARDEM
+#define HAVE_BOARD_CARDINSERT
+struct cardem_inst;
+void board_set_card_insert(struct cardem_inst *ci, bool card_insert);
+#endif
+
+#ifdef APPLICATION_trace
+#define HAVE_SNIFFER
+#endif
+
+/* Card I/O data signal input/output (I/O_SIM in schematic) */
+#define PIN_SIM_IO             {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+/* Card CLK clock input (CLK_SIM in schematic) */
+#define PIN_SIM_CLK            {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Card RST reset signal input (use as input since the phone will drive it) */
+#define PIN_SIM_RST_SNIFF      {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_DEGLITCH | PIO_IT_EDGE}
+/* Pins used to sniff phone-card communication */
+#define PINS_SIM_SNIFF          PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF
+
+/* Pin to measure card I/O timing (to start measuring the ETU on I/O activity; connected I/O_SIM in schematic) */
+#define PIN_SIM_IO_INPUT       {PIO_PA1B_TIOB0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
+#define PIN_SIM_CLK_INPUT      {PIO_PA4B_TCLK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
+/* Pins used to measure ETU timing (using timer counter) */ 
+#define PINS_TC                 PIN_SIM_IO_INPUT, PIN_SIM_CLK_INPUT
+
+//default state: NO uart connected, modem connected to physical sim, NO sim presence override, modem powers sim slot
+#define pin_conn_usim1_default {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_conn_usim2_default {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_conn_mdm_sim_default {PIO_PA0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define pin_conn_set_sim_det_default {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_en_st_sim_vdd_default {PIO_PB2, PIOB, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT}
+#define pin_en_mdm_sim_vdd_default {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+
+//cardem state: uart2 (!) connected, NO modem connected to physical sim, sim presence override, NOTHING powers sim slot
+#define pin_conn_usim1_cem {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_conn_usim2_cem {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define pin_conn_mdm_sim_cem {PIO_PA0, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_en_st_sim_vdd_cem {PIO_PB2, PIOB, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT}
+#define pin_en_mdm_sim_vdd_cem {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+
+//trace state: uart2 (!) connected, modem connected to physical sim, st powers sim slot
+#define pin_conn_usim1_trace {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_conn_usim2_trace {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define pin_conn_mdm_sim_trace {PIO_PA0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+#define pin_conn_set_sim_det_trace {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_en_st_sim_vdd_trace {PIO_PB2, PIOB, ID_PIOB, PIO_OUTPUT_1, PIO_DEFAULT}
+#define pin_en_mdm_sim_vdd_trace {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+
+#define PIN_MODEM_EN_off {PIO_PA11, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+
+#define PINS_SIM_DEFAULT pin_conn_usim1_default, pin_conn_usim2_default, pin_conn_mdm_sim_default, pin_conn_set_sim_det_default, PIN_N_MODEM_PWR_ON, PIN_MODEM_EN, pin_en_st_sim_vdd_default, pin_en_mdm_sim_vdd_default
+#define PINS_SIM_CARDEM pin_conn_usim1_cem, pin_conn_usim2_cem, pin_conn_mdm_sim_cem, pin_en_mdm_sim_vdd_cem, pin_en_st_sim_vdd_cem// , pin_conn_set_sim_det_cem
+
+#define PINS_BUS_SNIFF pin_conn_usim1_trace, pin_conn_usim2_trace, pin_conn_mdm_sim_trace, pin_conn_set_sim_det_trace,PIN_MODEM_EN_off
+#define PINS_PWR_SNIFF PIN_N_MODEM_PWR_ON, PIN_MODEM_EN, pin_en_st_sim_vdd_trace, pin_en_mdm_sim_vdd_trace
--- a/firmware/libboard/ngff_cardem/include/card_pres.h
+++ b/firmware/libboard/ngff_cardem/include/card_pres.h
@@ -0,0 +1,18 @@
+/* card presence utilities
+ *
+ * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#pragma once
+
+int is_card_present(int port);
+int card_present_init(void);
--- a/firmware/libboard/ngff_cardem/include/wwan_led.h
+++ b/firmware/libboard/ngff_cardem/include/wwan_led.h
@@ -0,0 +1,16 @@
+/* Code to read/track the status of the WWAN LEDs of attached modems
+ * 
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#pragma once
+
+int wwan_led_active(int wwan);
+int wwan_led_init(void);
--- a/firmware/libboard/ngff_cardem/include/wwan_perst.h
+++ b/firmware/libboard/ngff_cardem/include/wwan_perst.h
@@ -0,0 +1,17 @@
+/* Code to control the PERST lines of attached modems
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#pragma once
+
+int wwan_perst_set(int modem_nr, int active);
+int wwan_perst_do_reset_pulse(int modem_nr, unsigned int duration_ms);
+int wwan_perst_init(void);
--- a/firmware/libboard/ngff_cardem/product_string.txt
+++ b/firmware/libboard/ngff_cardem/product_string.txt
@@ -0,0 +1 @@
+ngff-cardem
--- a/firmware/libboard/ngff_cardem/source/board_ngff_cardem.c
+++ b/firmware/libboard/ngff_cardem/source/board_ngff_cardem.c
@@ -0,0 +1,155 @@
+/* sysmocom ngff-cardem application code
+ *
+ * (C) 2021 Harald Welte <laforge@osmocom.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include "board.h"
+#include "simtrace.h"
+#include "utils.h"
+#include "led.h"
+#include "wwan_led.h"
+#include "wwan_perst.h"
+#include "sim_switch.h"
+#include "boardver_adc.h"
+#include "card_pres.h"
+#include <osmocom/core/timer.h>
+#include "usb_buf.h"
+
+/* array of generated USB Strings */
+extern unsigned char *usb_strings[];
+
+/* returns '1' in case we should break any endless loop */
+void board_exec_dbg_cmd(int ch)
+{
+	switch (ch) {
+	case '?':
+		printf("\t?\thelp\r\n");
+		printf("\tR\treset SAM3\r\n");
+		printf("\tl\tswitch off LED 1\r\n");
+		printf("\tL\tswitch on  LED 1\r\n");
+		printf("\tg\tswitch off LED 2\r\n");
+		printf("\tG\tswitch on  LED 2\r\n");
+		printf("\t1\tGenerate 1ms reset pulse on WWAN1\r\n");
+		printf("\t!\tSwitch Channel A from physical -> remote\r\n");
+		printf("\tt\t(pseudo)talloc report\r\n");
+		break;
+	case 'R':
+		printf("Asking NVIC to reset us\r\n");
+		USBD_Disconnect();
+		NVIC_SystemReset();
+		break;
+	case 'l':
+		led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
+		printf("LED 1 switched off\r\n");
+		break;
+	case 'L':
+		led_blink(LED_GREEN, BLINK_ALWAYS_ON);
+		printf("LED 1 switched on\r\n");
+		break;
+	case 'g':
+		led_blink(LED_RED, BLINK_ALWAYS_OFF);
+		printf("LED 2 switched off\r\n");
+		break;
+	case 'G':
+		led_blink(LED_RED, BLINK_ALWAYS_ON);
+		printf("LED 2 switched on\r\n");
+		break;
+	case '1':
+		printf("Resetting Modem\r\n");
+		wwan_perst_do_reset_pulse(0, 300);
+		break;
+	case '!':
+		sim_switch_use_physical(0, 0);
+		break;
+	case 't':
+		talloc_report(NULL, stdout);
+		break;
+	default:
+		printf("Unknown command '%c'\r\n", ch);
+		break;
+	}
+}
+
+void board_main_top(void)
+{
+#ifndef APPLICATION_dfu
+	usb_buf_init();
+
+	wwan_led_init();
+	wwan_perst_init();
+	sim_switch_init();
+#endif
+
+	/* Obtain the circuit board version (currently just prints voltage) */
+	get_board_version_adc();
+#ifndef APPLICATION_dfu
+	/* Initialize checking for card insert/remove events */
+	card_present_init();
+#endif
+	wwan_perst_set(0, 0);
+}
+
+static int uart_has_loopback_jumper(void)
+{
+	unsigned int i;
+	const Pin uart_loopback_pins[] = {
+		{PIO_PA9A_URXD0, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT},
+		{PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+	};
+
+	/* Configure UART pins as I/O */
+	PIO_Configure(uart_loopback_pins, PIO_LISTSIZE(uart_loopback_pins));
+
+	/* Send pattern over UART TX and check if it is received on RX
+	 * If the loop doesn't get interrupted, RxD always follows TxD and thus a
+	 * loopback jumper has been placed on RxD/TxD, and we will boot
+	 * into DFU unconditionally
+	 */
+	int has_loopback_jumper = 1;
+	for (i = 0; i < 10; i++) {
+		/* Set TxD high; abort if RxD doesn't go high either */
+		PIO_Set(&uart_loopback_pins[1]);
+		if (!PIO_Get(&uart_loopback_pins[0])) {
+			has_loopback_jumper = 0;
+			break;
+		}
+		/* Set TxD low, abort if RxD doesn't go low either */
+		PIO_Clear(&uart_loopback_pins[1]);
+		if (PIO_Get(&uart_loopback_pins[0])) {
+			has_loopback_jumper = 0;
+			break;
+		}
+	}
+
+	/* Put pins back to UART mode */
+	const Pin uart_pins[] = {PINS_UART};
+	PIO_Configure(uart_pins, PIO_LISTSIZE(uart_pins));
+
+	return has_loopback_jumper;
+}
+
+int board_override_enter_dfu(void)
+{
+	/* If the loopback jumper is set, we enter DFU mode */
+	if (uart_has_loopback_jumper())
+		return 1;
+
+	return 0;
+}
+
+ static const Pin deton = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
+ static const Pin detoff = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT};
+
+void board_set_card_insert(struct cardem_inst *ci, bool card_insert)
+{
+	PIO_Configure(card_insert ? &deton : &detoff, 1);
+}
--- a/firmware/libboard/ngff_cardem/source/card_pres.c
+++ b/firmware/libboard/ngff_cardem/source/card_pres.c
@@ -0,0 +1,72 @@
+/* card presence utilities
+ *
+ * (C) 2016-2021 by Harald Welte <hwelte@hmw-consulting.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <osmocom/core/timer.h>
+#include "board.h"
+#include "utils.h"
+#include "card_pres.h"
+
+#define NUM_CARDPRES	1
+
+#define TIMER_INTERVAL_MS	500
+
+static const Pin pin_cardpres[NUM_CARDPRES] = { PIN_DET_USIM1_PRES };
+static int last_state[NUM_CARDPRES] = { -1 };
+static struct osmo_timer_list cardpres_timer;
+
+/* Determine if a SIM card is present in the given slot */
+int is_card_present(int port)
+{
+	const Pin *pin;
+	int present;
+
+	if (port < 0 || port >= NUM_CARDPRES)
+		return -1;
+	pin = &pin_cardpres[port];
+
+
+	/* high active here */
+	present = PIO_Get(pin);
+
+	return present;
+}
+
+static void cardpres_tmr_cb(void *data)
+{
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(pin_cardpres); i++) {
+		int state = is_card_present(i);
+		if (state != last_state[i]) {
+			TRACE_INFO("%u: Card Detect Status %d -> %d\r\n", i, last_state[i], state);
+			/* FIXME: report to USB host */
+			last_state[i] = state;
+		}
+	}
+
+	osmo_timer_schedule(&cardpres_timer, 0, TIMER_INTERVAL_MS*1000);
+}
+
+int card_present_init(void)
+{
+	unsigned int i;
+
+	PIO_Configure(pin_cardpres, ARRAY_SIZE(pin_cardpres));
+
+	/* start timer */
+	cardpres_timer.cb = cardpres_tmr_cb;
+	osmo_timer_schedule(&cardpres_timer, 0, TIMER_INTERVAL_MS*1000);
+
+	return 2;
+}
--- a/firmware/libboard/ngff_cardem/source/sim_switch.c
+++ b/firmware/libboard/ngff_cardem/source/sim_switch.c
@@ -0,0 +1,77 @@
+/* Code to switch between local (physical) and remote (emulated) SIM
+ *
+ * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include "board.h"
+#include "trace.h"
+#include "led.h"
+#include "sim_switch.h"
+
+//uart12bus	2-20e pa20
+//uart22bus	1-20e pa28
+//usim2bus	1-10e pa0  pivot
+//sim det	2-10e pa13
+
+static const Pin pins_default[]	= {PINS_SIM_DEFAULT};
+static const Pin pins_cem[]	= {PINS_SIM_CARDEM};
+
+static int initialized = 0;
+
+int sim_switch_use_physical(unsigned int nr, int physical)
+{
+	const Pin pin = PIN_MODEM_EN;// PIN_N_MODEM_PWR_ON;
+	enum led led;
+
+	if (!initialized) {
+		TRACE_ERROR("Somebody forgot to call sim_switch_init()\r\n");
+		sim_switch_init();
+	}
+
+	TRACE_INFO("Modem %d: %s SIM\r\n", nr,
+		   physical ? "physical" : "virtual");
+
+	switch (nr) {
+	case 0:
+		led = LED_USIM1;
+		break;
+
+	default:
+		TRACE_ERROR("Invalid SIM%u\r\n", nr);
+		return -1;
+	}
+
+	if (physical) {
+		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
+		PIO_Configure(pins_default, PIO_LISTSIZE(pins_default));
+		led_blink(led, BLINK_ALWAYS_ON);
+	} else {
+		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
+		PIO_Configure(pins_cem, PIO_LISTSIZE(pins_cem));
+		led_blink(led, BLINK_5O_5F);
+	}
+
+	/* just power cycle the modem because this circumvents weird issues with unreliable signals */
+	PIO_Clear(&pin);
+	mdelay(200);
+	PIO_Set(&pin);
+
+
+	return 0;
+}
+
+int sim_switch_init(void)
+{
+	PIO_Configure(pins_default, PIO_LISTSIZE(pins_default));
+	initialized = 1;
+	return 1;
+}
--- a/firmware/libboard/ngff_cardem/source/wwan_led.c
+++ b/firmware/libboard/ngff_cardem/source/wwan_led.c
@@ -0,0 +1,89 @@
+/* Code to read/track the status of the WWAN LEDs of attached modems
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+/* Depending on the board this is running on,  it might be possible
+ * for the controller to read the status of the WWAN LED output lines of
+ * the cellular modem.  If the board supports this, it sets the
+ * PIN_WWAN1 and/or PIN_WWAN2 defines in its board.h file.
+ */
+#include "board.h"
+#include "wwan_led.h"
+
+#ifdef PIN_WWAN1
+static const Pin pin_wwan1 = PIN_WWAN1;
+
+static void wwan1_irqhandler(const Pin *pPin)
+{
+	int active = wwan_led_active(0);
+
+	TRACE_INFO("0: WWAN LED %u\r\n", active);
+
+	/* TODO: notify host via USB */
+}
+#endif
+
+#ifdef PIN_WWAN2
+static const Pin pin_wwan2 = PIN_WWAN2;
+
+static void wwan2_irqhandler(const Pin *pPin)
+{
+	int active = wwan_led_active(1);
+	TRACE_INFO("1: WWAN LED %u\r\n", active);
+
+	/* TODO: notify host via USB */
+}
+#endif
+
+/* determine if a given WWAN led is currently active or not */
+int wwan_led_active(int wwan)
+{
+	const Pin *pin;
+	int active;
+
+	switch (wwan) {
+#ifdef PIN_WWAN1
+	case 0:
+		pin = &pin_wwan1;
+		break;
+#endif
+#ifdef PIN_WWAN2
+	case 1:
+		pin = &pin_wwan2;
+		break;
+#endif
+	default:
+		return -1;
+	}
+
+	active = PIO_Get(pin) ? 0 : 1;
+	return active;
+}
+
+int wwan_led_init(void)
+{
+	int num_leds = 0;
+
+#ifdef PIN_WWAN1
+	PIO_Configure(&pin_wwan1, 1);
+	PIO_ConfigureIt(&pin_wwan1, wwan1_irqhandler);
+	PIO_EnableIt(&pin_wwan1);
+	num_leds++;
+#endif
+
+#ifdef PIN_WWAN2
+	PIO_Configure(&pin_wwan2, 1);
+	PIO_ConfigureIt(&pin_wwan2, wwan2_irqhandler);
+	PIO_EnableIt(&pin_wwan2);
+	num_leds++;
+#endif
+	return num_leds;
+}
--- a/firmware/libboard/ngff_cardem/source/wwan_perst.c
+++ b/firmware/libboard/ngff_cardem/source/wwan_perst.c
@@ -0,0 +1,123 @@
+/* Code to control the PERST lines of attached modems
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+/* Depending on the board this is running on,  it might be possible
+ * for the controller to set the status of the PERST input line of
+ * the cellular modem.  If the board supports this, it sets the
+ * PIN_PERST1 and/or PIN_PERST2 defines in its board.h file.
+ */
+#include "board.h"
+#include "trace.h"
+#include "wwan_perst.h"
+#include <osmocom/core/timer.h>
+
+struct wwan_perst {
+	uint8_t idx;
+	const Pin pin;
+	struct osmo_timer_list timer;
+};
+
+#ifdef PIN_PERST1
+static struct wwan_perst perst1 = {
+	.idx = 0,
+	.pin = PIN_PERST1,
+};
+#endif
+
+#ifdef PIN_PERST2
+static struct wwan_perst perst2 = {
+	.idx = 1,
+	.pin = PIN_PERST2,
+};
+#endif
+
+static int initialized = 0;
+
+static void perst_tmr_cb(void *data)
+{
+	struct wwan_perst *perst = data;
+	/* release the (low-active) reset */
+	TRACE_INFO("%u: De-asserting modem reset\r\n", perst->idx);
+	PIO_Clear(&perst->pin);
+}
+
+static struct wwan_perst *get_perst_for_modem(int modem_nr)
+{
+	if (!initialized) {
+		TRACE_ERROR("Somebody forgot to call wwan_perst_init()\r\n");
+		wwan_perst_init();
+	}
+
+	switch (modem_nr) {
+#ifdef PIN_PERST1
+	case 0:
+		return &perst1;
+#endif
+#ifdef PIN_PERST2
+	case 1:
+		return &perst2;
+#endif
+	default:
+		return NULL;
+	}
+}
+
+int wwan_perst_do_reset_pulse(int modem_nr, unsigned int duration_ms)
+{
+	struct wwan_perst *perst = get_perst_for_modem(modem_nr);
+	if (!perst)
+		return -1;
+
+	TRACE_INFO("%u: Asserting modem reset\r\n", modem_nr);
+	PIO_Set(&perst->pin);
+	osmo_timer_schedule(&perst->timer, duration_ms/1000, (duration_ms%1000)*1000);
+
+	return 0;
+}
+
+int wwan_perst_set(int modem_nr, int active)
+{
+	struct wwan_perst *perst = get_perst_for_modem(modem_nr);
+	if (!perst)
+		return -1;
+
+	osmo_timer_del(&perst->timer);
+	if (active) {
+		TRACE_INFO("%u: Asserting modem reset\r\n", modem_nr);
+		PIO_Set(&perst->pin);
+	} else {
+		TRACE_INFO("%u: De-asserting modem reset\r\n", modem_nr);
+		PIO_Clear(&perst->pin);
+	}
+
+	return 0;
+}
+
+int wwan_perst_init(void)
+{
+	int num_perst = 0;
+#ifdef PIN_PERST1
+	PIO_Configure(&perst1.pin, 1);
+	perst1.timer.cb = perst_tmr_cb;
+	perst1.timer.data = (void *) &perst1;
+	num_perst++;
+#endif
+
+#ifdef PIN_PERST2
+	PIO_Configure(&perst2.pin, 1);
+	perst2.timer.cb = perst_tmr_cb;
+	perst2.timer.data = (void *) &perst2;
+	num_perst++;
+#endif
+	initialized = 1;
+	return num_perst;
+}
--- a/firmware/libboard/octsimtest/include/board.h
+++ b/firmware/libboard/octsimtest/include/board.h
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once
 #include "board_common.h"
@@ -87,11 +83,6 @@
 /* SPI flash write protect pin (active low, pulled low) */
 #define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}

-/** Pin configuration to control USB pull-up on D+
- *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
- */
-#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
 /** USB definitions */
 /* OpenMoko SIMtrace 2 USB vendor ID */
 #define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
--- a/firmware/libboard/octsimtest/include/i2c.h
+++ b/firmware/libboard/octsimtest/include/i2c.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/octsimtest/include/mcp23017.h
+++ b/firmware/libboard/octsimtest/include/mcp23017.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/octsimtest/source/board_octsimtest.c
+++ b/firmware/libboard/octsimtest/source/board_octsimtest.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include <stdbool.h>
 #include "board.h"
@@ -34,12 +30,12 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\t0-8\tselect physical SIM slot\n\r");
-		printf("\tR\treset SAM3\n\r");
-		printf("\tm\trun mcp23017 test\n\r");
-		printf("\ti\tset card insert via I2C\n\r");
-		printf("\tI\tdisable card insert\n\r");
+		printf("\t?\thelp\r\n");
+		printf("\t0-8\tselect physical SIM slot\r\n");
+		printf("\tR\treset SAM3\r\n");
+		printf("\tm\trun mcp23017 test\r\n");
+		printf("\ti\tset card insert via I2C\r\n");
+		printf("\tI\tdisable card insert\r\n");
 		break;
 	case '0': mux_set_slot(0); break;
 	case '1': mux_set_slot(1); break;
@@ -50,7 +46,7 @@ void board_exec_dbg_cmd(int ch)
 	case '6': mux_set_slot(6); break;
 	case '7': mux_set_slot(7); break;
 	case 'R':
-		printf("Asking NVIC to reset us\n\r");
+		printf("Asking NVIC to reset us\r\n");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
@@ -66,7 +62,7 @@ void board_exec_dbg_cmd(int ch)
 		mcp23017_set_output_a(MCP23017_ADDRESS, 0);
 		break;
 	default:
-		printf("Unknown command '%c'\n\r", ch);
+		printf("Unknown command '%c'\r\n", ch);
 		break;
 	}
 }
@@ -97,7 +93,7 @@ int board_override_enter_dfu(void)
 	/* Enter DFU bootloader in case the respective button is pressed */
 	if (PIO_Get(&bl_sw_pin) == 0) {
 		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
+		//printf("BOOTLOADER switch pressed -> Force DFU\r\n");
 		return 1;
 	} else
 		return 0;
--- a/firmware/libboard/octsimtest/source/i2c.c
+++ b/firmware/libboard/octsimtest/source/i2c.c
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include <stdbool.h>
--- a/firmware/libboard/octsimtest/source/mcp23017.c
+++ b/firmware/libboard/octsimtest/source/mcp23017.c
@@ -94,7 +94,7 @@ out_stop:

 int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb)
 {
-	TRACE_DEBUG("mcp23017_init\n\r");
+	TRACE_DEBUG("mcp23017_init\r\n");

 	// all gpio input
 	if (mcp23017_write_byte(slave, MCP23017_IODIRA, iodira))
@@ -105,23 +105,23 @@ int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb)
 	if (mcp23017_write_byte(slave, MCP23017_IOCONA, 0x20)) //disable SEQOP (autoinc addressing)
 		goto out_err;

-	TRACE_DEBUG("mcp23017 found\n\r");
+	TRACE_DEBUG("mcp23017 found\r\n");
 	return 0;

 out_err:
-	TRACE_WARNING("mcp23017 NOT found!\n\r");
+	TRACE_WARNING("mcp23017 NOT found!\r\n");
 	return -1;
 }

 int mcp23017_test(uint8_t slave)
 {
-	printf("mcp23017_test\n\r");
-	printf("GPIOA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_GPIOA));
-	printf("GPIOB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_GPIOB));
-	printf("IODIRA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IODIRA));
-	printf("IODIRB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IODIRB));
-	printf("IOCONA 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IOCONA));
-	printf("IOCONB 0x%x\n\r", mcp23017_read_byte(slave,MCP23017_IOCONB));
+	printf("mcp23017_test\r\n");
+	printf("GPIOA 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_GPIOA));
+	printf("GPIOB 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_GPIOB));
+	printf("IODIRA 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IODIRA));
+	printf("IODIRB 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IODIRB));
+	printf("IOCONA 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IOCONA));
+	printf("IOCONB 0x%x\r\n", mcp23017_read_byte(slave,MCP23017_IOCONB));

 	return 0;
 }
@@ -142,13 +142,13 @@ int mcp23017_toggle(uint8_t slave)
 	static bool foo=false;
 	if (foo)
 	{
-		printf("+\n\r");
+		printf("+\r\n");
 		mcp23017_write_byte(slave, MCP23017_OLATB, 0x80);
 		foo=false;
 	}
 	else
 	{
-		printf("-\n\r");
+		printf("-\r\n");
 		mcp23017_write_byte(slave, MCP23017_OLATB, 0x00);
 		foo=true;
 	}
--- a/firmware/libboard/octsimtest/source/mux.c
+++ b/firmware/libboard/octsimtest/source/mux.c
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */

 #include "board.h"
--- a/firmware/libboard/octsimtest/source/sim_switch.c
+++ b/firmware/libboard/octsimtest/source/sim_switch.c
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "trace.h"
--- a/firmware/libboard/owhw/include/board.h
+++ b/firmware/libboard/owhw/include/board.h
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once
 #include "board_common.h"
--- a/firmware/libboard/owhw/source/owhw.c
+++ b/firmware/libboard/owhw/source/owhw.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */

 #include "chip.h"
@@ -29,16 +25,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
+		printf("\t?\thelp\r\n");
+		printf("\tR\treset SAM3\r\n");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\n\r");
+		printf("Asking NVIC to reset us\r\n");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\n\r", ch);
+		printf("Unknown command '%c'\r\n", ch);
 		break;
 	}
 }
--- a/firmware/libboard/owhw/source/sim_switch.c
+++ b/firmware/libboard/owhw/source/sim_switch.c
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "trace.h"
@@ -40,7 +36,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		sim_switch_init();
 	}

-	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
+	TRACE_INFO("Modem %d: %s SIM\r\n", nr,
 		   physical ? "physical" : "virtual");

 	switch (nr) {
@@ -57,7 +53,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		break;
 #endif
 	default:
-		TRACE_ERROR("Invalid SIM%u\n\r", nr);
+		TRACE_ERROR("Invalid SIM%u\r\n", nr);
 		return -1;
 	}

--- a/firmware/libboard/qmod/include/board.h
+++ b/firmware/libboard/qmod/include/board.h
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once
 #include "board_common.h"
@@ -29,6 +25,8 @@
 #define BOARD_MAINOSC 12000000
 /** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */
 #define BOARD_MCK 58000000 // 18.432 * 29 / 6
+/** board has external clock, not crystal */
+#define BOARD_MAINOSC_BYPASS

 /** MCU pin connected to red LED */
 #define PIO_LED_RED     PIO_PA17
@@ -39,7 +37,7 @@
 /** green LED pin definition */
 #define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
 /** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN
 /** index for red LED in LEDs pin definition array */
 #define LED_NUM_RED     0
 /** index for green LED in LEDs pin definition array */
--- a/firmware/libboard/qmod/include/card_pres.h
+++ b/firmware/libboard/qmod/include/card_pres.h
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/qmod/include/i2c.h
+++ b/firmware/libboard/qmod/include/i2c.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/qmod/include/wwan_led.h
+++ b/firmware/libboard/qmod/include/wwan_led.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/qmod/include/wwan_perst.h
+++ b/firmware/libboard/qmod/include/wwan_perst.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libboard/qmod/source/board_qmod.c
+++ b/firmware/libboard/qmod/source/board_qmod.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "simtrace.h"
@@ -78,27 +74,27 @@ static int write_hub_eeprom(void)
 	/* wait */
 	mdelay(100);

-	TRACE_INFO("Writing EEPROM...\n\r");
+	TRACE_INFO("Writing EEPROM...\r\n");
 	/* write the EEPROM once */
 	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int rc = eeprom_write_byte(0x50, i, __eeprom_bin[i]);
 		if (rc < 0) {
-			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
+			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\r\n",
 				i, __eeprom_bin[i]);
 			return 1;
 		}
 	}

 	/* then pursue re-reading it again and again */
-	TRACE_INFO("Verifying EEPROM...\n\r");
+	TRACE_INFO("Verifying EEPROM...\r\n");
 	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int byte = eeprom_read_byte(0x50, i);
-		TRACE_DEBUG("0x%02x: %02x\n\r", i, byte);
+		TRACE_DEBUG("0x%02x: %02x\r\n", i, byte);
 		if (byte != __eeprom_bin[i])
-			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r",
+			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\r\n",
 					i, __eeprom_bin[i], byte);
 	}
-	TRACE_INFO("EEPROM written\n\r");
+	TRACE_INFO("EEPROM written\r\n");

 	/* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is
 	 * again powering us up */
@@ -113,17 +109,17 @@ static int erase_hub_eeprom(void)
 	/* wait */
 	mdelay(100);

-	TRACE_INFO("Erasing EEPROM...\n\r");
+	TRACE_INFO("Erasing EEPROM...\r\n");
 	/* write the EEPROM once */
 	for (i = 0; i < 256; i++) {
 		int rc = eeprom_write_byte(0x50, i, 0xff);
 		if (rc < 0) {
-			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
+			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\r\n",
 				i, __eeprom_bin[i]);
 			return 1;
 		}
 	}
-	TRACE_INFO("EEPROM erased\n\r");
+	TRACE_INFO("EEPROM erased\r\n");

 	return 0;
 }
@@ -147,41 +143,41 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case 'O':
-		printf("Setting PRTPWR_OVERRIDE\n\r");
+		printf("Setting PRTPWR_OVERRIDE\r\n");
 		PIO_Set(&pin_hubpwr_override);
 		break;
 	case 'o':
-		printf("Clearing PRTPWR_OVERRIDE\n\r");
+		printf("Clearing PRTPWR_OVERRIDE\r\n");
 		PIO_Clear(&pin_hubpwr_override);
 		break;
 #if (ALLOW_PEER_ERASE > 0)
 	case 'H':
-		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
+		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\r\n");
 		PIO_Clear(&pin_hub_rst);
 		break;
 	case 'h':
 		/* high level drives transistor -> HUB_RESET low */
-		printf("Asserting _HUB_RESET -> HUB_RESET low (active)\n\r");
+		printf("Asserting _HUB_RESET -> HUB_RESET low (active)\r\n");
 		PIO_Set(&pin_hub_rst);
 		break;
 	case 'w':
 		if (PIO_GetOutputDataStatus(&pin_hub_rst) == 0)
-			printf("WARNING: attempting EEPROM access while HUB not in reset\n\r");
-		printf("Please enter EEPROM offset:\n\r");
+			printf("WARNING: attempting EEPROM access while HUB not in reset\r\n");
+		printf("Please enter EEPROM offset:\r\n");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("Please enter EEPROM value:\n\r");
+		printf("Please enter EEPROM value:\r\n");
 		UART_GetIntegerMinMax(&val, 0, 255);
-		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
+		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\r\n", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case 'r':
-		printf("Please enter EEPROM offset:\n\r");
+		printf("Please enter EEPROM offset:\r\n");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
+		printf("EEPROM[0x%02lx] = 0x%02x\r\n", addr, eeprom_read_byte(0x50, addr));
 		break;
 	default:
-		printf("Unknown command '%c'\n\r", ch);
+		printf("Unknown command '%c'\r\n", ch);
 		break;
 	}
 }
@@ -198,93 +194,93 @@ void board_exec_dbg_cmd(int ch)

 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
-		printf("\tl\tswitch off LED 1\n\r");
-		printf("\tL\tswitch off LED 1\n\r");
-		printf("\tg\tswitch off LED 2\n\r");
-		printf("\tG\tswitch off LED 2\n\r");
+		printf("\t?\thelp\r\n");
+		printf("\tR\treset SAM3\r\n");
+		printf("\tl\tswitch off LED 1\r\n");
+		printf("\tL\tswitch off LED 1\r\n");
+		printf("\tg\tswitch off LED 2\r\n");
+		printf("\tG\tswitch off LED 2\r\n");
 		if (qmod_sam3_is_12()) {
 #if (ALLOW_PEER_ERASE > 0)
-			printf("\tE\tprogram EEPROM\n\r");
-			printf("\te\tErase EEPROM\n\r");
+			printf("\tE\tprogram EEPROM\r\n");
+			printf("\te\tErase EEPROM\r\n");
 #endif /* ALLOW_PEER_ERASE */
-			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
-			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
+			printf("\tO\tEnable PRTPWR_OVERRIDE\r\n");
+			printf("\to\tDisable PRTPWR_OVERRIDE\r\n");
 #if (ALLOW_PEER_ERASE > 0)
-			printf("\tH\tRelease HUB RESET (high)\n\r");
-			printf("\th\tAssert HUB RESET (low)\n\r");
-			printf("\tw\tWrite single byte in EEPROM\n\r");
+			printf("\tH\tRelease HUB RESET (high)\r\n");
+			printf("\th\tAssert HUB RESET (low)\r\n");
+			printf("\tw\tWrite single byte in EEPROM\r\n");
 #endif /* ALLOW_PEER_ERASE */
-			printf("\tr\tRead single byte from EEPROM\n\r");
+			printf("\tr\tRead single byte from EEPROM\r\n");
 		}
-		printf("\tX\tRelease peer SAM3 from reset\n\r");
-		printf("\tx\tAssert peer SAM3 reset\n\r");
+		printf("\tX\tRelease peer SAM3 from reset\r\n");
+		printf("\tx\tAssert peer SAM3 reset\r\n");
 #if (ALLOW_PEER_ERASE > 0)
-		printf("\tY\tRelease peer SAM3 ERASE signal\n\r");
-		printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r");
-		printf("\ty\tAssert peer SAM3 ERASE signal\n\r");
+		printf("\tY\tRelease peer SAM3 ERASE signal\r\n");
+		printf("\ta\tAllow asserting peer SAM3 ERASE signal\r\n");
+		printf("\ty\tAssert peer SAM3 ERASE signal\r\n");
 #endif /* ALLOW_PEER_ERASE */
-		printf("\tU\tProceed to USB Initialization\n\r");
-		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
-		printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r");
-		printf("\t!\tSwitch Channel A from physical -> remote\n\r");
-		printf("\t@\tSwitch Channel B from physical -> remote\n\r");
-		printf("\tt\t(pseudo)talloc report\n\r");
+		printf("\tU\tProceed to USB Initialization\r\n");
+		printf("\t1\tGenerate 1ms reset pulse on WWAN1\r\n");
+		printf("\t2\tGenerate 1ms reset pulse on WWAN2\r\n");
+		printf("\t!\tSwitch Channel A from physical -> remote\r\n");
+		printf("\t@\tSwitch Channel B from physical -> remote\r\n");
+		printf("\tt\t(pseudo)talloc report\r\n");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\n\r");
+		printf("Asking NVIC to reset us\r\n");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	case 'l':
 		led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
-		printf("LED 1 switched off\n\r");
+		printf("LED 1 switched off\r\n");
 		break;
 	case 'L':
 		led_blink(LED_GREEN, BLINK_ALWAYS_ON);
-		printf("LED 1 switched on\n\r");
+		printf("LED 1 switched on\r\n");
 		break;
 	case 'g':
 		led_blink(LED_RED, BLINK_ALWAYS_OFF);
-		printf("LED 2 switched off\n\r");
+		printf("LED 2 switched off\r\n");
 		break;
 	case 'G':
 		led_blink(LED_RED, BLINK_ALWAYS_ON);
-		printf("LED 2 switched on\n\r");
+		printf("LED 2 switched on\r\n");
 		break;
 	case 'X':
-		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
+		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\r\n");
 		PIO_Clear(&pin_peer_rst);
 		break;
 	case 'x':
-		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
+		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\r\n");
 		PIO_Set(&pin_peer_rst);
 		break;
 #if (ALLOW_PEER_ERASE > 0)
 	case 'Y':
-		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
+		printf("Clearing SIMTRACExx_ERASE (inactive)\r\n");
 		PIO_Clear(&pin_peer_erase);
 		break;
 	case 'a':
-		printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");
+		printf("Asserting SIMTRACExx_ERASE allowed on next command\r\n");
 		allow_erase = true;
 		break;
 	case 'y':
 		if (allow_erase) {
-			printf("Setting SIMTRACExx_ERASE (active)\n\r");
+			printf("Setting SIMTRACExx_ERASE (active)\r\n");
 			PIO_Set(&pin_peer_erase);
 		} else {
-			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
+			printf("Please first allow setting SIMTRACExx_ERASE\r\n");
 		}
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case '1':
-		printf("Resetting Modem 1 (of this SAM3)\n\r");
+		printf("Resetting Modem 1 (of this SAM3)\r\n");
 		wwan_perst_do_reset_pulse(0, 300);
 		break;
 	case '2':
-		printf("Resetting Modem 2 (of this SAM3)\n\r");
+		printf("Resetting Modem 2 (of this SAM3)\r\n");
 		wwan_perst_do_reset_pulse(1, 300);
 		break;
 	case '!':
@@ -298,7 +294,7 @@ void board_exec_dbg_cmd(int ch)
 		break;
 	default:
 		if (!qmod_sam3_is_12())
-			printf("Unknown command '%c'\n\r", ch);
+			printf("Unknown command '%c'\r\n", ch);
 		else
 			board_exec_dbg_cmd_st12only(ch);
 		break;
@@ -339,9 +335,9 @@ void board_main_top(void)
 #endif

 	if (qmod_sam3_is_12()) {
-		TRACE_INFO("Detected Quad-Modem ST12\n\r");
+		TRACE_INFO("Detected Quad-Modem ST12\r\n");
 	} else {
-		TRACE_INFO("Detected Quad-Modem ST34\n\r");
+		TRACE_INFO("Detected Quad-Modem ST34\r\n");
 #ifndef APPLICATION_dfu
 		/* make sure we use the second set of USB Strings
 		 * calling the interfaces "Modem 3" and "Modem 4" rather
--- a/firmware/libboard/qmod/source/card_pres.c
+++ b/firmware/libboard/qmod/source/card_pres.c
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include <osmocom/core/timer.h>
 #include "board.h"
--- a/firmware/libboard/qmod/source/i2c.c
+++ b/firmware/libboard/qmod/source/i2c.c
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include <stdbool.h>
--- a/firmware/libboard/qmod/source/sim_switch.c
+++ b/firmware/libboard/qmod/source/sim_switch.c
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "trace.h"
@@ -40,7 +36,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		sim_switch_init();
 	}

-	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
+	TRACE_INFO("Modem %d: %s SIM\r\n", nr,
 		   physical ? "physical" : "virtual");

 	switch (nr) {
@@ -57,7 +53,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		break;
 #endif
 	default:
-		TRACE_ERROR("Invalid SIM%u\n\r", nr);
+		TRACE_ERROR("Invalid SIM%u\r\n", nr);
 		return -1;
 	}

--- a/firmware/libboard/qmod/source/wwan_led.c
+++ b/firmware/libboard/qmod/source/wwan_led.c
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 /* Depending on the board this is running on,  it might be possible
 * for the controller to read the status of the WWAN LED output lines of
--- a/firmware/libboard/qmod/source/wwan_perst.c
+++ b/firmware/libboard/qmod/source/wwan_perst.c
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 /* Depending on the board this is running on,  it might be possible
 * for the controller to set the status of the PERST input line of
--- a/firmware/libboard/sam3p256/include/board.h
+++ b/firmware/libboard/sam3p256/include/board.h
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once
 #include "board_common.h"
@@ -135,11 +131,6 @@
 #define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 #endif

-/** Pin configuration to control USB pull-up on D+
- *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
- */
-#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
 /** USB definitions */
 /* OpenMoko SIMtrace 2 USB vendor ID */
 #define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
--- a/firmware/libboard/sam3p256/source/board_sam3p256.c
+++ b/firmware/libboard/sam3p256/source/board_sam3p256.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "simtrace.h"
@@ -28,16 +24,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
+		printf("\t?\thelp\r\n");
+		printf("\tR\treset SAM3\r\n");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\n\r");
+		printf("Asking NVIC to reset us\r\n");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\n\r", ch);
+		printf("Unknown command '%c'\r\n", ch);
 		break;
 	}
 }
@@ -61,7 +57,7 @@ int board_override_enter_dfu(void)
 	/* Enter DFU bootloader in case the respective button is pressed */
 	if (PIO_Get(&bl_sw_pin) == 0) {
 		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
+		//printf("BOOTLOADER switch pressed -> Force DFU\r\n");
 		return 1;
 	} else
 		return 0;
--- a/firmware/libboard/simtrace/include/board.h
+++ b/firmware/libboard/simtrace/include/board.h
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once
 #include "board_common.h"
@@ -40,7 +36,7 @@
 /** green LED pin definition */
 #define PIN_LED_GREEN   {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
 /** LEDs pin definition */
-#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN 
+#define PINS_LEDS       PIN_LED_RED, PIN_LED_GREEN
 /** index for red LED in LEDs pin definition array */
 #define LED_NUM_RED     0
 /** index for green LED in LEDs pin definition array */
@@ -134,11 +130,6 @@
 /* SPI flash write protect pin (active low, pulled low) */
 #define PIN_SPI_WP    {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}

-/** Pin configuration to control USB pull-up on D+
- *  @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high
- */
-#define PIN_USB_PULLUP  {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-
 /** USB definitions */
 /* OpenMoko SIMtrace 2 USB vendor ID */
 #define BOARD_USB_VENDOR_ID	USB_VENDOR_OPENMOKO
--- a/firmware/libboard/simtrace/source/board_simtrace.c
+++ b/firmware/libboard/simtrace/source/board_simtrace.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "simtrace.h"
@@ -28,16 +24,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\n\r");
-		printf("\tR\treset SAM3\n\r");
+		printf("\t?\thelp\r\n");
+		printf("\tR\treset SAM3\r\n");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\n\r");
+		printf("Asking NVIC to reset us\r\n");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\n\r", ch);
+		printf("Unknown command '%c'\r\n", ch);
 		break;
 	}
 }
@@ -61,7 +57,7 @@ int board_override_enter_dfu(void)
 	/* Enter DFU bootloader in case the respective button is pressed */
 	if (PIO_Get(&bl_sw_pin) == 0) {
 		/* do not print to early since the console is not initialized yet */
-		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
+		//printf("BOOTLOADER switch pressed -> Force DFU\r\n");
 		return 1;
 	} else
 		return 0;
--- a/firmware/libboard/simtrace/source/sim_switch.c
+++ b/firmware/libboard/simtrace/source/sim_switch.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "trace.h"
@@ -32,7 +28,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		return -1;
 	}

-	TRACE_INFO("Modem %u: %s SIM\n\r", nr, physical ? "physical" : "virtual");
+	TRACE_INFO("Modem %u: %s SIM\r\n", nr, physical ? "physical" : "virtual");

 	if (physical) {
 		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
--- a/firmware/libcommon/include/assert.h
+++ b/firmware/libcommon/include/assert.h
@@ -89,11 +89,11 @@
 		/// \param condition  Condition to verify.
 		#define ASSERT(condition)  { \
 			if (!(condition)) { \
-				printf_sync("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
+				printf_sync("-F- ASSERT: %s %s:%d\r\n", #condition, __BASE_FILE__, __LINE__); \
 				while (1); \
 			} \
 		}
-		#define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
+		#define SANITY_ERROR            "Sanity check failed at %s:%d\r\n"
 	
 		/// Performs the same duty as the ASSERT() macro, except a default error
 		/// message is output if the condition is false.
--- a/firmware/libcommon/include/card_emu.h
+++ b/firmware/libcommon/include/card_emu.h
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libcommon/include/iso7816_fidi.h
+++ b/firmware/libcommon/include/iso7816_fidi.h
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libcommon/include/llist_irqsafe.h
+++ b/firmware/libcommon/include/llist_irqsafe.h
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libcommon/include/ringbuffer.h
+++ b/firmware/libcommon/include/ringbuffer.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #ifndef SIMTRACE_RINGBUF_H
 #define SIMTRACE_RINGBUF_H
--- a/firmware/libcommon/include/simtrace.h
+++ b/firmware/libcommon/include/simtrace.h
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #ifndef SIMTRACE_H
 #define SIMTRACE_H
--- a/firmware/libcommon/include/simtrace_prot.h
+++ b/firmware/libcommon/include/simtrace_prot.h
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libcommon/include/simtrace_usb.h
+++ b/firmware/libcommon/include/simtrace_usb.h
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 /* SIMtrace USB IDs */
 #define USB_VENDOR_OPENMOKO			0x1d50
@@ -26,6 +22,7 @@
 #define USB_PRODUCT_SIMTRACE2_DFU	0x60e3	/* was 0x60e2 */
 #define USB_PRODUCT_SIMTRACE2		0x60e3
 #define USB_PRODUCT_OCTSIMTEST		0x616d
+#define USB_PRODUCT_NGFF_CARDEM		0x616e

 /* USB proprietary class */
 #define USB_CLASS_PROPRIETARY			0xff
--- a/firmware/libcommon/include/talloc.h
+++ b/firmware/libcommon/include/talloc.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libcommon/include/usb_buf.h
+++ b/firmware/libcommon/include/usb_buf.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libcommon/include/utils.h
+++ b/firmware/libcommon/include/utils.h
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #pragma once

--- a/firmware/libcommon/source/card_emu.c
+++ b/firmware/libcommon/source/card_emu.c
@@ -12,10 +12,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include <stdio.h>
 #include <assert.h>
@@ -268,24 +264,24 @@ struct msgb *usb_buf_alloc_st(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
 		if (!msg) { // allocation failed, we might be out of memory
 			struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
 			if (!bep) {
-				TRACE_ERROR("ep %u: %s queue does not exist\n\r",
+				TRACE_ERROR("ep %u: %s queue does not exist\r\n",
 				            ep, __func__);
 				return NULL;
 			}
 			if (llist_empty(&bep->queue)) {
-				TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\n\r",
+				TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\r\n",
 				            ep, __func__);
 				return NULL;
 			}
 			msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
 			if (!msg) {
-				TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r",
+				TRACE_ERROR("ep %u: %s no msg in non-empty queue\r\n",
 				            ep, __func__);
 				return NULL;
 			}
 			usb_buf_free(msg);
 			msg = NULL;
-			TRACE_DEBUG("ep %u: %s queue msg dropped\n\r",
+			TRACE_DEBUG("ep %u: %s queue msg dropped\r\n",
 			            ep, __func__);
 		}
 	}
@@ -317,7 +313,7 @@ static void flush_rx_buffer(struct card_handle *ch)
 	rd = (struct cardemu_usb_msg_rx_data *) msg->l2h;
 	rd->data_len = msgb_l2len(msg) - sizeof(*rd);

-	TRACE_INFO("%u: %s (%u)\n\r",
+	TRACE_DEBUG("%u: %s (%u)\r\n",
 			ch->num, __func__, rd->data_len);

 	usb_buf_upd_len_and_submit(msg);
@@ -464,11 +460,11 @@ static void card_set_state(struct card_handle *ch,
 static int tx_byte_atr(struct card_handle *ch)
 {
 	if (NULL == ch) {
-		TRACE_ERROR("ATR TX: no card handle provided\n\r");
+		TRACE_ERROR("ATR TX: no card handle provided\r\n");
 		return 0;
 	}
 	if (ISO_S_IN_ATR != ch->state) {
-		TRACE_ERROR("%u: ATR TX: no in ATR state\n\r", ch->num);
+		TRACE_ERROR("%u: ATR TX: no in ATR state\r\n", ch->num);
 		return 0;
 	}

@@ -816,7 +812,7 @@ static void send_tpdu_header(struct card_handle *ch)
 	struct cardemu_usb_msg_rx_data *rd;
 	uint8_t *cur;

-	TRACE_INFO("%u: %s: %02x %02x %02x %02x %02x\r\n",
+	TRACE_DEBUG("%u: %s: %02x %02x %02x %02x %02x\r\n",
 			ch->num, __func__,
 			ch->tpdu.hdr[0], ch->tpdu.hdr[1],
 			ch->tpdu.hdr[2], ch->tpdu.hdr[3],
@@ -922,6 +918,7 @@ static int tx_byte_tpdu(struct card_handle *ch)
 	byte = msgb_pull_u8(msg);

 	card_emu_uart_tx(ch->uart_chan, byte);
+	card_emu_uart_reset_wt(ch->uart_chan);

 	/* this must happen _after_ the byte has been transmitted */
 	switch (ch->tpdu.state) {
@@ -1177,7 +1174,7 @@ int card_emu_set_atr(struct card_handle *ch, const uint8_t *atr, uint8_t len)
 	for (i = 0; i < ch->atr.len; i++) {
 		TRACE_INFO_WP("%02x ", atr[i]);
 	}
-	TRACE_INFO_WP("\n\r");
+	TRACE_INFO_WP("\r\n");
 #endif
 	/* FIXME: race condition with transmitting ATR to reader? */

--- a/firmware/libcommon/source/cciddriver.c
+++ b/firmware/libcommon/source/cciddriver.c
@@ -184,7 +184,7 @@ static void RDRtoPCDatablock_ATR( void )
 	if( length > 5 ) {
 		ccidDriver.ProtocolDataStructure[1] = Atr[3]&0x0F; // TD(1)
 		ccidDriver.bProtocol = Atr[3]&0x0F;           // TD(1)
-		TRACE_INFO("Protocol data structure: 0x%x\n\r",
+		TRACE_INFO("Protocol data structure: 0x%x\r\n",
 					    ccidDriver.ProtocolDataStructure[1]);
 	}

@@ -367,7 +367,7 @@ static void PCtoRDRIccPowerOn( void )
 	// for emulation only //JCB 
 	if ( ccidDriver.sCcidCommand.bSpecific_0 != VOLTS_5_0 ) {

-		TRACE_ERROR("POWER_NOT_SUPPORTED\n\r");
+		TRACE_ERROR("POWER_NOT_SUPPORTED\r\n");
 	}

 	else {
@@ -428,7 +428,7 @@ static void PCtoRDRXfrBlock( void )
 	uint16_t msglen = 0;
 	uint32_t ret;

-	TRACE_DEBUG("PCtoRDRXfrBlock\n\r");
+	TRACE_DEBUG("PCtoRDRXfrBlock\r\n");

 	// Check the block length
 	if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) {
@@ -439,7 +439,7 @@ static void PCtoRDRXfrBlock( void )
 	// check bBWI
 	else if ( 0 != ccidDriver.sCcidCommand.bSpecific_0 ) {

-		 TRACE_ERROR("Bad bBWI\n\r");
+		 TRACE_ERROR("Bad bBWI\r\n");
 	}
 	else {

@@ -463,16 +463,16 @@ static void PCtoRDRXfrBlock( void )
 				}
 				else {
 					if (ccidDriver.ProtocolDataStructure[1] == PROTOCOL_T1) {
-					    TRACE_DEBUG("Not supported T=1\n\r");
+					    TRACE_DEBUG("Not supported T=1\r\n");
 					}
 					else {
-					    TRACE_DEBUG("Not supported 0x%x\n\r", ccidDriver.ProtocolDataStructure[1]);
+					    TRACE_DEBUG("Not supported 0x%x\r\n", ccidDriver.ProtocolDataStructure[1]);
 					}
 				}
 				break;

 			case CCID_FEATURES_EXC_APDU:
-				TRACE_DEBUG("Not supported CCID_FEATURES_EXC_APDU\n\r");
+				TRACE_DEBUG("Not supported CCID_FEATURES_EXC_APDU\r\n");
 				break;

 			default:
@@ -482,7 +482,7 @@ static void PCtoRDRXfrBlock( void )
 	}

 	ccidDriver.sCcidMessage.wLength = msglen;
-	TRACE_DEBUG("USB: 0x%X, 0x%X, 0x%X, 0x%X, 0x%X\n\r", ccidDriver.sCcidMessage.abData[0], 
+	TRACE_DEBUG("USB: 0x%X, 0x%X, 0x%X, 0x%X, 0x%X\r\n", ccidDriver.sCcidMessage.abData[0], 
 					                                                ccidDriver.sCcidMessage.abData[1], 
 					                                                ccidDriver.sCcidMessage.abData[2], 
 					                                                ccidDriver.sCcidMessage.abData[3],
@@ -614,7 +614,7 @@ static void PCtoRDRSecure( void )
 {
 	TRACE_DEBUG(".");

-	TRACE_DEBUG("For user\n\r");
+	TRACE_DEBUG("For user\r\n");
 }

 //------------------------------------------------------------------------------
@@ -628,7 +628,7 @@ static void PCtoRDRSecure( void )
 static void PCtoRDRMechanical( void )
 {
 	TRACE_DEBUG(".");
-	TRACE_DEBUG("Not implemented\n\r");
+	TRACE_DEBUG("Not implemented\r\n");

 	RDRtoPCSlotStatus();
 }
@@ -682,7 +682,7 @@ static void vCCIDCommandNotSupported( void )
 	// Command not supported
 	// vCCIDReportError(CMD_NOT_SUPPORTED);

-	TRACE_DEBUG("CMD_NOT_SUPPORTED\n\r");
+	TRACE_DEBUG("CMD_NOT_SUPPORTED\r\n");

 	// Header fields settings
 	ccidDriver.sCcidMessage.bMessageType = RDR_TO_PC_SLOTSTATUS;
@@ -708,7 +708,7 @@ static void vCCIDSendResponse( void )
 					          ccidDriver.sCcidMessage.bSizeToSend, 0, 0 );
 	} while (bStatus != USBD_STATUS_SUCCESS);

-	TRACE_DEBUG("bStatus: 0x%x\n\r", bStatus);
+	TRACE_DEBUG("bStatus: 0x%x\r\n", bStatus);
 }


@@ -723,7 +723,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 		TRACE_ERROR("USB error: %d", status);
 		return;
 	}
-	TRACE_DEBUG("Command: 0x%X 0x%x 0x%X 0x%X 0x%X 0x%X 0x%X\n\r\n\r",
+	TRACE_DEBUG("Command: 0x%X 0x%x 0x%X 0x%X 0x%X 0x%X 0x%X\r\n\r\n",
 				   (unsigned int)ccidDriver.sCcidCommand.bMessageType,
 				   (unsigned int)ccidDriver.sCcidCommand.wLength,
 				   (unsigned int)ccidDriver.sCcidCommand.bSlot,
@@ -735,10 +735,10 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 	// Check the slot number
 	if ( ccidDriver.sCcidCommand.bSlot > 0 ) {

-		TRACE_ERROR("BAD_SLOT_NUMBER\n\r");
+		TRACE_ERROR("BAD_SLOT_NUMBER\r\n");
 	}

-	TRACE_INFO("typ=0x%X\n\r", ccidDriver.sCcidCommand.bMessageType);
+	TRACE_INFO("typ=0x%X\r\n", ccidDriver.sCcidCommand.bMessageType);

 	ccidDriver.sCcidMessage.bStatus = 0;

@@ -807,7 +807,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 			}
 			else {
 				// command not supported
-				TRACE_INFO("Not supported: PC_TO_RDR_T0APDU\n\r");
+				TRACE_INFO("Not supported: PC_TO_RDR_T0APDU\r\n");
 				vCCIDCommandNotSupported();
 			}
 			MessageToSend = 1;
@@ -834,7 +834,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 			break;

 		default:
-			TRACE_DEBUG("default: Not supported: 0x%X\n\r", ccidDriver.sCcidCommand.bMessageType);
+			TRACE_DEBUG("default: Not supported: 0x%X\r\n", ccidDriver.sCcidCommand.bMessageType);
 			vCCIDCommandNotSupported();
 			MessageToSend = 1;
 			break;
@@ -853,7 +853,7 @@ static void CCIDCommandDispatcher( void *pArg, uint8_t status, uint32_t transfer
 //------------------------------------------------------------------------------
 static void CCID_RequestHandler(const USBGenericRequest *pRequest)
 {
-	TRACE_DEBUG("CCID_RHl\n\r");
+	TRACE_DEBUG("CCID_RHl\r\n");

 	// Check if this is a class request
 	if (USBGenericRequest_GetType(pRequest) == USBGenericRequest_CLASS) {
@@ -862,23 +862,23 @@ static void CCID_RequestHandler(const USBGenericRequest *pRequest)
 		switch (USBGenericRequest_GetRequest(pRequest)) {

 			case CCIDGenericRequest_ABORT:
-				TRACE_DEBUG("CCIDGenericRequest_ABORT\n\r");
+				TRACE_DEBUG("CCIDGenericRequest_ABORT\r\n");
 				break;

 			case CCIDGenericRequest_GET_CLOCK_FREQUENCIES:
-				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_CLOCK_FREQUENCIES\n\r");
+				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_CLOCK_FREQUENCIES\r\n");
 				// A CCID with bNumClockSupported equal to 00h does not have 
 				// to support this request
 				break;

 			case CCIDGenericRequest_GET_DATA_RATES:
-				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_DATA_RATES\n\r");
+				TRACE_DEBUG("Not supported: CCIDGenericRequest_GET_DATA_RATES\r\n");
 				// A CCID with bNumDataRatesSupported equal to 00h does not have 
 				// to support this request.
 				break;

 			default:
-				TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request (%d)\n\r",
+				TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request (%d)\r\n",
 					                                USBGenericRequest_GetRequest(pRequest));
 				USBD_Stall(0);
 		}
@@ -892,7 +892,7 @@ static void CCID_RequestHandler(const USBGenericRequest *pRequest)
 	else {

 		// Unsupported request type
-		TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request type (%d)\n\r",
+		TRACE_WARNING( "CCIDDriver_RequestHandler: Unsupported request type (%d)\r\n",
 					                                USBGenericRequest_GetType(pRequest));
 		USBD_Stall(0);
 	}
@@ -921,7 +921,7 @@ void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
 void CCID_SmartCardRequest( void )
 {
 	unsigned char bStatus;
-	TRACE_DEBUG("CCID_req\n\r");
+	TRACE_DEBUG("CCID_req\r\n");

 	do {

--- a/firmware/libcommon/source/crcstub.c
+++ b/firmware/libcommon/source/crcstub.c
@@ -0,0 +1,86 @@
+/* SIMtrace 2 firmware crc stub
+ *
+ * (C) 2021 by sysmocom -s.f.m.c. GmbH, Author: Eric Wild <ewild@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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <stdint.h>
+#include "board.h"
+#include "core_cm3.h"
+#include "usb/device/dfu/dfu.h"
+
+/*
+* This file is a bit special, everything has to go to specific sections, and no globals are available.
+* No external functions may be called, unless inlining is enforced!
+*/
+
+static void crc_check_stub();
+__attribute__((section(".crcstub_table"))) volatile uint32_t crcstub_dummy_table[] = {
+	(uint32_t)0xdeadc0de, /* deliberately choose invalid value so unpatched image will not be started */
+	(uint32_t)crc_check_stub, /* must be valid flash addr */
+	(uint32_t)0xf1, /* crc value calculated by the host */
+	(uint32_t)0xf2, /* crc calc start address */
+	(uint32_t)0xf3 /* crc calc length (byte) */
+};
+
+__attribute__((section(".crcstub_code"))) static void do_crc32(int8_t c, uint32_t *crc_reg)
+{
+	int32_t i, mask;
+	*crc_reg ^= c;
+
+	for (unsigned int j = 0; j < 8; j++)
+		if (*crc_reg & 1)
+			*crc_reg = (*crc_reg >> 1) ^ 0xEDB88320;
+		else
+			*crc_reg = *crc_reg >> 1;
+}
+
+__attribute__((section(".crcstub_code"), noinline)) static void crc_check_stub()
+{
+	uint32_t crc_reg = 0xffffffff;
+	uint32_t expected_crc_val = crcstub_dummy_table[2];
+	uint8_t *crc_calc_startaddr = (uint8_t *)crcstub_dummy_table[3];
+	volatile uint32_t *actual_exc_tbl = (volatile uint32_t *)crc_calc_startaddr;
+	uint32_t crc_len = crcstub_dummy_table[4];
+
+	/* 4000ms wdt tickling */
+	WDT->WDT_MR = WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT | (((4000UL << 8) / 1000) << 16) |
+		      ((4000UL << 8) / 1000);
+
+	for (uint8_t *i = crc_calc_startaddr; i < crc_calc_startaddr + crc_len; i++)
+		do_crc32(*i, &crc_reg);
+
+	crc_reg = ~crc_reg;
+
+	if (crc_reg == expected_crc_val) {
+		/* this looks a bit awkward because we have to ensure the bx does not require a sp-relative load */
+		__asm__ volatile("\
+		mov r0, %0;\n\
+		mov r1, %1;\n\
+		MSR msp,r0;\n\
+		bx r1;"
+				 :
+				 : "r"(actual_exc_tbl[0]), "r"(actual_exc_tbl[1]));
+	} else {
+		/* no globals ! */
+		((struct dfudata *)0x20000000)->magic = USB_DFU_MAGIC;
+		__DSB();
+		for (;;) {
+			/* no functon call, since NVIC_SystemReset() might not be inlined! */
+			SCB->AIRCR = ((0x5FA << SCB_AIRCR_VECTKEY_Pos) | (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) |
+				      SCB_AIRCR_SYSRESETREQ_Msk);
+			__DSB();
+			while (1)
+				;
+		}
+	}
+}
--- a/firmware/libcommon/source/fputs.c
+++ b/firmware/libcommon/source/fputs.c
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include <stdio.h>
 #include "uart_console.h"
--- a/firmware/libcommon/source/host_communication.c
+++ b/firmware/libcommon/source/host_communication.c
@@ -9,10 +9,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include "board.h"
 #include "llist_irqsafe.h"
--- a/firmware/libcommon/source/iso7816_4.c
+++ b/firmware/libcommon/source/iso7816_4.c
@@ -92,7 +92,7 @@ uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart)
 	while( ((us_base->US_CSR & US_CSR_RXRDY) == 0) ) {
 	WDT_Restart(WDT);
 		if(timeout++ > 12000 * (BOARD_MCK/1000000)) {
-			TRACE_WARNING("TimeOut\n\r");
+			TRACE_WARNING("TimeOut\r\n");
 			return( 0 );
 		}
 	}
@@ -107,9 +107,9 @@ uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart)
 					                  (1<<10)));

 	if (status != 0 ) {
-		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", status); 
-		TRACE_DEBUG("R:0x%" PRIX32 "\n\r", us_base->US_CSR);
-		TRACE_DEBUG("Nb:0x%" PRIX32 "\n\r", us_base->US_NER );
+		TRACE_DEBUG("R:0x%" PRIX32 "\r\n", status); 
+		TRACE_DEBUG("R:0x%" PRIX32 "\r\n", us_base->US_CSR);
+		TRACE_DEBUG("Nb:0x%" PRIX32 "\r\n", us_base->US_NER );
 		us_base->US_CR = US_CR_RSTSTA;
 	}

@@ -159,11 +159,11 @@ uint32_t ISO7816_SendChar( uint8_t CharToSend, Usart_info *usart )

 	if (status != 0 ) {
 		TRACE_INFO("******* status: 0x%" PRIX32 " (Overrun: %" PRIX32
-					", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\n\r",
+					", NACK: %" PRIX32 ", Timeout: %" PRIX32 ", underrun: %" PRIX32 ")\r\n",
 					status, ((status & US_CSR_OVRE)>> 5), ((status & US_CSR_NACK) >> 13),
 					((status & US_CSR_TIMEOUT) >> 8), ((status & (1 << 10)) >> 10));
-		TRACE_INFO("E (USART CSR reg):0x%" PRIX32 "\n\r", us_base->US_CSR);
-		TRACE_INFO("Nb (Number of errors):0x%" PRIX32 "\n\r", us_base->US_NER );
+		TRACE_INFO("E (USART CSR reg):0x%" PRIX32 "\r\n", us_base->US_CSR);
+		TRACE_INFO("Nb (Number of errors):0x%" PRIX32 "\r\n", us_base->US_NER );
 		us_base->US_CR = US_CR_RSTSTA;
 	}

@@ -219,13 +219,13 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 	uint8_t cmdCase;
 	uint32_t status = 0;

-	TRACE_INFO("pAPDU[0]=0x%X\n\r",pAPDU[0]);
-	TRACE_INFO("pAPDU[1]=0x%X\n\r",pAPDU[1]);
-	TRACE_INFO("pAPDU[2]=0x%X\n\r",pAPDU[2]);
-	TRACE_INFO("pAPDU[3]=0x%X\n\r",pAPDU[3]);
-	TRACE_INFO("pAPDU[4]=0x%X\n\r",pAPDU[4]);
-	TRACE_INFO("pAPDU[5]=0x%X\n\r",pAPDU[5]);
-	TRACE_INFO("wlength=%d\n\r",wLength);
+	TRACE_INFO("pAPDU[0]=0x%X\r\n",pAPDU[0]);
+	TRACE_INFO("pAPDU[1]=0x%X\r\n",pAPDU[1]);
+	TRACE_INFO("pAPDU[2]=0x%X\r\n",pAPDU[2]);
+	TRACE_INFO("pAPDU[3]=0x%X\r\n",pAPDU[3]);
+	TRACE_INFO("pAPDU[4]=0x%X\r\n",pAPDU[4]);
+	TRACE_INFO("pAPDU[5]=0x%X\r\n",pAPDU[5]);
+	TRACE_INFO("wlength=%d\r\n",wLength);

 	ISO7816_SendChar( pAPDU[0], &usart_sim ); /* CLA */
 	ISO7816_SendChar( pAPDU[1], &usart_sim ); /* INS */
@@ -272,7 +272,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		}
 	}

-	TRACE_DEBUG("CASE=0x%X NeNc=0x%X\n\r", cmdCase, NeNc);
+	TRACE_DEBUG("CASE=0x%X NeNc=0x%X\r\n", cmdCase, NeNc);

 	/* Handle Procedure Bytes */
 	do {
@@ -280,20 +280,20 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		if (status != 0) {
 			return status;
 		}
-		TRACE_INFO("procByte: 0x%X\n\r", procByte);
+		TRACE_INFO("procByte: 0x%X\r\n", procByte);
 		/* Handle NULL */
 		if ( procByte == ISO_NULL_VAL ) {
-			TRACE_INFO("INS\n\r");
+			TRACE_INFO("INS\r\n");
 			continue;
 		}
 		/* Handle SW1 */
 		else if ( ((procByte & 0xF0) ==0x60) || ((procByte & 0xF0) ==0x90) ) {
-			TRACE_INFO("SW1\n\r");
+			TRACE_INFO("SW1\r\n");
 			SW1 = 1;
 		}
 		/* Handle INS */
 		else if ( pAPDU[1] == procByte) {
-			TRACE_INFO("HdlINS\n\r");
+			TRACE_INFO("HdlINS\r\n");
 			if (cmdCase == CASE2) {
 				/* receive data from card */
 				do {
@@ -317,14 +317,14 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		#pragma GCC diagnostic ignored "-Wsign-compare"
 		if ( pAPDU[1] == (procByte ^ 0xff)) {
 		#pragma GCC diagnostic pop
-			TRACE_INFO("HdlINS+\n\r");
+			TRACE_INFO("HdlINS+\r\n");
 			if (cmdCase == CASE2) {
 				/* receive data from card */
 				status = ISO7816_GetChar(&pMessage[indexMsg++], &usart_sim);
 				if (status != 0) {
 					return status;
 				}
-				TRACE_INFO("Rcv: 0x%X\n\r", pMessage[indexMsg-1]);
+				TRACE_INFO("Rcv: 0x%X\r\n", pMessage[indexMsg-1]);
 			}
 			else {
 				status = ISO7816_SendChar(pAPDU[indexApdu++], &usart_sim);
@@ -336,7 +336,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		}
 		else {
 			/* ?? */
-			TRACE_INFO("procByte=0x%X\n\r", procByte);
+			TRACE_INFO("procByte=0x%X\r\n", procByte);
 			break;
 		}
 	} while (NeNc != 0);
@@ -356,7 +356,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 		return status;
 	}

-	TRACE_WARNING("SW1=0x%X, SW2=0x%X\n\r", pMessage[indexMsg-2], pMessage[indexMsg-1]);
+	TRACE_WARNING("SW1=0x%X, SW2=0x%X\r\n", pMessage[indexMsg-2], pMessage[indexMsg-1]);

 	*retlen = indexMsg;
 	return status;
@@ -368,7 +368,7 @@ uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
 */
 void ISO7816_Escape( void )
 {
-	TRACE_DEBUG("For user, if needed\n\r");
+	TRACE_DEBUG("For user, if needed\r\n");
 }

 /**
@@ -376,7 +376,7 @@ void ISO7816_Escape( void )
 */
 void ISO7816_RestartClock( void )
 {
-	TRACE_DEBUG("ISO7816_RestartClock\n\r");
+	TRACE_DEBUG("ISO7816_RestartClock\r\n");
 	USART_SIM->US_BRGR = 13;
 }

@@ -385,7 +385,7 @@ void ISO7816_RestartClock( void )
 */
 void ISO7816_StopClock( void )
 {
-	TRACE_DEBUG("ISO7816_StopClock\n\r");
+	TRACE_DEBUG("ISO7816_StopClock\r\n");
 	USART_SIM->US_BRGR = 0;
 }

@@ -394,8 +394,8 @@ void ISO7816_StopClock( void )
 */
 void ISO7816_toAPDU( void )
 {
-	TRACE_DEBUG("ISO7816_toAPDU\n\r");
-	TRACE_DEBUG("Not supported at this time\n\r");
+	TRACE_DEBUG("ISO7816_toAPDU\r\n");
+	TRACE_DEBUG("Not supported at this time\r\n");
 }

 /**
@@ -549,26 +549,26 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 	uint32_t y;
 	uint8_t offset;

-	printf("\n\r");
-	printf("ATR: Answer To Reset:\n\r");
+	printf("\r\n");
+	printf("ATR: Answer To Reset:\r\n");
 	printf("TS = 0x%X Initial character ",pAtr[0]);
 	if( pAtr[0] == 0x3B ) {

-		printf("Direct Convention\n\r");
+		printf("Direct Convention\r\n");
 	}
 	else {
 		if( pAtr[0] == 0x3F ) {

-			printf("Inverse Convention\n\r");
+			printf("Inverse Convention\r\n");
 		}
 		else {
-			printf("BAD Convention\n\r");
+			printf("BAD Convention\r\n");
 		}
 	}

-	printf("T0 = 0x%X Format caracter\n\r",pAtr[1]);
-	printf("    Number of historical bytes: K = %d\n\r", pAtr[1]&0x0F);
-	printf("    Presence further interface byte:\n\r");
+	printf("T0 = 0x%X Format caracter\r\n",pAtr[1]);
+	printf("    Number of historical bytes: K = %d\r\n", pAtr[1]&0x0F);
+	printf("    Presence further interface byte:\r\n");
 	if( pAtr[1]&0x80 ) {
 		printf("TA ");
 	}
@@ -582,7 +582,7 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 		printf("TD ");
 	}
 	if( pAtr[1] != 0 ) {
-		printf(" present\n\r");
+		printf(" present\r\n");
 	}

 	i = 2;
@@ -598,11 +598,11 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 				printf("FI = %d ", (pAtr[i]>>8));
 				printf("DI = %d", (pAtr[i]&0x0F));
 			}
-			printf("\n\r");
+			printf("\r\n");
 			i++;
 		}
 		if (y & 0x20) {  /* TB[i] */
-			printf("TB[%d] = 0x%X\n\r", offset, pAtr[i]);
+			printf("TB[%d] = 0x%X\r\n", offset, pAtr[i]);
 			i++;
 		}
 		if (y & 0x40) {  /* TC[i] */
@@ -610,11 +610,11 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 			if( offset == 1 ) {
 				printf("Extra Guard Time: N = %d", pAtr[i]);
 			}
-			printf("\n\r");
+			printf("\r\n");
 			i++;
 		}
 		if (y & 0x80) {  /* TD[i] */
-			printf("TD[%d] = 0x%X\n\r", offset, pAtr[i]);
+			printf("TD[%d] = 0x%X\r\n", offset, pAtr[i]);
 			y =  pAtr[i++] & 0xF0;
 		}
 		else {
@@ -624,13 +624,13 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
 	}

 	/* Historical Bytes */
-	printf("Historical bytes:\n\r");
+	printf("Historical bytes:\r\n");
 	y = pAtr[1] & 0x0F;
 	for( j=0; j < y; j++ ) {
 		printf(" 0x%X", pAtr[i]);
 		i++;
 	}
-	printf("\n\r\n\r");
+	printf("\r\n\r\n");

 }

@@ -645,7 +645,7 @@ void ISO7816_Set_Reset_Pin(const Pin *pPinIso7816RstMC) {
 void ISO7816_Init( Usart_info *usart, bool master_clock )
 {
 	uint32_t clk;
-	TRACE_DEBUG("ISO_Init\n\r");
+	TRACE_DEBUG("ISO_Init\r\n");

 	Usart *us_base = usart->base;
 	uint32_t us_id = usart->id;
--- a/firmware/libcommon/source/iso7816_fidi.c
+++ b/firmware/libcommon/source/iso7816_fidi.c
@@ -11,10 +11,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 */
 #include <stdint.h>
 #include <errno.h>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Couzens	87f8de15b4	fix newline \n\r with \r\n	2022-01-24 11:44:35 +01:00
Alexander Couzens	7674b08519	reduce debugging output on the serial	2022-01-24 10:58:51 +01:00
James Tavares	ea9a91f5ce	gitignore: add missing entries binaries Add missing entries for simtrace2-tool, crctool, and host/tests Change-Id: I23f4b387f220146bccf7d723cc773a72d8e17a65	2022-01-11 17:09:38 +00:00
James Tavares	91a93bc5de	firmware: add definition for main osc bypass when using external osc Add new board.h definition BOARD_MAINOSC_BYPASS to configure the clock module to use an external oscillator rather than a crystal. The qmod board is one such board. Change-Id: If62f55cd4c8b0cf758534f09d25a9bcb028814a7	2022-01-11 13:10:34 +00:00
James Tavares	aeaf12853e	simtrace2-tool: add "modem sim-card (insert\|remove)" command Add a new command to request that the simtrace2 firmware manipulate the card detect signal, causing the downstream cellular modem to believe that the SIM card has been inserted or removed, respectfully. Change-Id: I8c79eb29379a789d9d0d21495e30d66ddbdfb022	2022-01-10 18:06:45 -05:00
Eric Wild	7fde63b7c6	wireshark lua dissector: dissect more Change-Id: If81812b6330205a65c1c9b7d4240094b71f3c757	2021-12-15 14:10:19 +00:00
Eric Wild	cb655f9774	firmware: add crc stub to all dfu apps to ensure reliable loading DFU flashing of apps sometimes aborts, and although rare this leads to broken devices if no boot button or serial/jtag access exists, because the bootloader will keep trying to start a half-flashed app that then crashes at some point. The easiest fix that works with existing bootloaders is to prepend a small 512 byte stub that calculcates the crc and compares it with the crc calculated at build time, and then either starts the actual app, or sets the dfu flag and resets. This ensures we either have a working, running app, or end up in the bootloader, ready to flash again. For obvious reasons this only applies to dfu apps, and not to flash targets like the actual bootloader itself. Change-Id: Id6df0486c8b779889d21800dc2441b3aa9af8a5f	2021-12-15 14:04:20 +00:00
Oliver Smith	f721e69bc1	treewide: remove FSF address Remove the paragraph about writing to the Free Software Foundation's mailing address. The FSF has changed addresses in the past, and may do so again. In 2021 this is not useful, let's rather have a bit less boilerplate at the start of source files. Change-Id: Ie0a3b2273383adbb3303faffd6ff96be7f4cae99	2021-12-14 11:47:21 +01:00
Oliver Smith	8dada9b454	host/contrib/simtrace2.spec.in: update Apply various improvements from Martin Hauke, thanks! * Put sover into a variable * Sync BuildRequires with configure.ac * Update libosmo-simtrace2 summary * Use %make_build instead of make %{?_smp_mflags} Change-Id: I35ce3865702f72365b38b0eaa8b28f332dabcd1f	2021-12-10 14:50:18 +01:00
Oliver Smith	afd23660b3	Bump version: 0.8.0.1-8281 → 0.8.1 Change-Id: I6bcc798db9f4ab2b91711daebeba98abebd55e92	2021-12-10 10:04:28 +01:00
Oliver Smith	24a9ee8ae6	host/contrib/simtrace2.spec.in: fix soname Adjust the soname in the rpm recipe too, to fix: error: File not found: /home/abuild/rpmbuild/BUILDROOT/simtrace2-0.8.0.202112100026-1.1.x86_64/usr/lib64/libosmo-simtrace2.so.0* Change-Id: I748f44409ac736abbd5c18e31ae02d025dee2c77	2021-12-10 10:04:13 +01:00
Harald Welte	45a8f2beee	Bump version: 0.7.0.166-61b4-dirty → 0.8.0 Change-Id: I1650f7181cf514ba00e6f70e8133ee88780ebf41	2021-12-09 08:12:56 +01:00
Harald Welte	155c237504	host: Upgrade libosmocore dependency to 1.4.0 1.4.0 contains the most recent changes to libosmousb, so let's use that as a minimum basis. Change-Id: Ia44377cd6a8d7998c6995a3f89adb22cdc675601	2021-12-09 08:05:58 +01:00
Eric Wild	61b4aad46f	firmware: remove dfu-dfu default target It's useless, since blupdate does the same thing, just much faster and easier. Change-Id: I86dddfacea2e35f4d5a7f23ee4b3d12e3f1d35f1	2021-11-24 17:22:01 +00:00
Eric Wild	23125d05f7	jenkins: build bootloader updater Change-Id: I8b2023921a67b0e8945d8f24e4c8076de3e12acf	2021-11-02 10:50:36 +00:00
Eric Wild	7ac85188f4	firmware: add missing usb strings to blupdate that prevented building it Change-Id: I8d0d9bf98748d475427d9b0c78f2e0532ee4bca1	2021-11-02 09:54:55 +00:00
Eric Wild	23eb56319c	add our default clang-format file Change-Id: I77aab70400bdbb46cbdd83e428e2a28ebf29b8dd	2021-11-01 14:35:14 +01:00
Eric Wild	c85f52d5d5	firmware: drop cref printing No one reads this, no one wants to know this. Change-Id: Ie2281e207164f82d8ee29bd596a5593c22aaf198	2021-11-01 14:35:14 +01:00
Eric Wild	a079e2b4ee	firmware: increase reset delay before usb reattach The previous value was way too low and led to reenumeration issues when switching from app to bl because the hosts are fairly lenient and feature long delays until they accept disappearing devices as gone for good instead of ignoring a presuambly flaky usb cable or connection. Related: SYS5061 Change-Id: I9b8c8bf794ad5b94fc7ea2a01d1ebf4e36862c36	2021-11-01 14:35:14 +01:00
Eric Wild	f83d42ce51	firmware: remove usb pullup that dates back to simtrace1 All the parts are DNP and never existed on the simtrace2 with sam3; the sam3 has internal pullups that are part of the usb peripheral. Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d	2021-11-01 14:35:14 +01:00
Eric Wild	a7e306f745	firmware: add bootloader update "app" This bl updater can be flashed as app and will update the bootloader and then delete itself before resetting the sam3, so the device will end up in the newly updated dfu bootloader afterwards, without having to press the bootloader button or requring any other manual interaction, ready to receive a new application image. Building the blupdater requires a previously built dfu-flash bootloader bin file that will then be embedded into the app during building. Related: OS#1704 Related: SYS5061 Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3	2021-11-01 12:03:38 +00:00
Harald Welte	020edca678	cardem-pcsc: Fix return of uninitialized variable Fixes: CID#240740 Change-Id: I97431f491f60e2a6537502ef88042907723b7de6	2021-10-25 08:12:08 +02:00
Eric Wild	17bfa5273f	fix bootloader led config crash This led to occasional crashes for targets with leds since it was introduced 3 years ago The interesting thing is that most of the time it didn't crash... Change-Id: Ia6a1b1fc0e44a301b4fb1d9c9fdbc27d61dcab97	2021-10-20 20:03:06 +02:00
Eric Wild	a65fb1e319	clang build support Supposed to be used with https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm + distro provided binutils-arm-none-eabi package, might provide better and more reliable binary sizes, especially for the bootloader. Just run USE_CLANG=1 make Change-Id: I1a19f40d44797efad5c46121e73115ed738a095b	2021-10-20 20:03:06 +02:00
Eric Wild	af6ae8b8dd	drop unused exidx sections when linking clang might emit those even though they are neither needed or wanted, so just get rid of them. Change-Id: I159b4405cebe72af4d98b27f876c48835ffd6e2d	2021-10-20 20:03:06 +02:00
Eric Wild	90784220a5	add the ngff cardem to default build targets Change-Id: Icec4966fe419eee9f7ace67e46e3d88738812b38	2021-10-20 20:03:06 +02:00
Harald Welte	651050922a	simtrace2-tool: Initialize logging to avoid error on first log output This avoids ERROR: osmo_log_info == NULL! You must call log_init() before using logging in log_check_level() Change-Id: Id355ef33e10164f8e8eb40c2fd0b606bc8e9b6f7	2021-10-06 21:10:44 +02:00
Harald Welte	5b7a608277	simtrace2-cardem-pcsc: Remove double libusb initialization This code already calls osmo_libusb_init further above in the top of the main() function, so there's no use of calling libusb_init() directly in the same function lines below. Change-Id: I2e0c7446aaa644c5aae1059ce91ff9f729903cbc	2021-10-06 21:06:21 +02:00
Harald Welte	e304015b3c	Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}() We use other osmo_libusb_* functions later in the code, so it is best to initialize the library via libosmousb, and not directly. Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c	2021-10-06 21:06:06 +02:00
Harald Welte	19ccc209c1	jenkins.sh: Build 'trace' firmware for ngff_cardem Let's create and publish binary builds for 'trace' on BOARD=ngff_carde. According to SYS#5525 this is verified working since two months ago, so there's no reason to withhold the binary builds for it. Change-Id: I8a98002ef5aa58e5a3d49627323fe11505508bc8 Related: SYS#5525	2021-10-06 21:01:14 +02:00
Eric Wild	5e82a2a1c6	Revert "firmware: data sections" This reverts commit `e6a76c7bf4`. Might or might not cause weird issues depending on gcc and binutils versions, let's see if this helps. Change-Id: I2f593fd5e0f1494aae6b9fcfb2160a6c9168f5b8	2021-10-04 18:05:45 +02:00
Eric Wild	301aec51f7	contrib/jenkins.sh: lower trace to make bl fit We keep running out of rom space, so reduce tracing to nothing for alle dfu targets, and let's hope newer gcc versions stop producing more code... Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e	2021-10-04 15:07:44 +00:00
Eric Wild	1f75e3881c	contrib: allow manually forcing bulk simtrace dissection Change-Id: I5fcfe3c221b87b02e21c857ac51d0392c3b4de3c	2021-08-09 15:18:59 +02:00
Eric Wild	5beffa5d91	contrib/jenkins.sh: build ngff_Cardem dfu bootloader It does fit with some compiler versions, while others overflow the bl region, so just reduce the trace level a bit to make it fits all the time. Change-Id: I168a847da8dfc585aaeef0030f95fc225a713147	2021-08-09 12:45:13 +02:00
Harald Welte	3092721729	contrib/jenkins.sh: Build APP=cardem for BOARD=ngff_cardem This makes sure downloads.osmocom.org will get cardem images for the new ngff_cardem board. The dfu loader was not enabled as it currently overflows the ROM region by 200 bytes, see OS#5210. Change-Id: Id2b7925c823fb19f880e06a205764d2b19de4ad4 Related: OS#5210	2021-08-08 21:31:03 +02:00
Eric Wild	7ca68359f3	cardem: fix spurious NULL bytes during transfers The "wait time extension timer" was apparently not being reset during normal tx operations, which led to occasional NULL (0x60) bytes getting injected into transfers, which in turn led to more tx bytes than what the reader side expects... The odd thing is that this was only noticeable with high baud rates, probably due to the very long default WT of 9600 ETU, and even then only because it led to weird ngff modem resets after benign transfers. Change-Id: I15b0b83b7d93b8e5589f3640bd6eb2fc82f93394 Related: SYS#5553	2021-08-08 04:14:38 +02:00
Harald Welte	a951c4ae02	simtrace2.spec: Add simtrace2-tool binary to package This fixes RPM build issues reported as [ 59s] error: Installed (but unpackaged) file(s) found: [ 59s] /usr/bin/simtrace2-tool Change-Id: I1fd5980a686652afb47cd1c30e12919de626aec7	2021-08-03 09:02:34 +02:00
Eric Wild	d1d504bfa5	firmware: trace for ngff Change-Id: Iee1eedd93d72c02880fd59fb8588abe14d05e77b	2021-08-02 15:10:21 +00:00
Eric Wild	23a9771467	contrib: more cardem dissection Change-Id: Ia74d3674f854b390c9745a1cb8d5756bd5d39540	2021-08-02 09:23:19 +00:00
Eric Wild	a755b53768	simtrace2-cardem: use local sim on exit There is no obvious reason why the st should be stuck in cardem mode without a working running util on the host side since there is no state that is being kept, so switch back to using the local sim upon reset. Change-Id: Ib622af0027d40b4e8afbb0fa0d3689f0dbfcac92	2021-08-02 09:23:19 +00:00
Eric Wild	1ad205e682	firmware: make the ngff beakout blink ..but only if the cardem sim is active Change-Id: I65f1fbeb06690a143ef4c792728c9cb917a4ffde	2021-08-02 09:22:46 +00:00
Eric Wild	34317c1f32	firmware: proper makefile deps Single threaded evaluation is (assumed to be!) left to right, depth first - but with concurrent make using -j this breaks, because the actual usb string header is generated after the attempt to concurrently compile the code that needs it, since there is no explicit order among the all: dependencies. This is fixed by properly adding a dependency on that header. Change-Id: I0bdf915deabeda861f6398e654764918e58a64c2	2021-08-02 09:22:46 +00:00
Eric Wild	e6a76c7bf4	firmware: data sections Might or might not be compiler default, but why guess? Change-Id: Id3da816611afea0858466949dcc47db5e5d5493a	2021-08-02 09:22:46 +00:00
Harald Welte	4fe93be725	introduce support for new ngff_cardem board This adds support for the new ngff_cardem board, a board that basically combines a ngff breakout board with a built-in SIMtrace2. Cardem works, but depending on the modem it might need a adjusted ATR to ensure a lower baud rate is used by the modem, high rates might lead to weird power cycling of the card after a few transfers. Trace was also tested and appears to work as expected. Change-Id: Ia96124fbe8a752c98e7fd4096d542a3b2b9bc255	2021-08-02 09:22:46 +00:00
Harald Welte	51d87fbb66	Introduce simtrace2-tool The simtrace-tool is a command line tool which can be used to e.g. manually request a modem reset. Change-Id: I3a8896ac2b3caef7590b51118359e5caed820a40	2021-08-02 09:22:46 +00:00
Oliver Smith	c7490b46cd	gitreview: new file Change-Id: I650fe7c930392d24042e65295fa49400478ffab9	2021-07-30 10:32:35 +02:00
Harald Welte	c85f39078c	contrib/flash.py: Add OCTSIMTEST support Change-Id: Id906d955f45a204ac0b00f56d8f5149c64c62f32	2021-07-09 11:46:16 +00:00
Harald Welte	06fe3b8295	99-simtrace2.rules: Add OCTSIMTEST Change-Id: I226ee21e0937f851428578578f81075fa703dd54	2021-07-09 11:46:11 +00:00