mirror of
https://gitea.osmocom.org/sim-card/simtrace2.git
synced 2026-03-17 21:58:33 +03:00
Compare commits
4 Commits
0.9.0
...
laforge/ng
| Author | SHA1 | Date | |
|---|---|---|---|
|
774330d413 | ||
|
|
9d0d20c253 | ||
|
|
f7b7f41d2f | ||
|
|
07f94342be |
@@ -1 +0,0 @@
|
||||
--exclude ^firmware/atmel_softpack_libraries/.*$
|
||||
563
.clang-format
563
.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
|
||||
...
|
||||
1
.github/FUNDING.yml
vendored
1
.github/FUNDING.yml
vendored
@@ -1 +0,0 @@
|
||||
open_collective: osmocom
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -20,9 +20,6 @@ tags
|
||||
host/simtrace2-list
|
||||
host/simtrace2-cardem-pcsc
|
||||
host/contrib/simtrace2.spec
|
||||
host/src/simtrace2-tool
|
||||
host/tests
|
||||
usb_strings_generated.h
|
||||
firmware/usbstring/usbstring
|
||||
firmware/apps/*/usb_strings.txt.patched
|
||||
firmware/misc/crctool
|
||||
@@ -1,3 +0,0 @@
|
||||
[gerrit]
|
||||
host=gerrit.osmocom.org
|
||||
project=simtrace2
|
||||
14
Makefile
14
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 && \
|
||||
|
||||
26
README.md
26
README.md
@@ -13,17 +13,12 @@ stack and host software.
|
||||
Supported Hardware
|
||||
------------------
|
||||
|
||||
* Osmocom [SIMtrace2](https://osmocom.org/projects/simtrace2/wiki) with SAM3 controller
|
||||
* this is open hardware and schematics / PCB design is published
|
||||
* pre-built hardware available from [sysmocom webshop](https://shop.sysmocom.de/SIMtrace2-Hardware-Kit/simtrace2-kit)
|
||||
* Osmocom [ngff-cardem](https://osmocom.org/projects/ngff-cardem/wiki) M.2/NGFF modem carrier with SAM3 controller
|
||||
* this is open hardware and schematics / PCB design is published
|
||||
* pre-built hardware available from [sysmocom webshoo](https://shop.sysmocom.de/M.2-modem-carrier-with-remote-SIM-tracing/ngff-cardem-kit-external)
|
||||
* sysmocom [sysmoQMOD](https://sysmocom.de/products/lab/sysmoqmod/index.html) (with 4 Modems, 4 SIM slots and 2 SAM3)
|
||||
* this is a proprietary device, publicly available from sysmocom
|
||||
* hardware evaluation kit available from [sysmocom webshop](https://shop.sysmocom.de/sysmoQMOD-evaluation-kit/sysmoQMOD-evk)
|
||||
* 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)
|
||||
** this is a proprietary device, publicly available from sysmocom
|
||||
* sysmocom OWHW (with 2 Modems and 1 SAM3 onboard)
|
||||
* this is not publicly available hardware, but still supported
|
||||
** this is not publicly available hardware, but still supported
|
||||
|
||||
This Repository
|
||||
---------------
|
||||
@@ -41,14 +36,3 @@ The host software includes
|
||||
* 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
|
||||
|
||||
|
||||
Do not expect SIMtrace2 to work in VMs
|
||||
--------------------------------------
|
||||
|
||||
We only support running SIMtrace2 together with a Linux system running
|
||||
"bare iron" on actual hardware (x86, x86_64, arm, ...). **using VMs
|
||||
with USB pass-through for things with critical timing like SIMtrace2 is
|
||||
calling for trouble** and we will not accept related bug reports or
|
||||
support you if you do. If you still want to use VMs: Feel free to do
|
||||
so, but understand that it's unsupported and you are on your own.
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
# 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: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
|
||||
|
||||
@@ -27,45 +27,20 @@ verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
|
||||
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
export LD_LIBRARY_PATH="$inst/lib"
|
||||
|
||||
# dfu target MUST be built first, the combined targets need a bl that can be combined..
|
||||
BUILDS="simtrace/dfu qmod/dfu owhw/dfu ngff_cardem/dfu "
|
||||
#
|
||||
BUILDS+="simtrace/blupdate qmod/blupdate owhw/blupdate ngff_cardem/blupdate "
|
||||
BUILDS+="simtrace/cardem qmod/cardem owhw/cardem octsimtest/cardem ngff_cardem/cardem "
|
||||
BUILDS+="simtrace/trace ngff_cardem/trace "
|
||||
BUILDS=""
|
||||
BUILDS+="simtrace/dfu simtrace/trace simtrace/cardem "
|
||||
BUILDS+="qmod/dfu qmod/cardem "
|
||||
BUILDS+="owhw/dfu owhw/cardem "
|
||||
BUILDS+="octsimtest/cardem "
|
||||
|
||||
cd $TOPDIR/firmware
|
||||
for build in $BUILDS; do
|
||||
board=`echo $build | cut -d "/" -f 1`
|
||||
app=`echo $build | cut -d "/" -f 2`
|
||||
case "$build" in
|
||||
"owhw/cardem")
|
||||
comb="combined"
|
||||
;;
|
||||
"qmod/cardem")
|
||||
comb="combined"
|
||||
;;
|
||||
"ngff_cardem/cardem")
|
||||
comb="combined"
|
||||
;;
|
||||
"simtrace/trace")
|
||||
comb="combined"
|
||||
;;
|
||||
*)
|
||||
comb=""
|
||||
;;
|
||||
esac
|
||||
echo
|
||||
# Build the bootloader with clang, the rest with gcc (OS#5260, OS#6026)
|
||||
if [ "$app" = "dfu" ]; then
|
||||
echo "=============== $board / $app START (CLANG) =============="
|
||||
PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG=1 BOARD="$board" APP="$app" $comb
|
||||
echo "=============== $board / $app RES:$? =============="
|
||||
else
|
||||
echo "=============== $board / $app START (GCC) =============="
|
||||
make USE_CLANG=0 BOARD="$board" APP="$app" $comb
|
||||
echo "=============== $board / $app RES:$? =============="
|
||||
fi
|
||||
echo "=============== $board / $app START =============="
|
||||
make BOARD="$board" APP="$app"
|
||||
echo "=============== $board / $app RES:$? =============="
|
||||
done
|
||||
|
||||
echo
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/bash -e
|
||||
#!/bin/sh -e
|
||||
# Create copies of binaries with -latest, -$GIT_VERSION (OS#4413, OS#3452)
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
@@ -9,10 +9,8 @@ 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.*bin)$ ]];then
|
||||
without_ext="${file%.*}"
|
||||
cp -v "$file" "$without_ext-latest.$ext"
|
||||
cp -v "$file" "$without_ext-$GIT_VERSION.$ext"
|
||||
fi
|
||||
without_ext="${file%.*}"
|
||||
cp -v "$file" "$without_ext-latest.$ext"
|
||||
cp -v "$file" "$without_ext-$GIT_VERSION.$ext"
|
||||
done
|
||||
done
|
||||
|
||||
@@ -1,12 +1,3 @@
|
||||
-- wireshark LUA dissector for the SIMtrace USB protocol
|
||||
-- (C) 2021 by sysmocom - s.f.m.c. GmbH, Author: Eric Wild
|
||||
-- SPDX-License-Identifier: GPL-2.0+
|
||||
--
|
||||
-- Usage: Move this file to your "personal lua plugins" folder that
|
||||
-- can be found in the Wireshark Help->About Wireshark->Folders tab
|
||||
-- Windows: %APPDATA%\Wireshark\plugins.
|
||||
-- Unix-like systems: ~/.local/lib/wireshark/plugins.
|
||||
|
||||
usb_simtrace_protocol = Proto("USB_simtrace", "USB simtrace protocol")
|
||||
|
||||
|
||||
@@ -16,238 +7,39 @@ local control_commands = {
|
||||
[0x0001] = "SIMTRACE_CMD_BD_BOARD_INFO",
|
||||
|
||||
-- /* SIMTRACE_MSGC_CARDEM */
|
||||
[0x0101] = "DT_CEMU_TX_DATA",
|
||||
[0x0102] = "DT_CEMU_SET_ATR",
|
||||
[0x0103] = "BD_CEMU_STATS",
|
||||
[0x0104] = "BD_CEMU_STATUS",
|
||||
[0x0105] = "DT_CEMU_CARDINSERT",
|
||||
[0x0106] = "DO_CEMU_RX_DATA",
|
||||
[0x0107] = "DO_CEMU_PTS",
|
||||
[0x0108] = "BD_CEMU_CONFIG",
|
||||
[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] = "DT_MODEM_RESET",
|
||||
[0x0202] = "DT_MODEM_SIM_SELECT",
|
||||
[0x0203] = "BD_MODEM_STATUS",
|
||||
[0x0201] = "SIMTRACE_MSGT_DT_MODEM_RESET",
|
||||
[0x0202] = "SIMTRACE_MSGT_DT_MODEM_SIM_SELECT",
|
||||
[0x0203] = "SIMTRACE_MSGT_BD_MODEM_STATUS",
|
||||
|
||||
-- /* SIMTRACE_MSGC_SNIFF */
|
||||
[0x0300] = "SNIFF_CHANGE",
|
||||
[0x0301] = "SNIFF_FIDI",
|
||||
[0x0302] = "SNIFF_ATR",
|
||||
[0x0304] = "SNIFF_TPDU",
|
||||
[0x0303] = "SNIFF_PPS"
|
||||
[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.DEC)
|
||||
local slotnr = ProtoField.uint8("usb_simtrace.slotnr", "Slot Number", base.DEC)
|
||||
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.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.DEC)
|
||||
local rxtxdata = ProtoField.bytes("usb_simtrace.rxtxdata", "rx/tx (data)")
|
||||
|
||||
local hf_pts_len = ProtoField.uint8("usb_simtrace.pts_len", "PTS length", base.DEC)
|
||||
local hf_pts_req = ProtoField.bytes("usb_simtrace.pts_req", "PTS request")
|
||||
local hf_pts_resp = ProtoField.bytes("usb_simtrace.pts_resp", "PTS response")
|
||||
|
||||
local hf_cemu_cfg_features = ProtoField.uint32("usb_simtrace.cemu_cfg.features.status_irq", "CardEm Features", base.HEX)
|
||||
local hf_cemu_cfg_slot_mux_nr = ProtoField.uint32("usb_simtrace.cemu_cfg.features.slot_mux_nr", "CardEm Slot Mux Nr", base.DEC)
|
||||
local hf_cemu_cfg_presence_polarity = ProtoField.uint8("usb_simtrace.cemu_cfg.features.presence_polarity", "Sim presence polarity", base.DEC)
|
||||
|
||||
local card_insert_types = {
|
||||
[0x00] = "not inserted",
|
||||
[0x01] = "inserted",
|
||||
}
|
||||
local hf_cemu_cardinsert = ProtoField.uint8("usb_simtrace.cardinsert", "Card Insert", base.DEC, card_insert_types, 0xff)
|
||||
|
||||
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 CEMU_CONFIG_PRES_POL_PRES_H = ProtoField.uint32("usb_simtrace.CEMU_CONFIG.PRES_POL_PRES_H", "PRESENCE_HIGH", base.HEX_DEC, NULL, 0x00000001)
|
||||
local CEMU_CONFIG_PRES_POL_VALID = ProtoField.uint32("usb_simtrace.CEMU_CONFIG.PRES_POL_VALID", "PRESENCE_VALID", base.HEX_DEC, NULL, 0x00000002)
|
||||
|
||||
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)
|
||||
|
||||
local modem_sim_select_types = {
|
||||
[0x00] = "local",
|
||||
[0x01] = "remote",
|
||||
}
|
||||
local hf_modem_sim_select = ProtoField.uint8("usb_simtrace.modem.sim_select", "SIM card selection", base.DEC, modem_sim_select_types, 0xff)
|
||||
|
||||
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,
|
||||
CEMU_CONFIG_PRES_POL_PRES_H, CEMU_CONFIG_PRES_POL_VALID,
|
||||
modem_reset_status, modem_reset_len,
|
||||
hf_pts_len, hf_pts_req, hf_pts_resp,
|
||||
hf_cemu_cfg_features, hf_cemu_cfg_slot_mux_nr, hf_cemu_cfg_presence_polarity,
|
||||
hf_cemu_cardinsert, hf_modem_sim_select,
|
||||
msgtype, seqnr, slotnr, reserved, payloadlen, payload
|
||||
}
|
||||
|
||||
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))
|
||||
|
||||
local flagstr = " "
|
||||
if is_pbrx().value == 1 then
|
||||
flagstr = flagstr .. "R"
|
||||
else
|
||||
flagstr = flagstr .. "."
|
||||
end
|
||||
if is_pbtx().value == 1 then
|
||||
flagstr = flagstr .. "T"
|
||||
else
|
||||
flagstr = flagstr .. "."
|
||||
end
|
||||
if is_final().value == 1 then
|
||||
flagstr = flagstr .. "F"
|
||||
else
|
||||
flagstr = flagstr .. "."
|
||||
end
|
||||
if is_hdr().value == 1 then
|
||||
flagstr = flagstr .. "H"
|
||||
else
|
||||
flagstr = flagstr .. "."
|
||||
end
|
||||
flagstr = flagstr .. " "
|
||||
pinfo.cols.info:append(flagstr .. 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 dissect_pts(payload_data, pinfo, tree)
|
||||
local subtree = tree:add(usb_simtrace_protocol, payload_data, "PTS")
|
||||
local pts_len = payload_data(0,1):le_uint()
|
||||
local pts_req = payload_data(1, pts_len);
|
||||
local pts_resp = payload_data(7, pts_len);
|
||||
|
||||
subtree:add(hf_pts_len, pts_len);
|
||||
subtree:add(hf_pts_req, pts_req);
|
||||
subtree:add(hf_pts_resp, pts_resp);
|
||||
|
||||
pinfo.cols.info:append(" Req: " .. pts_req .. ", Resp: " .. pts_resp);
|
||||
end
|
||||
|
||||
function dissect_cemu_config(payload_data, pinfo, tree)
|
||||
local subtree = tree:add(usb_simtrace_protocol, payload_data, "Card Emu Config")
|
||||
|
||||
subtree:add(hf_cemu_cfg_features, payload_data(0,4));
|
||||
if payload_data:len() >= 4 then
|
||||
subtree:add(hf_cemu_cfg_slot_mux_nr, payload_data(4,1));
|
||||
end
|
||||
if payload_data:len() >= 5 then
|
||||
local pres = payload_data(5,1):le_uint();
|
||||
subtree:add(hf_cemu_cfg_presence_polarity, payload_data(5,1));
|
||||
headerSubtree:add(CEMU_CONFIG_PRES_POL_PRES_H, pres)
|
||||
headerSubtree:add(CEMU_CONFIG_PRES_POL_VALID, pres)
|
||||
end
|
||||
end
|
||||
|
||||
function dissect_modem_sim_sel(payload_data, pinfo, tree)
|
||||
local subtree = tree:add(usb_simtrace_protocol, payload_data, "Modem SIM Select")
|
||||
local sim_select = payload_data(0,1):le_uint();
|
||||
|
||||
subtree:add(hf_modem_sim_select, sim_select);
|
||||
pinfo.cols.info:append(" " .. modem_sim_select_types[sim_select]);
|
||||
end
|
||||
|
||||
function dissect_cemu_cardinsert(payload_data, pinfo, tree)
|
||||
local subtree = tree:add(usb_simtrace_protocol, payload_data, "Card Insert")
|
||||
local cins_type = payload_data(0,1):le_uint()
|
||||
|
||||
subtree:add(hf_cemu_cardinsert, cins_type);
|
||||
pinfo.cols.info:append(" " .. card_insert_types[cins_type]);
|
||||
end
|
||||
|
||||
|
||||
|
||||
function usb_simtrace_protocol.dissector(buffer, pinfo, tree)
|
||||
length = buffer:len()
|
||||
if length == 0 then return end
|
||||
@@ -262,38 +54,15 @@ function usb_simtrace_protocol.dissector(buffer, pinfo, tree)
|
||||
subtree:add(slotnr, buffer(3,1))
|
||||
subtree:add_le(payloadlen, buffer(6,2))
|
||||
pinfo.cols.info = string.format("Cmd 0x%04X : %s", command, control_commands[command])
|
||||
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 == 0x0105) then
|
||||
return dissect_cemu_cardinsert(payload_data(),pinfo,subtree)
|
||||
elseif(command == 0x0107) then
|
||||
return dissect_pts(payload_data(),pinfo,subtree)
|
||||
elseif(command == 0x0108) then
|
||||
return dissect_cemu_config(payload_data(),pinfo,subtree)
|
||||
elseif(command == 0x0201) then
|
||||
return dissect_modem_reset(payload_data(),pinfo,subtree)
|
||||
elseif(command == 0x0202) then
|
||||
return dissect_modem_sim_sel(payload_data(),pinfo,subtree)
|
||||
else
|
||||
subtree:add(payload, payload_data)
|
||||
end
|
||||
subtree:add(payload, buffer(8,length-8))
|
||||
|
||||
end
|
||||
|
||||
|
||||
function usb_simtrace_protocol.init()
|
||||
local usb_product_dissectors = DissectorTable.get("usb.product")
|
||||
usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST
|
||||
usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM
|
||||
usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2
|
||||
usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD
|
||||
usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW
|
||||
DissectorTable.get("usb.device"):add_for_decode_as(usb_simtrace_protocol)
|
||||
DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol)
|
||||
DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol)
|
||||
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)
|
||||
end
|
||||
|
||||
303
debian/changelog
vendored
303
debian/changelog
vendored
@@ -1,307 +1,8 @@
|
||||
simtrace2 (0.9.0) unstable; urgency=medium
|
||||
simtrace2 (0.5.2) UNRELEASED; urgency=medium
|
||||
|
||||
[ Oliver Smith ]
|
||||
* host/contrib/simtrace2.spec.in: update
|
||||
* treewide: remove FSF address
|
||||
* contrib/jenkins.sh: set USE_CLANG=1
|
||||
* Cosmetic: fix CI errors
|
||||
* debian/rules: remove override_dh_autoreconf
|
||||
* debian: set compat level to 10
|
||||
* contrib/jenkins: tweak shell logic
|
||||
* firmware/Makefile: don't use distribution's CFLAGS
|
||||
* contrib: remove rpm spec file
|
||||
|
||||
[ Eric Wild ]
|
||||
* firmware: add crc stub to all dfu apps to ensure reliable loading
|
||||
* wireshark lua dissector: dissect more
|
||||
* lua dissector: adjust usage instructions
|
||||
* conrtrib/upload : upload elf files
|
||||
* contrib/jenkins.sh : build and publish combined targets
|
||||
* fw: only build the bl with clang
|
||||
|
||||
[ James Tavares ]
|
||||
* simtrace2-tool: add "modem sim-card (insert|remove)" command
|
||||
* firmware: add definition for main osc bypass when using external osc
|
||||
* gitignore: add missing entries binaries
|
||||
* firmware: bugfix: disable cardemu comms in local SIM mode
|
||||
* main: rotor: erase immediately after send
|
||||
* Fix missing generation of waiting-time-extension in some situations
|
||||
|
||||
[ Harald Welte ]
|
||||
* host: Print strerror(errno) in case of problems opening the USB device
|
||||
* cosmetic: Fix indent of printf() statement
|
||||
* host: properly zero-initialize interface match structures
|
||||
* contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices
|
||||
* cosmetic: contrib/simtrace.lua: more consistent formatting
|
||||
* contrib/simtrace.lua: Add header with author/description/usage
|
||||
* contrib/simtrace.lua: print length + slot-number in decimal only
|
||||
* contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO
|
||||
* contrib/simtrace.lua: Dissect some more cardem related message types
|
||||
* contrib/simtrace.lua: Register for "decode as..."
|
||||
* cardem: Report the VCC voltage (if supported)
|
||||
* card_emu_uart_interrupt: ASSERT if we get called with wrong uart_chan
|
||||
* cardem: set more reasonable interrupt priorities
|
||||
* host: Always initialize libosmocore logging before using it
|
||||
* simtrace2-cardem-pcsc: rename 'flags' to 'status_flags'
|
||||
* simtrace2-cardem-pcsc: Move all logging into libosmocore
|
||||
* simtrace2-cardem-pcsc: Detect card power-up without RESET
|
||||
* host: Don't pass -1 (converted to 255) as address
|
||||
* simtrace2-cardem-pcsc: Fix copy+paste error in log message
|
||||
* simtrace2-cardem-pcsc: continue in case of LIBUSB_TRANSFER_ERROR
|
||||
* contrib/simtrace.lua: Add Flag bits + Data to COL_INFO
|
||||
* Reduce bInterval of interrupt endpoints to avoid interrupt misses
|
||||
* simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP
|
||||
* update git URLs (git -> https; gitea)
|
||||
* cardem: reset the uC in case of USB disconnect
|
||||
* cosmetic: Fix compile-time #error message string typo
|
||||
* firmware/sniffer: Fix copy+paste when logging invalid INS bytes
|
||||
* firmware/sniffer: Log parity errors, just like overruns and framing errors
|
||||
* firmware/sniffer: refactor setting TPDU state
|
||||
* firmware/sniffer: Log old and new state in ISO7816-3 state changes
|
||||
* firmware/sniffer: Avoid extra call for rbuf_is_full
|
||||
* firmware/sniffer: Fix programming error in PPS
|
||||
* firmware/sniffer: Make all global variables 'static'
|
||||
* firmware/sniffer: Group global variables in structs
|
||||
* firmware/sniffer: Log cause of WT change
|
||||
* firmware/sniffer: Rename global variable 'wt' to 'g_wt'
|
||||
* firmware/sniffer: Disable TIMEOUT interrupts in USART IER on exit
|
||||
* firmware/sniffer: Add + use 16bit ringbuffer
|
||||
* firmware/sniffer: Pass PARITY/OVERRUN/FRAMING error via ringbuffer
|
||||
* firmware/sniffer: Handle WT timeouts via ring-buffer
|
||||
* firmware/sniffer: introduce #define for interrupt enable flags
|
||||
* firmware/sniffer: Enable interrupts for overrun/parity/frame errors
|
||||
* Fix unchecked return value of osmo_libusb_init()
|
||||
* Add funding link to github mirror
|
||||
* README.md: Fix mark-down nested bullet syntax
|
||||
* README.md: Fix mark-down nested bullet syntax
|
||||
* README.md: add links to SIMtrace2 and QMOD
|
||||
* README.md: Add links to where hardware can be bought
|
||||
* README.md: Add section on ngff_carem
|
||||
* README.md: Add note to avoid using a VM
|
||||
|
||||
[ Alexander Couzens ]
|
||||
* firmware: usb: call USBD_HAL_DISCONNECT while usb init to recover from resets
|
||||
* ngff_cardem: cosmetic: fix superflous space
|
||||
* dissector: add support for sim polarity
|
||||
* firmware: allow to change the sim presence pin polarity
|
||||
* simtrace2-cardem-pcsc: allow to set sim presence polarity
|
||||
|
||||
[ Vadim Yanitskiy ]
|
||||
* host/cardem: fix integer overflow in process_do_rx_da()
|
||||
|
||||
[ Philipp Maier ]
|
||||
* simtrace2-cardem-pcsc: mark reset events in GSMTAP trace
|
||||
|
||||
-- Oliver Smith <osmith@sysmocom.de> Wed, 12 Feb 2025 16:07:53 +0100
|
||||
|
||||
simtrace2 (0.8.1) unstable; urgency=medium
|
||||
|
||||
* host/contrib/simtrace2.spec.in: fix soname
|
||||
|
||||
-- Oliver Smith <osmith@sysmocom.de> Fri, 10 Dec 2021 10:04:28 +0100
|
||||
|
||||
simtrace2 (0.8.0) unstable; urgency=medium
|
||||
|
||||
[ Harald Welte ]
|
||||
* adapt to host tools in autotools
|
||||
* simtrace2_api: Remove dead code
|
||||
* fix baudrate of 'make log'
|
||||
* qmod DFU: Don't overwrite memory beyond end of usb_strings[]
|
||||
* usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/
|
||||
* Patch actual board name into the USB iProduct string descriptor
|
||||
* Build only 'reasonable' combinations of APP/MEMORY
|
||||
* stdio: Add support for %p format string (pointer address)
|
||||
* Fix format string related warnings (int vs. long)
|
||||
* Add missing CR to achieve CRLF at end of log lines
|
||||
* more comments in host_communication.c.
|
||||
* usb_buf: count number of elements in queue
|
||||
* usb_buf: Limit the maximum queue length to 3 elements
|
||||
* qmod: Don't print EEPROM operations in help when not supported
|
||||
* cosmetic: board_qmod: Annotate #endif with comments
|
||||
* qmod: Document '!' and '@' commands on UART
|
||||
* implement minimalistic talloc_report(); add 't' command on UART
|
||||
* update copyright statement
|
||||
* cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT
|
||||
* usb_buf: Actually limit queue to 3 elements, not 4
|
||||
* USBD_HAL: Don't disable UDP peripheral clock on suspend
|
||||
* usb_buf: Properly initialize buffered_endpoint->ep number
|
||||
* pseudo_talloc: Increment number of buffers from 10 to 20
|
||||
* card_emu: Factor out card_handle_reset() from card_emu_init()
|
||||
* cardem: Move card_emu_io_statechg() calls out of interrupt context
|
||||
* cardem: RST resets all state (including release of buffers)
|
||||
* host_communication: Send zero-length-packet on wMaxPacketSize
|
||||
* card_emu: Initialize PTSS state every time we start PTS
|
||||
* card_emu: Avoid recursive calls to card_set_state()
|
||||
* card_emu: Always print state names in string representation
|
||||
* card_emu: Remove extraneous code
|
||||
* card_emu: Remove extraneous initialization of ch->pts.state
|
||||
* cardem: Make card_emu_report_status() optionally use IRQ endpoint
|
||||
* cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG
|
||||
* cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ
|
||||
* simtrace2-sniff: Reformat value_string to pass our validation scripts
|
||||
* firmware: Reformat value_string to pass our validation scripts
|
||||
* jenkins.sh: Add verify_value_string_arrays_are_terminated.py
|
||||
* [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly
|
||||
* [lib] apdu_dispatch: Don't print APDU state to stdout
|
||||
* OSMO_ASSERT() on double-free or invalid pointer
|
||||
* Update .gitignore file for host
|
||||
* migrate to libosmousb
|
||||
* library: Add osmo_st2_compatible_dev_idsp[]
|
||||
* firmware: move printing of welcome banner to common function print_banner()
|
||||
* firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c
|
||||
* host: Add COPYING file for host software (GPLv2)
|
||||
* host/lib/gsmtap.c: Add GPLv2 disclaimer
|
||||
* increase ringbuffer size from 512 to 1024 bytes
|
||||
* simtrace2_api: Add osmo_st2_cardem_request_config()
|
||||
* Disable interrupts during EEFC_ReadUniqueID()
|
||||
* cardem: Fix infinite loop + watchdog reset on long OUT message
|
||||
* extend osmo_st2_cardem_inst with fields required by osmo-remsim
|
||||
* cosmetic: Add missing CR to LF in dispatch_received_usb_msg()
|
||||
* USBD.c: Don't reset EP0 on SetConfiguration(0)
|
||||
* pio_it.c: Permit repeated calls to PIO_ConfigureIt()
|
||||
* simtrace2_siff: getopt_long() returns int, not char
|
||||
* Introduce support for asynchronous USB transmission
|
||||
* firmware: fix builds with gcc stack smashing protection enabled
|
||||
* dfu: Shrink code by 144 bytes (by not calling PIO_InitializeInterrupts)
|
||||
* dfu: Save another 60 bytes by changing the way we print horizontal lines
|
||||
* migrate from BSC_FD_* to OSMO_FD_*
|
||||
* remove usb2udp
|
||||
* rename simtrace2-remsim to simtrace2-cardem-pcsc
|
||||
* Update README
|
||||
* remove old pre-autoconf makefile
|
||||
* simtrace2-cardem-pcsc: Make it work again
|
||||
* Revert "add ISO 7816-3 library to remsim project"
|
||||
* Revert "add library providing ISO 7816-3 utilities"
|
||||
* card_emu: waiting_time is stored in etu, not clocks.
|
||||
* card_emu: Rename fi to Fi and di to Di
|
||||
* card_emu: Clarify and differentiate F/Fi/F_index/Fi_index
|
||||
* iso7816_fidi: Add iso7816_3_ prefix to symbols; fix terminology
|
||||
* card_emu: improve reset detection conditions
|
||||
* card_emu: explicitly initialize PTS and TPDU states
|
||||
* card_emu: Use USART timeout for waiting time
|
||||
* card_emu: Fix USART timer, particularly in re-start situations
|
||||
* card_emu: Fix computation of waiting time
|
||||
* contrib/jenkins.sh: Switch from rita -> ftp.osmocom.org
|
||||
* st2-cardem-pcsc: Fix goto-in-while mess
|
||||
* st2-cardem-pcsc: Use ATR of real card by default
|
||||
* simtrace board.h: Enable HAVE_CARDEM if we build the cardem firmware
|
||||
* jenkins.sh: build 'cardem' firmware also for simtrace board
|
||||
* Revert "cardem: disable upload for simtrace2"
|
||||
* simtrace2-cardem-pcsc: Decode STATUS flags to strings
|
||||
* simtrace2-cardem-pcsc: Reset the real card if reader resets cardem
|
||||
* assert: Use printf_sync() to ensure printing of assert / panic
|
||||
* Add usb product ID of sysmoOCTSIMTEST
|
||||
* octsimtest: remove lots of unused #defines
|
||||
* octsimtest: most code for support of this new board
|
||||
* octsimtest: Switch direction of I/O level shifter depending on uart tx / rx
|
||||
* cardem-pcsc: initialize libosmocore logging
|
||||
* octsimtest: Adjust VCC voltage thresholds (resistive VCC divider)
|
||||
* contrib/jenkins.sh: Build 'cardem' app for 'octsimtest' board
|
||||
* firmware: octsimtest: Fix IO_DIR pin definition
|
||||
* firmware: octsimtest: Make slot mux configurable via USB
|
||||
* firmware: octsimtest: mcp23017 initializaiton
|
||||
* firmware: cardem: re-factor CARDINSERT command processing
|
||||
* firmware: octsimtest: Support SIMTRACE_MSGT_DT_CEMU_CARDINSERT
|
||||
* firmware: octsimtest: use TRACE_* macros instead of direct printf
|
||||
* firmware: octsimtest: Fix disabling the card_insert signal
|
||||
* firmware: octsimtest: Add i/I command for setting card-insert via I2C GPIO
|
||||
* firmware: octsimtest: ensure all card_insert GPIO are 0 after reset
|
||||
* don't printf() directly from library code, go via libosmocore logging
|
||||
* simtrace2-list: Use osmo_st2_compatible_dev_ids[]
|
||||
* board_gpio.gnumeric: Add ngff-cardem pin-out
|
||||
* 99-simtrace2.rules: Add OCTSIMTEST
|
||||
* contrib/flash.py: Add OCTSIMTEST support
|
||||
* Introduce simtrace2-tool
|
||||
* introduce support for new ngff_cardem board
|
||||
* simtrace2.spec: Add simtrace2-tool binary to package
|
||||
* contrib/jenkins.sh: Build APP=cardem for BOARD=ngff_cardem
|
||||
* jenkins.sh: Build 'trace' firmware for ngff_cardem
|
||||
* Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}()
|
||||
* simtrace2-cardem-pcsc: Remove double libusb initialization
|
||||
* simtrace2-tool: Initialize logging to avoid error on first log output
|
||||
* cardem-pcsc: Fix return of uninitialized variable
|
||||
* host: Upgrade libosmocore dependency to 1.4.0
|
||||
|
||||
[ 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
|
||||
|
||||
|
||||
2
debian/compat
vendored
2
debian/compat
vendored
@@ -1 +1 @@
|
||||
10
|
||||
9
|
||||
|
||||
16
debian/control
vendored
16
debian/control
vendored
@@ -1,8 +1,8 @@
|
||||
Source: simtrace2
|
||||
Maintainer: Osmocom team <openbsc@lists.osmocom.org>
|
||||
Maintainer: Harald Welte <laforge@gnumonks.org>
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>= 10),
|
||||
Build-Depends: debhelper (>= 9),
|
||||
autotools-dev,
|
||||
autoconf,
|
||||
automake,
|
||||
@@ -10,14 +10,14 @@ Build-Depends: debhelper (>= 10),
|
||||
pkg-config,
|
||||
git,
|
||||
dh-autoreconf,
|
||||
libosmocore-dev (>= 1.11.0),
|
||||
libosmocore-dev,
|
||||
libpcsclite-dev,
|
||||
libnewlib-arm-none-eabi,
|
||||
libusb-1.0-0-dev,
|
||||
gcc-arm-none-eabi
|
||||
Standards-Version: 3.9.8
|
||||
Vcs-Git: https://gitea.osmocom.org/sim-card/simtrace2
|
||||
Vcs-Browser: https://gitea.osmocom.org/sim-card/simtrace2
|
||||
Vcs-Git: git://git.osmocom.org/simtrace2.git
|
||||
Vcs-Browser: http://git.osmocom.org/simtrace2/
|
||||
Homepage: http://osmocom.org/projects/simtrace2/wiki
|
||||
|
||||
Package: simtrace2-firmware
|
||||
@@ -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
|
||||
|
||||
5
debian/rules
vendored
5
debian/rules
vendored
@@ -13,4 +13,7 @@ export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
|
||||
|
||||
|
||||
%:
|
||||
dh $@ --no-parallel
|
||||
dh $@
|
||||
|
||||
override_dh_autoreconf:
|
||||
cd host && dh_autoreconf
|
||||
|
||||
@@ -29,13 +29,6 @@
|
||||
# Makefile for compiling the Getting Started with SAM3S Microcontrollers project
|
||||
|
||||
GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarball-version)
|
||||
|
||||
CFLAGS = \
|
||||
-Werror=format-security \
|
||||
-Wformat \
|
||||
-g \
|
||||
$(NULL)
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# User-modifiable options
|
||||
#-------------------------------------------------------------------------------
|
||||
@@ -56,8 +49,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
|
||||
@@ -80,20 +72,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
|
||||
@@ -124,7 +108,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 stack_check.c
|
||||
|
||||
C_BOARD = $(notdir $(wildcard libboard/common/source/*.c))
|
||||
C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))
|
||||
@@ -154,11 +138,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)
|
||||
@@ -172,11 +152,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
|
||||
@@ -189,16 +164,16 @@ CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long
|
||||
CFLAGS += -Wunreachable-code
|
||||
#CFLAGS += -Wcast-align
|
||||
#CFLAGS += -std=c11
|
||||
#CFLAGS += -Wmissing-noreturn
|
||||
CFLAGS += -Wmissing-noreturn
|
||||
#CFLAGS += -Wconversion
|
||||
CFLAGS += -Wno-unused-but-set-variable -Wno-unused-variable
|
||||
|
||||
CFLAGS += -Wno-suggest-attribute=noreturn
|
||||
|
||||
# -mlong-calls -Wall
|
||||
#CFLAGS += -save-temps -fverbose-asm
|
||||
#CFLAGS += -Wa,-a,-ad
|
||||
CFLAGS += -D__ARM -fno-builtin
|
||||
CFLAGS += -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd
|
||||
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)
|
||||
@@ -212,10 +187,7 @@ 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,--print-memory-usage -Wl,--no-undefined $(LIB)
|
||||
#LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
|
||||
|
||||
# Append BIN directories to output filename
|
||||
@@ -225,7 +197,7 @@ OUTPUT := $(BIN)/$(OUTPUT)
|
||||
# Rules
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
all: $(BIN) $(OBJ) $(MEMORIES)
|
||||
all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES)
|
||||
|
||||
combined: $(OUTPUT)-combined.bin
|
||||
|
||||
@@ -236,15 +208,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)/" $< > $@
|
||||
@@ -255,70 +224,29 @@ 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))
|
||||
$(SILENT)$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)
|
||||
$(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt
|
||||
$(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin
|
||||
$(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf
|
||||
|
||||
$$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
|
||||
@echo [COMPILING $$<]
|
||||
$(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
|
||||
$(SILENT)$(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 $$@ $$<
|
||||
$(SILENT)@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$<
|
||||
|
||||
debug_$(1): $(1)
|
||||
$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
|
||||
endef
|
||||
|
||||
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:
|
||||
|
||||
@@ -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
|
||||
@@ -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("\n\r\n\r");
|
||||
printf("bootloader updater %s for board %s\n\r"
|
||||
"(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r",
|
||||
manifest_revision, manifest_board);
|
||||
|
||||
/* clear g_dfu on power-up reset */
|
||||
memset(g_dfu, 0, sizeof(*g_dfu));
|
||||
|
||||
TRACE_INFO("USB init...\n\r");
|
||||
/* 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();
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
sysmocom - s.f.m.c. GmbH
|
||||
PRODUCT_STRING
|
||||
bootloader updater
|
||||
RAM
|
||||
Flash (Application Partition)
|
||||
Flash (Bootloader Partition)
|
||||
@@ -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
|
||||
@@ -155,7 +154,7 @@ extern int main(void)
|
||||
WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT |
|
||||
(WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000));
|
||||
|
||||
PIO_InitializeInterrupts(10);
|
||||
PIO_InitializeInterrupts(0);
|
||||
|
||||
print_banner();
|
||||
board_main_top();
|
||||
@@ -194,8 +193,8 @@ extern int main(void)
|
||||
WDT_Restart(WDT);
|
||||
#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
|
||||
const char rotor[] = { '-', '\\', '|', '/' };
|
||||
putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
|
||||
putchar('\b');
|
||||
putchar(rotor[i++ % ARRAY_SIZE(rotor)]);
|
||||
#endif
|
||||
check_exec_dbg_cmd();
|
||||
osmo_timers_prepare();
|
||||
@@ -206,10 +205,6 @@ extern int main(void)
|
||||
if (isUsbConnected) {
|
||||
isUsbConnected = 0;
|
||||
}
|
||||
/* HACK: we don't really deal with USB disconnect yet,
|
||||
* so let's just reset the entire uC if this happens */
|
||||
TRACE_INFO("Resetting uC on USB disconnect\n\r");
|
||||
NVIC_SystemReset();
|
||||
} else if (isUsbConnected == 0) {
|
||||
TRACE_INFO("USB is now configured\n\r");
|
||||
|
||||
|
||||
@@ -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"
|
||||
@@ -267,7 +271,7 @@ 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
|
||||
@@ -338,7 +342,16 @@ extern int main(void)
|
||||
TRACE_INFO("USB init...\n\r");
|
||||
/* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */
|
||||
USBD_Disconnect();
|
||||
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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
|
||||
/* Define attribute */
|
||||
#if defined ( __CC_ARM ) /* Keil µVision 4 */
|
||||
#if defined ( __CC_ARM ) /* Keil µVision 4 */
|
||||
#define WEAK __attribute__ ((weak))
|
||||
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
|
||||
#define WEAK __weak
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
*------------------------------------------------------------------------------*/
|
||||
|
||||
/* Define attribute */
|
||||
#if defined ( __CC_ARM ) /* Keil µVision 4 */
|
||||
#if defined ( __CC_ARM ) /* Keil µVision 4 */
|
||||
#define WEAK __attribute__ ((weak))
|
||||
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
|
||||
#define WEAK __weak
|
||||
|
||||
@@ -296,7 +296,7 @@ typedef uint32_t (*USBDescriptorParseFunction)(void *descriptor, void *parseArg)
|
||||
*/
|
||||
#pragma pack(1)
|
||||
|
||||
#if defined ( __CC_ARM ) /* Keil µVision 4 */
|
||||
#if defined ( __CC_ARM ) /* Keil µVision 4 */
|
||||
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
|
||||
#define __attribute__(...)
|
||||
#elif defined ( __GNUC__ ) /* GCC CS3 2009q3-68 */
|
||||
|
||||
@@ -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_
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
};
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 = .;
|
||||
|
||||
|
||||
@@ -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 = .;
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -100,7 +100,6 @@ extern void UART_Configure( uint32_t baudrate, uint32_t masterClock)
|
||||
|
||||
/* Enable TX interrupts */
|
||||
pUart->UART_IER = UART_IER_TXRDY;
|
||||
NVIC_SetPriority(CONSOLE_IRQ, 15); /* lowest priority */
|
||||
NVIC_EnableIRQ(CONSOLE_IRQ);
|
||||
|
||||
/* Enable receiver and transmitter */
|
||||
|
||||
@@ -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"
|
||||
@@ -64,7 +68,7 @@
|
||||
#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_USIM1_VCC {PIO_PB2, 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}
|
||||
@@ -73,17 +77,14 @@
|
||||
#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}
|
||||
#define PIN_DET_USIM1_PRES {PIO_PA8, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | 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 PIN_PERST1 {PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_PULLUP}
|
||||
#define PINS_PERST { PIN_PERST1 }
|
||||
|
||||
#define PIN_VERSION_DET {PIO_PA19, PIOA, ID_PIOA, PIO_PERIPH_D, PIO_DEFAULT}
|
||||
@@ -101,62 +102,6 @@
|
||||
|
||||
#define DETECT_VCC_BY_ADC
|
||||
#define VCC_UV_THRESH_1V8 1500000
|
||||
#define VCC_UV_THRESH_3V VCC_UV_THRESH_1V8
|
||||
#define VCC_UV_THRESH_3V 2500000
|
||||
|
||||
#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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* sysmocom ngff-cardem application code
|
||||
/* sysmocom quad-modem sysmoQMOD application code
|
||||
*
|
||||
* (C) 2021 Harald Welte <laforge@osmocom.org>
|
||||
*
|
||||
@@ -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 "simtrace.h"
|
||||
@@ -38,8 +42,10 @@ void board_exec_dbg_cmd(int ch)
|
||||
printf("\tL\tswitch on LED 1\n\r");
|
||||
printf("\tg\tswitch off LED 2\n\r");
|
||||
printf("\tG\tswitch on LED 2\n\r");
|
||||
printf("\tU\tProceed to USB Initialization\n\r");
|
||||
printf("\t1\tGenerate 1ms reset pulse on WWAN1\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':
|
||||
@@ -89,13 +95,12 @@ void board_main_top(void)
|
||||
sim_switch_init();
|
||||
#endif
|
||||
|
||||
/* Obtain the circuit board version (currently just prints voltage) */
|
||||
/* 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)
|
||||
@@ -145,11 +150,3 @@ int board_override_enter_dfu(void)
|
||||
|
||||
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);
|
||||
}
|
||||
@@ -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"
|
||||
@@ -35,9 +39,9 @@ int is_card_present(int port)
|
||||
return -1;
|
||||
pin = &pin_cardpres[port];
|
||||
|
||||
|
||||
/* high active here */
|
||||
present = PIO_Get(pin);
|
||||
/* Card present signals are low-active, as we have a switch
|
||||
* against GND and an internal-pull-up in the SAM3 */
|
||||
present = PIO_Get(pin) ? 0 : 1;
|
||||
|
||||
return present;
|
||||
}
|
||||
|
||||
@@ -11,25 +11,28 @@
|
||||
* 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"
|
||||
#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};
|
||||
#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 = PIN_MODEM_EN;// PIN_N_MODEM_PWR_ON;
|
||||
const Pin *pin;
|
||||
enum led led;
|
||||
|
||||
if (!initialized) {
|
||||
@@ -41,10 +44,18 @@ int sim_switch_use_physical(unsigned int nr, int physical)
|
||||
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\n\r", nr);
|
||||
return -1;
|
||||
@@ -52,26 +63,28 @@ int sim_switch_use_physical(unsigned int nr, int physical)
|
||||
|
||||
if (physical) {
|
||||
TRACE_INFO("%u: Use local/physical SIM\r\n", nr);
|
||||
PIO_Configure(pins_default, PIO_LISTSIZE(pins_default));
|
||||
PIO_Clear(pin);
|
||||
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);
|
||||
PIO_Set(pin);
|
||||
led_blink(led, BLINK_ALWAYS_OFF);
|
||||
}
|
||||
|
||||
/* 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));
|
||||
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 1;
|
||||
return num_switch;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -43,7 +47,7 @@ static void wwan2_irqhandler(const Pin *pPin)
|
||||
}
|
||||
#endif
|
||||
|
||||
/* determine if a given WWAN led is currently active or not */
|
||||
/* determine if a tiven WWAN led is currently active or not */
|
||||
int wwan_led_active(int wwan)
|
||||
{
|
||||
const Pin *pin;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
@@ -83,6 +87,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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 <stdbool.h>
|
||||
#include "board.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
|
||||
*/
|
||||
#include "board.h"
|
||||
#include <stdbool.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
|
||||
*/
|
||||
|
||||
#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
|
||||
*/
|
||||
#include "board.h"
|
||||
#include "trace.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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 */
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 "trace.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
|
||||
|
||||
@@ -69,8 +73,6 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx);
|
||||
void card_emu_uart_wait_tx_idle(uint8_t uart_chan);
|
||||
void card_emu_uart_interrupt(uint8_t uart_chan);
|
||||
|
||||
int card_emu_get_vcc(uint8_t uart_chan);
|
||||
|
||||
struct cardemu_usb_msg_config;
|
||||
int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg,
|
||||
unsigned int scfg_len);
|
||||
|
||||
@@ -175,11 +175,11 @@ typedef struct
|
||||
{
|
||||
/// Number of seconds. If 00h then CCID default value is used.
|
||||
unsigned char bTimeOut;
|
||||
/// Several parameters for the PIN format options (defined in § 6.1.11.4)
|
||||
/// Several parameters for the PIN format options (defined in § 6.1.11.4)
|
||||
unsigned char bmFormatString4;
|
||||
/// Define the length of the PIN to present in the APDU command
|
||||
unsigned char bmPINBlockString;
|
||||
/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
|
||||
/// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
|
||||
unsigned char bmPinLengthFormat;
|
||||
/// Insertion position offset in byte for the current PIN
|
||||
unsigned char bInsertionOffsetOld;
|
||||
@@ -218,13 +218,13 @@ typedef struct
|
||||
/// Protocol Data Structure for Protocol T=0 (bProtocolNum=0, dwLength=00000005h)
|
||||
typedef struct
|
||||
{
|
||||
/// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// clock rate conversion factor
|
||||
/// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// baud rate conversion factor
|
||||
unsigned char bmFindexDindex;
|
||||
/// For T=0 ,B0 - 0b, B7-2 - 000000b
|
||||
/// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
|
||||
/// For T=0 ,B0 – 0b, B7-2 – 000000b
|
||||
/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
|
||||
unsigned char bmTCCKST0; // 0 to 2
|
||||
/// Extra Guardtime between two characters. Add 0 to 254 etu to the normal
|
||||
/// guardtime of 12etu. FFh is the same as 00h.
|
||||
@@ -243,14 +243,14 @@ typedef struct
|
||||
/// Protocol Data Structure for Protocol T=1 (bProtocolNum=1, dwLength=00000007h)
|
||||
typedef struct
|
||||
{
|
||||
/// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// B7-4 – FI – Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// clock rate conversion factor
|
||||
/// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// B3-0 – DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
|
||||
/// baud rate conversion factor
|
||||
unsigned char bmFindexDindex;
|
||||
/// For T=1, B7-2 - 000100b
|
||||
/// B0 - Checksum type (b0=0 for LRC, b0=1 for CRC
|
||||
/// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
|
||||
/// For T=1, B7-2 – 000100b
|
||||
/// B0 – Checksum type (b0=0 for LRC, b0=1 for CRC
|
||||
/// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
|
||||
unsigned char bmTCCKST1; // 10h, 11h, 12h, 13h
|
||||
/// Extra Guardtime (0 to 254 etu between two characters).
|
||||
/// If value is FFh, then guardtime is reduced by 1.
|
||||
@@ -292,8 +292,8 @@ typedef struct
|
||||
/// - 04h 1.8V
|
||||
/// Other bits are RFU.
|
||||
unsigned char bVoltageSupport;
|
||||
/// RRRR -Upper Word- is RFU = 0000h
|
||||
/// PPPP -Lower Word- Encodes the supported protocol types. A "1" in a given
|
||||
/// RRRR –Upper Word- is RFU = 0000h
|
||||
/// PPPP –Lower Word- Encodes the supported protocol types. A ‘1’ in a given
|
||||
/// bit position indicates support for the associated ISO protocol.
|
||||
/// 0001h = Protocol T=0
|
||||
/// 0002h = Protocol T=1
|
||||
@@ -318,7 +318,7 @@ typedef struct
|
||||
/// Indicates the maximum IFSD supported by CCID for protocol T=1.
|
||||
unsigned long dwMaxIFSD;
|
||||
/// - RRRR-Upper Word- is RFU = 0000h
|
||||
/// - PPPP-Lower Word- encodes the supported protocol types. A "1" in a given
|
||||
/// - PPPP-Lower Word- encodes the supported protocol types. A ‘1’ in a given
|
||||
/// bit position indicates support for the associated protocol.
|
||||
/// 0001h indicates support for the 2-wire protocol 1
|
||||
/// 0002h indicates support for the 3-wire protocol 1
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -32,22 +36,4 @@ int rbuf_write(volatile ringbuf * rb, uint8_t item);
|
||||
bool rbuf_is_empty(volatile ringbuf * rb);
|
||||
bool rbuf_is_full(volatile ringbuf * rb);
|
||||
|
||||
|
||||
/* same as above but with 16bit values instead of 8bit */
|
||||
|
||||
#define RING16_BUFLEN 512
|
||||
|
||||
typedef struct ringbuf16 {
|
||||
uint16_t buf[RING16_BUFLEN];
|
||||
size_t ird;
|
||||
size_t iwr;
|
||||
} ringbuf16;
|
||||
|
||||
void rbuf16_reset(volatile ringbuf16 * rb);
|
||||
uint16_t rbuf16_read(volatile ringbuf16 * rb);
|
||||
uint16_t rbuf16_peek(volatile ringbuf16 * rb);
|
||||
int rbuf16_write(volatile ringbuf16 * rb, uint16_t item);
|
||||
bool rbuf16_is_empty(volatile ringbuf16 * rb);
|
||||
bool rbuf16_is_full(volatile ringbuf16 * rb);
|
||||
|
||||
#endif /* end of include guard: SIMTRACE_RINGBUF_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
|
||||
@@ -124,8 +128,4 @@ extern void mode_cardemu_usart1_irq(void);
|
||||
void Timer_Init( void );
|
||||
void TC0_Counter_Reset( void );
|
||||
|
||||
/* Sim presence pins */
|
||||
bool mode_cardemu_get_presence_pol(uint8_t instance);
|
||||
void mode_cardemu_set_presence_pol(uint8_t instance, bool high);
|
||||
|
||||
#endif /* 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
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
@@ -261,21 +265,12 @@ struct cardemu_usb_msg_error {
|
||||
/* enable/disable the generation of DO_STATUS on IRQ endpoint */
|
||||
#define CEMU_FEAT_F_STATUS_IRQ 0x00000001
|
||||
|
||||
#define CEMU_CONFIG_PRES_POL_PRES_L 0x00
|
||||
#define CEMU_CONFIG_PRES_POL_PRES_H 0x01
|
||||
#define CEMU_CONFIG_PRES_POL_VALID 0x02
|
||||
|
||||
/* SIMTRACE_MSGT_BD_CEMU_CONFIG */
|
||||
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;
|
||||
/* Sim presence pin polarity. Bit 1 is a validity bit. Bit 0 gpio value when sim present.
|
||||
* When sim is present, set sim_present gpio to high -> 0x03
|
||||
* When sim is present, set sim_present gpio to low -> 0x02
|
||||
*/
|
||||
uint8_t pres_pol;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/***********************************************************************
|
||||
@@ -322,9 +317,6 @@ struct st_modem_status {
|
||||
#define SNIFF_DATA_FLAG_ERROR_INCOMPLETE (1<<5)
|
||||
#define SNIFF_DATA_FLAG_ERROR_MALFORMED (1<<6)
|
||||
#define SNIFF_DATA_FLAG_ERROR_CHECKSUM (1<<7)
|
||||
#define SNIFF_DATA_FLAG_ERROR_OVERRUN (1<<8)
|
||||
#define SNIFF_DATA_FLAG_ERROR_FRAMING (1<<9)
|
||||
#define SNIFF_DATA_FLAG_ERROR_PARITY (1<<10)
|
||||
|
||||
/* SIMTRACE_MSGT_SNIFF_CHANGE */
|
||||
struct sniff_change {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 <stdio.h>
|
||||
#include <assert.h>
|
||||
@@ -24,7 +28,6 @@
|
||||
#include "trace.h"
|
||||
#include "iso7816_fidi.h"
|
||||
#include "card_emu.h"
|
||||
#include "simtrace.h"
|
||||
#include "simtrace_prot.h"
|
||||
#include "usb_buf.h"
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
@@ -776,15 +779,6 @@ static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts)
|
||||
/* prepare to extend the waiting time once half of it is reached */
|
||||
card_emu_uart_update_wt(ch->uart_chan, ch->waiting_time);
|
||||
break;
|
||||
case TPDU_S_WAIT_TX:
|
||||
/* If we came from WAIT_RX, disable the receiver and
|
||||
* enable the transmitter. If we came from WAIT_RX or
|
||||
* WAIT_PB, reset the waiting time so that we can extend
|
||||
* waiting time if needed. */
|
||||
card_emu_uart_enable(ch->uart_chan, ENABLE_TX);
|
||||
/* prepare to extend the waiting time once half of it is reached */
|
||||
card_emu_uart_update_wt(ch->uart_chan, ch->waiting_time);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -928,7 +922,6 @@ static int tx_byte_tpdu(struct card_handle *ch)
|
||||
byte = msgb_pull_u8(msg);
|
||||
|
||||
card_emu_uart_tx(ch->uart_chan, byte);
|
||||
card_emu_uart_reset_wt(ch->uart_chan);
|
||||
|
||||
/* this must happen _after_ the byte has been transmitted */
|
||||
switch (ch->tpdu.state) {
|
||||
@@ -1068,10 +1061,7 @@ void card_emu_report_status(struct card_handle *ch, bool report_on_irq)
|
||||
sts->flags |= CEMU_STATUS_F_CLK_ACTIVE;
|
||||
if (ch->in_reset)
|
||||
sts->flags |= CEMU_STATUS_F_RESET_ACTIVE;
|
||||
#ifdef DETECT_VCC_BY_ADC
|
||||
sts->voltage_mv = card_emu_get_vcc(ch->num);
|
||||
#endif
|
||||
/* FIXME: card insert */
|
||||
/* FIXME: voltage + card insert */
|
||||
sts->F_index = ch->F_index;
|
||||
sts->D_index = ch->D_index;
|
||||
sts->wi = ch->wi;
|
||||
@@ -1097,7 +1087,7 @@ static void card_emu_report_config(struct card_handle *ch)
|
||||
#else
|
||||
cfg->slot_mux_nr = 0;
|
||||
#endif
|
||||
cfg->pres_pol = mode_cardemu_get_presence_pol(ch->num) | CEMU_CONFIG_PRES_POL_VALID;
|
||||
|
||||
|
||||
usb_buf_upd_len_and_submit(msg);
|
||||
}
|
||||
@@ -1115,12 +1105,7 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
|
||||
card_set_state(ch, ISO_S_WAIT_POWER);
|
||||
chg_mask |= CEMU_STATUS_F_VCC_PRESENT;
|
||||
} else if (active == 1 && ch->vcc_active == 0) {
|
||||
#ifdef DETECT_VCC_BY_ADC
|
||||
TRACE_INFO("%u: VCC activated (%d mV)\r\n", ch->num,
|
||||
card_emu_get_vcc(ch->num));
|
||||
#else
|
||||
TRACE_INFO("%u: VCC activated\r\n", ch->num);
|
||||
#endif
|
||||
card_set_state(ch, ISO_S_WAIT_CLK);
|
||||
chg_mask |= CEMU_STATUS_F_VCC_PRESENT;
|
||||
}
|
||||
@@ -1271,11 +1256,6 @@ int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_con
|
||||
}
|
||||
#endif
|
||||
|
||||
if (scfg_len >= sizeof(uint32_t)+sizeof(uint8_t)+sizeof(uint8_t)) {
|
||||
if (scfg->pres_pol & CEMU_CONFIG_PRES_POL_VALID)
|
||||
mode_cardemu_set_presence_pol(ch->num, scfg->pres_pol & CEMU_CONFIG_PRES_POL_PRES_H);
|
||||
}
|
||||
|
||||
/* send back a report of our current configuration */
|
||||
card_emu_report_config(ch);
|
||||
|
||||
|
||||
@@ -193,8 +193,8 @@ static void RDRtoPCDatablock_ATR( void )
|
||||
ccidDriver.ProtocolDataStructure[0] = Atr[2]; // TA(1)
|
||||
|
||||
// bmTCCKST0
|
||||
// For T=0 ,B0 - 0b, B7-2 - 000000b
|
||||
// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
|
||||
// For T=0 ,B0 – 0b, B7-2 – 000000b
|
||||
// B1 – Convention used (b1=0 for direct, b1=1 for inverse)
|
||||
|
||||
// bGuardTimeT0
|
||||
// Extra Guardtime between two characters. Add 0 to 254 etu to the normal
|
||||
@@ -1005,7 +1005,7 @@ unsigned char CCID_Removal( void )
|
||||
//------------------------------------------------------------------------------
|
||||
/// Interrupt-IN Messages
|
||||
/// This message is sent when any bit in the bHardwareErrorCode field is set.
|
||||
/// If this message is sent when there is no "outstanding" command, the bSeq
|
||||
/// If this message is sent when there is no “outstanding” command, the bSeq
|
||||
/// field will be undefined.
|
||||
/// \param bSlot ICC slot number
|
||||
/// \param bSeq Sequence number of the bulk OUT command when the hardware error
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
/* SIMtrace 2 firmware crc stub
|
||||
*
|
||||
* (C) 2021 by sysmocom -s.f.m.c. GmbH, Author: Eric Wild <ewild@sysmocom.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include "board.h"
|
||||
#include "core_cm3.h"
|
||||
#include "usb/device/dfu/dfu.h"
|
||||
|
||||
/*
|
||||
* This file is a bit special, everything has to go to specific sections, and no globals are available.
|
||||
* No external functions may be called, unless inlining is enforced!
|
||||
*/
|
||||
|
||||
static void crc_check_stub();
|
||||
__attribute__((section(".crcstub_table"))) volatile uint32_t crcstub_dummy_table[] = {
|
||||
(uint32_t)0xdeadc0de, /* deliberately choose invalid value so unpatched image will not be started */
|
||||
(uint32_t)crc_check_stub, /* must be valid flash addr */
|
||||
(uint32_t)0xf1, /* crc value calculated by the host */
|
||||
(uint32_t)0xf2, /* crc calc start address */
|
||||
(uint32_t)0xf3 /* crc calc length (byte) */
|
||||
};
|
||||
|
||||
__attribute__((section(".crcstub_code"))) static void do_crc32(int8_t c, uint32_t *crc_reg)
|
||||
{
|
||||
int32_t i, mask;
|
||||
*crc_reg ^= c;
|
||||
|
||||
for (unsigned int j = 0; j < 8; j++)
|
||||
if (*crc_reg & 1)
|
||||
*crc_reg = (*crc_reg >> 1) ^ 0xEDB88320;
|
||||
else
|
||||
*crc_reg = *crc_reg >> 1;
|
||||
}
|
||||
|
||||
__attribute__((section(".crcstub_code"), noinline)) static void crc_check_stub()
|
||||
{
|
||||
uint32_t crc_reg = 0xffffffff;
|
||||
uint32_t expected_crc_val = crcstub_dummy_table[2];
|
||||
uint8_t *crc_calc_startaddr = (uint8_t *)crcstub_dummy_table[3];
|
||||
volatile uint32_t *actual_exc_tbl = (volatile uint32_t *)crc_calc_startaddr;
|
||||
uint32_t crc_len = crcstub_dummy_table[4];
|
||||
|
||||
/* 4000ms wdt tickling */
|
||||
WDT->WDT_MR = WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT | (((4000UL << 8) / 1000) << 16) |
|
||||
((4000UL << 8) / 1000);
|
||||
|
||||
for (uint8_t *i = crc_calc_startaddr; i < crc_calc_startaddr + crc_len; i++)
|
||||
do_crc32(*i, &crc_reg);
|
||||
|
||||
crc_reg = ~crc_reg;
|
||||
|
||||
if (crc_reg == expected_crc_val) {
|
||||
/* this looks a bit awkward because we have to ensure the bx does not require a sp-relative load */
|
||||
__asm__ volatile("\
|
||||
mov r0, %0;\n\
|
||||
mov r1, %1;\n\
|
||||
MSR msp,r0;\n\
|
||||
bx r1;"
|
||||
:
|
||||
: "r"(actual_exc_tbl[0]), "r"(actual_exc_tbl[1]));
|
||||
} else {
|
||||
/* no globals ! */
|
||||
((struct dfudata *)0x20000000)->magic = USB_DFU_MAGIC;
|
||||
__DSB();
|
||||
for (;;) {
|
||||
/* no functon call, since NVIC_SystemReset() might not be inlined! */
|
||||
SCB->AIRCR = ((0x5FA << SCB_AIRCR_VECTKEY_Pos) | (SCB->AIRCR & SCB_AIRCR_PRIGROUP_Msk) |
|
||||
SCB_AIRCR_SYSRESETREQ_Msk);
|
||||
__DSB();
|
||||
while (1)
|
||||
;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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 <stdio.h>
|
||||
#include "uart_console.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
|
||||
*/
|
||||
#include "board.h"
|
||||
#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
|
||||
*/
|
||||
#include <stdint.h>
|
||||
#include <errno.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
|
||||
*/
|
||||
|
||||
#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
|
||||
*/
|
||||
#include "board.h"
|
||||
#include "boardver_adc.h"
|
||||
@@ -35,21 +39,9 @@ static const Pin pins_cardsim[] = PINS_CARDSIM;
|
||||
#endif
|
||||
|
||||
/* UART pins */
|
||||
#if defined(ngff_cardem)
|
||||
static const Pin pins_usim1[] = {PINS_USIM2};
|
||||
static const Pin pin_usim1_rst = PIN_USIM2_nRST;
|
||||
#define FIRST_USART_BASE USART0
|
||||
#define FIRST_USART_ID ID_USART0
|
||||
#define FIRST_USART_IRQ USART0_IRQn
|
||||
#else
|
||||
static const Pin pins_usim1[] = {PINS_USIM1};
|
||||
static const Pin pin_usim1_rst = PIN_USIM1_nRST;
|
||||
#define FIRST_USART_BASE USART1
|
||||
#define FIRST_USART_ID ID_USART1
|
||||
#define FIRST_USART_IRQ USART1_IRQn
|
||||
#endif
|
||||
static const Pin pin_usim1_vcc = PIN_USIM1_VCC;
|
||||
|
||||
#ifdef PIN_USIM1_IO_DIR
|
||||
static const Pin pin_io_dir = PIN_USIM1_IO_DIR;
|
||||
#endif
|
||||
@@ -79,36 +71,22 @@ struct cardem_inst {
|
||||
uint8_t ep_out;
|
||||
uint8_t ep_in;
|
||||
uint8_t ep_int;
|
||||
/*! Pin to set when SIM is present/inserted (SIM presence pin). */
|
||||
const Pin pin_insert;
|
||||
/*! Invert the Pin polarity. When not inverted, the SIM pin_insert will be High, when a SIM is present. */
|
||||
bool pin_insert_inverted;
|
||||
#ifdef DETECT_VCC_BY_ADC
|
||||
uint32_t vcc_uv;
|
||||
#endif
|
||||
|
||||
/*! real-time state of VCC I/O line, irrespective of enabled flag */
|
||||
bool vcc_active;
|
||||
|
||||
/*! last VCC state we reported to the card emu state machine (conditioned by enabled flag) */
|
||||
bool vcc_active_last;
|
||||
|
||||
/*! real-time state of RST I/O line, irrespective of enabled flag */
|
||||
bool rst_active;
|
||||
|
||||
/*! last RST state we reported to the card emu state machine (conditioned by enabled flag) */
|
||||
bool rst_active_last;
|
||||
|
||||
/*! flag indicating whether this instance should perform card emulation, or not */
|
||||
bool enabled;
|
||||
};
|
||||
|
||||
struct cardem_inst cardem_inst[] = {
|
||||
{
|
||||
.num = 0,
|
||||
.usart_info = {
|
||||
.base = FIRST_USART_BASE,
|
||||
.id = FIRST_USART_ID,
|
||||
.base = USART1,
|
||||
.id = ID_USART1,
|
||||
.state = USART_RCV
|
||||
},
|
||||
.ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT,
|
||||
@@ -116,10 +94,7 @@ struct cardem_inst cardem_inst[] = {
|
||||
.ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT,
|
||||
#ifdef PIN_SET_USIM1_PRES
|
||||
.pin_insert = PIN_SET_USIM1_PRES,
|
||||
#endif /* PIN_SET_USIM1_PRES */
|
||||
#ifdef PIN_SET_USIM1_PRES_INVERTED
|
||||
.pin_insert_inverted = true,
|
||||
#endif /* PIN_SET_USIM1_PRES_INVERTED */
|
||||
#endif
|
||||
},
|
||||
#ifdef CARDEMU_SECOND_UART
|
||||
{
|
||||
@@ -134,10 +109,7 @@ struct cardem_inst cardem_inst[] = {
|
||||
.ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT,
|
||||
#ifdef PIN_SET_USIM2_PRES
|
||||
.pin_insert = PIN_SET_USIM2_PRES,
|
||||
#endif /* PIN_SET_USIM2_PRES */
|
||||
#ifdef PIN_SET_USIM2_PRES_INVERTED
|
||||
.pin_insert_inverted = true,
|
||||
#endif /* PIN_SET_USIM2_PRES_INVERTED */
|
||||
#endif
|
||||
},
|
||||
#endif
|
||||
};
|
||||
@@ -188,16 +160,6 @@ static void card_emu_uart_set_direction(uint8_t uart_chan, bool tx)
|
||||
#endif
|
||||
}
|
||||
|
||||
int card_emu_get_vcc(uint8_t uart_chan)
|
||||
{
|
||||
struct cardem_inst *ci = &cardem_inst[uart_chan];
|
||||
#ifdef DETECT_VCC_BY_ADC
|
||||
return ci->vcc_uv / 1000;
|
||||
#else
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* call-back from card_emu.c to enable/disable transmit and/or receive */
|
||||
void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx)
|
||||
{
|
||||
@@ -430,9 +392,10 @@ void card_emu_uart_reset_wt(uint8_t uart_chan)
|
||||
/* call-back from card_emu.c to force a USART interrupt */
|
||||
void card_emu_uart_interrupt(uint8_t uart_chan)
|
||||
{
|
||||
OSMO_ASSERT(uart_chan < ARRAY_SIZE(cardem_inst));
|
||||
Usart *usart = get_usart_by_chan(uart_chan);
|
||||
|
||||
if (!usart) {
|
||||
return;
|
||||
}
|
||||
if (USART0 == usart) {
|
||||
NVIC_SetPendingIRQ(USART0_IRQn);
|
||||
} else if (USART1 == usart) {
|
||||
@@ -446,7 +409,7 @@ void card_emu_uart_interrupt(uint8_t uart_chan)
|
||||
|
||||
#ifdef DETECT_VCC_BY_ADC
|
||||
#if !defined(VCC_UV_THRESH_1V8) || !defined(VCC_UV_THRESH_3V)
|
||||
#error "You must define VCC_UV_THRESH_{1V8,3V} if you use ADC VCC detection"
|
||||
#error "You must define VCC_UV_THRESH_{1V1,3V} if you use ADC VCC detection"
|
||||
#endif
|
||||
|
||||
static volatile int adc_triggered = 0;
|
||||
@@ -490,7 +453,6 @@ static int card_vcc_adc_init(void)
|
||||
ADC->ADC_CHER |= ADC_CHER_CH6;
|
||||
ADC->ADC_IER |= ADC_IER_EOC6;
|
||||
#endif
|
||||
NVIC_SetPriority(ADC_IRQn, 13);
|
||||
NVIC_EnableIRQ(ADC_IRQn);
|
||||
ADC->ADC_CR |= ADC_CR_START;
|
||||
|
||||
@@ -535,25 +497,19 @@ void ADC_IrqHandler(void)
|
||||
#endif /* DETECT_VCC_BY_ADC */
|
||||
|
||||
|
||||
/**
|
||||
* called from main loop; dispatches card I/O state changes to card_emu from main loop.
|
||||
* NOTE: conditions I/O state on the ci->enabled flag; if the instance is disabled, we assume VCC is
|
||||
* disabled and the device is not in reset
|
||||
*/
|
||||
/* called from main loop; dispatches card I/O state changes to card_emu from main loop */
|
||||
static void process_io_statechg(struct cardem_inst *ci)
|
||||
{
|
||||
const bool vcc_active = ci->vcc_active && ci->enabled;
|
||||
if (vcc_active != ci->vcc_active_last) {
|
||||
card_emu_io_statechg(ci->ch, CARD_IO_VCC, vcc_active);
|
||||
if (ci->vcc_active != ci->vcc_active_last) {
|
||||
card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active);
|
||||
/* FIXME do this for real */
|
||||
card_emu_io_statechg(ci->ch, CARD_IO_CLK, vcc_active);
|
||||
ci->vcc_active_last = vcc_active;
|
||||
card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active);
|
||||
ci->vcc_active_last = ci->vcc_active;
|
||||
}
|
||||
|
||||
const bool rst_active = ci->rst_active && ci->enabled;
|
||||
if (rst_active != ci->rst_active_last) {
|
||||
card_emu_io_statechg(ci->ch, CARD_IO_RST, rst_active);
|
||||
ci->rst_active_last = rst_active;
|
||||
if (ci->rst_active != ci->rst_active_last) {
|
||||
card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active);
|
||||
ci->rst_active_last = ci->rst_active;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -600,8 +556,6 @@ void mode_cardemu_init(void)
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
NVIC_SetPriority(UDP_IRQn, 14);
|
||||
|
||||
#ifdef PINS_CARDSIM
|
||||
PIO_Configure(pins_cardsim, PIO_LISTSIZE(pins_cardsim));
|
||||
#endif
|
||||
@@ -615,8 +569,7 @@ void mode_cardemu_init(void)
|
||||
|
||||
/* configure USART as ISO-7816 slave (e.g. card) */
|
||||
ISO7816_Init(&cardem_inst[0].usart_info, CLK_SLAVE);
|
||||
NVIC_SetPriority(FIRST_USART_IRQ, 0);
|
||||
NVIC_EnableIRQ(FIRST_USART_IRQ);
|
||||
NVIC_EnableIRQ(USART1_IRQn);
|
||||
PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler);
|
||||
PIO_EnableIt(&pin_usim1_rst);
|
||||
|
||||
@@ -643,7 +596,6 @@ void mode_cardemu_init(void)
|
||||
PIO_Configure(pins_usim2, PIO_LISTSIZE(pins_usim2));
|
||||
ISO7816_Init(&cardem_inst[1].usart_info, CLK_SLAVE);
|
||||
/* TODO enable timeout */
|
||||
NVIC_SetPriority(USART0_IRQn, 0);
|
||||
NVIC_EnableIRQ(USART0_IRQn);
|
||||
PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler);
|
||||
PIO_EnableIt(&pin_usim2_rst);
|
||||
@@ -675,9 +627,9 @@ void mode_cardemu_exit(void)
|
||||
PIO_DisableIt(&pin_usim1_rst);
|
||||
PIO_DisableIt(&pin_usim1_vcc);
|
||||
|
||||
NVIC_DisableIRQ(FIRST_USART_IRQ);
|
||||
USART_SetTransmitterEnabled(FIRST_USART_BASE, 0);
|
||||
USART_SetReceiverEnabled(FIRST_USART_BASE, 0);
|
||||
NVIC_DisableIRQ(USART1_IRQn);
|
||||
USART_SetTransmitterEnabled(USART1, 0);
|
||||
USART_SetReceiverEnabled(USART1, 0);
|
||||
|
||||
#ifdef CARDEMU_SECOND_UART
|
||||
PIO_DisableIt(&pin_usim2_rst);
|
||||
@@ -709,7 +661,7 @@ static void process_card_insert(struct cardem_inst *ci, bool card_insert)
|
||||
TRACE_INFO("%u: set card_insert to %s\r\n", ci->num, card_insert ? "INSERTED" : "REMOVED");
|
||||
|
||||
#ifdef HAVE_BOARD_CARDINSERT
|
||||
board_set_card_insert(ci, card_insert ^ ci->pin_insert_inverted);
|
||||
board_set_card_insert(ci, card_insert);
|
||||
#else
|
||||
if (!ci->pin_insert.pio) {
|
||||
TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",
|
||||
@@ -717,7 +669,7 @@ static void process_card_insert(struct cardem_inst *ci, bool card_insert)
|
||||
return;
|
||||
}
|
||||
|
||||
if (card_insert ^ ci->pin_insert_inverted)
|
||||
if (card_insert)
|
||||
PIO_Set(&ci->pin_insert);
|
||||
else
|
||||
PIO_Clear(&ci->pin_insert);
|
||||
@@ -804,8 +756,10 @@ static int usb_command_sim_select(struct msgb *msg, struct cardem_inst *ci)
|
||||
if (msgb_l2len(msg) < sizeof(*mss))
|
||||
return -1;
|
||||
|
||||
ci->enabled = mss->remote_sim ? true : false;
|
||||
sim_switch_use_physical(ci->num, !ci->enabled);
|
||||
if (mss->remote_sim)
|
||||
sim_switch_use_physical(ci->num, 0);
|
||||
else
|
||||
sim_switch_use_physical(ci->num, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -949,10 +903,7 @@ void mode_cardemu_run(void)
|
||||
}
|
||||
uint8_t byte = rbuf_read(&ci->rb);
|
||||
__enable_irq();
|
||||
|
||||
if (ci->enabled) {
|
||||
card_emu_process_rx_byte(ci->ch, byte);
|
||||
}
|
||||
card_emu_process_rx_byte(ci->ch, byte);
|
||||
//TRACE_ERROR("%uRx%02x\r\n", i, byte);
|
||||
}
|
||||
|
||||
@@ -971,25 +922,3 @@ void mode_cardemu_run(void)
|
||||
process_any_usb_commands(queue, ci);
|
||||
}
|
||||
}
|
||||
|
||||
void mode_cardemu_set_presence_pol(uint8_t instance, bool high)
|
||||
{
|
||||
struct cardem_inst *ci;
|
||||
|
||||
if (instance >= ARRAY_SIZE(cardem_inst))
|
||||
return;
|
||||
|
||||
ci = &cardem_inst[instance];
|
||||
ci->pin_insert_inverted = !high;
|
||||
}
|
||||
|
||||
bool mode_cardemu_get_presence_pol(uint8_t instance)
|
||||
{
|
||||
struct cardem_inst *ci;
|
||||
|
||||
if (instance >= ARRAY_SIZE(cardem_inst))
|
||||
return false;
|
||||
|
||||
ci = &cardem_inst[instance];
|
||||
return !ci->pin_insert_inverted;
|
||||
}
|
||||
|
||||
@@ -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 <stdint.h>
|
||||
#include <stdio.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
|
||||
*/
|
||||
#include "ringbuffer.h"
|
||||
#include "trace.h"
|
||||
@@ -28,16 +32,6 @@ void rbuf_reset(volatile ringbuf * rb)
|
||||
local_irq_restore(state);
|
||||
}
|
||||
|
||||
void rbuf16_reset(volatile ringbuf16 * rb)
|
||||
{
|
||||
unsigned long state;
|
||||
|
||||
local_irq_save(state);
|
||||
rb->ird = 0;
|
||||
rb->iwr = 0;
|
||||
local_irq_restore(state);
|
||||
}
|
||||
|
||||
uint8_t rbuf_read(volatile ringbuf * rb)
|
||||
{
|
||||
unsigned long state;
|
||||
@@ -51,49 +45,21 @@ uint8_t rbuf_read(volatile ringbuf * rb)
|
||||
return val;
|
||||
}
|
||||
|
||||
uint16_t rbuf16_read(volatile ringbuf16 * rb)
|
||||
{
|
||||
unsigned long state;
|
||||
uint16_t val;
|
||||
|
||||
local_irq_save(state);
|
||||
val = rb->buf[rb->ird];
|
||||
rb->ird = (rb->ird + 1) % RING16_BUFLEN;
|
||||
local_irq_restore(state);
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
uint8_t rbuf_peek(volatile ringbuf * rb)
|
||||
{
|
||||
return rb->buf[rb->ird];
|
||||
}
|
||||
|
||||
uint16_t rbuf16_peek(volatile ringbuf16 * rb)
|
||||
{
|
||||
return rb->buf[rb->ird];
|
||||
}
|
||||
|
||||
bool rbuf_is_empty(volatile ringbuf * rb)
|
||||
{
|
||||
return rb->ird == rb->iwr;
|
||||
}
|
||||
|
||||
bool rbuf16_is_empty(volatile ringbuf16 * rb)
|
||||
{
|
||||
return rb->ird == rb->iwr;
|
||||
}
|
||||
|
||||
static bool __rbuf_is_full(volatile ringbuf * rb)
|
||||
{
|
||||
return rb->ird == (rb->iwr + 1) % RING_BUFLEN;
|
||||
}
|
||||
|
||||
static bool __rbuf16_is_full(volatile ringbuf16 * rb)
|
||||
{
|
||||
return rb->ird == (rb->iwr + 1) % RING16_BUFLEN;
|
||||
}
|
||||
|
||||
bool rbuf_is_full(volatile ringbuf * rb)
|
||||
{
|
||||
unsigned long state;
|
||||
@@ -106,18 +72,6 @@ bool rbuf_is_full(volatile ringbuf * rb)
|
||||
return rc;
|
||||
}
|
||||
|
||||
bool rbuf16_is_full(volatile ringbuf16 * rb)
|
||||
{
|
||||
unsigned long state;
|
||||
bool rc;
|
||||
|
||||
local_irq_save(state);
|
||||
rc = rb->ird == (rb->iwr + 1) % RING16_BUFLEN;
|
||||
local_irq_restore(state);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
int rbuf_write(volatile ringbuf * rb, uint8_t item)
|
||||
{
|
||||
unsigned long state;
|
||||
@@ -134,18 +88,4 @@ int rbuf_write(volatile ringbuf * rb, uint8_t item)
|
||||
}
|
||||
}
|
||||
|
||||
int rbuf16_write(volatile ringbuf16 * rb, uint16_t item)
|
||||
{
|
||||
unsigned long state;
|
||||
|
||||
local_irq_save(state);
|
||||
if (!__rbuf16_is_full(rb)) {
|
||||
rb->buf[rb->iwr] = item;
|
||||
rb->iwr = (rb->iwr + 1) % RING16_BUFLEN;
|
||||
local_irq_restore(state);
|
||||
return 0;
|
||||
} else {
|
||||
local_irq_restore(state);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* SIMtrace 2 sniffer mode
|
||||
*
|
||||
* (C) 2016-2022 by Harald Welte <hwelte@hmw-consulting.de>
|
||||
* (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de>
|
||||
* (C) 2018 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
|
||||
@@ -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
|
||||
*/
|
||||
/* This code implement the Sniffer mode to sniff the communication between a
|
||||
* SIM card (or any ISO 7816 smart card) and a phone (or any ISO 7816 card
|
||||
@@ -111,13 +115,6 @@ enum tpdu_sniff_state {
|
||||
TPDU_S_SW2, /*!< second status word */
|
||||
};
|
||||
|
||||
/*! Error flags we use to report USART errors via the ringbuffer */
|
||||
#define RBUF16_F_OVERRUN 0x0100
|
||||
#define RBUF16_F_FRAMING 0x0200
|
||||
#define RBUF16_F_PARITY 0x0400
|
||||
#define RBUF16_F_TIMEOUT_WT 0x0800
|
||||
#define RBUF16_F_DATA_BYTE 0x8000
|
||||
|
||||
/*------------------------------------------------------------------------------
|
||||
* Internal variables
|
||||
*------------------------------------------------------------------------------*/
|
||||
@@ -145,58 +142,50 @@ static struct Usart_info sniff_usart = {
|
||||
.state = USART_RCV,
|
||||
};
|
||||
/*! Ring buffer to store sniffer communication data */
|
||||
static struct ringbuf16 sniff_buffer;
|
||||
static struct ringbuf sniff_buffer;
|
||||
|
||||
/* Flags to know is the card status changed (see SIMTRACE_MSGT_DT_SNIFF_CHANGE flags) */
|
||||
static volatile uint32_t change_flags = 0;
|
||||
volatile uint32_t change_flags = 0;
|
||||
|
||||
/* ISO 7816 variables */
|
||||
/*! ISO 7816-3 state */
|
||||
static enum iso7816_3_sniff_state iso_state = ISO7816_S_RESET;
|
||||
|
||||
static struct {
|
||||
/*! ATR state */
|
||||
enum atr_sniff_state state;
|
||||
/*! ATR data
|
||||
* @remark can be used to check later protocol changes
|
||||
*/
|
||||
uint8_t atr[MAX_ATR_SIZE];
|
||||
/*! Current index in the ATR data */
|
||||
uint8_t atr_i;
|
||||
} g_atr;
|
||||
|
||||
enum iso7816_3_sniff_state iso_state = ISO7816_S_RESET;
|
||||
/*! ATR state */
|
||||
enum atr_sniff_state atr_state;
|
||||
/*! ATR data
|
||||
* @remark can be used to check later protocol changes
|
||||
*/
|
||||
uint8_t atr[MAX_ATR_SIZE];
|
||||
/*! Current index in the ATR data */
|
||||
uint8_t atr_i = 0;
|
||||
/*! If convention conversion is needed */
|
||||
static bool convention_convert = false;
|
||||
bool convention_convert = false;
|
||||
/*! The supported T protocols */
|
||||
static uint16_t t_protocol_support = 0;
|
||||
|
||||
static struct {
|
||||
/*! PPS state
|
||||
* @remark it is shared between request and response since they aren't simultaneous but
|
||||
* follow the same procedure */
|
||||
enum pps_sniff_state state;
|
||||
/*! PPS request data
|
||||
* @remark can be used to check PPS response */
|
||||
uint8_t req[MAX_PPS_SIZE];
|
||||
/*! PPS response data */
|
||||
uint8_t rsp[MAX_PPS_SIZE];
|
||||
} g_pps;
|
||||
|
||||
static struct {
|
||||
/*! TPDU state */
|
||||
enum tpdu_sniff_state state;
|
||||
/*! Final TPDU packet
|
||||
* @note this is the complete command+response TPDU, including header, data, and status words
|
||||
* @remark this does not include the procedure bytes */
|
||||
uint8_t packet[5+256+2];
|
||||
/*! Current index in TPDU packet */
|
||||
uint16_t packet_i;
|
||||
} g_tpdu;
|
||||
uint16_t t_protocol_support = 0;
|
||||
/*! PPS state
|
||||
* @remark it is shared between request and response since they aren't simultaneous but follow the same procedure
|
||||
*/
|
||||
enum pps_sniff_state pps_state;
|
||||
/*! PPS request data
|
||||
* @remark can be used to check PPS response
|
||||
*/
|
||||
uint8_t pps_req[MAX_PPS_SIZE];
|
||||
/*! PPS response data */
|
||||
uint8_t pps_rsp[MAX_PPS_SIZE];
|
||||
/*! TPDU state */
|
||||
enum tpdu_sniff_state tpdu_state;
|
||||
/*! Final TPDU packet
|
||||
* @note this is the complete command+response TPDU, including header, data, and status words
|
||||
* @remark this does not include the procedure bytes
|
||||
*/
|
||||
uint8_t tpdu_packet[5+256+2];
|
||||
/*! Current index in TPDU packet */
|
||||
uint16_t tpdu_packet_i = 0;
|
||||
|
||||
/*! Waiting Time (WT)
|
||||
* @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
|
||||
*/
|
||||
static uint32_t g_wt = 9600;
|
||||
uint32_t wt = 9600;
|
||||
|
||||
/*------------------------------------------------------------------------------
|
||||
* Internal functions
|
||||
@@ -211,11 +200,10 @@ static const uint8_t convention_convert_lut[256] = { 0xff, 0x7f, 0xbf, 0x3f, 0xd
|
||||
/*! Update Waiting Time (WT)
|
||||
* @param[in] wi Waiting Integer (0 if unchanged)
|
||||
* @param[in] d Baud Rate divider (0 if unchanged)
|
||||
* @param[in] cause String describing the source of the change
|
||||
* @note set wt to be used by the receiver timeout
|
||||
* @note defined in ISO/IEC 7816-3:2006(E) section 8.1 and 10.2
|
||||
*/
|
||||
static void update_wt(uint8_t wi, uint8_t d, const char *cause)
|
||||
static void update_wt(uint8_t wi, uint8_t d)
|
||||
{
|
||||
static uint8_t wt_wi = 10; /* Waiting time Integer (WI), used to calculate the Waiting Time (WT) */
|
||||
static uint8_t wt_d = 1; /* baud rate adjustment integer (the actual value, not the table index) */
|
||||
@@ -226,8 +214,8 @@ static void update_wt(uint8_t wi, uint8_t d, const char *cause)
|
||||
if (0 != d) {
|
||||
wt_d = d;
|
||||
}
|
||||
g_wt = wt_wi * 960UL * wt_d;
|
||||
TRACE_INFO("WT updated (wi=%u, d=%u, cause=%s) to %lu ETU\n\r", wi, d, cause, g_wt);
|
||||
wt = wt_wi * 960UL * wt_d;
|
||||
TRACE_INFO("WT updated to %lu ETU\n\r", wt);
|
||||
}
|
||||
|
||||
/*! Allocate USB buffer and push + initialize simtrace_msg_hdr
|
||||
@@ -271,15 +259,6 @@ void usb_msg_upd_len_and_submit(struct msgb *usb_msg)
|
||||
usb_buf_submit(usb_msg);
|
||||
}
|
||||
|
||||
/*! Update the TPDU state
|
||||
* @param[in] tpdu_state_new new TPDU state to update to
|
||||
*/
|
||||
static void change_tpdu_state(enum tpdu_sniff_state tpdu_state_new)
|
||||
{
|
||||
//TRACE_ERROR("TPDU state %u->%u\n\r", g_tpdu.state, tpdu_state_new);
|
||||
g_tpdu.state = tpdu_state_new;
|
||||
}
|
||||
|
||||
/*! Update the ISO 7816-3 state
|
||||
* @param[in] iso_state_new new ISO 7816-3 state to update to
|
||||
*/
|
||||
@@ -295,33 +274,32 @@ static void change_state(enum iso7816_3_sniff_state iso_state_new)
|
||||
switch (iso_state_new) {
|
||||
case ISO7816_S_RESET:
|
||||
update_fidi(&sniff_usart, 0x11); /* reset baud rate to default Di/Fi values */
|
||||
update_wt(10, 1, "RESET"); /* reset WT time-out */
|
||||
update_wt(10, 1); /* reset WT time-out */
|
||||
break;
|
||||
case ISO7816_S_WAIT_ATR:
|
||||
rbuf16_reset(&sniff_buffer); /* reset buffer for new communication */
|
||||
rbuf_reset(&sniff_buffer); /* reset buffer for new communication */
|
||||
break;
|
||||
case ISO7816_S_IN_ATR:
|
||||
g_atr.atr_i = 0;
|
||||
atr_i = 0;
|
||||
convention_convert = false;
|
||||
t_protocol_support = 0;
|
||||
g_atr.state = ATR_S_WAIT_TS;
|
||||
atr_state = ATR_S_WAIT_TS;
|
||||
break;
|
||||
case ISO7816_S_IN_PPS_REQ:
|
||||
case ISO7816_S_IN_PPS_RSP:
|
||||
g_pps.state = PPS_S_WAIT_PPSS;
|
||||
pps_state = PPS_S_WAIT_PPSS;
|
||||
break;
|
||||
case ISO7816_S_WAIT_TPDU:
|
||||
change_tpdu_state(TPDU_S_CLA);
|
||||
g_tpdu.packet_i = 0;
|
||||
tpdu_state = TPDU_S_CLA;
|
||||
tpdu_packet_i = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
TRACE_INFO("ISO 7816-3 state %u->%u\n\r", iso_state, iso_state_new);
|
||||
|
||||
/* save new state */
|
||||
iso_state = iso_state_new;
|
||||
TRACE_INFO("Changed to ISO 7816-3 state %u\n\r", iso_state);
|
||||
}
|
||||
|
||||
const struct value_string data_flags[] = {
|
||||
@@ -406,13 +384,13 @@ static void usb_send_atr(uint32_t flags)
|
||||
TRACE_WARNING("Can't print ATR in ISO 7816-3 state %u\n\r", iso_state);
|
||||
return;
|
||||
}
|
||||
if (g_atr.atr_i >= ARRAY_SIZE(g_atr.atr)) {
|
||||
if (atr_i >= ARRAY_SIZE(atr)) {
|
||||
TRACE_ERROR("ATR buffer overflow\n\r");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Send ATR over USB */
|
||||
usb_send_data(SIMTRACE_MSGT_SNIFF_ATR, g_atr.atr, g_atr.atr_i, flags);
|
||||
usb_send_data(SIMTRACE_MSGT_SNIFF_ATR, atr, atr_i, flags);
|
||||
}
|
||||
|
||||
/*! Process ATR byte
|
||||
@@ -430,16 +408,16 @@ static void process_byte_atr(uint8_t byte)
|
||||
TRACE_ERROR("Processing ATR data in wrong ISO 7816-3 state %u\n\r", iso_state);
|
||||
return;
|
||||
}
|
||||
if (g_atr.atr_i >= ARRAY_SIZE(g_atr.atr)) {
|
||||
if (atr_i >= ARRAY_SIZE(atr)) {
|
||||
TRACE_ERROR("ATR data overflow\n\r");
|
||||
return;
|
||||
}
|
||||
|
||||
/* save data for use by other functions */
|
||||
g_atr.atr[g_atr.atr_i++] = byte;
|
||||
atr[atr_i++] = byte;
|
||||
|
||||
/* handle ATR byte depending on current state */
|
||||
switch (g_atr.state) {
|
||||
switch (atr_state) {
|
||||
case ATR_S_WAIT_TS: /* see ISO/IEC 7816-3:2006 section 8.1 */
|
||||
flags = 0;
|
||||
switch (byte) {
|
||||
@@ -448,7 +426,7 @@ static void process_byte_atr(uint8_t byte)
|
||||
convention_convert = !convention_convert;
|
||||
case 0x3b: /* direct convention used and correctly decoded */
|
||||
case 0x3f: /* inverse convention used and correctly decoded */
|
||||
g_atr.state = ATR_S_WAIT_T0; /* wait for format byte */
|
||||
atr_state = ATR_S_WAIT_T0; /* wait for format byte */
|
||||
break;
|
||||
default:
|
||||
TRACE_WARNING("Invalid TS received\n\r");
|
||||
@@ -461,41 +439,41 @@ static void process_byte_atr(uint8_t byte)
|
||||
break;
|
||||
case ATR_S_WAIT_T0: /* see ISO/IEC 7816-3:2006 section 8.2.2 */
|
||||
case ATR_S_WAIT_TD: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
|
||||
if (ATR_S_WAIT_T0 == g_atr.state) {
|
||||
if (ATR_S_WAIT_T0 == atr_state) {
|
||||
atr_hist_len = (byte & 0x0f); /* save the number of historical bytes */
|
||||
} else if (ATR_S_WAIT_TD == g_atr.state) {
|
||||
} else if (ATR_S_WAIT_TD == atr_state) {
|
||||
t_protocol_support |= (1<<(byte & 0x0f)); /* remember supported protocol to know if TCK will be present */
|
||||
}
|
||||
y = (byte & 0xf0); /* remember upcoming interface bytes */
|
||||
i++; /* next interface byte sub-group is coming */
|
||||
if (y & 0x10) {
|
||||
g_atr.state = ATR_S_WAIT_TA; /* wait for interface byte TA */
|
||||
atr_state = ATR_S_WAIT_TA; /* wait for interface byte TA */
|
||||
break;
|
||||
}
|
||||
case ATR_S_WAIT_TA: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
|
||||
if (y & 0x20) {
|
||||
g_atr.state = ATR_S_WAIT_TB; /* wait for interface byte TB */
|
||||
atr_state = ATR_S_WAIT_TB; /* wait for interface byte TB */
|
||||
break;
|
||||
}
|
||||
case ATR_S_WAIT_TB: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
|
||||
if (y & 0x40) {
|
||||
g_atr.state = ATR_S_WAIT_TC; /* wait for interface byte TC */
|
||||
atr_state = ATR_S_WAIT_TC; /* wait for interface byte TC */
|
||||
break;
|
||||
}
|
||||
case ATR_S_WAIT_TC: /* see ISO/IEC 7816-3:2006 section 8.2.3 */
|
||||
/* retrieve WI encoded in TC2*/
|
||||
if (ATR_S_WAIT_TC == g_atr.state && 2 == i) {
|
||||
if (ATR_S_WAIT_TC==atr_state && 2==i) {
|
||||
if (0 == byte) {
|
||||
update_wt(10, 0, "TC2=0");
|
||||
update_wt(10, 0);
|
||||
} else {
|
||||
update_wt(byte, 0, "TC2");
|
||||
update_wt(byte, 0);
|
||||
}
|
||||
}
|
||||
if (y & 0x80) {
|
||||
g_atr.state = ATR_S_WAIT_TD; /* wait for interface byte TD */
|
||||
atr_state = ATR_S_WAIT_TD; /* wait for interface byte TD */
|
||||
break;
|
||||
} else if (atr_hist_len) {
|
||||
g_atr.state = ATR_S_WAIT_HIST; /* wait for historical bytes */
|
||||
atr_state = ATR_S_WAIT_HIST; /* wait for historical bytes */
|
||||
break;
|
||||
}
|
||||
case ATR_S_WAIT_HIST: /* see ISO/IEC 7816-3:2006 section 8.2.4 */
|
||||
@@ -504,7 +482,7 @@ static void process_byte_atr(uint8_t byte)
|
||||
}
|
||||
if (0 == atr_hist_len) {
|
||||
if (t_protocol_support > 1) {
|
||||
g_atr.state = ATR_S_WAIT_TCK; /* wait for check bytes */
|
||||
atr_state = ATR_S_WAIT_TCK; /* wait for check bytes */
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
@@ -512,11 +490,11 @@ static void process_byte_atr(uint8_t byte)
|
||||
}
|
||||
case ATR_S_WAIT_TCK: /* see ISO/IEC 7816-3:2006 section 8.2.5 */
|
||||
/* verify checksum if present */
|
||||
if (ATR_S_WAIT_TCK == g_atr.state) {
|
||||
if (ATR_S_WAIT_TCK == atr_state) {
|
||||
uint8_t ui;
|
||||
uint8_t checksum = 0;
|
||||
for (ui = 1; ui < g_atr.atr_i; ui++) {
|
||||
checksum ^= g_atr.atr[ui];
|
||||
for (ui = 1; ui < atr_i; ui++) {
|
||||
checksum ^= atr[ui];
|
||||
}
|
||||
if (checksum) {
|
||||
flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
|
||||
@@ -529,7 +507,7 @@ static void process_byte_atr(uint8_t byte)
|
||||
change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
|
||||
break;
|
||||
default:
|
||||
TRACE_INFO("Unknown ATR state %u\n\r", g_atr.state);
|
||||
TRACE_INFO("Unknown ATR state %u\n\r", atr_state);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -543,9 +521,9 @@ static void usb_send_pps(uint32_t flags)
|
||||
|
||||
/* Sanity check */
|
||||
if (ISO7816_S_IN_PPS_REQ == iso_state) {
|
||||
pps_cur = g_pps.req;
|
||||
pps_cur = pps_req;
|
||||
} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
|
||||
pps_cur = g_pps.rsp;
|
||||
pps_cur = pps_rsp;
|
||||
} else {
|
||||
TRACE_ERROR("Can't print PPS in ISO 7816-3 state %u\n\r", iso_state);
|
||||
return;
|
||||
@@ -554,22 +532,22 @@ static void usb_send_pps(uint32_t flags)
|
||||
/* Get only relevant data */
|
||||
uint8_t pps[6];
|
||||
uint8_t pps_i = 0;
|
||||
if (g_pps.state > PPS_S_WAIT_PPSS) {
|
||||
if (pps_state > PPS_S_WAIT_PPSS) {
|
||||
pps[pps_i++] = pps_cur[0];
|
||||
}
|
||||
if (g_pps.state > PPS_S_WAIT_PPS0) {
|
||||
if (pps_state > PPS_S_WAIT_PPS0) {
|
||||
pps[pps_i++] = pps_cur[1];
|
||||
}
|
||||
if (g_pps.state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {
|
||||
if (pps_state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {
|
||||
pps[pps_i++] = pps_cur[2];
|
||||
}
|
||||
if (g_pps.state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {
|
||||
if (pps_state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {
|
||||
pps[pps_i++] = pps_cur[3];
|
||||
}
|
||||
if (g_pps.state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {
|
||||
if (pps_state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {
|
||||
pps[pps_i++] = pps_cur[4];
|
||||
}
|
||||
if (g_pps.state > PPS_S_WAIT_PCK) {
|
||||
if (pps_state > PPS_S_WAIT_PCK) {
|
||||
pps[pps_i++] = pps_cur[5];
|
||||
}
|
||||
|
||||
@@ -599,21 +577,21 @@ static void process_byte_pps(uint8_t byte)
|
||||
|
||||
/* sanity check */
|
||||
if (ISO7816_S_IN_PPS_REQ == iso_state) {
|
||||
pps_cur = g_pps.req;
|
||||
pps_cur = pps_req;
|
||||
} else if (ISO7816_S_IN_PPS_RSP == iso_state) {
|
||||
pps_cur = g_pps.rsp;
|
||||
pps_cur = pps_rsp;
|
||||
} else {
|
||||
TRACE_ERROR("Processing PPS data in wrong ISO 7816-3 state %u\n\r", iso_state);
|
||||
return;
|
||||
}
|
||||
|
||||
/* handle PPS byte depending on current state */
|
||||
switch (g_pps.state) { /* see ISO/IEC 7816-3:2006 section 9.2 */
|
||||
switch (pps_state) { /* see ISO/IEC 7816-3:2006 section 9.2 */
|
||||
case PPS_S_WAIT_PPSS: /*!< initial byte */
|
||||
flags = 0;
|
||||
if (byte == 0xff) {
|
||||
if (0xff) {
|
||||
pps_cur[0] = byte;
|
||||
g_pps.state = PPS_S_WAIT_PPS0; /* go to next state */
|
||||
pps_state = PPS_S_WAIT_PPS0; /* go to next state */
|
||||
} else {
|
||||
TRACE_INFO("Invalid PPSS received\n\r");
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
@@ -624,24 +602,24 @@ static void process_byte_pps(uint8_t byte)
|
||||
case PPS_S_WAIT_PPS0: /*!< format byte */
|
||||
pps_cur[1] = byte;
|
||||
if (pps_cur[1] & 0x10) {
|
||||
g_pps.state = PPS_S_WAIT_PPS1; /* go to next state */
|
||||
pps_state = PPS_S_WAIT_PPS1; /* go to next state */
|
||||
break;
|
||||
}
|
||||
case PPS_S_WAIT_PPS1: /*!< first parameter byte */
|
||||
pps_cur[2] = byte; /* not always right but doesn't affect the process */
|
||||
if (pps_cur[1] & 0x20) {
|
||||
g_pps.state = PPS_S_WAIT_PPS2; /* go to next state */
|
||||
pps_state = PPS_S_WAIT_PPS2; /* go to next state */
|
||||
break;
|
||||
}
|
||||
case PPS_S_WAIT_PPS2: /*!< second parameter byte */
|
||||
pps_cur[3] = byte; /* not always right but doesn't affect the process */
|
||||
if (pps_cur[1] & 0x40) {
|
||||
g_pps.state = PPS_S_WAIT_PPS3; /* go to next state */
|
||||
pps_state = PPS_S_WAIT_PPS3; /* go to next state */
|
||||
break;
|
||||
}
|
||||
case PPS_S_WAIT_PPS3: /*!< third parameter byte */
|
||||
pps_cur[4] = byte; /* not always right but doesn't affect the process */
|
||||
g_pps.state = PPS_S_WAIT_PCK; /* go to next state */
|
||||
pps_state = PPS_S_WAIT_PCK; /* go to next state */
|
||||
break;
|
||||
case PPS_S_WAIT_PCK: /*!< check byte */
|
||||
pps_cur[5] = byte; /* not always right but doesn't affect the process */
|
||||
@@ -662,7 +640,7 @@ static void process_byte_pps(uint8_t byte)
|
||||
if (check) {
|
||||
flags |= SNIFF_DATA_FLAG_ERROR_CHECKSUM;
|
||||
}
|
||||
g_pps.state = PPS_S_WAIT_END;
|
||||
pps_state = PPS_S_WAIT_END;
|
||||
usb_send_pps(flags); /* send PPS to host software using USB */
|
||||
if (ISO7816_S_IN_PPS_REQ == iso_state) {
|
||||
if (0 == check) { /* checksum is valid */
|
||||
@@ -683,7 +661,7 @@ static void process_byte_pps(uint8_t byte)
|
||||
TRACE_INFO("PPS negotiation successful: Fn=%u Dn=%u\n\r",
|
||||
iso7816_3_fi_table[fn], iso7816_3_di_table[dn]);
|
||||
update_fidi(&sniff_usart, pps_cur[2]);
|
||||
update_wt(0, iso7816_3_di_table[dn], "PPS");
|
||||
update_wt(0, iso7816_3_di_table[dn]);
|
||||
usb_send_fidi(pps_cur[2]); /* send Fi/Di change notification to host software over USB */
|
||||
} else { /* checksum is invalid */
|
||||
TRACE_INFO("PPS negotiation failed\n\r");
|
||||
@@ -692,10 +670,10 @@ static void process_byte_pps(uint8_t byte)
|
||||
}
|
||||
break;
|
||||
case PPS_S_WAIT_END:
|
||||
TRACE_WARNING("Unexpected PPS received %u\n\r", g_pps.state);
|
||||
TRACE_WARNING("Unexpected PPS received %u\n\r", pps_state);
|
||||
break;
|
||||
default:
|
||||
TRACE_WARNING("Unknown PPS state %u\n\r", g_pps.state);
|
||||
TRACE_WARNING("Unknown PPS state %u\n\r", pps_state);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -713,7 +691,7 @@ static void usb_send_tpdu(uint32_t flags)
|
||||
}
|
||||
|
||||
/* Send ATR over USB */
|
||||
usb_send_data(SIMTRACE_MSGT_SNIFF_TPDU, g_tpdu.packet, g_tpdu.packet_i, flags);
|
||||
usb_send_data(SIMTRACE_MSGT_SNIFF_TPDU, tpdu_packet, tpdu_packet_i, flags);
|
||||
}
|
||||
|
||||
static void process_byte_tpdu(uint8_t byte)
|
||||
@@ -723,13 +701,13 @@ static void process_byte_tpdu(uint8_t byte)
|
||||
TRACE_ERROR("Processing TPDU data in wrong ISO 7816-3 state %u\n\r", iso_state);
|
||||
return;
|
||||
}
|
||||
if (g_tpdu.packet_i >= ARRAY_SIZE(g_tpdu.packet)) {
|
||||
if (tpdu_packet_i >= ARRAY_SIZE(tpdu_packet)) {
|
||||
TRACE_ERROR("TPDU data overflow\n\r");
|
||||
return;
|
||||
}
|
||||
|
||||
/* handle TPDU byte depending on current state */
|
||||
switch (g_tpdu.state) {
|
||||
switch (tpdu_state) {
|
||||
case TPDU_S_CLA:
|
||||
if (0xff == byte) {
|
||||
TRACE_WARNING("0xff is not a valid class byte\n\r");
|
||||
@@ -738,51 +716,51 @@ static void process_byte_tpdu(uint8_t byte)
|
||||
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
|
||||
return;
|
||||
}
|
||||
g_tpdu.packet_i = 0;
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
change_tpdu_state(TPDU_S_INS);
|
||||
tpdu_packet_i = 0;
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
tpdu_state = TPDU_S_INS;
|
||||
break;
|
||||
case TPDU_S_INS:
|
||||
if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {
|
||||
TRACE_WARNING("invalid INS 0x%02x\n\r", byte);
|
||||
TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
|
||||
return;
|
||||
}
|
||||
g_tpdu.packet_i = 1;
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
change_tpdu_state(TPDU_S_P1);
|
||||
tpdu_packet_i = 1;
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
tpdu_state = TPDU_S_P1;
|
||||
break;
|
||||
case TPDU_S_P1:
|
||||
g_tpdu.packet_i = 2;
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
change_tpdu_state(TPDU_S_P2);
|
||||
tpdu_packet_i = 2;
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
tpdu_state = TPDU_S_P2;
|
||||
break;
|
||||
case TPDU_S_P2:
|
||||
g_tpdu.packet_i = 3;
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
change_tpdu_state(TPDU_S_P3);
|
||||
tpdu_packet_i = 3;
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
tpdu_state = TPDU_S_P3;
|
||||
break;
|
||||
case TPDU_S_P3:
|
||||
g_tpdu.packet_i = 4;
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
change_tpdu_state(TPDU_S_PROCEDURE);
|
||||
tpdu_packet_i = 4;
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
tpdu_state = TPDU_S_PROCEDURE;
|
||||
break;
|
||||
case TPDU_S_PROCEDURE:
|
||||
if (0x60 == byte) { /* wait for next procedure byte */
|
||||
break;
|
||||
} else if (g_tpdu.packet[1] == byte) { /* get all remaining data bytes */
|
||||
change_tpdu_state(TPDU_S_DATA_REMAINING);
|
||||
} else if (tpdu_packet[1] == byte) { /* get all remaining data bytes */
|
||||
tpdu_state = TPDU_S_DATA_REMAINING;
|
||||
break;
|
||||
} else if ((~g_tpdu.packet[1]) == byte) { /* get single data byte */
|
||||
change_tpdu_state(TPDU_S_DATA_SINGLE);
|
||||
} else if ((~tpdu_packet[1]) == byte) { /* get single data byte */
|
||||
tpdu_state = TPDU_S_DATA_SINGLE;
|
||||
break;
|
||||
}
|
||||
case TPDU_S_SW1:
|
||||
if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { /* this procedure byte is SW1 */
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
change_tpdu_state(TPDU_S_SW2);
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
tpdu_state = TPDU_S_SW2;
|
||||
} else {
|
||||
TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
@@ -792,28 +770,28 @@ static void process_byte_tpdu(uint8_t byte)
|
||||
}
|
||||
break;
|
||||
case TPDU_S_SW2:
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
usb_send_tpdu(0); /* send TPDU to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_TPDU); /* this is the end of the TPDU */
|
||||
break;
|
||||
case TPDU_S_DATA_SINGLE:
|
||||
case TPDU_S_DATA_REMAINING:
|
||||
g_tpdu.packet[g_tpdu.packet_i++] = byte;
|
||||
if (0 == g_tpdu.packet[4]) {
|
||||
if (5+256 <= g_tpdu.packet_i) {
|
||||
change_tpdu_state(TPDU_S_PROCEDURE);
|
||||
tpdu_packet[tpdu_packet_i++] = byte;
|
||||
if (0 == tpdu_packet[4]) {
|
||||
if (5+256 <= tpdu_packet_i) {
|
||||
tpdu_state = TPDU_S_PROCEDURE;
|
||||
}
|
||||
} else {
|
||||
if (5+g_tpdu.packet[4] <= g_tpdu.packet_i) {
|
||||
change_tpdu_state(TPDU_S_PROCEDURE);
|
||||
if (5+tpdu_packet[4] <= tpdu_packet_i) {
|
||||
tpdu_state = TPDU_S_PROCEDURE;
|
||||
}
|
||||
}
|
||||
if (TPDU_S_DATA_SINGLE == g_tpdu.state) {
|
||||
change_tpdu_state(TPDU_S_PROCEDURE);
|
||||
if (TPDU_S_DATA_SINGLE == tpdu_state) {
|
||||
tpdu_state = TPDU_S_PROCEDURE;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
TRACE_ERROR("unhandled TPDU state %u\n\r", g_tpdu.state);
|
||||
TRACE_ERROR("unhandled TPDU state %u\n\r", tpdu_state);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -825,37 +803,37 @@ void Sniffer_usart_isr(void)
|
||||
|
||||
/* Read channel status register */
|
||||
uint32_t csr = sniff_usart.base->US_CSR;
|
||||
|
||||
uint16_t byte = 0;
|
||||
/* Verify if there was an error */
|
||||
if (csr & US_CSR_OVRE) {
|
||||
TRACE_WARNING("USART overrun error\n\r");
|
||||
sniff_usart.base->US_CR |= US_CR_RSTSTA;
|
||||
}
|
||||
if (csr & US_CSR_FRAME) {
|
||||
TRACE_WARNING("USART framing error\n\r");
|
||||
sniff_usart.base->US_CR |= US_CR_RSTSTA;
|
||||
}
|
||||
|
||||
/* Verify if character has been received */
|
||||
if (csr & US_CSR_RXRDY) {
|
||||
/* Read communication data byte between phone and SIM */
|
||||
byte = RBUF16_F_DATA_BYTE | (sniff_usart.base->US_RHR & 0xff);
|
||||
uint8_t byte = sniff_usart.base->US_RHR;
|
||||
/* Reset WT timer */
|
||||
wt_remaining = g_wt;
|
||||
wt_remaining = wt;
|
||||
/* Store sniffed data into buffer (also clear interrupt */
|
||||
if (rbuf_is_full(&sniff_buffer)) {
|
||||
TRACE_ERROR("USART buffer full\n\r");
|
||||
} else {
|
||||
rbuf_write(&sniff_buffer, byte);
|
||||
}
|
||||
}
|
||||
|
||||
/* Verify if there was an error */
|
||||
if (csr & US_CSR_OVRE)
|
||||
byte |= RBUF16_F_OVERRUN;
|
||||
if (csr & US_CSR_FRAME)
|
||||
byte |= RBUF16_F_FRAMING;
|
||||
if (csr & US_CSR_PARE)
|
||||
byte |= RBUF16_F_PARITY;
|
||||
|
||||
if (csr & (US_CSR_OVRE|US_CSR_FRAME|US_CSR_PARE))
|
||||
sniff_usart.base->US_CR |= US_CR_RSTSTA;
|
||||
|
||||
/* Verify it WT timeout occurred, to detect unresponsive card */
|
||||
if (csr & US_CSR_TIMEOUT) {
|
||||
if (wt_remaining <= (sniff_usart.base->US_RTOR & 0xffff)) {
|
||||
/* ensure the timeout is enqueued in the ring-buffer */
|
||||
byte |= RBUF16_F_TIMEOUT_WT;
|
||||
/* Just set the flag and let the main loop handle it */
|
||||
change_flags |= SNIFF_CHANGE_FLAG_TIMEOUT_WT;
|
||||
/* Reset timeout value */
|
||||
wt_remaining = g_wt;
|
||||
wt_remaining = wt;
|
||||
} else {
|
||||
wt_remaining -= (sniff_usart.base->US_RTOR & 0xffff); /* be sure to subtract the actual timeout since the new might not have been set and reloaded yet */
|
||||
}
|
||||
@@ -871,12 +849,6 @@ void Sniffer_usart_isr(void)
|
||||
sniff_usart.base->US_CR |= US_CR_RETTO;
|
||||
}
|
||||
}
|
||||
|
||||
/* Store sniffed data (or error flags, or both) into buffer */
|
||||
if (byte) {
|
||||
if (rbuf16_write(&sniff_buffer, byte) != 0)
|
||||
TRACE_ERROR("USART buffer full\n\r");
|
||||
}
|
||||
}
|
||||
|
||||
/** PIO interrupt service routine to checks if the card reset line has changed
|
||||
@@ -918,8 +890,6 @@ void Sniffer_usart0_irq(void)
|
||||
* Initialization routine
|
||||
*-----------------------------------------------------------------------------*/
|
||||
|
||||
#define SNIFFER_IER (US_IER_RXRDY | US_IER_TIMEOUT | US_IER_OVRE | US_IER_FRAME | US_IER_PARE)
|
||||
|
||||
/* Called during USB enumeration after device is enumerated by host */
|
||||
void Sniffer_configure(void)
|
||||
{
|
||||
@@ -931,7 +901,7 @@ void Sniffer_exit(void)
|
||||
{
|
||||
TRACE_INFO("Sniffer exit\n\r");
|
||||
/* Disable USART */
|
||||
USART_DisableIt(sniff_usart.base, SNIFFER_IER);
|
||||
USART_DisableIt(sniff_usart.base, US_IER_RXRDY);
|
||||
/* NOTE: don't forget to set the IRQ according to the USART peripheral used */
|
||||
NVIC_DisableIRQ(IRQ_USART_SIM);
|
||||
USART_SetReceiverEnabled(sniff_usart.base, 0);
|
||||
@@ -959,15 +929,15 @@ void Sniffer_init(void)
|
||||
PIO_EnableIt(&pin_rst);
|
||||
|
||||
/* Clear ring buffer containing the sniffed data */
|
||||
rbuf16_reset(&sniff_buffer);
|
||||
rbuf_reset(&sniff_buffer);
|
||||
/* Configure USART to as ISO-7816 slave communication to sniff communication */
|
||||
ISO7816_Init(&sniff_usart, CLK_SLAVE);
|
||||
/* Only receive data when sniffing */
|
||||
USART_SetReceiverEnabled(sniff_usart.base, 1);
|
||||
/* Enable Receiver time-out to detect waiting time (WT) time-out (e.g. unresponsive cards) */
|
||||
sniff_usart.base->US_RTOR = g_wt;
|
||||
sniff_usart.base->US_RTOR = wt;
|
||||
/* Enable interrupt to indicate when data has been received or timeout occurred */
|
||||
USART_EnableIt(sniff_usart.base, SNIFFER_IER);
|
||||
USART_EnableIt(sniff_usart.base, US_IER_RXRDY | US_IER_TIMEOUT);
|
||||
/* Set USB priority lower than USART to not miss sniffing data (both at 0 per default) */
|
||||
if (NVIC_GetPriority(IRQ_USART_SIM) >= NVIC_GetPriority(UDP_IRQn)) {
|
||||
NVIC_SetPriority(UDP_IRQn, NVIC_GetPriority(IRQ_USART_SIM) + 2);
|
||||
@@ -1025,82 +995,45 @@ void Sniffer_run(void)
|
||||
* is remaining
|
||||
*/
|
||||
/* Handle sniffed data */
|
||||
if (!rbuf16_is_empty(&sniff_buffer)) { /* use if instead of while to let the main loop restart the watchdog */
|
||||
uint16_t entry = rbuf16_read(&sniff_buffer);
|
||||
|
||||
if (entry & RBUF16_F_DATA_BYTE) {
|
||||
uint8_t byte = entry & 0xff;
|
||||
/* Convert convention if required */
|
||||
if (convention_convert) {
|
||||
byte = convention_convert_lut[byte];
|
||||
}
|
||||
|
||||
//TRACE_ERROR_WP(">%02x", byte);
|
||||
switch (iso_state) { /* Handle byte depending on state */
|
||||
case ISO7816_S_RESET: /* During reset we shouldn't receive any data */
|
||||
break;
|
||||
case ISO7816_S_WAIT_ATR: /* After a reset we expect the ATR */
|
||||
change_state(ISO7816_S_IN_ATR); /* go to next state */
|
||||
case ISO7816_S_IN_ATR: /* More ATR data incoming */
|
||||
process_byte_atr(byte);
|
||||
break;
|
||||
case ISO7816_S_WAIT_TPDU: /* After the ATR we expect TPDU or PPS data */
|
||||
case ISO7816_S_WAIT_PPS_RSP:
|
||||
if (0xff == byte) {
|
||||
if (ISO7816_S_WAIT_PPS_RSP == iso_state) {
|
||||
change_state(ISO7816_S_IN_PPS_RSP); /* Go to PPS state */
|
||||
} else {
|
||||
change_state(ISO7816_S_IN_PPS_REQ); /* Go to PPS state */
|
||||
}
|
||||
process_byte_pps(byte);
|
||||
break;
|
||||
if (!rbuf_is_empty(&sniff_buffer)) { /* use if instead of while to let the main loop restart the watchdog */
|
||||
uint8_t byte = rbuf_read(&sniff_buffer);
|
||||
/* Convert convention if required */
|
||||
if (convention_convert) {
|
||||
byte = convention_convert_lut[byte];
|
||||
}
|
||||
//TRACE_ERROR_WP(">%02x", byte);
|
||||
switch (iso_state) { /* Handle byte depending on state */
|
||||
case ISO7816_S_RESET: /* During reset we shouldn't receive any data */
|
||||
break;
|
||||
case ISO7816_S_WAIT_ATR: /* After a reset we expect the ATR */
|
||||
change_state(ISO7816_S_IN_ATR); /* go to next state */
|
||||
case ISO7816_S_IN_ATR: /* More ATR data incoming */
|
||||
process_byte_atr(byte);
|
||||
break;
|
||||
case ISO7816_S_WAIT_TPDU: /* After the ATR we expect TPDU or PPS data */
|
||||
case ISO7816_S_WAIT_PPS_RSP:
|
||||
if (0xff == byte) {
|
||||
if (ISO7816_S_WAIT_PPS_RSP == iso_state) {
|
||||
change_state(ISO7816_S_IN_PPS_RSP); /* Go to PPS state */
|
||||
} else {
|
||||
change_state(ISO7816_S_IN_PPS_REQ); /* Go to PPS state */
|
||||
}
|
||||
case ISO7816_S_IN_TPDU: /* More TPDU data incoming */
|
||||
if (ISO7816_S_WAIT_TPDU == iso_state) {
|
||||
change_state(ISO7816_S_IN_TPDU);
|
||||
}
|
||||
process_byte_tpdu(byte);
|
||||
break;
|
||||
case ISO7816_S_IN_PPS_REQ:
|
||||
case ISO7816_S_IN_PPS_RSP:
|
||||
process_byte_pps(byte);
|
||||
break;
|
||||
default:
|
||||
TRACE_ERROR("Data received in unknown state %u\n\r", iso_state);
|
||||
}
|
||||
}
|
||||
|
||||
/* Use timeout to detect interrupted data transmission */
|
||||
if (entry & RBUF16_F_TIMEOUT_WT) {
|
||||
TRACE_ERROR("USART TIMEOUT Error\n\r");
|
||||
switch (iso_state) {
|
||||
case ISO7816_S_IN_ATR:
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_ATR);
|
||||
break;
|
||||
case ISO7816_S_IN_TPDU:
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_TPDU);
|
||||
break;
|
||||
case ISO7816_S_IN_PPS_REQ:
|
||||
case ISO7816_S_IN_PPS_RSP:
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_TPDU);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
case ISO7816_S_IN_TPDU: /* More TPDU data incoming */
|
||||
if (ISO7816_S_WAIT_TPDU == iso_state) {
|
||||
change_state(ISO7816_S_IN_TPDU);
|
||||
}
|
||||
process_byte_tpdu(byte);
|
||||
break;
|
||||
case ISO7816_S_IN_PPS_REQ:
|
||||
case ISO7816_S_IN_PPS_RSP:
|
||||
process_byte_pps(byte);
|
||||
break;
|
||||
default:
|
||||
TRACE_ERROR("Data received in unknown state %u\n\r", iso_state);
|
||||
}
|
||||
|
||||
if (entry & RBUF16_F_PARITY)
|
||||
TRACE_ERROR("USART PARITY Error\r\n");
|
||||
if (entry & RBUF16_F_FRAMING)
|
||||
TRACE_ERROR("USART FRAMING Error\r\n");
|
||||
if (entry & RBUF16_F_OVERRUN)
|
||||
TRACE_ERROR("USART OVERRUN Error\r\n");
|
||||
}
|
||||
|
||||
/* Handle flags */
|
||||
@@ -1134,6 +1067,30 @@ void Sniffer_run(void)
|
||||
printf("reset de-asserted\n\r");
|
||||
}
|
||||
}
|
||||
if (change_flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {
|
||||
/* Use timeout to detect interrupted data transmission */
|
||||
switch (iso_state) {
|
||||
case ISO7816_S_IN_ATR:
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_ATR);
|
||||
break;
|
||||
case ISO7816_S_IN_TPDU:
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_TPDU);
|
||||
break;
|
||||
case ISO7816_S_IN_PPS_REQ:
|
||||
case ISO7816_S_IN_PPS_RSP:
|
||||
led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */
|
||||
usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */
|
||||
change_state(ISO7816_S_WAIT_TPDU);
|
||||
break;
|
||||
default:
|
||||
change_flags &= ~SNIFF_CHANGE_FLAG_TIMEOUT_WT; /* We don't care about the timeout is all other cases */
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (change_flags) {
|
||||
usb_send_change(change_flags); /* send timeout to host software over USB */
|
||||
change_flags = 0; /* Reset flags */
|
||||
|
||||
@@ -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 <stdint.h>
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user