WIP: firmware: sniffer: inbound USB handling

Change-Id: Ic953148600d82285281abcb573a07e2e9b8082a7

.clang-format

@@ -1,563 +0,0 @@
-# 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
-...

.gitignore

@@ -18,11 +18,7 @@ tags
 *.bin
 *.p
 host/simtrace2-list
-host/simtrace2-cardem-pcsc
-host/contrib/simtrace2.spec
-host/src/simtrace2-tool
-host/tests
+host/simtrace2-remsim
+host/simtrace2-remsim-usb2udp
 usb_strings_generated.h
 firmware/usbstring/usbstring
-firmware/apps/*/usb_strings.txt.patched
-firmware/misc/crctool

.gitreview

@@ -1,3 +0,0 @@
-[gerrit]
-host=gerrit.osmocom.org
-project=simtrace2

Makefile

@@ -8,23 +8,13 @@ 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-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
+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
 
 utils:
 	(cd host && \

README.md

@@ -5,6 +5,9 @@ This is the repository for the next-generation SIMtrace devices,
 providing abilities to trace the communication between (U)SIM card and
 phone, remote (U)SIM card forward, (U)SIM man-in-the-middle, and more.
 
+This is under heavy development, and right now it is not surprising if
+things still break on a daily basis.
+
 NOTE: Nothing in this repository applies to the SIMtrace v1.x hardware
 or its associated firmware.  SIMtrace v1.x is based on a different CPU /
 microcontroller architecture and uses a completely different software
@@ -13,6 +16,12 @@ stack and host software.
 Supported Hardware
 ------------------
 
+At this point, the primary development target is still the OWHW + sysmoQMOD
+device, but we expect to add support for a SAM3 based SIMtrace hardware
+board soon.
+
+The goal is to support the following devices:
+
 * Osmocom SIMtrace 1.x with SAM3 controller
 ** this is open hardware and schematics / PCB design is published
 * sysmocom sysmoQMOD (with 4 Modems,  4 SIM slots and 2 SAM3)
@@ -28,11 +37,3 @@ This repository contains several directory
 * firmware - the firmware to run on the actual devices
 * hardware - some information related to the hardware
 * host - Programs to use on the USB host to interface with the hardware
-
-
-The host software includes
-
-* libosmo-simtrace2 - a shared library to talk to devices running the simtrace2 firmware
-* simtrace2-list - list any USB-attached devices running simtrace2 firmware
-* simtrace2-sniff - interface the 'trace' firmware to obtain card protocol traces
-* simtrace2-cardem-pcsc - interface the 'cardem' fimrware to use a SIM in a PC/SC reader

TODO-RELEASE

@@ -1,10 +0,0 @@
-# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
-# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release
-# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
-# LIBVERSION=c:r:a
-# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
-# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
-# If any interfaces have been added since the last public release: c:r:a + 1.
-# If any interfaces have been removed or changed since the last public release: c:r:0.
-#library	what			description / commit summary line
-simtrace2	API/ABI change		osmo_st2_transport new member

contrib/flash.py

@@ -27,9 +27,7 @@ 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"})
-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]
+DEVICES = [DEVICE_SIMTRACE, DEVICE_QMOD]
 
 # which firmware does the SIMtrace USN interface subclass correspond
 FIRMWARE_SUBCLASS = {1: "trace", 2: "cardem"}

contrib/jenkins.sh

@@ -28,11 +28,9 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 
 BUILDS=""
-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 "
+BUILDS+="simtrace/dfu simtrace/cardem simtrace/trace " # simtrace/triple_play
+BUILDS+="qmod/dfu qmod/cardem "
+BUILDS+="owhw/dfu owhw/cardem "
 
 cd $TOPDIR/firmware
 for build in $BUILDS; do
@@ -65,19 +63,20 @@ make dist
 #	make -C "$base/doc/manuals" publish
 #fi
 
+rm -rf $TOPDIR/firmware/bin/simtrace-cardem*
+
 if [ "x$publish" = "x--publish" ]; then
 	echo
 	echo "=============== UPLOAD BUILD  =============="
-	$TOPDIR/contrib/prepare_upload.sh
 
 	cat > "/build/known_hosts" <<EOF
-[ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
-[ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
-[ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
+[rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
+[rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
+[rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
 EOF
 	SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48"
-	rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries@ftp.osmocom.org:web-files/simtrace2/firmware/latest/
-	rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries@ftp.osmocom.org:web-files/simtrace2/firmware/all/
+	rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/latest/
+	rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/all/
 fi
 
 echo

contrib/prepare_upload.sh

@@ -1,18 +0,0 @@
-#!/bin/bash -e
-# Create copies of binaries with -latest, -$GIT_VERSION (OS#4413, OS#3452)
-cd "$(dirname "$0")/.."
-
-GIT_VERSION="$(./git-version-gen .tarball-version)"
-
-echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..."
-
-cd firmware/bin
-for ext in bin elf; do
-	for file in *."$ext"; do
-		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

contrib/simtrace.lua

@@ -1,182 +0,0 @@
-usb_simtrace_protocol = Proto("USB_simtrace",  "USB simtrace protocol")
-
-
-local control_commands = {
--- /* SIMTRACE_MSGC_GENERIC */
-[0x0000] = "SIMTRACE_CMD_DO_ERROR",
-[0x0001] = "SIMTRACE_CMD_BD_BOARD_INFO",
-
--- /* SIMTRACE_MSGC_CARDEM */
-[0x0101] = "SIMTRACE_MSGT_DT_CEMU_TX_DATA",
-[0x0102] = "SIMTRACE_MSGT_DT_CEMU_SET_ATR",
-[0x0103] = "SIMTRACE_MSGT_BD_CEMU_STATS",
-[0x0104] = "SIMTRACE_MSGT_BD_CEMU_STATUS",
-[0x0105] = "SIMTRACE_MSGT_DT_CEMU_CARDINSERT",
-[0x0106] = "SIMTRACE_MSGT_DO_CEMU_RX_DATA",
-[0x0107] = "SIMTRACE_MSGT_DO_CEMU_PTS",
-[0x0108] = "SIMTRACE_MSGT_BD_CEMU_CONFIG",
-
--- /* SIMTRACE_MSGC_MODEM */
-[0x0201] = "SIMTRACE_MSGT_DT_MODEM_RESET",
-[0x0202] = "SIMTRACE_MSGT_DT_MODEM_SIM_SELECT",
-[0x0203] = "SIMTRACE_MSGT_BD_MODEM_STATUS",
-
--- /* SIMTRACE_MSGC_SNIFF */
-[0x0300] = "SIMTRACE_MSGT_SNIFF_CHANGE",
-[0x0301] = "SIMTRACE_MSGT_SNIFF_FIDI",
-[0x0302] = "SIMTRACE_MSGT_SNIFF_ATR",
-[0x0304] = "SIMTRACE_MSGT_SNIFF_TPDU",
-[0x0303] = "SIMTRACE_MSGT_SNIFF_PPS"
-}
-
-local msgtype  = ProtoField.uint16("usb_simtrace.msgtype", "Message Type", base.HEX_DEC, control_commands)
-local seqnr  = ProtoField.uint8("usb_simtrace.seqnr", "Sequence Number", base.HEX_DEC)
-local slotnr  = ProtoField.uint8("usb_simtrace.slotnr", "Slot Number", base.HEX_DEC)
-local reserved  = ProtoField.uint16("usb_simtrace.reserved", "reserved", base.HEX_DEC)
-local payloadlen  = ProtoField.uint16("usb_simtrace.length", "length", base.HEX_DEC)
-local payload  = ProtoField.bytes("usb_simtrace.payload", "Data")
-
-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()
-  if length == 0 then return end
-
-  pinfo.cols.protocol = usb_simtrace_protocol.name
-
-  local subtree = tree:add(usb_simtrace_protocol, buffer(), "USB simtrace Data")
-  local command = buffer(0,2):uint()
-
-  subtree:add(msgtype, command):set_generated()
-  subtree:add(seqnr, buffer(2,1))
-  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])
-  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
-
-
-function usb_simtrace_protocol.init()
-local usb_product_dissectors = DissectorTable.get("usb.product")
-usb_product_dissectors:add(0x1d50616d, 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

debian/changelog

@@ -1,211 +1,8 @@
-simtrace2 (0.8.1) unstable; urgency=medium
+simtrace2 (0.5.2) UNRELEASED; 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
 
-  [ 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
+ -- Harald Welte <lafore@gnumonks.org>  Thu, 28 Nov 2019 00:44:57 +0100
 
 simtrace2 (0.5.1) unstable; urgency=medium
 

debian/control

@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                git,
                dh-autoreconf,
-               libosmocore-dev (>= 1.4.0),
+               libosmocore-dev,
                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-1
+Depends: ${shlibs:Depends}, ${misc:Depends}, libosmo-simtrace2-0
 Recommends: simtrace2-firmware
 Description: Host utilities to communicate with SIMtrace2 USB Devices.
 
-Package: libosmo-simtrace2-1
+Package: libosmo-simtrace2-0
 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-1, ${misc:Depends}
+Depends: libosmo-simtrace2-0, ${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

debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

firmware/Makefile

@@ -28,19 +28,11 @@
 
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers project
 
-GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarball-version)
+GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarvers)
 #-------------------------------------------------------------------------------
 #        User-modifiable options
 #-------------------------------------------------------------------------------
 
-# verbosity
-V ?= 0
-ifneq ("$(V)","0")
-SILENT :=
-else
-SILENT := @
-endif
-
 # Chip & board used for compilation
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
 CHIP  ?= sam3s4
@@ -49,8 +41,7 @@ APP ?= dfu
 
 # Defines which are the available memory targets for the SAM3S-EK board.
 ifeq ($(APP), dfu)
-MEMORIES ?= flash
-TRACE_LEVEL ?= 0
+MEMORIES ?= flash dfu
 else
 MEMORIES ?= dfu
 endif
@@ -73,20 +64,12 @@ AT91LIB_USB_DFU_PATH = $(AT91LIB)/usb/device/dfu
 # Tool suffix when cross-compiling
 CROSS_COMPILE = arm-none-eabi-
 
-USE_CLANG ?= 0
-ifneq ("$(USE_CLANG)","0")
-# --target=thumbv7m-none-eabi
-CC = clang
-LD = ld.lld
-SIZE = llvm-size
-LIBS = -nostdlib
-else
+LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib
+
+# Compilation tools
 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
@@ -117,7 +100,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 crcstub.c
+	       main_common.c
 
 C_BOARD      = $(notdir $(wildcard libboard/common/source/*.c))
 C_BOARD     += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))
@@ -147,11 +130,7 @@ 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)
@@ -165,11 +144,6 @@ 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
@@ -182,33 +156,22 @@ 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 += -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
+CFLAGS += -D__ARM
+CFLAGS += --param max-inline-insns-single=500 -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)
 CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP)
-
-# Disable stack protector by default (OS#5081)
-ifeq ($(STACK_PROTECTOR), 1)
-CFLAGS += -fstack-protector
-else
-CFLAGS += -fno-stack-protector
-endif
-
 ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__
-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
+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,--warn-unresolved-symbols -Wl,--print-memory-usage $(LIB)
 #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
 
 # Append BIN directories to output filename
@@ -218,7 +181,7 @@ OUTPUT := $(BIN)/$(OUTPUT)
 #		Rules
 #-------------------------------------------------------------------------------
 
-all: $(BIN) $(OBJ) $(MEMORIES)
+all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES)
 
 combined: $(OUTPUT)-combined.bin
 
@@ -229,15 +192,12 @@ $(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): apps/$(APP)/usb_strings_generated.h misc/crctool
+$(BIN) $(OBJ):
 	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)/" $< > $@
@@ -248,70 +208,33 @@ 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))
 
-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
+$(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
+	@$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
+	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf
+	cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf
+	@$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
+	@$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
+	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin
+	cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin
+	@$(SIZE) $$^ $(OUTPUT)-$$@.elf
 
 $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
 	@echo [COMPILING $$<]
-	$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
+	@$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$<
 
 $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
 	@echo [ASSEMBLING $$@]
-	$(SILENT)$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
+	@$(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
 
-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$@ $<
+$(foreach MEMORY, $(MEMORIES), $(eval $(call RULES,$(MEMORY))))
 
+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:

firmware/apps/blupdate/Makefile

@@ -1,12 +0,0 @@
-
-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

firmware/apps/blupdate/main.c

@@ -1,136 +0,0 @@
-/* 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();
-}

firmware/apps/blupdate/usb_strings.txt

@@ -1,6 +0,0 @@
-sysmocom - s.f.m.c. GmbH
-PRODUCT_STRING
-bootloader updater
-RAM
-Flash (Application Partition)
-Flash (Bootloader Partition)

firmware/apps/cardem/Makefile

@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c usb.c
+C_FILES += card_emu.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c

firmware/apps/cardem/main.c

@@ -12,6 +12,10 @@
  * 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
@@ -67,13 +71,8 @@ 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
@@ -148,8 +147,7 @@ extern int main(void)
 	unsigned int i = 0;
 
 	led_init();
-	led_blink(LED_RED, BLINK_ALWAYS_ON);
-	led_blink(LED_GREEN, BLINK_ALWAYS_ON);
+	led_blink(LED_RED, BLINK_3O_5F);
 
 	/* Enable watchdog for 2000ms, with no window */
 	WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
@@ -160,7 +158,7 @@ extern int main(void)
 	print_banner();
 	board_main_top();
 
-	TRACE_INFO("USB init...\r\n");
+	TRACE_INFO("USB init...\n\r");
 	SIMtrace_USB_Initialize();
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -169,7 +167,7 @@ extern int main(void)
 #if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\r\n");
+				    "not be configured)\n\r");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
@@ -177,19 +175,19 @@ extern int main(void)
 		i++;
 	}
 
-	TRACE_INFO("calling configure of all configurations...\r\n");
+	TRACE_INFO("calling configure of all configurations...\n\r");
 	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...\r\n", simtrace_config);
+	TRACE_INFO("calling init of config %u...\n\r", 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...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -207,12 +205,12 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\r\n");
+			TRACE_INFO("USB is now configured\n\r");
 
 			isUsbConnected = 1;
 		}
 		if (last_simtrace_config != simtrace_config) {
-			TRACE_INFO("USB config chg %u -> %u\r\n",
+			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
 			if (config_func_ptrs[last_simtrace_config].exit) {
 				config_func_ptrs[last_simtrace_config].exit();
@@ -222,6 +220,7 @@ extern int main(void)
 			}
 			last_simtrace_config = simtrace_config;
 		} else {
+			//FIXME: usb_proces() for every interface in this configuration?
 			if (config_func_ptrs[simtrace_config].run) {
 				config_func_ptrs[simtrace_config].run();
 			}

firmware/apps/dfu/main.c

@@ -12,6 +12,10 @@
  * 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"
@@ -78,9 +82,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)\r\n", altif, offset, len);
+	TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len);
 #else
-	printf("DL off=%u\r\n", offset);
+	printf("DL off=%u\n\r", offset);
 #endif
 
 #ifdef PINS_LEDS
@@ -113,19 +117,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\r\n");
+			TRACE_ERROR("DFU download flash unlock failed\n\r");
 			rc =  DFU_RET_STALL;
 			break;
 		}
 		rc = FLASHD_Write(addr, data, len);
 		if (rc != 0) {
-			TRACE_ERROR("DFU download flash erase failed\r\n");
+			TRACE_ERROR("DFU download flash erase failed\n\r");
 			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\r\n");
+				TRACE_ERROR("DFU download flash data written not correct\n\r");
 				rc = DFU_RET_STALL;
 				break;
 			}
@@ -133,7 +137,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\r\n", altif);
+		TRACE_ERROR("DFU download for unknown AltIf %d\n\r", altif);
 		rc = DFU_RET_STALL;
 		break;
 	}
@@ -179,11 +183,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\r\n", altif);
+		TRACE_ERROR("DFU upload for unknown AltIf %d\n\r", altif);
 		/* FIXME: set error codes */
 		return -1;
 	}
-	printf("=%u\r\n", req_len);
+	printf("=%u\n\r", req_len);
 	return req_len;
 }
 
@@ -239,17 +243,6 @@ static void check_exec_dbg_cmd(void)
 	//board_exec_dbg_cmd(ch);
 }
 
-/* print a horizontal line of '=' characters; Doing this in a loop vs. using a 'const'
- * string saves us ~60 bytes of executable size (matters particularly for DFU loader) */
-static void print_line(void)
-{
-	int i;
-	for (i = 0; i < 78; i++)
-		fputc('=', stdout);
-	fputc('\n', stdout);
-	fputc('\r', stdout);
-}
-
 /*------------------------------------------------------------------------------
  *        Main
  *------------------------------------------------------------------------------*/
@@ -267,23 +260,25 @@ extern int main(void)
 
 #ifdef PINS_LEDS
 	/* Configure LED */
-	PIO_Configure(pinsLeds, PIO_LISTSIZE(pinsLeds));
+	PIO_Configure(pinsLeds, sizeof(pinsLeds));
 	PIO_Set(&pinsLeds[LED_NUM_RED]);
 	PIO_Clear(&pinsLeds[LED_NUM_GREEN]);
 #endif
 
+	PIO_InitializeInterrupts(0);
+
 	EEFC_ReadUniqueID(g_unique_id);
 
-	printf("\r\n\r\n");
-	print_line();
-	printf("DFU bootloader %s for board %s\r\n"
-		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\r\n",
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"DFU bootloader %s for board %s\n\r"
+		"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r"
+		"=============================================================================\n\r",
 		manifest_revision, manifest_board);
-	print_line();
 
 #if (TRACE_LEVEL >= TRACE_LEVEL_INFO)
-	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",
+	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",
 		   g_unique_id[0], g_unique_id[1],
 		   g_unique_id[2], g_unique_id[3]);
 	static const char* reset_causes[] = {
@@ -294,9 +289,9 @@ extern int main(void)
 		"user reset (NRST pin detected low)",
 	};
 	if (reset_cause < ARRAY_SIZE(reset_causes)) {
-		TRACE_INFO("Reset Cause: %s\r\n", reset_causes[reset_cause]);
+		TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);
 	} else {
-		TRACE_INFO("Reset Cause: 0x%lx\r\n", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
+		TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);
 	}
 #endif
 
@@ -306,25 +301,25 @@ extern int main(void)
 	switch (USBDFU_OverrideEnterDFU()) {
 	case 0:
 		if (SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) {
-			TRACE_INFO_WP("unknown\r\n");
+			TRACE_INFO_WP("unknown\n\r");
 		} else {
-			TRACE_INFO_WP("DFU is the main application\r\n");
+			TRACE_INFO_WP("DFU is the main application\n\r");
 		}
 		break;
 	case 1:
-		TRACE_INFO_WP("DFU switch requested by main application\r\n");
+		TRACE_INFO_WP("DFU switch requested by main application\n\r");
 		break;
 	case 2:
-		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\r\n");
+		TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");
 		break;
 	case 3:
-		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\r\n");
+		TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");
 		break;
 	case 4: // the is no reason
-		TRACE_INFO_WP("reset vector (second application word) does no point in flash\r\n");
+		TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");
 		break;
 	default:
-		TRACE_INFO_WP("unknown\r\n");
+		TRACE_INFO_WP("unknown\n\r");
 		break;
 	}
 #endif
@@ -335,10 +330,19 @@ extern int main(void)
 
 	board_main_top();
 
-	TRACE_INFO("USB init...\r\n");
+	TRACE_INFO("USB init...\n\r");
 	/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
 	USBD_Disconnect();
-	mdelay(500);
+#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
+
 	USBDFU_Initialize(&dfu_descriptors);
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -346,7 +350,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)\r\n");
+			TRACE_ERROR("Resetting board (USB could not be configured)\n\r");
 			g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot
 			USBD_Disconnect();
 			NVIC_SystemReset();
@@ -358,7 +362,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...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -378,7 +382,7 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\r\n");
+			TRACE_INFO("USB is now configured\n\r");
 
 			isUsbConnected = 1;
 		}

firmware/apps/freq_ctr/main.c

@@ -32,17 +32,17 @@ extern int main(void)
 	PIO_InitializeInterrupts(0);
 
 
-	printf("\r\n\r\n"
-		"=============================================================================\r\n"
-		"Freq Ctr firmware " GIT_VERSION " (C) 2019 by Harald Welte\r\n"
-		"=============================================================================\r\n");
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"Freq Ctr firmware " GIT_VERSION " (C) 2019 by Harald Welte\n\r"
+		"=============================================================================\n\r");
 
 	board_main_top();
 
-	TRACE_INFO("starting frequency counter...\r\n");
+	TRACE_INFO("starting frequency counter...\n\r");
 	freq_ctr_init();
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 

firmware/apps/gpio_test/gpio_test.c

@@ -4,5 +4,5 @@
 
 void gpio_test_init(void)
 {
-	printf("FIXME run tests here\r\n");
+	printf("FIXME run tests here\n\r");
 }

firmware/apps/gpio_test/main.c

@@ -32,17 +32,17 @@ extern int main(void)
 	PIO_InitializeInterrupts(0);
 
 
-	printf("\r\n\r\n"
-		"=============================================================================\r\n"
-		"GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\r\n"
-		"=============================================================================\r\n");
+	printf("\n\r\n\r"
+		"=============================================================================\n\r"
+		"GPIO Test firmware " GIT_VERSION " (C) 2019 Sysmocom GmbH\n\r"
+		"=============================================================================\n\r");
 
 	board_main_top();
 
-	TRACE_INFO("starting gpio test...\r\n");
+	TRACE_INFO("starting gpio test...\n\r");
 	gpio_test_init();
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 

firmware/apps/trace/Makefile

@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c usb.c
+C_FILES += card_emu.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c

firmware/apps/trace/main.c

@@ -12,6 +12,10 @@
  * 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
@@ -156,7 +160,7 @@ extern int main(void)
 	print_banner();
 	board_main_top();
 
-	TRACE_INFO("USB init...\r\n");
+	TRACE_INFO("USB init...\n\r");
 	SIMtrace_USB_Initialize();
 
 	while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -165,7 +169,7 @@ extern int main(void)
 #if 0
 		if (i >= MAX_USB_ITER * 3) {
 			TRACE_ERROR("Resetting board (USB could "
-				    "not be configured)\r\n");
+				    "not be configured)\n\r");
 			USBD_Disconnect();
 			NVIC_SystemReset();
 		}
@@ -173,17 +177,17 @@ extern int main(void)
 		i++;
 	}
 
-	TRACE_INFO("calling configure of all configurations...\r\n");
+	TRACE_INFO("calling configure of all configurations...\n\r");
 	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...\r\n", simtrace_config);
+	TRACE_INFO("calling init of config %u...\n\r", simtrace_config);
 	config_func_ptrs[simtrace_config].init();
 	last_simtrace_config = simtrace_config;
 
-	TRACE_INFO("entering main loop...\r\n");
+	TRACE_INFO("entering main loop...\n\r");
 	while (1) {
 		WDT_Restart(WDT);
 #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -201,12 +205,12 @@ extern int main(void)
 				isUsbConnected = 0;
 			}
 		} else if (isUsbConnected == 0) {
-			TRACE_INFO("USB is now configured\r\n");
+			TRACE_INFO("USB is now configured\n\r");
 
 			isUsbConnected = 1;
 		}
 		if (last_simtrace_config != simtrace_config) {
-			TRACE_INFO("USB config chg %u -> %u\r\n",
+			TRACE_INFO("USB config chg %u -> %u\n\r",
 				   last_simtrace_config, simtrace_config);
 			config_func_ptrs[last_simtrace_config].exit();
 			config_func_ptrs[simtrace_config].init();

firmware/apps/triple_play/Makefile

@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c usb.c
+C_FILES += card_emu.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c mode_ccid.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c

firmware/apps/triple_play/main.c

@@ -11,6 +11,10 @@
  * 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

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\r\n", bEndpoint, pEndpoint->state);
+            TRACE_ERROR("Error Wr%d, %x\n\r", 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("\r\n");
+            printf("\n\r");
         }
         printf("0x%x ", ((uint8_t*)pData)[i]);
     }
-    printf("\r\n");
+    printf("\n\r");
 */
 
     /* 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("\r\n");
+            printf("\n\r");
         }
         printf("0x%x ", ((uint8_t*)pData)[i]);
     }
-    printf("\r\n");
+    printf("\n\r");
 */
 
     /* 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(".\r\n");
+        TRACE_DEBUG_WP(".\n\r");
         return;
     }
 
@@ -1212,7 +1212,7 @@ void USBD_IrqHandler(void)
 
                 if (status != 0) {
 
-                    TRACE_DEBUG_WP("\r\n  - ");
+                    TRACE_DEBUG_WP("\n\r  - ");
                 }
             }
             eptnum++;
@@ -1221,7 +1221,7 @@ void USBD_IrqHandler(void)
 
     /* Toggle LED back to its previous state */
     TRACE_DEBUG_WP("!");
-    TRACE_DEBUG_WP("\r\n");
+    TRACE_DEBUG_WP("\n\r");
     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\r\n", "USBD_HAL_Init");
+    TRACE_DEBUG("%s\n\r", "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\r\n", bEP);
+        TRACE_WARNING("UDP_Stall: EP%d locked\n\r", bEP);
         return USBD_STATUS_LOCKED;
     }
     /* STALL endpoint */
@@ -1672,6 +1672,10 @@ uint8_t USBD_HAL_Halt(uint8_t bEndpoint, uint8_t ctl)
             UDP->UDP_RST_EP |= 1 << bEndpoint;
             UDP->UDP_RST_EP &= ~(1 << bEndpoint);
         }
+
+        /* This fixes a weird bug with regard to ping-pong OUT endpoints */
+        UDP->UDP_RST_EP |= 1 << bEndpoint;
+        UDP->UDP_RST_EP &= ~(1 << bEndpoint);
     }
 
     /* Return Halt status */

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\r\n", dwAddress, wPage, wOffset ) ;
+    TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
     /* Store values */
     if ( pEfc )
     {

firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c

@@ -151,7 +151,8 @@ WEAK void HardFault_Handler( void )
 		" mrseq r0, msp		\n"
 		" mrsne r0, psp		\n"
 		//" ldr r1, [r0, #24] 	\n"
-		" b hard_fault_handler_c\n");
+		" b hard_fault_handler_c\n"
+		".syntax divided	\n");
 }
 
 /**

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\r\n", *pdwActualStart, *pdwActualEnd ) ;
+    TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\n\r", *pdwActualStart, *pdwActualEnd ) ;
 }
 
 

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 "\r\n", id ) ;
+        TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", 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\r\n", i ) ;
+                    TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", 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()\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
 
     /* Reset sources */
     _dwNumSources = 0 ;
 
     /* Configure PIO interrupt sources */
-    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
     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\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
     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\r\n" ) ;
+    TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
     PMC_EnablePeripheral( ID_PIOC ) ;
     PIOC->PIO_ISR ;
     PIOC->PIO_IDR = 0xFFFFFFFF ;
@@ -211,16 +211,6 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
     NVIC_EnableIRQ( PIOC_IRQn ) ;
 }
 
-static InterruptSource *find_intsource4pin(const Pin *pPin)
-{
-    unsigned int i ;
-    for (i = 0; i < _dwNumSources; i++) {
-        if (_aIntSources[i].pPin == pPin)
-	    return &_aIntSources[i];
-    }
-    return NULL;
-}
-
 /**
  * Configures a PIO or a group of PIO to generate an interrupt on status
  * change. The provided interrupt handler will be called with the triggering
@@ -234,21 +224,19 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
     Pio* pio ;
     InterruptSource* pSource ;
 
-    TRACE_DEBUG( "PIO_ConfigureIt()\r\n" ) ;
+    TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
 
     assert( pPin ) ;
     pio = pPin->pio ;
+    assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
 
-    pSource = find_intsource4pin(pPin);
-    if (!pSource) {
-        /* Define new source */
-        TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\r\n",  _dwNumSources ) ;
-        assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
-        pSource = &(_aIntSources[_dwNumSources]) ;
-        pSource->pPin = pPin ;
-        _dwNumSources++ ;
-    }
+    /* Define new source */
+    TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r",  _dwNumSources ) ;
+
+    pSource = &(_aIntSources[_dwNumSources]) ;
+    pSource->pPin = pPin ;
     pSource->handler = handler ;
+    _dwNumSources++ ;
 
     /* PIO3 with additional interrupt support
      * Configure additional interrupt mode registers */
@@ -288,7 +276,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
  */
 extern void PIO_EnableIt( const Pin *pPin )
 {
-    TRACE_DEBUG( "PIO_EnableIt()\r\n" ) ;
+    TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
 
     assert( pPin != NULL ) ;
 
@@ -320,7 +308,7 @@ extern void PIO_DisableIt( const Pin *pPin )
 {
     assert( pPin != NULL ) ;
 
-    TRACE_DEBUG( "PIO_DisableIt()\r\n" ) ;
+    TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
 
     pPin->pio->PIO_IDR = pPin->mask;
 }

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\r\n", dwId ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", 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\r\n", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral"  " %" PRIu32 " is already enabled\n\r", 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\r\n", dwId ) ;
+            TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", 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\r\n", dwId + 32 ) ;
+            TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", 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\r\n" ) ;
+    TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
 }
 
 /**
@@ -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\r\n" ) ;
+    TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
 }
 
 /**

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.\r\n");
+                TRACE_ERROR("USART_Write: Timed out.\n\r");
                 return;
             }
             timeOut--;
@@ -269,7 +269,7 @@ uint16_t USART_Read(
 
             if (timeOut == 0) {
 
-                TRACE_ERROR( "USART_Read: Timed out.\r\n" ) ;
+                TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
                 return 0;
             }
             timeOut--;

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\r\n", "USBD_RequestHandler");
+    TRACE_DEBUG("%s\n\r", "USBD_RequestHandler");
     if (bEndpoint != 0) {
         TRACE_WARNING("EP%d request not supported, default EP only",
                       bEndpoint);
@@ -300,7 +300,7 @@ void USBD_SetConfiguration(uint8_t cfgnum)
     else {
         deviceState = USBD_STATE_ADDRESS;
         /* Reset all endpoints */
-        USBD_HAL_ResetEPs(0xFFFFFFFE, USBD_STATUS_RESET, 0);
+        USBD_HAL_ResetEPs(0xFFFFFFFF, USBD_STATUS_RESET, 0);
     }
 }
 
@@ -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\r\n");
+        TRACE_INFO("USBD_RemoteWakeUp: Device is not suspended\n\r");
         return;
     }
     USBD_HAL_Activate();
@@ -356,7 +356,7 @@ void USBD_Disconnect(void)
  */
 void USBD_Init(void)
 {
-    TRACE_INFO_WP("USBD_Init\r\n");
+    TRACE_INFO_WP("USBD_Init\n\r");
 
     /* HW Layer Initialize */
     USBD_HAL_Init();
@@ -367,7 +367,7 @@ void USBD_Init(void)
 
     /* Upper Layer Initialize */
     USBDCallbacks_Initialized();
-    TRACE_DEBUG("%s\r\n", "..");
+    TRACE_DEBUG("%s\n\r", "..");
 }
 
 /**

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\r\n", "SetConfiguration");
+    TRACE_DEBUG("%s\n\r", "SetConfiguration");
 
     if (USBD_IsHighSpeed()) {
 
@@ -361,7 +361,7 @@ static void GetDescriptor(
 
         default:
             TRACE_WARNING(
-                      "USBDDriver_GetDescriptor: Unknown descriptor type (%d)\r\n",
+                      "USBDDriver_GetDescriptor: Unknown descriptor type (%d)\n\r",
                       type);
             USBD_Stall(0);
     }
@@ -565,7 +565,7 @@ void USBDDriver_RequestHandler(
 
                 default:
                     TRACE_WARNING(
-                              "USBDDriver_RequestHandler: Unknown recipient (%d)\r\n",
+                              "USBDDriver_RequestHandler: Unknown recipient (%d)\n\r",
                               USBGenericRequest_GetRecipient(pRequest));
                     USBD_Stall(0);
             }
@@ -595,7 +595,7 @@ void USBDDriver_RequestHandler(
 
                 default:
                     TRACE_WARNING(
-                              "USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
+                              "USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
                               USBFeatureRequest_GetFeatureSelector(pRequest));
                     USBD_Stall(0);
             }
@@ -642,7 +642,7 @@ void USBDDriver_RequestHandler(
 
             default:
                 TRACE_WARNING(
-                          "USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
+                          "USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
                           USBFeatureRequest_GetFeatureSelector(pRequest));
                 USBD_Stall(0);
         }
@@ -665,7 +665,7 @@ void USBDDriver_RequestHandler(
 
     default:
         TRACE_WARNING(
-                  "USBDDriver_RequestHandler: Unknown request code (%d)\r\n",
+                  "USBDDriver_RequestHandler: Unknown request code (%d)\n\r",
                   USBGenericRequest_GetRequest(pRequest));
         USBD_Stall(0);
     }

firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h

@@ -39,8 +39,8 @@ struct dfu_desc {
 #define DFU_FUNC_DESC  {						\
 	.bLength		= USB_DT_DFU_SIZE,			\
 	.bDescriptorType	= USB_DT_DFU,				\
-	.bmAttributes		= USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH, \
-	.wDetachTimeOut		= 0x00,				\
+	.bmAttributes		= USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \
+	.wDetachTimeOut		= 0xff00,				\
 	.wTransferSize		= BOARD_DFU_PAGE_SIZE,			\
 	.bcdDFUVersion		= 0x0100,				\
 }

firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c

@@ -14,6 +14,10 @@
  *  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>
@@ -49,7 +53,7 @@ struct dfudata *g_dfu = &_g_dfu;
 
 WEAK void dfu_drv_updstatus(void)
 {
-	TRACE_INFO("DFU: updstatus()\r\n");
+	TRACE_INFO("DFU: updstatus()\n\r");
 
 	/* we transition immediately from MANIFEST_SYNC to MANIFEST,
 	 * as the flash-writing is not asynchronous in this
@@ -72,7 +76,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)\r\n", dstat.bStatus, dstat.bState);
+	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
 
 	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
 }
@@ -81,7 +85,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%ld)\r\n", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -106,10 +110,10 @@ static void dnload_cb(void *arg, unsigned char status, unsigned long int transfe
 {
 	int rc;
 
-	TRACE_DEBUG("COMPLETE\r\n");
+	TRACE_DEBUG("COMPLETE\n\r");
 
 	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USBD download callback status %d\r\n", status);
+		TRACE_ERROR("USBD download callback status %d\n\r", status);
 		USBD_Stall(0);
 		return;
 	}
@@ -136,14 +140,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\r\n");
+		TRACE_ERROR("DFU length exceeds flash page size\n\r");
 		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\r\n");
+		TRACE_ERROR("DFU length not four-byte-aligned\n\r");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
@@ -153,7 +157,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\r\n");
+		TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\n\r");
 		g_dfu->state = DFU_STATE_dfuMANIFEST_SYNC;
 		return DFU_RET_ZLP;
 	}
@@ -172,10 +176,10 @@ static void upload_cb(void *arg, unsigned char status, unsigned long int transfe
 {
 	int rc;
 
-	TRACE_DEBUG("COMPLETE\r\n");
+	TRACE_DEBUG("COMPLETE\n\r");
 
 	if (status != USBD_STATUS_SUCCESS) {
-		TRACE_ERROR("USBD upload callback status %d\r\n", status);
+		TRACE_ERROR("USBD upload callback status %d\n\r", status);
 		USBD_Stall(0);
 		return;
 	}
@@ -191,7 +195,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\r\n");
+		TRACE_ERROR("DFU length exceeds flash page size\n\r");
 		g_dfu->state = DFU_STATE_dfuERROR;
 		g_dfu->status = DFU_STATUS_errADDRESS;
 		return DFU_RET_STALL;
@@ -199,7 +203,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\r\n", rc);
+		TRACE_ERROR("application handle_upload() returned %d\n\r", rc);
 		return DFU_RET_STALL;
 	}
 
@@ -217,7 +221,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\r\n",
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),
 			USBGenericRequest_GetRecipient(request),
 			val, len);

firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c

@@ -15,6 +15,10 @@
  *  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>
@@ -55,7 +59,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)\r\n", dstat.bStatus, dstat.bState);
+	TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
 
 	USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
 }
@@ -64,7 +68,7 @@ static void __dfufunc handle_getstate(void)
 {
 	uint8_t u8 = g_dfu->state;
 
-	TRACE_DEBUG("handle_getstate(%lu)\r\n", g_dfu->state);
+	TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);
 
 	USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
 }
@@ -110,7 +114,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\r\n",
+	TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
 			USBGenericRequest_GetType(request),
 			USBGenericRequest_GetRecipient(request),
 			val, len);
@@ -159,10 +163,8 @@ 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\r\n");
+			TRACE_DEBUG("\r\n====dfu_detach\n\r");
 			g_dfu->state = DFU_STATE_appDETACH;
-			USBD_Write(0, 0, 0, 0, 0);
-			DFURT_SwitchToDFU();
 			ret = DFU_RET_ZLP;
 			goto out;
 			break;
@@ -207,14 +209,13 @@ out:
 
 void DFURT_SwitchToDFU(void)
 {
-	__disable_irq();
-
 	/* store the magic value that the DFU loader can detect and
 	 * activate itself, rather than boot into the application */
 	g_dfu->magic = USB_DFU_MAGIC;
-	__DMB();
+
 	/* Disconnect the USB by removing the pull-up */
 	USBD_Disconnect();
+	__disable_irq();
 
 	/* reset the processor, we will start execution with the
 	 * ResetVector of the bootloader */

firmware/libboard/common/include/board_common.h

@@ -12,6 +12,10 @@
  * 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_

firmware/libboard/common/include/boardver_adc.h

@@ -7,6 +7,10 @@
  * 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
 

firmware/libboard/common/include/led.h

@@ -7,6 +7,10 @@
  * 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
 
@@ -27,8 +31,7 @@ enum led_pattern {
 	BLINK_200O_F		= 7,
 	BLINK_600O_F		= 8,
 	BLINK_CUSTOM		= 9,
-	BLINK_2F_O		= 10,
-	BLINK_5O_5F		= 11,
+	BLINK_2F_O,
 	_NUM_LED_BLINK
 };
 

firmware/libboard/common/include/manifest.h

@@ -7,6 +7,10 @@
  * 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

firmware/libboard/common/include/sim_switch.h

@@ -7,16 +7,12 @@
  * 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
 
-/** switch card lines to use physical or emulated card
- *  @param[in] nr card interface number (i.e. slot)
- *  @param[in] physical which physical interface to switch to (e.g. 0: physical, 1: virtual)
- *  @return 0 on success, negative else
- */
 int sim_switch_use_physical(unsigned int nr, int physical);
-/** initialise card switching capabilities
- *  @return number of switchable card interfaces
- */
 int sim_switch_init(void);

firmware/libboard/common/resources/sam3s4/dfu.ld

@@ -39,8 +39,7 @@ SEARCH_DIR(.)
 MEMORY
 {
 	/* reserve the first 16k (= 0x4000) for the DFU bootloader */
-	crcstub (rx)  : ORIGIN = 0x00400000 + 16K, LENGTH = 512 /* crcstub part */
-	rom (rx)  : ORIGIN = 0x00400000 + 16K + 512, LENGTH = 256K - 16K - 512 /* flash, 256K */
+	rom (rx)  : ORIGIN = 0x00400000 + 16K, LENGTH = 256K - 16K /* flash, 256K */
 	/* note: dfudata will be at the start */
 	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */
 }
@@ -48,17 +47,9 @@ MEMORY
 /* Section Definitions */ 
 SECTIONS 
 { 
-    .crcstub :
-    {
+    .text : 
+    { 
         . = ALIGN(4);
-        KEEP(*(.crcstub_table))
-        KEEP(*(.crcstub_code))
-    } > crcstub = 0xff
-
-    .text :
-    {
-
-        . = ALIGN(512);
         _sfixed = .;
         KEEP(*(.vectors .vectors.*))
         *(.text .text.* .gnu.linkonce.t.*) 	      
@@ -103,21 +94,16 @@ SECTIONS
 
         . = ALIGN(4);
         _efixed = .;            /* End of text section */
-    } > rom = 0xff
-
-    /DISCARD/ :
-    {
-        *(.ARM.exidx)
-    }
-
-    .blupdate :
-    {
-        . = ALIGN(4);
-        _blupdate_start = .;
-        KEEP(*(.fwupdate .fwupdate.*));
-        _blupdate_end = .;
     } > rom
 
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
     . = ALIGN(4); 
     _etext = .;
 

firmware/libboard/common/resources/sam3s4/flash.ld

@@ -94,12 +94,13 @@ SECTIONS
         _efixed = .;            /* End of text section */
     } > rom
 
-    /DISCARD/ :
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
     {
-        *(.ARM.exidx)
-        *(.crcstub_table)
-        *(.crcstub_code)
-    }
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
 
     . = ALIGN(4); 
     _etext = .;

firmware/libboard/common/source/board_lowlevel.c

@@ -147,7 +147,7 @@ extern WEAK void LowLevelInit( void )
 	}
 */
 
-#ifndef BOARD_MAINOSC_BYPASS
+#ifndef qmod
 	/* 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
-	/* Board has external clock, not a crystal oscillator */
+	/* QMOD has external 12MHz clock source */
 	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 */
@@ -218,8 +218,3 @@ void mdelay(unsigned int msecs)
 	do {
 	} while ((jiffies - jiffies_start) < msecs);
 }
-
-void abort() {
-	NVIC_SystemReset();
-	while(1) {};
-}

firmware/libboard/common/source/boardver_adc.c

@@ -7,6 +7,10 @@
  * 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"

firmware/libboard/common/source/led.c

@@ -12,6 +12,10 @@
  * 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>
@@ -54,10 +58,6 @@ 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,10 +107,6 @@ 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),

firmware/libboard/common/source/manifest.c

@@ -7,6 +7,10 @@
  * 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"
 

firmware/libboard/common/source/sim_switch.c

@@ -11,6 +11,10 @@
  * 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"
@@ -36,7 +40,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		sim_switch_init();
 	}
 
-	TRACE_INFO("Modem %d: %s SIM\r\n", nr,
+	TRACE_INFO("Modem %d: %s SIM\n\r", nr,
 		   physical ? "physical" : "virtual");
 
 	switch (nr) {
@@ -53,7 +57,7 @@ int sim_switch_use_physical(unsigned int nr, int physical)
 		break;
 #endif
 	default:
-		TRACE_ERROR("Invalid SIM%u\r\n", nr);
+		TRACE_ERROR("Invalid SIM%u\n\r", nr);
 		return -1;
 	}
 

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( "\r\n" ) ;
+	printf( "\n\r" ) ;
 }
 
 /**
@@ -273,7 +273,7 @@ extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAdd
 			UART_PutChar( *pucTmp++ ) ;
 		}
 
-		printf( "\r\n" ) ;
+		printf( "\n\r" ) ;
 	}
 
 	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( "\r\n" ) ;
+		printf( "\n\r" ) ;
 	}
 }
 
@@ -335,12 +335,12 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 			{
 				if ( ucNbNb == 0 )
 				{
-					printf( "\r\nWrite a number and press ENTER or SPACE!\r\n" ) ;
+					printf( "\n\rWrite a number and press ENTER or SPACE!\n\r" ) ;
 					return 0 ;
 				}
 				else
 				{
-					printf( "\r\n" ) ;
+					printf( "\n\r" ) ;
 					*pdwValue=dwValue ;
 
 					return 1 ;
@@ -348,7 +348,7 @@ extern uint32_t UART_GetInteger( uint32_t* pdwValue )
 			}
 			else
 			{
-				printf( "\r\n'%c' not a number!\r\n", ucKey ) ;
+				printf( "\n\r'%c' not a number!\n\r", 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( "\r\nThe number have to be between %d and %d\r\n", (int)dwMin, (int)dwMax ) ;
+		printf( "\n\rThe number have to be between %d and %d\n\r", (int)dwMin, (int)dwMax ) ;
 
 		return 0 ;
 	}
 
-	printf( "\r\n" ) ;
+	printf( "\n\r" ) ;
 
 	*pdwValue = dwValue ;
 
@@ -421,7 +421,7 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 				}
 				else
 				{
-					printf( "\r\nIt is not a hexa character!\r\n" ) ;
+					printf( "\n\rIt is not a hexa character!\n\r" ) ;
 
 					return 0 ;
 				}
@@ -429,7 +429,7 @@ extern uint32_t UART_GetHexa32( uint32_t* pdwValue )
 		}
 	}
 
-	printf("\r\n" ) ;
+	printf("\n\r" ) ;
 	*pdwValue = dwValue ;
 
 	return 1 ;

firmware/libboard/ngff_cardem/include/board.h

@@ -1,162 +0,0 @@
-/* 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

firmware/libboard/ngff_cardem/include/card_pres.h

@@ -1,18 +0,0 @@
-/* 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);

firmware/libboard/ngff_cardem/include/wwan_led.h

@@ -1,16 +0,0 @@
-/* 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);

firmware/libboard/ngff_cardem/include/wwan_perst.h

@@ -1,17 +0,0 @@
-/* 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);

firmware/libboard/ngff_cardem/product_string.txt

@@ -1 +0,0 @@
-ngff-cardem

firmware/libboard/ngff_cardem/source/board_ngff_cardem.c

@@ -1,155 +0,0 @@
-/* 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);
-}

firmware/libboard/ngff_cardem/source/card_pres.c

@@ -1,72 +0,0 @@
-/* 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;
-}

firmware/libboard/ngff_cardem/source/sim_switch.c

@@ -1,77 +0,0 @@
-/* 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;
-}

firmware/libboard/ngff_cardem/source/wwan_led.c

@@ -1,89 +0,0 @@
-/* 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;
-}

firmware/libboard/ngff_cardem/source/wwan_perst.c

@@ -1,123 +0,0 @@
-/* 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;
-}

firmware/libboard/octsimtest/include/board.h

@@ -11,6 +11,10 @@
  * 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"
@@ -46,28 +50,81 @@
 /* Button to force bootloader start (shorted to ground when pressed */
 #define PIN_BOOTLOADER_SW      {PIO_PA5, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
 
+//FIXME SIM_PWEN_PIN collides with PA5/bootloader_sw on octsimtest
+/* Enable powering the card using the second 3.3 V output of the LDO (active high) */
+#define SIM_PWEN_PIN           {PIO_PA12, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Enable powering the SIM card */
+#define PWR_PINS                SIM_PWEN_PIN
+
 // FIXME PA8 is 32khz xtal on octsimtest
+/* Card presence pin */
+#define SW_SIM                  PIO_PA11
 /* Pull card presence pin high (shorted to ground in card slot when card is present) */
+#define SMARTCARD_CONNECT_PIN  {SW_SIM, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }
+
+/** Smart card connection **/
+//FIXME
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_SIM_RST            {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* 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}
+/* 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}
+//FIXME PIO_PA4B_TCLK0 PA4 is LED on octsimtest
+/* Pin used as clock input (to measure the ETU duration; connected to CLK_SIM in schematic) */
+#define PIN_SIM_CLK_INPUT      {PIO_PA14, 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
 
 /** Phone connection **/
 /* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */
 #define PIN_USIM1_VCC          {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
 /* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
-#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
+#define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH }
 /* Phone I/O data signal input/output (I/O_PHONE in schematic) */
 #define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Phone CLK clock input (CLK_PHONE in schematic) */
 #define PIN_PHONE_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/* Pin used to switch level shifter in I/O line between rx (0) and tx (1) */
-#define PIN_USIM1_IO_DIR	{PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
 /* Pin used for phone USIM slot 1 communication */
-#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST, PIN_USIM1_IO_DIR
+#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
 /* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
 #define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
 #define PIN_PHONE_CLK_INPUT    {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
 
 /** Default pin configuration **/
+/* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_SC_SW_DEFAULT      {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */
+#define PIN_IO_SW_DEFAULT      {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Disconnect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_DEFAULT        PIN_SC_SW_DEFAULT, PIN_IO_SW_DEFAULT
+
+/** Sniffer configuration **/
+/* Connect VPP, CLK, and RST lines between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_SC_SW_SNIFF        {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect I/O line between card and phone using bus switch (low connects signals on bus switch) */
+#define PIN_IO_SW_SNIFF        {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */
+#define PINS_BUS_SNIFF          PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF
+/* 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
+/* Disable power converter 4.5-6V to 3.3V (active high) */
+#define PIN_SIM_PWEN_SNIFF     {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */
+#define PIN_VCC_FWD_SNIFF      {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
+/* Use phone VCC to power card */
+#define PINS_PWR_SNIFF          PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF
+
+/** CCID configuration */
+/* Card RST reset signal input (active low; RST_SIM in schematic) */
+#define PIN_ISO7816_RSTMC      {PIO_PA7, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
+/* ISO7816-communication related pins */
+#define PINS_ISO7816            PIN_SIM_IO,  PIN_SIM_CLK,  PIN_ISO7816_RSTMC // SIM_PWEN_PIN, PIN_SIM_IO2, PIN_SIM_CLK2
 
 /** External SPI flash interface   **/
 /* SPI MISO pin definition */
@@ -83,36 +140,30 @@
 /* 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
 /* OpenMoko SIMtrace 2 USB product ID (main application/runtime mode) */
-#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_OCTSIMTEST
+#define BOARD_USB_PRODUCT_ID	USB_PRODUCT_SIMTRACE2
 /* OpenMoko SIMtrace 2 DFU USB product ID (DFU bootloader/DFU mode) */
-#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_OCTSIMTEST
+#define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU
 /* USB release number (bcdDevice, shown as 0.00) */
 #define BOARD_USB_RELEASE	0x000
 /* Indicate SIMtrace is bus power in USB attributes */
 #define BOARD_USB_BMATTRIBUTES	USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP
 
-#define DETECT_VCC_BY_ADC
-/* we have a resistive voltage divider of 47 + 30 kOhms to also detect 5V supply power */
-#define VCC_UV_THRESH_1V8	(1500000*47)/(47+30)
-#define VCC_UV_THRESH_3V	(2500000*47)/(47+30)
-
-#define HAVE_SLOT_MUX
-
-#define HAVE_BOARD_CARDINSERT
-struct cardem_inst;
-void board_set_card_insert(struct cardem_inst *ci, bool card_insert);
-
 /** Supported modes */
 /* SIMtrace board supports sniffer mode */
 //#define HAVE_SNIFFER
 /* SIMtrace board supports CCID mode */
 //#define HAVE_CCID
 /* SIMtrace board supports card emulation mode */
-#define HAVE_CARDEM
+//#define HAVE_CARDEM
 /* SIMtrace board supports man-in-the-middle mode */
 //#define HAVE_MITM
 /* octsimtest board supports gpio_test mode */

firmware/libboard/octsimtest/include/i2c.h

@@ -9,6 +9,10 @@
  * 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
 

firmware/libboard/octsimtest/include/mcp23017.h

@@ -9,15 +9,17 @@
  * 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
 
 #define MCP23017_ADDRESS 0x20
 
-int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb);
+int mcp23017_init(uint8_t slave);
 int mcp23017_test(uint8_t slave);
 int mcp23017_toggle(uint8_t slave);
-int mcp23017_set_output_a(uint8_t slave, uint8_t val);
-int mcp23017_set_output_b(uint8_t slave, uint8_t val);
 //int mcp23017_write_byte(uint8_t slave, uint8_t addr, uint8_t byte);
 //int mcp23017_read_byte(uint8_t slave, uint8_t addr);

firmware/libboard/octsimtest/include/mux.h

@@ -1,17 +0,0 @@
-#pragma once
-
-void mux_init(void);
-int mux_set_slot(uint8_t s);
-int mux_get_slot(void);
-void mux_set_freq(uint8_t s);
-
-/* this reflects the wiring between U5 and U4 */
-#define MUX_FREQ_DIV_2		0
-#define MUX_FREQ_DIV_4		1
-#define MUX_FREQ_DIV_16		2
-#define MUX_FREQ_DIV_32		3
-#define MUX_FREQ_DIV_32		3
-#define MUX_FREQ_DIV_128	4
-#define MUX_FREQ_DIV_512	5
-#define MUX_FREQ_DIV_2048	6
-#define MUX_FREQ_DIV_4096	7

firmware/libboard/octsimtest/source/board_octsimtest.c

@@ -12,8 +12,11 @@
  * 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"
 #include "simtrace.h"
 #include "utils.h"
@@ -22,47 +25,29 @@
 #include "usb_buf.h"
 #include "i2c.h"
 #include "mcp23017.h"
-#include "mux.h"
-
-static bool mcp2317_present = false;
 
 void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		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");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
+		printf("\tm\trun mcp23017 test\n\r");
+		printf("\tR\ttoggle MSB of gpio on mcp23017\n\r");
 		break;
-	case '0': mux_set_slot(0); break;
-	case '1': mux_set_slot(1); break;
-	case '2': mux_set_slot(2); break;
-	case '3': mux_set_slot(3); break;
-	case '4': mux_set_slot(4); break;
-	case '5': mux_set_slot(5); break;
-	case '6': mux_set_slot(6); break;
-	case '7': mux_set_slot(7); break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	case 'm':
 		mcp23017_test(MCP23017_ADDRESS);
 		break;
-	case 'i':
-		printf("Setting card insert (slot=%u)\r\n", mux_get_slot());
-		mcp23017_set_output_a(MCP23017_ADDRESS, (1 << mux_get_slot()));
-		break;
-	case 'I':
-		printf("Releasing card insert (slot=%u)\r\n", mux_get_slot());
-		mcp23017_set_output_a(MCP23017_ADDRESS, 0);
+	case 't':
+		mcp23017_toggle(MCP23017_ADDRESS);
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -72,13 +57,9 @@ void board_main_top(void)
 #ifndef APPLICATION_dfu
 	usb_buf_init();
 
-	mux_init();
 	i2c_pin_init();
-	/* PORT A: all outputs, Port B0 output, B1..B7 unused */
-	if (mcp23017_init(MCP23017_ADDRESS, 0x00, 0xfe) == 0) {
-		mcp2317_present = true;
-		mcp23017_set_output_a(MCP23017_ADDRESS, 0);
-	}
+	if (!mcp23017_init(MCP23017_ADDRESS))
+		printf("mcp23017 not found!\n\r");
 	/* Initialize checking for card insert/remove events */
 	//card_present_init();
 #endif
@@ -93,28 +74,8 @@ 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\r\n");
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
 		return 1;
 	} else
 		return 0;
 }
-
-void board_set_card_insert(struct cardem_inst *ci, bool card_insert)
-{
-	int s = mux_get_slot();
-
-	/* A0 .. A7 of the MCP are each connected to the gate of a FET which closes
-	 * the sim-present signal of the respective slot */
-
-	if (mcp2317_present) {
-		if (card_insert) {
-			/* we must enable card-presence of the active slot and disable it on all others */
-			mcp23017_set_output_a(MCP23017_ADDRESS, (1 << s));
-		} else {
-			/* we disable all card insert signals */
-			mcp23017_set_output_a(MCP23017_ADDRESS, 0);
-		}
-	} else {
-		TRACE_WARNING("No MCP23017 present; cannot set CARD_INSERT\r\n");
-	}
-}

firmware/libboard/octsimtest/source/i2c.c

@@ -9,6 +9,10 @@
  * 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>

firmware/libboard/octsimtest/source/mcp23017.c

@@ -92,63 +92,47 @@ out_stop:
 		return 0;
 }
 
-int mcp23017_init(uint8_t slave, uint8_t iodira, uint8_t iodirb)
+int mcp23017_init(uint8_t slave)
 {
-	TRACE_DEBUG("mcp23017_init\r\n");
-
+	printf("mcp23017_init\n\r");
 	// all gpio input
-	if (mcp23017_write_byte(slave, MCP23017_IODIRA, iodira))
-		goto out_err;
+	if (mcp23017_write_byte(slave, MCP23017_IODIRA, 0xff))
+		return false;
 	// msb of portb output, rest input
-	if (mcp23017_write_byte(slave, MCP23017_IODIRB, iodirb))
-		goto out_err;
+	if (mcp23017_write_byte(slave, MCP23017_IODIRB, 0x7f))
+		return false;
 	if (mcp23017_write_byte(slave, MCP23017_IOCONA, 0x20)) //disable SEQOP (autoinc addressing)
-		goto out_err;
-
-	TRACE_DEBUG("mcp23017 found\r\n");
-	return 0;
-
-out_err:
-	TRACE_WARNING("mcp23017 NOT found!\r\n");
-	return -1;
+		return false;
+	printf("mcp23017 found\n\r");
+	return true;
 }
 
 int mcp23017_test(uint8_t slave)
 {
-	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));
+	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));
 
 	return 0;
 }
 
-int mcp23017_set_output_a(uint8_t slave, uint8_t val)
-{
-	return mcp23017_write_byte(slave, MCP23017_OLATA, val);
-}
-
-int mcp23017_set_output_b(uint8_t slave, uint8_t val)
-{
-	return mcp23017_write_byte(slave, MCP23017_OLATB, val);
-}
-
 int mcp23017_toggle(uint8_t slave)
 {
 	// example writing MSB of gpio
 	static bool foo=false;
 	if (foo)
 	{
-		printf("+\r\n");
+		printf("+\n\r");
 		mcp23017_write_byte(slave, MCP23017_OLATB, 0x80);
 		foo=false;
 	}
 	else
 	{
-		printf("-\r\n");
+		printf("-\n\r");
 		mcp23017_write_byte(slave, MCP23017_OLATB, 0x00);
 		foo=true;
 	}

firmware/libboard/octsimtest/source/mux.c

@@ -1,109 +0,0 @@
-/* sysmoOCTSIMTEST support for multiplexers
- *
- * (C) 2021 by Harald Welte <laforge@gnumonks.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 "mux.h"
-#include <stdbool.h>
-#include <errno.h>
-
-/* 3-bit S0..S2 signal for slot selection */
-static const Pin pin_in_sel[3] = {
-	{ PIO_PA1, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA2, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA3, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-};
-
-/* 3-bit S0..S2 signal for frequency divider selection */
-static const Pin pin_freq_sel[3] = {
-	{ PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA17, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-	{ PIO_PA18, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT },
-};
-
-/* low-active output enable for all muxes */
-static const Pin pin_oe = { PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT };
-
-static uint8_t g_mux_slot = 0;
-
-/* initialize the external 1:8 multiplexers */
-void mux_init(void)
-{
-	PIO_Configure(&pin_oe, PIO_LISTSIZE(pin_oe));
-	PIO_Configure(pin_in_sel, PIO_LISTSIZE(pin_in_sel));
-	PIO_Configure(pin_freq_sel, PIO_LISTSIZE(pin_freq_sel));
-
-	mux_set_slot(0);
-}
-
-/* set the slot selection mux */
-int mux_set_slot(uint8_t s)
-{
-	TRACE_INFO("%s(%u)\r\n", __func__, s);
-
-	if (s > 7)
-		return -EINVAL;
-
-	/* !OE = H: disconnect input and output of muxes */
-	PIO_Set(&pin_oe);
-
-	if (s & 1)
-		PIO_Set(&pin_in_sel[0]);
-	else
-		PIO_Clear(&pin_in_sel[0]);
-	if (s & 2)
-		PIO_Set(&pin_in_sel[1]);
-	else
-		PIO_Clear(&pin_in_sel[1]);
-	if (s & 4)
-		PIO_Set(&pin_in_sel[2]);
-	else
-		PIO_Clear(&pin_in_sel[2]);
-
-	/* !OE = L: (re-)enable the output of muxes */
-	PIO_Clear(&pin_oe);
-
-	g_mux_slot = s;
-	return s;
-}
-
-int mux_get_slot(void)
-{
-	return g_mux_slot;
-}
-
-/* set the frequency divider mux */
-void mux_set_freq(uint8_t s)
-{
-	TRACE_INFO("%s(%u)\r\n", __func__, s);
-
-	/* no need for 'break before make' here, this would also affect
-	 * the SIM card I/O signals which we don't want to disturb */
-
-	if (s & 1)
-		PIO_Set(&pin_freq_sel[0]);
-	else
-		PIO_Clear(&pin_freq_sel[0]);
-	if (s & 2)
-		PIO_Set(&pin_freq_sel[1]);
-	else
-		PIO_Clear(&pin_freq_sel[1]);
-	if (s & 4)
-		PIO_Set(&pin_freq_sel[2]);
-	else
-		PIO_Clear(&pin_freq_sel[2]);
-
-	/* !OE = L: ensure enable the output of muxes */
-	PIO_Clear(&pin_oe);
-}

firmware/libboard/octsimtest/source/sim_switch.c

@@ -1,33 +0,0 @@
-/* Code to switch between local (physical) and remote (emulated) SIM
- *
- * (C) 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 "board.h"
-#include "trace.h"
-#include "sim_switch.h"
-
-int sim_switch_use_physical(unsigned int nr, int physical)
-{
-	if (physical) {
-		TRACE_ERROR("%u: Use local/physical SIM - UNSUPPORTED!\r\n", nr);
-	} else {
-		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
-	}
-
-	return 0;
-}
-
-int sim_switch_init(void)
-{
-	return 1; // SIMtrace hardware has only one switchable interface
-}

firmware/libboard/owhw/include/board.h

@@ -12,6 +12,10 @@
  * 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"

firmware/libboard/owhw/source/owhw.c

@@ -12,6 +12,10 @@
  * 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"
@@ -25,16 +29,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }

firmware/libboard/owhw/source/sim_switch.c

@@ -1,86 +0,0 @@
-/* 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"
-
-#ifdef PIN_SIM_SWITCH1
-static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
-#endif
-#ifdef PIN_SIM_SWITCH2
-static const Pin pin_conn_usim2 = {PIO_PA28, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};
-#endif
-
-static int initialized = 0;
-
-int sim_switch_use_physical(unsigned int nr, int physical)
-{
-	const Pin *pin;
-	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) {
-#ifdef PIN_SIM_SWITCH1
-	case 0:
-		pin = &pin_conn_usim1;
-		led = LED_USIM1;
-		break;
-#endif
-#ifdef PIN_SIM_SWITCH2
-	case 1:
-		pin = &pin_conn_usim2;
-		led = LED_USIM2;
-		break;
-#endif
-	default:
-		TRACE_ERROR("Invalid SIM%u\r\n", nr);
-		return -1;
-	}
-
-	if (physical) {
-		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
-		PIO_Clear(pin);
-		led_blink(led, BLINK_ALWAYS_ON);
-	} else {
-		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
-		PIO_Set(pin);
-		led_blink(led, BLINK_ALWAYS_OFF);
-	}
-
-	return 0;
-}
-
-int sim_switch_init(void)
-{
-	int num_switch = 0;
-#ifdef PIN_SIM_SWITCH1
-	PIO_Configure(&pin_conn_usim1, 1);
-	num_switch++;
-#endif
-#ifdef PIN_SIM_SWITCH2
-	PIO_Configure(&pin_conn_usim2, 1);
-	num_switch++;
-#endif
-	initialized = 1;
-	return num_switch;
-}

firmware/libboard/qmod/include/board.h

@@ -11,6 +11,10 @@
  * 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"
@@ -25,8 +29,6 @@
 #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
@@ -37,7 +39,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 */
@@ -107,9 +109,6 @@
 #define BOARD_USB_RELEASE	0x010
 
 #define CARDEMU_SECOND_UART
-
 #define DETECT_VCC_BY_ADC
-#define VCC_UV_THRESH_1V8	1500000
-#define VCC_UV_THRESH_3V	2500000
 
 #define HAVE_CARDEM

firmware/libboard/qmod/include/card_pres.h

@@ -11,6 +11,10 @@
  * 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
 

firmware/libboard/qmod/include/i2c.h

@@ -9,6 +9,10 @@
  * 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
 

firmware/libboard/qmod/include/wwan_led.h

@@ -9,6 +9,10 @@
  * 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
 

firmware/libboard/qmod/include/wwan_perst.h

@@ -9,6 +9,10 @@
  * 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
 

firmware/libboard/qmod/source/board_qmod.c

@@ -12,6 +12,10 @@
  * 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"
@@ -74,27 +78,27 @@ static int write_hub_eeprom(void)
 	/* wait */
 	mdelay(100);
 
-	TRACE_INFO("Writing EEPROM...\r\n");
+	TRACE_INFO("Writing EEPROM...\n\r");
 	/* 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\r\n",
+			TRACE_ERROR("Writing EEPROM failed at byte %u: 0x%02x\n\r",
 				i, __eeprom_bin[i]);
 			return 1;
 		}
 	}
 
 	/* then pursue re-reading it again and again */
-	TRACE_INFO("Verifying EEPROM...\r\n");
+	TRACE_INFO("Verifying EEPROM...\n\r");
 	for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) {
 		int byte = eeprom_read_byte(0x50, i);
-		TRACE_DEBUG("0x%02x: %02x\r\n", i, byte);
+		TRACE_DEBUG("0x%02x: %02x\n\r", i, byte);
 		if (byte != __eeprom_bin[i])
-			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\r\n",
+			TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r",
 					i, __eeprom_bin[i], byte);
 	}
-	TRACE_INFO("EEPROM written\r\n");
+	TRACE_INFO("EEPROM written\n\r");
 
 	/* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is
 	 * again powering us up */
@@ -109,17 +113,17 @@ static int erase_hub_eeprom(void)
 	/* wait */
 	mdelay(100);
 
-	TRACE_INFO("Erasing EEPROM...\r\n");
+	TRACE_INFO("Erasing EEPROM...\n\r");
 	/* 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\r\n",
+			TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r",
 				i, __eeprom_bin[i]);
 			return 1;
 		}
 	}
-	TRACE_INFO("EEPROM erased\r\n");
+	TRACE_INFO("EEPROM erased\n\r");
 
 	return 0;
 }
@@ -143,41 +147,41 @@ static void board_exec_dbg_cmd_st12only(int ch)
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case 'O':
-		printf("Setting PRTPWR_OVERRIDE\r\n");
+		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
 		break;
 	case 'o':
-		printf("Clearing PRTPWR_OVERRIDE\r\n");
+		printf("Clearing PRTPWR_OVERRIDE\n\r");
 		PIO_Clear(&pin_hubpwr_override);
 		break;
 #if (ALLOW_PEER_ERASE > 0)
 	case 'H':
-		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\r\n");
+		printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
 		PIO_Clear(&pin_hub_rst);
 		break;
 	case 'h':
 		/* high level drives transistor -> HUB_RESET low */
-		printf("Asserting _HUB_RESET -> HUB_RESET low (active)\r\n");
+		printf("Asserting _HUB_RESET -> HUB_RESET low (active)\n\r");
 		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\r\n");
-		printf("Please enter EEPROM offset:\r\n");
+			printf("WARNING: attempting EEPROM access while HUB not in reset\n\r");
+		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("Please enter EEPROM value:\r\n");
+		printf("Please enter EEPROM value:\n\r");
 		UART_GetIntegerMinMax(&val, 0, 255);
-		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\r\n", val, addr);
+		printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);
 		eeprom_write_byte(0x50, addr, val);
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case 'r':
-		printf("Please enter EEPROM offset:\r\n");
+		printf("Please enter EEPROM offset:\n\r");
 		UART_GetIntegerMinMax(&addr, 0, 255);
-		printf("EEPROM[0x%02lx] = 0x%02x\r\n", addr, eeprom_read_byte(0x50, addr));
+		printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -194,93 +198,93 @@ 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 off LED 1\r\n");
-		printf("\tg\tswitch off LED 2\r\n");
-		printf("\tG\tswitch off LED 2\r\n");
+		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");
 		if (qmod_sam3_is_12()) {
 #if (ALLOW_PEER_ERASE > 0)
-			printf("\tE\tprogram EEPROM\r\n");
-			printf("\te\tErase EEPROM\r\n");
+			printf("\tE\tprogram EEPROM\n\r");
+			printf("\te\tErase EEPROM\n\r");
 #endif /* ALLOW_PEER_ERASE */
-			printf("\tO\tEnable PRTPWR_OVERRIDE\r\n");
-			printf("\to\tDisable PRTPWR_OVERRIDE\r\n");
+			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
+			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
 #if (ALLOW_PEER_ERASE > 0)
-			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");
+			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");
 #endif /* ALLOW_PEER_ERASE */
-			printf("\tr\tRead single byte from EEPROM\r\n");
+			printf("\tr\tRead single byte from EEPROM\n\r");
 		}
-		printf("\tX\tRelease peer SAM3 from reset\r\n");
-		printf("\tx\tAssert peer SAM3 reset\r\n");
+		printf("\tX\tRelease peer SAM3 from reset\n\r");
+		printf("\tx\tAssert peer SAM3 reset\n\r");
 #if (ALLOW_PEER_ERASE > 0)
-		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");
+		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");
 #endif /* ALLOW_PEER_ERASE */
-		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");
+		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");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	case 'l':
 		led_blink(LED_GREEN, BLINK_ALWAYS_OFF);
-		printf("LED 1 switched off\r\n");
+		printf("LED 1 switched off\n\r");
 		break;
 	case 'L':
 		led_blink(LED_GREEN, BLINK_ALWAYS_ON);
-		printf("LED 1 switched on\r\n");
+		printf("LED 1 switched on\n\r");
 		break;
 	case 'g':
 		led_blink(LED_RED, BLINK_ALWAYS_OFF);
-		printf("LED 2 switched off\r\n");
+		printf("LED 2 switched off\n\r");
 		break;
 	case 'G':
 		led_blink(LED_RED, BLINK_ALWAYS_ON);
-		printf("LED 2 switched on\r\n");
+		printf("LED 2 switched on\n\r");
 		break;
 	case 'X':
-		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\r\n");
+		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
 		PIO_Clear(&pin_peer_rst);
 		break;
 	case 'x':
-		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\r\n");
+		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
 		PIO_Set(&pin_peer_rst);
 		break;
 #if (ALLOW_PEER_ERASE > 0)
 	case 'Y':
-		printf("Clearing SIMTRACExx_ERASE (inactive)\r\n");
+		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
 		PIO_Clear(&pin_peer_erase);
 		break;
 	case 'a':
-		printf("Asserting SIMTRACExx_ERASE allowed on next command\r\n");
+		printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");
 		allow_erase = true;
 		break;
 	case 'y':
 		if (allow_erase) {
-			printf("Setting SIMTRACExx_ERASE (active)\r\n");
+			printf("Setting SIMTRACExx_ERASE (active)\n\r");
 			PIO_Set(&pin_peer_erase);
 		} else {
-			printf("Please first allow setting SIMTRACExx_ERASE\r\n");
+			printf("Please first allow setting SIMTRACExx_ERASE\n\r");
 		}
 		break;
 #endif /* ALLOW_PEER_ERASE */
 	case '1':
-		printf("Resetting Modem 1 (of this SAM3)\r\n");
+		printf("Resetting Modem 1 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(0, 300);
 		break;
 	case '2':
-		printf("Resetting Modem 2 (of this SAM3)\r\n");
+		printf("Resetting Modem 2 (of this SAM3)\n\r");
 		wwan_perst_do_reset_pulse(1, 300);
 		break;
 	case '!':
@@ -294,7 +298,7 @@ void board_exec_dbg_cmd(int ch)
 		break;
 	default:
 		if (!qmod_sam3_is_12())
-			printf("Unknown command '%c'\r\n", ch);
+			printf("Unknown command '%c'\n\r", ch);
 		else
 			board_exec_dbg_cmd_st12only(ch);
 		break;
@@ -335,9 +339,9 @@ void board_main_top(void)
 #endif
 
 	if (qmod_sam3_is_12()) {
-		TRACE_INFO("Detected Quad-Modem ST12\r\n");
+		TRACE_INFO("Detected Quad-Modem ST12\n\r");
 	} else {
-		TRACE_INFO("Detected Quad-Modem ST34\r\n");
+		TRACE_INFO("Detected Quad-Modem ST34\n\r");
 #ifndef APPLICATION_dfu
 		/* make sure we use the second set of USB Strings
 		 * calling the interfaces "Modem 3" and "Modem 4" rather

firmware/libboard/qmod/source/card_pres.c

@@ -11,6 +11,10 @@
  * 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"

firmware/libboard/qmod/source/i2c.c

@@ -9,6 +9,10 @@
  * 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>

firmware/libboard/qmod/source/wwan_led.c

@@ -9,6 +9,10 @@
  * 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

firmware/libboard/qmod/source/wwan_perst.c

@@ -9,6 +9,10 @@
  * 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

firmware/libboard/sam3p256/include/board.h

@@ -11,6 +11,10 @@
  * 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"
@@ -131,6 +135,11 @@
 #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

firmware/libboard/sam3p256/source/board_sam3p256.c

@@ -12,6 +12,10 @@
  * 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"
@@ -24,16 +28,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -57,7 +61,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\r\n");
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
 		return 1;
 	} else
 		return 0;

firmware/libboard/simtrace/include/board.h

@@ -12,6 +12,10 @@
  * 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"
@@ -36,7 +40,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 */
@@ -74,11 +78,11 @@
 /* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */
 #define PIN_USIM1_nRST         {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH }
 /* Phone I/O data signal input/output (I/O_PHONE in schematic) */
-#define PIN_USIM1_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+#define PIN_PHONE_IO           {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Phone CLK clock input (CLK_PHONE in schematic) */
-#define PIN_USIM1_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
+#define PIN_PHONE_CLK          {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Pin used for phone USIM slot 1 communication */
-#define PINS_USIM1              PIN_USIM1_IO, PIN_USIM1_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
+#define PINS_USIM1              PIN_PHONE_IO, PIN_PHONE_CLK, PIN_PHONE_CLK_INPUT, PIN_USIM1_VCC, PIN_PHONE_IO_INPUT, PIN_USIM1_nRST
 /* Phone I/O data signal input/output (unused USART RX input; connected to I/O_PHONE in schematic) */
 #define PIN_PHONE_IO_INPUT     {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
 /* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */
@@ -130,6 +134,11 @@
 /* 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
@@ -144,14 +153,10 @@
 
 /** Supported modes */
 /* SIMtrace board supports sniffer mode */
-#ifdef APPLICATION_trace
 #define HAVE_SNIFFER
-#endif
 /* SIMtrace board supports CCID mode */
 //#define HAVE_CCID
 /* SIMtrace board supports card emulation mode */
-#ifdef APPLICATION_cardem
-#define HAVE_CARDEM
-#endif
+//#define HAVE_CARDEM
 /* SIMtrace board supports man-in-the-middle mode */
 //#define HAVE_MITM

firmware/libboard/simtrace/source/board_simtrace.c

@@ -12,6 +12,10 @@
  * 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"
@@ -24,16 +28,16 @@ void board_exec_dbg_cmd(int ch)
 {
 	switch (ch) {
 	case '?':
-		printf("\t?\thelp\r\n");
-		printf("\tR\treset SAM3\r\n");
+		printf("\t?\thelp\n\r");
+		printf("\tR\treset SAM3\n\r");
 		break;
 	case 'R':
-		printf("Asking NVIC to reset us\r\n");
+		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
 	default:
-		printf("Unknown command '%c'\r\n", ch);
+		printf("Unknown command '%c'\n\r", ch);
 		break;
 	}
 }
@@ -57,7 +61,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\r\n");
+		//printf("BOOTLOADER switch pressed -> Force DFU\n\r");
 		return 1;
 	} else
 		return 0;

firmware/libboard/simtrace/source/sim_switch.c

@@ -1,50 +0,0 @@
-/* Code to switch between local (physical) and remote (emulated) SIM
- *
- * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
- * (C) 2018, 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 "trace.h"
-#include "led.h"
-#include "sim_switch.h"
-
-int sim_switch_use_physical(unsigned int nr, int physical)
-{
-	const Pin pin_sc = PIN_SC_SW_DEFAULT; // pin to control bus switch for VCC/RST/CLK signals
-	const Pin pin_io = PIN_IO_SW_DEFAULT; // pin to control bus switch for I/O signal
-
-	if (nr > 0) {
-		TRACE_ERROR("SIM interface for Modem %d can't be switched\r\n", nr);
-		return -1;
-	}
-
-	TRACE_INFO("Modem %u: %s SIM\r\n", nr, physical ? "physical" : "virtual");
-
-	if (physical) {
-		TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
-		PIO_Set(&pin_sc);
-		PIO_Set(&pin_io);
-	} else {
-		TRACE_INFO("%u: Use remote/emulated SIM\r\n", nr);
-		PIO_Clear(&pin_sc);
-		PIO_Clear(&pin_io);
-	}
-
-	return 0;
-}
-
-int sim_switch_init(void)
-{
-	// the bus switch is already initialised
-	return 1; // SIMtrace hardware has only one switchable interface
-}

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\r\n", #condition, __BASE_FILE__, __LINE__); \
+				printf("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \
 				while (1); \
 			} \
 		}
-		#define SANITY_ERROR            "Sanity check failed at %s:%d\r\n"
+		#define SANITY_ERROR            "Sanity check failed at %s:%d\n\r"
 	
 		/// Performs the same duty as the ASSERT() macro, except a default error
 		/// message is output if the condition is false.

firmware/libcommon/include/card_emu.h

@@ -12,6 +12,10 @@
  * 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
 
@@ -27,6 +31,7 @@ enum card_io {
 
 /** initialise card slot
  *  @param[in] slot_num slot number (arbitrary number)
+ *  @param[in] tc_chan timer counter channel (to measure the ETU)
  *  @param[in] uart_chan UART peripheral channel
  *  @param[in] in_ep USB IN end point number
  *  @param[in] irq_ep USB INTerrupt end point number
@@ -35,7 +40,7 @@ enum card_io {
  *  @param[in] clocked initial CLK signat state (true = active)
  *  @return main card handle reference
  */
-struct card_handle *card_emu_init(uint8_t slot_num, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked);
+struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked);
 
 /* process a single byte received from the reader */
 void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte);
@@ -53,17 +58,10 @@ struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch);
 void card_emu_have_new_uart_tx(struct card_handle *ch);
 void card_emu_report_status(struct card_handle *ch, bool report_on_irq);
 
-void card_emu_wtime_half_expired(void *ch);
-void card_emu_wtime_expired(void *ch);
-
-
-#define ENABLE_TX		0x01
-#define ENABLE_RX		0x02
-#define ENABLE_TX_TIMER_ONLY	0x03
+#define ENABLE_TX	0x01
+#define ENABLE_RX	0x02
 
 int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi);
-void card_emu_uart_update_wt(uint8_t uart_chan, uint32_t wt);
-void card_emu_uart_reset_wt(uint8_t uart_chan);
 int card_emu_uart_tx(uint8_t uart_chan, uint8_t byte);
 void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx);
 void card_emu_uart_wait_tx_idle(uint8_t uart_chan);

firmware/libcommon/include/iso7816_fidi.h

@@ -11,16 +11,20 @@
  * 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 <stdint.h>
 
 /* Table 7 of ISO 7816-3:2006 */
-extern const uint16_t iso7816_3_fi_table[16];
+extern const uint16_t fi_table[];
 
 /* Table 8 from ISO 7816-3:2006 */
-extern const uint8_t iso7816_3_di_table[16];
+extern const uint8_t di_table[];
 
-/* compute the F/D ratio based on F_index and D_index values */
-int iso7816_3_compute_fd_ratio(uint8_t f_index, uint8_t d_index);
+/* compute the F/D ratio based on Fi and Di values */
+int compute_fidi_ratio(uint8_t fi, uint8_t di);

firmware/libcommon/include/llist_irqsafe.h

@@ -11,6 +11,10 @@
  * 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
 

firmware/libcommon/include/ringbuffer.h

@@ -9,6 +9,10 @@
  * 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

firmware/libcommon/include/simtrace.h

@@ -12,6 +12,10 @@
  * 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

firmware/libcommon/include/simtrace_prot.h

@@ -12,6 +12,10 @@
  * 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
 
@@ -226,17 +230,11 @@ struct cardemu_usb_msg_status {
 	uint32_t flags;
 	/* phone-applied target voltage in mV */
 	uint16_t voltage_mv;
-	/* F/D related information. Not actual Fn/Dn values but indexes into tables! */
-	union {
-		uint8_t F_index;	/* <! Index to ISO7816-3 Table 7 (F and f_max values) */
-		uint8_t fi;		/* <! old, wrong name for API compatibility */
-	};
-	union {
-		uint8_t D_index;	/* <! Index to ISO7816-3 Table 8 (D value) */
-		uint8_t di;		/* <! old, wrong name for API compatibility */
-	};
-	uint8_t wi;		/* <! Waiting Integer as defined in ISO7816-3 Section 10.2 */
-	uint32_t waiting_time;	/* <! Waiting Time in etu as defined in ISO7816-3 Section 8.1 */
+	/* Fi/Di related information */
+	uint8_t fi;
+	uint8_t di;
+	uint8_t wi;
+	uint32_t waiting_time;
 } __attribute__ ((packed));
 
 /* CEMU_USB_MSGT_DO_PTS */
@@ -265,8 +263,6 @@ struct cardemu_usb_msg_error {
 struct cardemu_usb_msg_config {
 	/* bit-mask of CEMU_FEAT_F flags */
 	uint32_t features;
-	/* the selected slot number (if an external mux is present) */
-	uint8_t slot_mux_nr;
 } __attribute__ ((packed));
 
 /***********************************************************************

firmware/libcommon/include/simtrace_usb.h

@@ -11,6 +11,10 @@
  * 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
@@ -21,8 +25,6 @@
 #define USB_PRODUCT_QMOD_SAM3		0x4004
 #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

firmware/libcommon/include/talloc.h

@@ -9,6 +9,10 @@
  * 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
 

firmware/libcommon/include/usb_buf.h

@@ -9,6 +9,10 @@
  * 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
 
@@ -38,5 +42,15 @@ int usb_drain_queue(uint8_t ep);
 void usb_buf_init(void);
 struct usb_buffered_ep *usb_get_buf_ep(uint8_t ep);
 
-int usb_refill_to_host(uint8_t ep);
-int usb_refill_from_host(uint8_t ep);
+struct usb_if {
+	uint8_t if_num;		/* interface number */
+	uint8_t ep_out;		/* OUT endpoint (0 if none) */
+	uint8_t ep_in;		/* IN endpint (0 if none) */
+	uint8_t ep_int;		/* INT endpoint (0 if none) */
+	void *data;		/* opaque data, passed through */
+	struct {
+		/* call-back to be called for inclming messages on OUT EP */
+		void (*rx_out)(struct msgb *msg, const struct usb_if *usb_if);
+	} ops;
+};
+void usb_process(const struct usb_if *usb_if);