contrib: integrate RPM spec

Remove OpenSUSE bug report link, set version to 0.0.0, make it build with CentOS 8 etc. Disable lms, usrp1 for CentOS 8. Make fdupes dependency (duplicate files removal) suse specific, as the package is not available for CentOS 8. Related: OS#4550 Change-Id: Ie27fcc4f9033f0049507d9dcc295541ac0744c73
contrib: import RPM spec
2025-11-02 05:03:18 +00:00 · 2020-05-15 11:51:26 +02:00 · 2020-05-14 11:54:22 +02:00 · 2020-05-09 18:54:20 +02:00 · 2020-05-07 23:55:56 +02:00 · 2020-05-02 22:34:27 +02:00
26 changed files with 608 additions and 3974 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,521 +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_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'
-  - 'dma_fence_chain_for_each'
-  - '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_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_active_dev_scope'
-  - 'for_each_active_drhd_unit'
-  - 'for_each_active_iommu'
-  - '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_pre_auxs'
-  - 'for_each_card_prelinks'
-  - 'for_each_card_rtds'
-  - 'for_each_card_rtds_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_dev_addr'
-  - 'for_each_dev_scope'
-  - 'for_each_displayid_db'
-  - '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_efi_handle'
-  - '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_platforms'
-  - 'for_each_lru'
-  - 'for_each_matching_node'
-  - 'for_each_matching_node_and_match'
-  - 'for_each_member'
-  - 'for_each_memblock'
-  - 'for_each_memblock_type'
-  - 'for_each_memcg_cache_index'
-  - 'for_each_mem_pfn_range'
-  - 'for_each_mem_range'
-  - 'for_each_mem_range_rev'
-  - 'for_each_migratetype_order'
-  - 'for_each_msi_entry'
-  - 'for_each_msi_entry_safe'
-  - '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_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_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_property_of_node'
-  - 'for_each_registered_fb'
-  - 'for_each_reserved_mem_region'
-  - 'for_each_rtd_codec_dai'
-  - 'for_each_rtd_codec_dai_rollback'
-  - 'for_each_rtd_components'
-  - '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_sibling_event'
-  - 'for_each_subelement'
-  - 'for_each_subelement_extid'
-  - 'for_each_subelement_id'
-  - '__for_each_thread'
-  - 'for_each_thread'
-  - '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_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'
-  - '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_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'
-  - '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'
-  - 'rbtree_postorder_for_each_entry_safe'
-  - 'rdma_for_each_block'
-  - 'rdma_for_each_port'
-  - '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'
-  - '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'
-
-#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: Inner
-#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
-ObjCBlockIndentWidth: 8
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-
-# Taken from git's rules
-#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
-PenaltyBreakBeforeFirstCallParameter: 30
-PenaltyBreakComment: 10
-PenaltyBreakFirstLessLess: 0
-PenaltyBreakString: 10
-PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
-
-PointerAlignment: Right
-ReflowComments: false
-SortIncludes: false
-#SortUsingDeclarations: false # Unknown to clang-format-4.0
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
-#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
-SpaceBeforeParens: ControlStatements
-#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp03
-TabWidth: 8
-UseTab: Always
-...
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,8 @@ SUBDIRS = \
 	GSM \
 	Transceiver52M \
 	contrib \
-	tests
+	tests \
+	utils

 EXTRA_DIST = \
 	LEGAL \
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -104,11 +104,3 @@ osmo_trx_lms_LDADD = \
 	$(LMS_LIBS)
 osmo_trx_lms_CPPFLAGS  = $(AM_CPPFLAGS) $(LMS_CFLAGS)
 endif
-
-bin_PROGRAMS += osmo-trx-ipc
-osmo_trx_ipc_SOURCES = osmo-trx.cpp
-osmo_trx_ipc_LDADD = \
-	$(builddir)/device/ipc/libdevice.la \
-	$(COMMON_LDADD) \
-	$(UHD_LIBS)
-osmo_trx_ipc_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)
--- a/Transceiver52M/device/Makefile.am
+++ b/Transceiver52M/device/Makefile.am
@@ -2,10 +2,6 @@ include $(top_srcdir)/Makefile.common

 SUBDIRS = common

-#if DEVICE_IPC
-SUBDIRS += ipc
-#endif
-
 if DEVICE_USRP1
 SUBDIRS += usrp1
 endif
--- a/Transceiver52M/device/ipc/IPCDevice.cpp
+++ b/Transceiver52M/device/ipc/IPCDevice.cpp
--- a/Transceiver52M/device/ipc/IPCDevice.h
+++ b/Transceiver52M/device/ipc/IPCDevice.h
@@ -1,236 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: AGPL-3.0+
-*
-* This software is distributed under multiple licenses; see the COPYING file in
-* the main directory for licensing information for this specific distribution.
-*
-* This use of this software may be subject to additional restrictions.
-* See the LEGAL file in the main directory for details.
-
-    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.
-
-*/
-
-#ifndef _IPC_DEVICE_H_
-#define _IPC_DEVICE_H_
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-extern "C" {
-#include <osmocom/core/select.h>
-#include <osmocom/core/timer.h>
-#include "shm.h"
-#include "ipc_shm.h"
-}
-
-#include "radioDevice.h"
-#include "smpl_buf.h"
-
-#include <sys/time.h>
-#include <math.h>
-#include <limits.h>
-#include <string>
-#include <iostream>
-#include <lime/LimeSuite.h>
-
-struct ipc_sock_state {
-	struct osmo_fd conn_bfd; /* fd for connection to the BTS */
-	struct osmo_timer_list timer; /* socket connect retry timer */
-	struct llist_head upqueue; /* queue for sending messages */
-};
-
-/** A class to handle a LimeSuite supported device */
-class IPCDevice : public RadioDevice {
-    protected:
-	struct ipc_sock_state sk_state;
-	/* FIXME: current limit 8 chans, make dynamic */
-	struct ipc_sock_state sk_chan_state[8];
-	uint8_t tmp_state;
-	char shm_name[SHM_NAME_MAX];
-	int ipc_shm_connect(const char *shm_name);
-	void *shm;
-	struct ipc_shm_region *shm_dec;
-
-	std::vector<smpl_buf *> rx_buffers;
-	double actualSampleRate; ///< the actual USRP sampling rate
-
-	bool started; ///< flag indicates LMS has started
-	bool skipRx; ///< set if LMS is transmit-only.
-
-	TIMESTAMP ts_initial, ts_offset;
-
-	std::vector<double> tx_gains, rx_gains;
-
-	struct ipc_sk_if_info_req current_info_req;
-	struct ipc_sk_if_info_cnf current_info_cnf;
-	struct ipc_sk_if_open_cnf current_open_cnf;
-
-	std::vector<struct ipc_shm_io *> shm_io_rx_streams;
-	std::vector<struct ipc_shm_io *> shm_io_tx_streams;
-
-	bool do_calib(size_t chan);
-	bool do_filters(size_t chan);
-	int get_ant_idx(const std::string &name, bool dir_tx, size_t chan);
-	virtual bool flush_recv(size_t num_pkts);
-	void update_stream_stats_rx(size_t chan, bool *overrun);
-	void update_stream_stats_tx(size_t chan, bool *underrun);
-	bool do_clock_src_freq(enum ReferenceType ref, double freq);
-
-    public:
-	virtual void ipc_sock_close(ipc_sock_state *state);
-	virtual int ipc_sock_read(struct osmo_fd *bfd);
-	virtual int ipc_sock_write(struct osmo_fd *bfd);
-	virtual int ipc_rx(uint8_t msg_type, struct ipc_sk_if *ipc_prim);
-	virtual int ipc_rx_greeting_cnf(const struct ipc_sk_if_greeting *greeting_cnf);
-	virtual int ipc_rx_info_cnf(const struct ipc_sk_if_info_cnf *info_cnf);
-	virtual int ipc_rx_open_cnf(const struct ipc_sk_if_open_cnf *open_cnf);
-	virtual int ipc_tx_open_req(struct ipc_sock_state *state, uint32_t num_chans, uint32_t ref);
-
-	/** Object constructor */
-	IPCDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset,
-		  const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths);
-	virtual ~IPCDevice() override;
-
-	/** Instantiate the LMS */
-	virtual int open(const std::string &args, int ref, bool swap_channels) override;
-
-	/** Start the LMS */
-	virtual bool start() override;
-
-	/** Stop the LMS */
-	virtual bool stop() override;
-
-	enum TxWindowType getWindowType() override
-	{
-		return TX_WINDOW_LMS1;
-	}
-
-	/**
-	Read samples from the LMS.
-	@param buf preallocated buf to contain read result
-	@param len number of samples desired
-	@param overrun Set if read buffer has been overrun, e.g. data not being read fast enough
-	@param timestamp The timestamp of the first samples to be read
-	@param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough
-	@return The number of samples actually read
-	*/
-	virtual int readSamples(std::vector<short *> &buf, int len, bool *overrun, TIMESTAMP timestamp = 0xffffffff,
-				bool *underrun = NULL) override;
-	/**
-	Write samples to the LMS.
-	@param buf Contains the data to be written.
-	@param len number of samples to write.
-	@param underrun Set if LMS does not have data to transmit, e.g. data not being sent fast enough
-	@param timestamp The timestamp of the first sample of the data buffer.
-	@return The number of samples actually written
-	*/
-	virtual int writeSamples(std::vector<short *> &bufs, int len, bool *underrun,
-				 TIMESTAMP timestamp = 0xffffffff) override;
-
-	/** Update the alignment between the read and write timestamps */
-	virtual bool updateAlignment(TIMESTAMP timestamp) override;
-
-	/** Set the transmitter frequency */
-	virtual bool setTxFreq(double wFreq, size_t chan = 0) override;
-
-	/** Set the receiver frequency */
-	virtual bool setRxFreq(double wFreq, size_t chan = 0) override;
-
-	/** Returns the starting write Timestamp*/
-	virtual TIMESTAMP initialWriteTimestamp(void) override;
-
-	/** Returns the starting read Timestamp*/
-	virtual TIMESTAMP initialReadTimestamp(void) override;
-
-	/** returns the full-scale transmit amplitude **/
-	virtual double fullScaleInputValue() override
-	{
-		return (double)SHRT_MAX * current_info_cnf.iq_scaling_val_rx;
-	}
-
-	/** returns the full-scale receive amplitude **/
-	virtual double fullScaleOutputValue() override
-	{
-		return (double)SHRT_MAX * current_info_cnf.iq_scaling_val_tx;
-	}
-
-	/** sets the receive chan gain, returns the gain setting **/
-	virtual double setRxGain(double dB, size_t chan = 0) override;
-
-	/** get the current receive gain */
-	virtual double getRxGain(size_t chan = 0) override
-	{
-		return rx_gains[chan];
-	}
-
-	/** return maximum Rx Gain **/
-	virtual double maxRxGain(void) override;
-
-	/** return minimum Rx Gain **/
-	virtual double minRxGain(void) override;
-
-	/** sets the transmit chan gain, returns the gain setting **/
-	virtual double setTxGain(double dB, size_t chan = 0) override;
-
-	/** get transmit gain */
-	virtual double getTxGain(size_t chan = 0) override
-	{
-		return tx_gains[chan];
-	}
-
-	/** return maximum Tx Gain **/
-	virtual double maxTxGain(void) override;
-
-	/** return minimum Rx Gain **/
-	virtual double minTxGain(void) override;
-
-	/** sets the RX path to use, returns true if successful and false otherwise */
-	virtual bool setRxAntenna(const std::string &ant, size_t chan = 0) override;
-
-	/* return the used RX path */
-	virtual std::string getRxAntenna(size_t chan = 0) override;
-
-	/** sets the RX path to use, returns true if successful and false otherwise */
-	virtual bool setTxAntenna(const std::string &ant, size_t chan = 0) override;
-
-	/* return the used RX path */
-	virtual std::string getTxAntenna(size_t chan = 0) override;
-
-	/** return whether user drives synchronization of Tx/Rx of USRP */
-	virtual bool requiresRadioAlign() override;
-
-	/** return whether user drives synchronization of Tx/Rx of USRP */
-	virtual GSM::Time minLatency() override;
-
-	/** Return internal status values */
-	virtual inline double getTxFreq(size_t chan = 0) override
-	{
-		return 0;
-	}
-	virtual inline double getRxFreq(size_t chan = 0) override
-	{
-		return 0;
-	}
-	virtual inline double getSampleRate() override
-	{
-		return actualSampleRate;
-	}
-	int ipc_chan_sock_read(osmo_fd *bfd);
-	int ipc_chan_sock_write(osmo_fd *bfd);
-	int ipc_chan_rx(uint8_t msg_type, ipc_sk_chan_if *ipc_prim, uint8_t chan_nr);
-	int ipc_rx_chan_start_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr);
-	int ipc_rx_chan_stop_cnf(ipc_sk_chan_if_op_rc *ret, uint8_t chan_nr);
-	int ipc_rx_chan_setgain_cnf(ipc_sk_chan_if_gain *ret, uint8_t chan_nr);
-	int ipc_rx_chan_setfreq_cnf(ipc_sk_chan_if_freq_cnf *ret, uint8_t chan_nr);
-	int ipc_rx_chan_notify_underflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr);
-	int ipc_rx_chan_notify_overflow(ipc_sk_chan_if_notfiy *ret, uint8_t chan_nr);
-};
-
-#endif // _IPC_DEVICE_H_
--- a/Transceiver52M/device/ipc/Makefile.am
+++ b/Transceiver52M/device/ipc/Makefile.am
@@ -1,29 +0,0 @@
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
-AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-AM_LDFLAGS = -lpthread -lrt
-
-noinst_HEADERS = IPCDevice.h shm.h ../uhd/UHDDevice.h uhdwrap.h
-
-noinst_LTLIBRARIES = libdevice.la
-
-libdevice_la_SOURCES = ipc-driver-test.c IPCDevice.cpp shm.c ../uhd/UHDDevice.cpp uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c 
-libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la
-libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS) -DIPCMAGIC
-
-bin_PROGRAMS = ipc-driver-test
-#ipc_driver_test_SHORTNAME = drvt
-ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c ../uhd/UHDDevice.cpp
-ipc_driver_test_LDADD = \
-        shm.lo \
-	$(LIBOSMOCORE_LIBS) \
-	$(LIBOSMOCTRL_LIBS) \
-	$(LIBOSMOVTY_LIBS)
-ipc_driver_test_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS)
-ipc_driver_test_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)
-ipc_driver_test_CFLAGS  = $(AM_CFLAGS) $(UHD_CFLAGS)
-ipc_driver_test_LDFLAGS  = $(AM_LDFLAGS) $(UHD_LIBS)
-ipc_driver_test_LDADD += $(top_builddir)/Transceiver52M/device/common/libdevice_common.la $(top_builddir)/CommonLibs/libcommon.la
-
--- a/Transceiver52M/device/ipc/ipc-driver-test.c
+++ b/Transceiver52M/device/ipc/ipc-driver-test.c
@@ -1,467 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define _GNU_SOURCE
-#include <pthread.h>
-
-
-#include <debug.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <inttypes.h>
-#include <sys/mman.h>
-#include <sys/stat.h> /* For mode constants */
-#include <fcntl.h> /* For O_* constants */
-#include <getopt.h>
-
-#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/socket.h>
-#include <osmocom/core/logging.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/timer.h>
-
-#include "shm.h"
-#include "ipc_shm.h"
-#include "ipc_chan.h"
-#include "ipc_sock.h"
-
-#define DEFAULT_SHM_NAME "/osmo-trx-ipc-driver-shm2"
-
-static void *tall_ctx;
-struct ipc_sock_state *global_ipc_sock_state;
-
-/* 8 channels are plenty */
-struct ipc_sock_state *global_ctrl_socks[8];
-struct ipc_shm_io *ios_tx_to_device[8];
-struct ipc_shm_io *ios_rx_from_device[8];
-
-void *shm;
-void *global_dev;
-
-static struct ipc_shm_region *decoded_region;
-
-/* Debug Areas of the code */
-//enum { DMAIN,
-//};
-static const struct log_info_cat default_categories[] = {
-	[DMAIN] = {
-		.name = "DMAIN",
-        		.color = NULL,
-		.description = "Main generic category",
-		 .loglevel = LOGL_DEBUG,.enabled = 1,
-	},
-    [DDEV] = {
-		.name = "DDEV",
-		.description = "Device/Driver specific code",
-		.color = NULL,
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-};
-
-const struct log_info log_infox = {
-	.cat = default_categories,
-	.num_cat = ARRAY_SIZE(default_categories),
-};
-#ifdef __cplusplus
-}
-#endif
-
-#include "uhdwrap.h"
-
-volatile int ipc_exit_requested = 0;
-
-static int ipc_shm_setup(const char *shm_name, size_t shm_len)
-{
-	int fd;
-	int rc;
-
-	LOGP(DMAIN, LOGL_NOTICE, "Opening shm path %s\n", shm_name);
-	if ((fd = shm_open(shm_name, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "shm_open %d: %s\n", errno, strerror(errno));
-		rc = -errno;
-		goto err_shm_open;
-	}
-
-	LOGP(DMAIN, LOGL_NOTICE, "Truncating %d to size %zu\n", fd, shm_len);
-	if (ftruncate(fd, shm_len) < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "ftruncate %d: %s\n", errno, strerror(errno));
-		rc = -errno;
-		goto err_mmap;
-	}
-
-	LOGP(DMAIN, LOGL_NOTICE, "mmaping shared memory fd %d\n", fd);
-	if ((shm = mmap(NULL, shm_len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED) {
-		LOGP(DMAIN, LOGL_ERROR, "mmap %d: %s\n", errno, strerror(errno));
-		rc = -errno;
-		goto err_mmap;
-	}
-
-	LOGP(DMAIN, LOGL_NOTICE, "mmap'ed shared memory at addr %p\n", shm);
-	/* After a call to mmap(2) the file descriptor may be closed without affecting the memory mapping. */
-	close(fd);
-	return 0;
-err_mmap:
-	shm_unlink(shm_name);
-	close(fd);
-err_shm_open:
-	return rc;
-}
-
-struct msgb *ipc_msgb_alloc(uint8_t msg_type)
-{
-	struct msgb *msg;
-	struct ipc_sk_if *ipc_prim;
-
-	msg = msgb_alloc(sizeof(struct ipc_sk_if) + 1000, "ipc_sock_tx");
-	if (!msg)
-		return NULL;
-	msgb_put(msg, sizeof(struct ipc_sk_if) + 1000);
-	ipc_prim = (struct ipc_sk_if *)msg->data;
-	ipc_prim->msg_type = msg_type;
-
-	return msg;
-}
-
-static int ipc_tx_greeting_cnf(uint8_t req_version)
-{
-	struct msgb *msg;
-	struct ipc_sk_if *ipc_prim;
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_GREETING_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_if *)msg->data;
-	ipc_prim->u.greeting_cnf.req_version = req_version;
-
-	return ipc_sock_send(msg);
-}
-
-static int ipc_tx_info_cnf()
-{
-	struct msgb *msg;
-	struct ipc_sk_if *ipc_prim;
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_INFO_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_if *)msg->data;
-
-	uhdwrap_fill_info_cnf(ipc_prim);
-
-	return ipc_sock_send(msg);
-}
-
-static int ipc_tx_open_cnf(int rc, uint32_t num_chans, int32_t timingoffset)
-{
-	struct msgb *msg;
-	struct ipc_sk_if *ipc_prim;
-	struct ipc_sk_if_open_cnf_chan *chan_info;
-	unsigned int i;
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_OPEN_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_if *)msg->data;
-	ipc_prim->u.open_cnf.return_code = rc;
-	ipc_prim->u.open_cnf.path_delay = timingoffset; // 6.18462e-5 * 1625e3 / 6;
-	OSMO_STRLCPY_ARRAY(ipc_prim->u.open_cnf.shm_name, DEFAULT_SHM_NAME);
-
-	chan_info = ipc_prim->u.open_cnf.chan_info;
-	for (i = 0; i < num_chans; i++) {
-		snprintf(chan_info->chan_ipc_sk_path, sizeof(chan_info->chan_ipc_sk_path), "%s_%d", IPC_SOCK_PATH_PREFIX, i);
-		/* FIXME: dynamc chan limit, currently 8 */
-		if (i < 8)
-			ipc_sock_init(chan_info->chan_ipc_sk_path, &global_ctrl_socks[i], ipc_chan_sock_accept, i);
-		chan_info++;
-	}
-
-	return ipc_sock_send(msg);
-}
-
-int ipc_rx_greeting_req(struct ipc_sk_if_greeting *greeting_req)
-{
-	if (greeting_req->req_version == IPC_SOCK_API_VERSION)
-		ipc_tx_greeting_cnf(IPC_SOCK_API_VERSION);
-	else
-		ipc_tx_greeting_cnf(0);
-	return 0;
-}
-
-int ipc_rx_info_req(struct ipc_sk_if_info_req *info_req)
-{
-	ipc_tx_info_cnf();
-	return 0;
-}
-
-int ipc_rx_open_req(struct ipc_sk_if_open_req *open_req)
-{
-	/* calculate size needed */
-	unsigned int len;
-
-	global_dev = uhdwrap_open(open_req);
-
-	/* b210 packet size is 2040, but our tx size is 2500, so just do *2 */
-	int shmbuflen = uhdwrap_get_bufsizerx(global_dev) * 2;
-
-	len = ipc_shm_encode_region(NULL, open_req->num_chans, 4, shmbuflen);
-	/* Here we verify num_chans, rx_path, tx_path, clockref, etc. */
-	int rc = ipc_shm_setup(DEFAULT_SHM_NAME, len);
-	len = ipc_shm_encode_region((struct ipc_shm_raw_region *)shm, open_req->num_chans, 4, shmbuflen);
-	LOGP(DMAIN, LOGL_NOTICE, "%s\n", osmo_hexdump((const unsigned char *)shm, 80));
-
-	/* set up our own copy of the decoded area, we have to do it here,
-	 *  since the uhd wrapper does not allow starting single channels
-	* additionally go for the producer init for both, so only we are responsible for the init, instead
-     * of splitting it with the client and causing potential races if one side uses it too early */
-	decoded_region = ipc_shm_decode_region(0, (struct ipc_shm_raw_region *)shm);
-	for (unsigned int i = 0; i < open_req->num_chans; i++) {
-		//		ios_tx_to_device[i] = ipc_shm_init_consumer(decoded_region->channels[i]->dl_stream);
-		ios_tx_to_device[i] = ipc_shm_init_producer(decoded_region->channels[i]->dl_stream);
-		ios_rx_from_device[i] = ipc_shm_init_producer(decoded_region->channels[i]->ul_stream);
-	}
-
-	ipc_tx_open_cnf(-rc, open_req->num_chans, uhdwrap_get_timingoffset(global_dev));
-	return 0;
-}
-
-void *uplink_thread(void *x_void_ptr)
-{
-	uint32_t chann = decoded_region->num_chans;
-
-	pthread_setname_np(pthread_self(), "uplink rx");
-
-	while (!ipc_exit_requested) {
-		int32_t read = uhdwrap_read(global_dev, chann);
-		if (read < 0)
-			return 0;
-	}
-	return 0;
-}
-
-void *downlink_thread(void *x_void_ptr)
-{
-	int chann = decoded_region->num_chans;
-	pthread_setname_np(pthread_self(), "downlink tx");
-
-	while (!ipc_exit_requested) {
-		bool underrun;
-		uhdwrap_write(global_dev, chann, &underrun);
-	}
-	return 0;
-}
-
-int ipc_rx_chan_start_req(struct ipc_sk_chan_if_op_void *req, uint8_t chan_nr)
-{
-	struct msgb *msg;
-	struct ipc_sk_chan_if *ipc_prim;
-	int rc;
-
-	/* no per-chan start/stop */
-	rc = uhdwrap_start(global_dev, chan_nr);
-
-	pthread_t rx, tx;
-	pthread_create(&rx, NULL, uplink_thread, 0);
-	pthread_create(&tx, NULL, downlink_thread, 0);
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_START_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-	ipc_prim->u.start_cnf.return_code = rc ? 0 : -1;
-
-	return ipc_chan_sock_send(msg, chan_nr);
-}
-int ipc_rx_chan_stop_req(struct ipc_sk_chan_if_op_void *req, uint8_t chan_nr)
-{
-	struct msgb *msg;
-	struct ipc_sk_chan_if *ipc_prim;
-	int rc;
-
-	/* no per-chan start/stop */
-	rc = uhdwrap_stop(global_dev, chan_nr);
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_STOP_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-	ipc_prim->u.stop_cnf.return_code = rc ? 0 : -1;
-
-	return ipc_chan_sock_send(msg, chan_nr);
-}
-int ipc_rx_chan_setgain_req(struct ipc_sk_chan_if_gain *req, uint8_t chan_nr)
-{
-	struct msgb *msg;
-	struct ipc_sk_chan_if *ipc_prim;
-	double rv;
-
-	rv = uhdwrap_set_gain(global_dev, req->gain, chan_nr, req->is_tx);
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_SETGAIN_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-	ipc_prim->u.set_gain_cnf.is_tx = req->is_tx;
-	ipc_prim->u.set_gain_cnf.gain = rv;
-
-	return ipc_chan_sock_send(msg, chan_nr);
-}
-
-int ipc_rx_chan_setfreq_req(struct ipc_sk_chan_if_freq_req *req, uint8_t chan_nr)
-{
-	struct msgb *msg;
-	struct ipc_sk_chan_if *ipc_prim;
-	bool rv;
-
-	rv = uhdwrap_set_freq(global_dev, req->freq, chan_nr, req->is_tx);
-
-	msg = ipc_msgb_alloc(IPC_IF_MSG_SETFREQ_CNF);
-	if (!msg)
-		return -ENOMEM;
-	ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-	ipc_prim->u.set_freq_cnf.return_code = rv ? 0 : 1;
-
-	return ipc_chan_sock_send(msg, chan_nr);
-}
-
-int ipc_sock_init(const char *path, struct ipc_sock_state **global_state_var,
-		  int (*sock_callback_fn)(struct osmo_fd *fd, unsigned int what), int n)
-{
-	struct ipc_sock_state *state;
-	struct osmo_fd *bfd;
-	int rc;
-
-	state = talloc_zero(NULL, struct ipc_sock_state);
-	if (!state)
-		return -ENOMEM;
-	*global_state_var = state;
-
-	INIT_LLIST_HEAD(&state->upqueue);
-	state->conn_bfd.fd = -1;
-
-	bfd = &state->listen_bfd;
-
-	bfd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, path, OSMO_SOCK_F_BIND);
-	if (bfd->fd < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "Could not create %s unix socket: %s\n", path, strerror(errno));
-		talloc_free(state);
-		return -1;
-	}
-
-	bfd->when = BSC_FD_READ;
-	bfd->cb = sock_callback_fn;
-	bfd->data = state;
-	bfd->priv_nr = n;
-
-	rc = osmo_fd_register(bfd);
-	if (rc < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "Could not register listen fd: %d\n", rc);
-		close(bfd->fd);
-		talloc_free(state);
-		return rc;
-	}
-
-	//osmo_signal_register_handler(SS_GLOBAL, IPC_if_signal_cb, NULL);
-
-	LOGP(DMAIN, LOGL_INFO, "Started listening on IPC socket: %s\n", path);
-
-	return 0;
-}
-
-static void print_help(void)
-{
-	printf(	"ipc-driver-test Usage:\n"
-		" -h  --help		This message\n"
-		" -n  --sock-num NR	Master socket suffix number NR\n"
-	      );
-}
-
-static int msocknum = 0;
-
-static void handle_options(int argc, char **argv)
-{
-	while (1) {
-		int option_index = 0, c;
-		const struct option long_options[] = {
-			{ "help", 0, 0, 'h' },
-			{ "sock-num", 1, 0, 'n' },
-			{0,0,0,0}
-		};
-
-		c = getopt_long(argc, argv, "hn:",
-				long_options, &option_index);
-		if (c == -1)
-			break;
-
-		switch (c) {
-		case 'h':
-			print_help();
-			exit(0);
-			break;
-		case 'n':
-			msocknum = atoi(optarg);
-			break;
-		default:
-			exit(2);
-			break;
-		}
-	}
-
-	if (argc > optind) {
-		fprintf(stderr, "Unsupported positional arguments on command line\n");
-		exit(2);
-	}
-}
-
-#if defined(IPCMAGIC) && defined(__cplusplus)
-extern "C" int osmo_ctx_init(const char *id);
-
-extern "C" int magicmain(int argc, char **argv)
-{
-	osmo_ctx_init("main");
-	osmo_select_init();
-
-#else
-int main(int argc, char **argv)
-{
-#endif
-	char ipc_msock_path[sizeof(IPC_SOCK_PATH_PREFIX)+3];
-	tall_ctx = talloc_named_const(NULL, 0, "OsmoTRX");
-	msgb_talloc_ctx_init(tall_ctx, 0);
-	osmo_init_logging2(tall_ctx, &log_infox);
-	log_enable_multithread();
-
-	handle_options(argc, argv);
-	snprintf(ipc_msock_path,sizeof(ipc_msock_path), "%s%d", IPC_SOCK_PATH_PREFIX, msocknum);
-
-	LOGP(DMAIN, LOGL_INFO, "Starting %s\n", argv[0]);
-	ipc_sock_init(ipc_msock_path, &global_ipc_sock_state, ipc_sock_accept, 0);
-	while (!ipc_exit_requested)
-		osmo_select_main(0);
-	//ipc_sock_close()
-	return 0;
-}
--- a/Transceiver52M/device/ipc/ipc-driver-test.h
+++ b/Transceiver52M/device/ipc/ipc-driver-test.h
@@ -1,42 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#pragma once
-
-#include <osmocom/core/select.h>
-#include "shm.h"
-
-extern struct ipc_sock_state *global_ipc_sock_state;
-
-/* 8 channels are plenty */
-extern struct ipc_sock_state *global_ctrl_socks[8];
-extern struct ipc_shm_io *ios_tx_to_device[8];
-extern struct ipc_shm_io *ios_rx_from_device[8];
-
-struct ipc_sock_state {
-	struct osmo_fd listen_bfd; /* fd for listen socket */
-	struct osmo_fd conn_bfd; /* fd for connection to lcr */
-	struct llist_head upqueue; /* queue for sending messages */
-};
-
-int ipc_sock_init(const char *path, struct ipc_sock_state **global_state_var,
-		  int (*sock_callback_fn)(struct osmo_fd *fd, unsigned int what), int n);
-
-int ipc_rx_greeting_req(struct ipc_sk_if_greeting *greeting_req);
-int ipc_rx_info_req(struct ipc_sk_if_info_req *info_req);
-int ipc_rx_open_req(struct ipc_sk_if_open_req *open_req);
-
-int ipc_rx_chan_start_req(struct ipc_sk_chan_if_op_void *req, uint8_t chan_nr);
-int ipc_rx_chan_stop_req(struct ipc_sk_chan_if_op_void *req, uint8_t chan_nr);
-int ipc_rx_chan_setgain_req(struct ipc_sk_chan_if_gain *req, uint8_t chan_nr);
-int ipc_rx_chan_setfreq_req(struct ipc_sk_chan_if_freq_req *req, uint8_t chan_nr);
--- a/Transceiver52M/device/ipc/ipc_chan.c
+++ b/Transceiver52M/device/ipc/ipc_chan.c
@@ -1,254 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <inttypes.h>
-#include <sys/mman.h>
-#include <sys/stat.h> /* For mode constants */
-#include <fcntl.h> /* For O_* constants */
-
-#include <debug.h>
-#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/socket.h>
-#include <osmocom/core/logging.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/timer.h>
-
-#include "shm.h"
-#include "ipc-driver-test.h"
-#include "ipc_chan.h"
-#include "ipc_sock.h"
-
-static int ipc_chan_rx(uint8_t msg_type, struct ipc_sk_chan_if *ipc_prim, uint8_t chan_nr)
-{
-	int rc = 0;
-
-	switch (msg_type) {
-	case IPC_IF_MSG_START_REQ:
-		rc = ipc_rx_chan_start_req(&ipc_prim->u.start_req, chan_nr);
-		break;
-	case IPC_IF_MSG_STOP_REQ:
-		rc = ipc_rx_chan_stop_req(&ipc_prim->u.stop_req, chan_nr);
-		break;
-	case IPC_IF_MSG_SETGAIN_REQ:
-		rc = ipc_rx_chan_setgain_req(&ipc_prim->u.set_gain_req, chan_nr);
-		break;
-	case IPC_IF_MSG_SETFREQ_REQ:
-		rc = ipc_rx_chan_setfreq_req(&ipc_prim->u.set_freq_req, chan_nr);
-		break;
-	default:
-		LOGP(DMAIN, LOGL_ERROR, "Received unknown IPC msg type %d\n", msg_type);
-		rc = -EINVAL;
-	}
-
-	return rc;
-}
-
-static int ipc_chan_sock_read(struct osmo_fd *bfd)
-{
-	struct ipc_sock_state *state = (struct ipc_sock_state *)bfd->data;
-	struct ipc_sk_chan_if *ipc_prim;
-	struct msgb *msg;
-	int rc;
-
-	msg = msgb_alloc(sizeof(*ipc_prim) + 1000, "ipc_chan_sock_rx");
-	if (!msg)
-		return -ENOMEM;
-
-	ipc_prim = (struct ipc_sk_chan_if *)msg->tail;
-
-	rc = recv(bfd->fd, msg->tail, msgb_tailroom(msg), 0);
-	if (rc == 0)
-		goto close;
-
-	if (rc < 0) {
-		if (errno == EAGAIN) {
-			msgb_free(msg);
-			return 0;
-		}
-		goto close;
-	}
-
-	if (rc < (int)sizeof(*ipc_prim)) {
-		LOGP(DMAIN, LOGL_ERROR,
-		     "Received %d bytes on Unix Socket, but primitive size "
-		     "is %zu, discarding\n",
-		     rc, sizeof(*ipc_prim));
-		msgb_free(msg);
-		return 0;
-	}
-
-	rc = ipc_chan_rx(ipc_prim->msg_type, ipc_prim, bfd->priv_nr);
-
-	/* as we always synchronously process the message in IPC_rx() and
-	 * its callbacks, we can free the message here. */
-	msgb_free(msg);
-
-	return rc;
-
-close:
-	msgb_free(msg);
-	ipc_sock_close(state);
-	return -1;
-}
-
-int ipc_chan_sock_send(struct msgb *msg, uint8_t chan_nr)
-{
-	struct ipc_sock_state *state = global_ctrl_socks[chan_nr];
-	struct osmo_fd *conn_bfd;
-
-	if (!state)
-		return -EINVAL;
-
-	if (!state) {
-		LOGP(DMAIN, LOGL_INFO,
-		     "IPC socket not created, "
-		     "dropping message\n");
-		msgb_free(msg);
-		return -EINVAL;
-	}
-	conn_bfd = &state->conn_bfd;
-	if (conn_bfd->fd <= 0) {
-		LOGP(DMAIN, LOGL_NOTICE,
-		     "IPC socket not connected, "
-		     "dropping message\n");
-		msgb_free(msg);
-		return -EIO;
-	}
-	msgb_enqueue(&state->upqueue, msg);
-	conn_bfd->when |= BSC_FD_WRITE;
-
-	return 0;
-}
-
-static int ipc_chan_sock_write(struct osmo_fd *bfd)
-{
-	struct ipc_sock_state *state = (struct ipc_sock_state *)bfd->data;
-	int rc;
-
-	while (!llist_empty(&state->upqueue)) {
-		struct msgb *msg, *msg2;
-		struct ipc_sk_chan_if *ipc_prim;
-
-		/* peek at the beginning of the queue */
-		msg = llist_entry(state->upqueue.next, struct msgb, list);
-		ipc_prim = (struct ipc_sk_chan_if *)msg->data;
-
-		bfd->when &= ~BSC_FD_WRITE;
-
-		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
-		if (!msgb_length(msg)) {
-			LOGP(DMAIN, LOGL_ERROR,
-			     "message type (%d) with ZERO "
-			     "bytes!\n",
-			     ipc_prim->msg_type);
-			goto dontsend;
-		}
-
-		/* try to send it over the socket */
-		rc = write(bfd->fd, msgb_data(msg), msgb_length(msg));
-		if (rc == 0)
-			goto close;
-		if (rc < 0) {
-			if (errno == EAGAIN) {
-				bfd->when |= BSC_FD_WRITE;
-				break;
-			}
-			goto close;
-		}
-
-	dontsend:
-		/* _after_ we send it, we can deueue */
-		msg2 = msgb_dequeue(&state->upqueue);
-		assert(msg == msg2);
-		msgb_free(msg);
-	}
-	return 0;
-
-close:
-	ipc_sock_close(state);
-	return -1;
-}
-
-static int ipc_chan_sock_cb(struct osmo_fd *bfd, unsigned int flags)
-{
-	int rc = 0;
-
-	if (flags & BSC_FD_READ)
-		rc = ipc_chan_sock_read(bfd);
-	if (rc < 0)
-		return rc;
-
-	if (flags & BSC_FD_WRITE)
-		rc = ipc_chan_sock_write(bfd);
-
-	return rc;
-}
-
-int ipc_chan_sock_accept(struct osmo_fd *bfd, unsigned int flags)
-{
-	struct ipc_sock_state *state = (struct ipc_sock_state *)bfd->data;
-	struct osmo_fd *conn_bfd = &state->conn_bfd;
-	struct sockaddr_un un_addr;
-	socklen_t len;
-	int rc;
-
-	len = sizeof(un_addr);
-	rc = accept(bfd->fd, (struct sockaddr *)&un_addr, &len);
-	if (rc < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "Failed to accept a new connection\n");
-		return -1;
-	}
-
-	if (conn_bfd->fd >= 0) {
-		LOGP(DMAIN, LOGL_NOTICE,
-		     "osmo-trx connects but we already have "
-		     "another active connection ?!?\n");
-		/* We already have one IPC connected, this is all we support */
-		state->listen_bfd.when &= ~BSC_FD_READ;
-		close(rc);
-		return 0;
-	}
-
-	conn_bfd->fd = rc;
-	conn_bfd->when = BSC_FD_READ;
-	conn_bfd->cb = ipc_chan_sock_cb;
-	conn_bfd->data = state;
-
-	if (osmo_fd_register(conn_bfd) != 0) {
-		LOGP(DMAIN, LOGL_ERROR,
-		     "Failed to register new connection "
-		     "fd\n");
-		close(conn_bfd->fd);
-		conn_bfd->fd = -1;
-		return -1;
-	}
-
-	LOGP(DMAIN, LOGL_NOTICE, "Unix socket connected to external osmo-trx\n");
-
-	/* send current info */
-	//IPC_tx_info_ind();
-
-	return 0;
-}
--- a/Transceiver52M/device/ipc/ipc_chan.h
+++ b/Transceiver52M/device/ipc/ipc_chan.h
@@ -1,23 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#ifndef IPC_CHAN_H
-#define IPC_CHAN_H
-
-#include "shm.h"
-#include "ipc-driver-test.h"
-
-int ipc_chan_sock_send(struct msgb *msg, uint8_t chan_nr);
-int ipc_chan_sock_accept(struct osmo_fd *bfd, unsigned int flags);
-
-#endif // IPC_CHAN_H
--- a/Transceiver52M/device/ipc/ipc_shm.c
+++ b/Transceiver52M/device/ipc/ipc_shm.c
@@ -1,204 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Eric Wild <ewild@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <shm.h>
-#include "ipc_shm.h"
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#define SAMPLE_SIZE_BYTE sizeof(uint16_t) * 2
-
-struct ipc_shm_io *ipc_shm_init_consumer(struct ipc_shm_stream *s)
-{
-	unsigned int i;
-
-	struct ipc_shm_io *r = (struct ipc_shm_io *)malloc(sizeof(struct ipc_shm_io));
-	r->this_stream = s->raw;
-	r->buf_ptrs =
-		(volatile struct ipc_shm_raw_smpl_buf **)malloc(sizeof(struct ipc_shm_raw_smpl_buf *) * s->num_buffers);
-
-	/* save actual ptrs */
-	for (i = 0; i < s->num_buffers; i++)
-		r->buf_ptrs[i] = s->buffers[i];
-
-	r->partial_read_begin_ptr = 0;
-	return r;
-}
-
-struct ipc_shm_io *ipc_shm_init_producer(struct ipc_shm_stream *s)
-{
-	int rv;
-	pthread_mutexattr_t att;
-	pthread_condattr_t t1, t2;
-	struct ipc_shm_io *r = ipc_shm_init_consumer(s);
-	rv = pthread_mutexattr_init(&att);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	rv = pthread_mutexattr_setrobust(&att, PTHREAD_MUTEX_ROBUST);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	rv = pthread_mutexattr_setpshared(&att, PTHREAD_PROCESS_SHARED);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	rv = pthread_mutex_init((pthread_mutex_t *)&r->this_stream->lock, &att);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	pthread_mutexattr_destroy(&att);
-
-	rv = pthread_condattr_setpshared(&t1, PTHREAD_PROCESS_SHARED);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	rv = pthread_condattr_setpshared(&t2, PTHREAD_PROCESS_SHARED);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	rv = pthread_cond_init((pthread_cond_t *)&r->this_stream->cf, &t1);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	rv = pthread_cond_init((pthread_cond_t *)&r->this_stream->ce, &t2);
-	if (rv != 0) {
-		fprintf(stderr, "%s:%d rv:%d", __FILE__, __LINE__, rv);
-		exit(EXIT_FAILURE);
-	}
-
-	pthread_condattr_destroy(&t1);
-	pthread_condattr_destroy(&t2);
-
-	r->this_stream->read_next = 0;
-	r->this_stream->write_next = 0;
-	return r;
-}
-
-void ipc_shm_close(struct ipc_shm_io *r)
-{
-	if (r) {
-		if (r->buf_ptrs)
-			free(r->buf_ptrs);
-		free(r);
-	}
-}
-
-int32_t ipc_shm_enqueue(struct ipc_shm_io *r, uint64_t timestamp, uint32_t len_in_sps, uint16_t *data)
-{
-	volatile struct ipc_shm_raw_smpl_buf *buf;
-	int32_t rv;
-	struct timespec tv;
-	clock_gettime(CLOCK_REALTIME, &tv);
-	tv.tv_sec += 1;
-
-	rv = pthread_mutex_timedlock((pthread_mutex_t *)&r->this_stream->lock, &tv);
-	if (rv != 0)
-		return -rv;
-
-	while (((r->this_stream->write_next + 1) & (r->this_stream->num_buffers - 1)) == r->this_stream->read_next &&
-	       rv == 0)
-		rv = pthread_cond_timedwait((pthread_cond_t *)&r->this_stream->ce,
-					    (pthread_mutex_t *)&r->this_stream->lock, &tv);
-	if (rv != 0)
-		return -rv;
-
-	buf = r->buf_ptrs[r->this_stream->write_next];
-	buf->timestamp = timestamp;
-
-	rv = len_in_sps <= r->this_stream->buffer_size ? len_in_sps : r->this_stream->buffer_size;
-
-	memcpy((void *)buf->samples, data, SAMPLE_SIZE_BYTE * rv);
-	buf->data_len = rv;
-
-	r->this_stream->write_next = (r->this_stream->write_next + 1) & (r->this_stream->num_buffers - 1);
-
-	pthread_cond_signal((pthread_cond_t *)&r->this_stream->cf);
-	pthread_mutex_unlock((pthread_mutex_t *)&r->this_stream->lock);
-
-	return rv;
-}
-
-int32_t ipc_shm_read(struct ipc_shm_io *r, uint16_t *out_buf, uint32_t num_samples, uint64_t *timestamp,
-		     uint32_t timeout_seconds)
-{
-	volatile struct ipc_shm_raw_smpl_buf *buf;
-	int32_t rv;
-	uint8_t freeflag = 0;
-	struct timespec tv;
-	clock_gettime(CLOCK_REALTIME, &tv);
-	tv.tv_sec += timeout_seconds;
-
-	rv = pthread_mutex_timedlock((pthread_mutex_t *)&r->this_stream->lock, &tv);
-	if (rv != 0)
-		return -rv;
-
-	while (r->this_stream->write_next == r->this_stream->read_next && rv == 0)
-		rv = pthread_cond_timedwait((pthread_cond_t *)&r->this_stream->cf,
-					    (pthread_mutex_t *)&r->this_stream->lock, &tv);
-	if (rv != 0)
-		return -rv;
-
-	buf = r->buf_ptrs[r->this_stream->read_next];
-	if (buf->data_len <= num_samples) {
-		memcpy(out_buf, (void *)&buf->samples[r->partial_read_begin_ptr * 2], SAMPLE_SIZE_BYTE * buf->data_len);
-		r->partial_read_begin_ptr = 0;
-		rv = buf->data_len;
-		buf->data_len = 0;
-		r->this_stream->read_next = (r->this_stream->read_next + 1) & (r->this_stream->num_buffers - 1);
-		freeflag = 1;
-
-	} else /*if (buf->data_len > num_samples)*/ {
-		memcpy(out_buf, (void *)&buf->samples[r->partial_read_begin_ptr * 2], SAMPLE_SIZE_BYTE * num_samples);
-		r->partial_read_begin_ptr += num_samples;
-		buf->data_len -= num_samples;
-		rv = num_samples;
-	}
-
-	*timestamp = buf->timestamp;
-	buf->timestamp += rv;
-
-	if (freeflag)
-		pthread_cond_signal((pthread_cond_t *)&r->this_stream->ce);
-
-	pthread_mutex_unlock((pthread_mutex_t *)&r->this_stream->lock);
-
-	return rv;
-}
--- a/Transceiver52M/device/ipc/ipc_shm.h
+++ b/Transceiver52M/device/ipc/ipc_shm.h
@@ -1,43 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Eric Wild <ewild@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-*/
-#ifndef IPC_SHM_H
-#define IPC_SHM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <shm.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-struct ipc_shm_io {
-	volatile struct ipc_shm_raw_stream *this_stream; // plus num_buffers at end
-	volatile struct ipc_shm_raw_smpl_buf **volatile buf_ptrs;
-	uint32_t partial_read_begin_ptr;
-};
-
-struct ipc_shm_io *ipc_shm_init_consumer(struct ipc_shm_stream *s);
-struct ipc_shm_io *ipc_shm_init_producer(struct ipc_shm_stream *s);
-void ipc_shm_close(struct ipc_shm_io *r);
-int32_t ipc_shm_enqueue(struct ipc_shm_io *r, uint64_t timestamp, uint32_t len_in_sps, uint16_t *data);
-int32_t ipc_shm_tryenqueue(struct ipc_shm_io *r, uint64_t timestamp, uint32_t len_in_sps, uint16_t *data);
-volatile struct ipc_shm_raw_smpl_buf *ipc_shm_dequeue(struct ipc_shm_io *r);
-int32_t ipc_shm_read(struct ipc_shm_io *r, uint16_t *out_buf, uint32_t num_samples, uint64_t *timestamp,
-		     uint32_t timeout_seconds);
-
-#endif // IPC_SHM_H
--- a/Transceiver52M/device/ipc/ipc_sock.c
+++ b/Transceiver52M/device/ipc/ipc_sock.c
@@ -1,271 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <inttypes.h>
-#include <sys/mman.h>
-#include <sys/stat.h> /* For mode constants */
-#include <fcntl.h> /* For O_* constants */
-
-#include <debug.h>
-#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/socket.h>
-#include <osmocom/core/logging.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/timer.h>
-
-#include "shm.h"
-#include "ipc-driver-test.h"
-
-extern volatile int ipc_exit_requested;
-static int ipc_rx(uint8_t msg_type, struct ipc_sk_if *ipc_prim)
-{
-	int rc = 0;
-
-	switch (msg_type) {
-	case IPC_IF_MSG_GREETING_REQ:
-		rc = ipc_rx_greeting_req(&ipc_prim->u.greeting_req);
-		break;
-	case IPC_IF_MSG_INFO_REQ:
-		rc = ipc_rx_info_req(&ipc_prim->u.info_req);
-		break;
-	case IPC_IF_MSG_OPEN_REQ:
-		rc = ipc_rx_open_req(&ipc_prim->u.open_req);
-		break;
-	default:
-		LOGP(DMAIN, LOGL_ERROR, "Received unknown IPC msg type %d\n", msg_type);
-		rc = -EINVAL;
-	}
-
-	return rc;
-}
-
-int ipc_sock_send(struct msgb *msg)
-{
-	struct ipc_sock_state *state = global_ipc_sock_state;
-	struct osmo_fd *conn_bfd;
-	//struct ipc_sk_if *ipc_prim = (struct ipc_sk_if *) msg->data;
-
-	if (!state) {
-		LOGP(DMAIN, LOGL_INFO,
-		     "IPC socket not created, "
-		     "dropping message\n");
-		msgb_free(msg);
-		return -EINVAL;
-	}
-	conn_bfd = &state->conn_bfd;
-	if (conn_bfd->fd <= 0) {
-		LOGP(DMAIN, LOGL_NOTICE,
-		     "IPC socket not connected, "
-		     "dropping message\n");
-		msgb_free(msg);
-		return -EIO;
-	}
-	msgb_enqueue(&state->upqueue, msg);
-	conn_bfd->when |= BSC_FD_WRITE;
-
-	return 0;
-}
-
-void ipc_sock_close(struct ipc_sock_state *state)
-{
-	struct osmo_fd *bfd = &state->conn_bfd;
-
-	LOGP(DMAIN, LOGL_NOTICE, "IPC socket has LOST connection\n");
-
-	ipc_exit_requested = 1;
-
-	close(bfd->fd);
-	bfd->fd = -1;
-	osmo_fd_unregister(bfd);
-
-	/* re-enable the generation of ACCEPT for new connections */
-	state->listen_bfd.when |= BSC_FD_READ;
-
-	/* flush the queue */
-	while (!llist_empty(&state->upqueue)) {
-		struct msgb *msg = msgb_dequeue(&state->upqueue);
-		msgb_free(msg);
-	}
-}
-
-int ipc_sock_read(struct osmo_fd *bfd)
-{
-	struct ipc_sock_state *state = (struct ipc_sock_state *)bfd->data;
-	struct ipc_sk_if *ipc_prim;
-	struct msgb *msg;
-	int rc;
-
-	msg = msgb_alloc(sizeof(*ipc_prim) + 1000, "ipc_sock_rx");
-	if (!msg)
-		return -ENOMEM;
-
-	ipc_prim = (struct ipc_sk_if *)msg->tail;
-
-	rc = recv(bfd->fd, msg->tail, msgb_tailroom(msg), 0);
-	if (rc == 0)
-		goto close;
-
-	if (rc < 0) {
-		if (errno == EAGAIN) {
-			msgb_free(msg);
-			return 0;
-		}
-		goto close;
-	}
-
-	if (rc < (int)sizeof(*ipc_prim)) {
-		LOGP(DMAIN, LOGL_ERROR,
-		     "Received %d bytes on Unix Socket, but primitive size "
-		     "is %zu, discarding\n",
-		     rc, sizeof(*ipc_prim));
-		msgb_free(msg);
-		return 0;
-	}
-
-	rc = ipc_rx(ipc_prim->msg_type, ipc_prim);
-
-	/* as we always synchronously process the message in IPC_rx() and
-	 * its callbacks, we can free the message here. */
-	msgb_free(msg);
-
-	return rc;
-
-close:
-	msgb_free(msg);
-	ipc_sock_close(state);
-	return -1;
-}
-
-static int ipc_sock_write(struct osmo_fd *bfd)
-{
-	struct ipc_sock_state *state = (struct ipc_sock_state *)bfd->data;
-	int rc;
-
-	while (!llist_empty(&state->upqueue)) {
-		struct msgb *msg, *msg2;
-		struct ipc_sk_if *ipc_prim;
-
-		/* peek at the beginning of the queue */
-		msg = llist_entry(state->upqueue.next, struct msgb, list);
-		ipc_prim = (struct ipc_sk_if *)msg->data;
-
-		bfd->when &= ~BSC_FD_WRITE;
-
-		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
-		if (!msgb_length(msg)) {
-			LOGP(DMAIN, LOGL_ERROR,
-			     "message type (%d) with ZERO "
-			     "bytes!\n",
-			     ipc_prim->msg_type);
-			goto dontsend;
-		}
-
-		/* try to send it over the socket */
-		rc = write(bfd->fd, msgb_data(msg), msgb_length(msg));
-		if (rc == 0)
-			goto close;
-		if (rc < 0) {
-			if (errno == EAGAIN) {
-				bfd->when |= BSC_FD_WRITE;
-				break;
-			}
-			goto close;
-		}
-
-	dontsend:
-		/* _after_ we send it, we can deueue */
-		msg2 = msgb_dequeue(&state->upqueue);
-		assert(msg == msg2);
-		msgb_free(msg);
-	}
-	return 0;
-
-close:
-	ipc_sock_close(state);
-	return -1;
-}
-
-static int ipc_sock_cb(struct osmo_fd *bfd, unsigned int flags)
-{
-	int rc = 0;
-
-	if (flags & BSC_FD_READ)
-		rc = ipc_sock_read(bfd);
-	if (rc < 0)
-		return rc;
-
-	if (flags & BSC_FD_WRITE)
-		rc = ipc_sock_write(bfd);
-
-	return rc;
-}
-
-/* accept connection coming from IPC */
-int ipc_sock_accept(struct osmo_fd *bfd, unsigned int flags)
-{
-	struct ipc_sock_state *state = (struct ipc_sock_state *)bfd->data;
-	struct osmo_fd *conn_bfd = &state->conn_bfd;
-	struct sockaddr_un un_addr;
-	socklen_t len;
-	int rc;
-
-	len = sizeof(un_addr);
-	rc = accept(bfd->fd, (struct sockaddr *)&un_addr, &len);
-	if (rc < 0) {
-		LOGP(DMAIN, LOGL_ERROR, "Failed to accept a new connection\n");
-		return -1;
-	}
-
-	if (conn_bfd->fd >= 0) {
-		LOGP(DMAIN, LOGL_NOTICE,
-		     "ip clent connects but we already have "
-		     "another active connection ?!?\n");
-		/* We already have one IPC connected, this is all we support */
-		state->listen_bfd.when &= ~BSC_FD_READ;
-		close(rc);
-		return 0;
-	}
-
-	conn_bfd->fd = rc;
-	conn_bfd->when = BSC_FD_READ;
-	conn_bfd->cb = ipc_sock_cb;
-	conn_bfd->data = state;
-
-	if (osmo_fd_register(conn_bfd) != 0) {
-		LOGP(DMAIN, LOGL_ERROR,
-		     "Failed to register new connection "
-		     "fd\n");
-		close(conn_bfd->fd);
-		conn_bfd->fd = -1;
-		return -1;
-	}
-
-	LOGP(DMAIN, LOGL_NOTICE, "Unix socket connected to external osmo-trx\n");
-
-	/* send current info */
-	//IPC_tx_info_ind();
-
-	return 0;
-}
--- a/Transceiver52M/device/ipc/ipc_sock.h
+++ b/Transceiver52M/device/ipc/ipc_sock.h
@@ -1,24 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#ifndef IPC_SOCK_H
-#define IPC_SOCK_H
-
-#include "shm.h"
-#include "ipc-driver-test.h"
-
-int ipc_sock_send(struct msgb *msg);
-int ipc_sock_accept(struct osmo_fd *bfd, unsigned int flags);
-void ipc_sock_close(struct ipc_sock_state *state);
-
-#endif // IPC_SOCK_H
--- a/Transceiver52M/device/ipc/shm.c
+++ b/Transceiver52M/device/ipc/shm.c
@@ -1,165 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <osmocom/core/talloc.h>
-
-#include "shm.h"
-
-//#define ENCDECDEBUG
-
-/* Convert offsets to pointers */
-struct ipc_shm_stream *ipc_shm_decode_stream(void *tall_ctx, struct ipc_shm_raw_region *root_raw,
-					     struct ipc_shm_raw_stream *stream_raw)
-{
-	unsigned int i;
-	struct ipc_shm_stream *stream;
-	stream = talloc_zero(tall_ctx, struct ipc_shm_stream);
-	stream = talloc_zero_size(tall_ctx, sizeof(struct ipc_shm_stream) +
-						    sizeof(struct ipc_shm_raw_smpl_buf *) * stream_raw->num_buffers);
-	if (!stream)
-		return NULL;
-	stream->num_buffers = stream_raw->num_buffers;
-	stream->buffer_size = stream_raw->buffer_size;
-	stream->raw = stream_raw;
-	for (i = 0; i < stream->num_buffers; i++) {
-#ifdef ENCDECDEBUG
-		fprintf(stderr, "decode: smpl_buf %d at offset %u\n", i, stream_raw->buffer_offset[i]);
-#endif
-		stream->buffers[i] =
-			(struct ipc_shm_raw_smpl_buf *)(((uint8_t *)root_raw) + stream_raw->buffer_offset[i]);
-	}
-	return stream;
-}
-
-struct ipc_shm_channel *ipc_shm_decode_channel(void *tall_ctx, struct ipc_shm_raw_region *root_raw,
-					       struct ipc_shm_raw_channel *chan_raw)
-{
-	struct ipc_shm_channel *chan;
-	chan = talloc_zero(tall_ctx, struct ipc_shm_channel);
-	if (!chan)
-		return NULL;
-#ifdef ENCDECDEBUG
-	fprintf(stderr, "decode: streams at offset %u and %u\n", chan_raw->dl_buf_offset, chan_raw->ul_buf_offset);
-#endif
-	chan->dl_stream = ipc_shm_decode_stream(
-		chan, root_raw, (struct ipc_shm_raw_stream *)(((uint8_t *)root_raw) + chan_raw->dl_buf_offset));
-	chan->ul_stream = ipc_shm_decode_stream(
-		chan, root_raw, (struct ipc_shm_raw_stream *)(((uint8_t *)root_raw) + chan_raw->ul_buf_offset));
-	return chan;
-}
-struct ipc_shm_region *ipc_shm_decode_region(void *tall_ctx, struct ipc_shm_raw_region *root_raw)
-{
-	unsigned int i;
-	struct ipc_shm_region *root;
-	root = talloc_zero_size(tall_ctx,
-				sizeof(struct ipc_shm_region) + sizeof(struct ipc_shm_channel *) * root_raw->num_chans);
-	if (!root)
-		return NULL;
-
-	root->num_chans = root_raw->num_chans;
-	for (i = 0; i < root->num_chans; i++) {
-#ifdef ENCDECDEBUG
-		fprintf(stderr, "decode: channel %d at offset %u\n", i, root_raw->chan_offset[i]);
-#endif
-		root->channels[i] = ipc_shm_decode_channel(
-			root, root_raw,
-			(struct ipc_shm_raw_channel *)(((uint8_t *)root_raw) + root_raw->chan_offset[i]));
-	}
-	return root;
-}
-
-unsigned int ipc_shm_encode_smpl_buf(struct ipc_shm_raw_region *root_raw, struct ipc_shm_raw_smpl_buf *smpl_buf_raw,
-				     uint32_t buffer_size)
-{
-	uint8_t *start = (uint8_t *)smpl_buf_raw;
-	unsigned int offset = sizeof(struct ipc_shm_raw_smpl_buf);
-	offset = (((uintptr_t)offset + 7) & ~0x07ULL);
-#ifdef ENCDECDEBUG
-	fprintf(stderr, "encode: smpl_buf at offset %lu\n", (start - (uint8_t *)root_raw));
-#endif
-	offset += buffer_size * sizeof(uint16_t) * 2; /* samples */
-	return offset;
-}
-
-unsigned int ipc_shm_encode_stream(struct ipc_shm_raw_region *root_raw, struct ipc_shm_raw_stream *stream_raw,
-				   uint32_t num_buffers, uint32_t buffer_size)
-{
-	unsigned int i;
-	ptrdiff_t start = (ptrdiff_t)stream_raw;
-	unsigned int offset = sizeof(struct ipc_shm_raw_stream) + sizeof(uint32_t) * num_buffers;
-	offset = (((uintptr_t)offset + 7) & ~0x07ULL);
-#ifdef ENCDECDEBUG
-	fprintf(stderr, "encode: stream at offset %lu\n", (start - (ptrdiff_t)root_raw));
-#endif
-	if (root_raw) {
-		stream_raw->num_buffers = num_buffers;
-		stream_raw->buffer_size = buffer_size;
-		stream_raw->read_next = 0;
-		stream_raw->write_next = 0;
-	}
-	for (i = 0; i < num_buffers; i++) {
-		if (root_raw)
-			stream_raw->buffer_offset[i] = (start + offset - (ptrdiff_t)root_raw);
-		offset +=
-			ipc_shm_encode_smpl_buf(root_raw, (struct ipc_shm_raw_smpl_buf *)(start + offset), buffer_size);
-	}
-	return offset;
-}
-unsigned int ipc_shm_encode_channel(struct ipc_shm_raw_region *root_raw, struct ipc_shm_raw_channel *chan_raw,
-				    uint32_t num_buffers, uint32_t buffer_size)
-{
-	uint8_t *start = (uint8_t *)chan_raw;
-	unsigned int offset = sizeof(struct ipc_shm_raw_channel);
-	offset = (((uintptr_t)offset + 7) & ~0x07ULL);
-#ifdef ENCDECDEBUG
-	fprintf(stderr, "encode: channel at offset %lu\n", (start - (uint8_t *)root_raw));
-#endif
-	if (root_raw)
-		chan_raw->dl_buf_offset = (start + offset - (uint8_t *)root_raw);
-	offset += ipc_shm_encode_stream(root_raw, (struct ipc_shm_raw_stream *)(start + offset), num_buffers,
-					buffer_size);
-	if (root_raw)
-		chan_raw->ul_buf_offset = (start + offset - (uint8_t *)root_raw);
-	offset += ipc_shm_encode_stream(root_raw, (struct ipc_shm_raw_stream *)(start + offset), num_buffers,
-					buffer_size);
-	return offset;
-}
-/* if root_raw is NULL, then do a dry run, aka only calculate final offset */
-unsigned int ipc_shm_encode_region(struct ipc_shm_raw_region *root_raw, uint32_t num_chans, uint32_t num_buffers,
-				   uint32_t buffer_size)
-{
-	unsigned i;
-	uintptr_t start = (uintptr_t)root_raw;
-	unsigned int offset = sizeof(struct ipc_shm_raw_region) + sizeof(uint32_t) * num_chans;
-	offset = (((uintptr_t)offset + 7) & ~0x07ULL);
-
-	if (root_raw)
-		root_raw->num_chans = num_chans;
-	for (i = 0; i < num_chans; i++) {
-		uint32_t ofs = (start + offset - (uintptr_t)root_raw);
-		if (root_raw)
-			root_raw->chan_offset[i] = (start + offset - (uintptr_t)root_raw);
-#ifdef ENCDECDEBUG
-		fprintf(stderr, "encode: channel %d chan_offset[i]=%u\n", i, ofs);
-#endif
-		offset += ipc_shm_encode_channel(root_raw, (struct ipc_shm_raw_channel *)(start + offset), num_buffers,
-						 buffer_size);
-	}
-	//TODO: pass maximum size and verify we didn't go through
-	return offset;
-}
--- a/Transceiver52M/device/ipc/shm.h
+++ b/Transceiver52M/device/ipc/shm.h
@@ -1,224 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Pau Espin Pedrol <pespin@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#pragma once
-
-#include <stdint.h>
-#include <unistd.h>
-#include <limits.h>
-//#include <pthread.h>
-#include <semaphore.h>
-
-/* RAW structures */
-struct ipc_shm_raw_smpl_buf {
-	uint64_t timestamp;
-	uint32_t data_len; /* In samples */
-	uint16_t samples[0];
-};
-
-struct ipc_shm_raw_stream {
-	pthread_mutex_t lock;
-	pthread_cond_t cf;
-	pthread_cond_t ce;
-	uint32_t num_buffers;
-	uint32_t buffer_size; /* In samples */
-	uint32_t read_next;
-	uint32_t write_next;
-	uint32_t buffer_offset[0];
-	//struct ipc_shm_smpl_buf buffers[0];
-};
-
-struct ipc_shm_raw_channel {
-	uint32_t dl_buf_offset;
-	uint32_t ul_buf_offset;
-};
-
-struct ipc_shm_raw_region {
-	uint32_t num_chans;
-	uint32_t chan_offset[0];
-};
-
-/* non-raw, Pointer converted structures */
-struct ipc_shm_stream {
-	uint32_t num_buffers;
-	uint32_t buffer_size;
-	volatile struct ipc_shm_raw_stream *raw;
-	volatile struct ipc_shm_raw_smpl_buf *buffers[0];
-};
-
-struct ipc_shm_channel {
-	struct ipc_shm_stream *dl_stream;
-	struct ipc_shm_stream *ul_stream;
-};
-
-/* Pointer converted structures */
-struct ipc_shm_region {
-	uint32_t num_chans;
-	struct ipc_shm_channel *channels[0];
-};
-
-unsigned int ipc_shm_encode_region(struct ipc_shm_raw_region *root_raw, uint32_t num_chans, uint32_t num_buffers,
-				   uint32_t buffer_size);
-struct ipc_shm_region *ipc_shm_decode_region(void *tall_ctx, struct ipc_shm_raw_region *root_raw);
-/****************************************/
-/* UNIX SOCKET API                      */
-/****************************************/
-
-//////////////////
-// Master socket
-//////////////////
-
-#define IPC_SOCK_PATH_PREFIX "/tmp/ipc_sock"
-#define IPC_SOCK_API_VERSION 1
-
-/* msg_type */
-#define IPC_IF_MSG_GREETING_REQ 0x00
-#define IPC_IF_MSG_GREETING_CNF 0x01
-#define IPC_IF_MSG_INFO_REQ 0x02
-#define IPC_IF_MSG_INFO_CNF 0x03
-#define IPC_IF_MSG_OPEN_REQ 0x04
-#define IPC_IF_MSG_OPEN_CNF 0x05
-
-#define MAX_NUM_CHANS 30
-#define RF_PATH_NAME_SIZE 25
-#define MAX_NUM_RF_PATHS 10
-#define SHM_NAME_MAX NAME_MAX /* 255 */
-
-#define FEATURE_MASK_CLOCKREF_INTERNAL (0x1 << 0)
-#define FEATURE_MASK_CLOCKREF_EXTERNAL (0x1 << 1)
-struct ipc_sk_if_info_chan {
-	char tx_path[MAX_NUM_RF_PATHS][RF_PATH_NAME_SIZE];
-	char rx_path[MAX_NUM_RF_PATHS][RF_PATH_NAME_SIZE];
-} __attribute__((packed));
-
-struct ipc_sk_if_open_req_chan {
-	char tx_path[RF_PATH_NAME_SIZE];
-	char rx_path[RF_PATH_NAME_SIZE];
-} __attribute__((packed));
-
-struct ipc_sk_if_open_cnf_chan {
-	char chan_ipc_sk_path[108];
-} __attribute__((packed));
-
-struct ipc_sk_if_greeting {
-	uint8_t req_version;
-} __attribute__((packed));
-
-struct ipc_sk_if_info_req {
-	uint8_t spare;
-} __attribute__((packed));
-
-struct ipc_sk_if_info_cnf {
-	uint32_t feature_mask;
-	double min_rx_gain;
-	double max_rx_gain;
-	double min_tx_gain;
-	double max_tx_gain;
-	double iq_scaling_val_rx;
-	double iq_scaling_val_tx;
-	uint32_t max_num_chans;
-	char dev_desc[200];
-	struct ipc_sk_if_info_chan chan_info[0];
-} __attribute__((packed));
-
-struct ipc_sk_if_open_req {
-	uint32_t num_chans;
-	uint32_t clockref; /* One of FEATUER_MASK_CLOCKREF_* */
-	uint32_t rx_sample_freq_num;
-	uint32_t rx_sample_freq_den;
-	uint32_t tx_sample_freq_num;
-	uint32_t tx_sample_freq_den;
-	uint32_t bandwidth;
-	struct ipc_sk_if_open_req_chan chan_info[0];
-} __attribute__((packed));
-
-struct ipc_sk_if_open_cnf {
-	uint8_t return_code;
-	uint32_t path_delay;
-	char shm_name[SHM_NAME_MAX];
-	struct ipc_sk_if_open_cnf_chan chan_info[0];
-} __attribute__((packed));
-
-struct ipc_sk_if {
-	uint8_t msg_type; /* message type */
-	uint8_t spare[2];
-
-	union {
-		struct ipc_sk_if_greeting greeting_req;
-		struct ipc_sk_if_greeting greeting_cnf;
-		struct ipc_sk_if_info_req info_req;
-		struct ipc_sk_if_info_cnf info_cnf;
-		struct ipc_sk_if_open_req open_req;
-		struct ipc_sk_if_open_cnf open_cnf;
-	} u;
-} __attribute__((packed));
-
-//////////////////
-// Channel socket
-//////////////////
-#define IPC_IF_CHAN_MSG_OFFSET 50
-#define IPC_IF_MSG_START_REQ IPC_IF_CHAN_MSG_OFFSET + 0x00
-#define IPC_IF_MSG_START_CNF IPC_IF_CHAN_MSG_OFFSET + 0x01
-#define IPC_IF_MSG_STOP_REQ IPC_IF_CHAN_MSG_OFFSET + 0x02
-#define IPC_IF_MSG_STOP_CNF IPC_IF_CHAN_MSG_OFFSET + 0x03
-#define IPC_IF_MSG_SETGAIN_REQ IPC_IF_CHAN_MSG_OFFSET + 0x04
-#define IPC_IF_MSG_SETGAIN_CNF IPC_IF_CHAN_MSG_OFFSET + 0x05
-#define IPC_IF_MSG_SETFREQ_REQ IPC_IF_CHAN_MSG_OFFSET + 0x06
-#define IPC_IF_MSG_SETFREQ_CNF IPC_IF_CHAN_MSG_OFFSET + 0x07
-
-#define IPC_IF_NOTIFY_UNDERFLOW IPC_IF_CHAN_MSG_OFFSET + 0x08
-#define IPC_IF_NOTIFY_OVERFLOW IPC_IF_CHAN_MSG_OFFSET + 0x09
-
-struct ipc_sk_chan_if_op_void {
-	// at least one dummy byte, to allow c/c++ compatibility
-	uint8_t dummy;
-} __attribute__((packed));
-
-struct ipc_sk_chan_if_op_rc {
-	uint8_t return_code;
-} __attribute__((packed));
-
-struct ipc_sk_chan_if_gain {
-	double gain;
-	uint8_t is_tx;
-} __attribute__((packed));
-
-struct ipc_sk_chan_if_freq_req {
-	double freq;
-	uint8_t is_tx;
-} __attribute__((packed));
-
-struct ipc_sk_chan_if_freq_cnf {
-	uint8_t return_code;
-} __attribute__((packed));
-
-struct ipc_sk_chan_if_notfiy {
-	uint8_t dummy;
-} __attribute__((packed));
-
-struct ipc_sk_chan_if {
-	uint8_t msg_type; /* message type */
-	uint8_t spare[2];
-
-	union {
-		struct ipc_sk_chan_if_op_void start_req;
-		struct ipc_sk_chan_if_op_rc start_cnf;
-		struct ipc_sk_chan_if_op_void stop_req;
-		struct ipc_sk_chan_if_op_rc stop_cnf;
-		struct ipc_sk_chan_if_gain set_gain_req;
-		struct ipc_sk_chan_if_gain set_gain_cnf;
-		struct ipc_sk_chan_if_freq_req set_freq_req;
-		struct ipc_sk_chan_if_freq_cnf set_freq_cnf;
-		struct ipc_sk_chan_if_notfiy notify;
-	} u;
-} __attribute__((packed));
--- a/Transceiver52M/device/ipc/uhdwrap.cpp
+++ b/Transceiver52M/device/ipc/uhdwrap.cpp
@@ -1,243 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Eric Wild <ewild@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-extern "C" {
-#include <osmocom/core/application.h>
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/socket.h>
-#include <osmocom/core/logging.h>
-#include <osmocom/core/utils.h>
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/timer.h>
-
-#include "shm.h"
-#include "ipc_shm.h"
-#include "ipc-driver-test.h"
-}
-#include "../uhd/UHDDevice.h"
-#include "uhdwrap.h"
-
-#include "trx_vty.h"
-#include "Logger.h"
-#include "Threads.h"
-#include "Utils.h"
-
-int uhd_wrap::open(const std::string &args, int ref, bool swap_channels)
-{
-	int rv = uhd_device::open(args, ref, swap_channels);
-	samps_per_buff_rx = rx_stream->get_max_num_samps();
-	samps_per_buff_tx = tx_stream->get_max_num_samps();
-	channel_count = usrp_dev->get_rx_num_channels();
-
-	wrap_rx_buffs = std::vector<std::vector<short> >(channel_count, std::vector<short>(2 * samps_per_buff_rx));
-	for (size_t i = 0; i < wrap_rx_buffs.size(); i++)
-		wrap_rx_buf_ptrs.push_back(&wrap_rx_buffs[i].front());
-
-	wrap_tx_buffs = std::vector<std::vector<short> >(channel_count, std::vector<short>(2 * 5000));
-	for (size_t i = 0; i < wrap_tx_buffs.size(); i++)
-		wrap_tx_buf_ptrs.push_back(&wrap_tx_buffs[i].front());
-
-	return rv;
-}
-
-uhd_wrap::~uhd_wrap()
-{
-	//	drvtest::gshutdown = 1;
-	//t->join();
-}
-
-size_t uhd_wrap::bufsizerx()
-{
-	return samps_per_buff_rx;
-}
-
-size_t uhd_wrap::bufsizetx()
-{
-	return samps_per_buff_tx;
-}
-
-int uhd_wrap::chancount()
-{
-	return channel_count;
-}
-
-int uhd_wrap::wrap_read(TIMESTAMP *timestamp)
-{
-	uhd::rx_metadata_t md;
-	size_t num_rx_samps = rx_stream->recv(wrap_rx_buf_ptrs, samps_per_buff_rx, md, 0.1, true);
-	*timestamp = md.time_spec.to_ticks(rx_rate);
-	return num_rx_samps; //uhd_device::readSamples(bufs, len, overrun, timestamp, underrun);
-}
-
-extern "C" void *uhdwrap_open(struct ipc_sk_if_open_req *open_req)
-{
-	unsigned int rx_sps, tx_sps;
-
-	/* FIXME: dev arg string* */
-	/* FIXME: rx frontend bw? */
-	/* FIXME: tx frontend bw? */
-	ReferenceType cref;
-	switch (open_req->clockref) {
-	case FEATURE_MASK_CLOCKREF_EXTERNAL:
-		cref = ReferenceType::REF_EXTERNAL;
-		break;
-	case FEATURE_MASK_CLOCKREF_INTERNAL:
-	default:
-		cref = ReferenceType::REF_INTERNAL;
-		break;
-	}
-
-	std::vector<std::string> tx_paths;
-	std::vector<std::string> rx_paths;
-	for (unsigned int i = 0; i < open_req->num_chans; i++) {
-		tx_paths.push_back(open_req->chan_info[i].tx_path);
-		rx_paths.push_back(open_req->chan_info[i].rx_path);
-	}
-
-	rx_sps = open_req->rx_sample_freq_num / open_req->rx_sample_freq_den;
-	tx_sps = open_req->tx_sample_freq_num / open_req->tx_sample_freq_den;
-	uhd_wrap *uhd_wrap_dev =
-		new uhd_wrap(tx_sps, rx_sps, RadioDevice::NORMAL, open_req->num_chans, 0.0, tx_paths, rx_paths);
-	uhd_wrap_dev->open("", cref, false);
-
-	return uhd_wrap_dev;
-}
-extern "C" int32_t uhdwrap_get_bufsizerx(void *dev)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-	return d->bufsizerx();
-}
-
-extern "C" int32_t uhdwrap_get_timingoffset(void *dev)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-	return d->getTimingOffset();
-}
-
-extern "C" int32_t uhdwrap_read(void *dev, uint32_t num_chans)
-{
-	TIMESTAMP t;
-	uhd_wrap *d = (uhd_wrap *)dev;
-
-	if (num_chans != d->wrap_rx_buf_ptrs.size()) {
-		perror("omg chans?!");
-	}
-
-	int32_t read = d->wrap_read(&t);
-	if (read < 0)
-		return read;
-
-	for (uint32_t i = 0; i < num_chans; i++) {
-		ipc_shm_enqueue(ios_rx_from_device[i], t, read, (uint16_t *)&d->wrap_rx_buffs[i].front());
-	}
-	return read;
-}
-
-extern "C" int32_t uhdwrap_write(void *dev, uint32_t num_chans, bool *underrun)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-
-	uint64_t timestamp;
-	int32_t len;
-	for (uint32_t i = 0; i < num_chans; i++) {
-		len = ipc_shm_read(ios_tx_to_device[i], (uint16_t *)&d->wrap_tx_buffs[i].front(), 5000, &timestamp, 1);
-		if (len < 0)
-			return 0;
-	}
-
-	return d->writeSamples(d->wrap_tx_buf_ptrs, len, underrun, timestamp);
-}
-
-extern "C" double uhdwrap_set_freq(void *dev, double f, size_t chan, bool for_tx)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-	if (for_tx)
-		return d->setTxFreq(f, chan);
-	else
-		return d->setRxFreq(f, chan);
-}
-
-extern "C" double uhdwrap_set_gain(void *dev, double f, size_t chan, bool for_tx)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-	if (for_tx)
-		return d->setTxGain(f, chan);
-	else
-		return d->setRxGain(f, chan);
-}
-
-extern "C" int32_t uhdwrap_start(void *dev, int chan)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-	return d->start();
-}
-
-extern "C" int32_t uhdwrap_stop(void *dev, int chan)
-{
-	uhd_wrap *d = (uhd_wrap *)dev;
-	return d->stop();
-}
-
-extern "C" void uhdwrap_fill_info_cnf(struct ipc_sk_if *ipc_prim)
-{
-	struct ipc_sk_if_info_chan *chan_info;
-
-	uhd::device_addr_t args("");
-	uhd::device_addrs_t devs_found = uhd::device::find(args);
-	if (devs_found.size() < 1) {
-		std::cout << "\n No device found!";
-		exit(0);
-	}
-
-	uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(devs_found[0]);
-	auto rxchans = usrp->get_rx_num_channels();
-	auto txchans = usrp->get_tx_num_channels();
-	auto rx_range = usrp->get_rx_gain_range();
-	auto tx_range = usrp->get_tx_gain_range();
-
-	//auto nboards = usrp->get_num_mboards();
-	auto refs = usrp->get_clock_sources(0);
-	auto devname = usrp->get_mboard_name(0);
-
-	ipc_prim->u.info_cnf.feature_mask = 0;
-	if (std::find(refs.begin(), refs.end(), "internal") != refs.end())
-		ipc_prim->u.info_cnf.feature_mask |= FEATURE_MASK_CLOCKREF_INTERNAL;
-	if (std::find(refs.begin(), refs.end(), "external") != refs.end())
-		ipc_prim->u.info_cnf.feature_mask |= FEATURE_MASK_CLOCKREF_EXTERNAL;
-
-	// at least one duplex channel
-	auto num_chans = rxchans == txchans ? txchans : 1;
-
-	ipc_prim->u.info_cnf.min_rx_gain = rx_range.start();
-	ipc_prim->u.info_cnf.max_rx_gain = rx_range.stop();
-	ipc_prim->u.info_cnf.min_tx_gain = tx_range.start();
-	ipc_prim->u.info_cnf.max_tx_gain = tx_range.stop();
-	ipc_prim->u.info_cnf.iq_scaling_val_rx = 0.3;
-	ipc_prim->u.info_cnf.iq_scaling_val_tx = 1;
-	ipc_prim->u.info_cnf.max_num_chans = num_chans;
-	OSMO_STRLCPY_ARRAY(ipc_prim->u.info_cnf.dev_desc, devname.c_str());
-	chan_info = ipc_prim->u.info_cnf.chan_info;
-	for (unsigned int i = 0; i < ipc_prim->u.info_cnf.max_num_chans; i++) {
-		auto rxant = usrp->get_rx_antennas(i);
-		auto txant = usrp->get_tx_antennas(i);
-		for (unsigned int j = 0; j < txant.size(); j++) {
-			OSMO_STRLCPY_ARRAY(chan_info->tx_path[j], txant[j].c_str());
-		}
-		for (unsigned int j = 0; j < rxant.size(); j++) {
-			OSMO_STRLCPY_ARRAY(chan_info->rx_path[j], rxant[j].c_str());
-		}
-		chan_info++;
-	}
-}
--- a/Transceiver52M/device/ipc/uhdwrap.h
+++ b/Transceiver52M/device/ipc/uhdwrap.h
@@ -1,79 +0,0 @@
-/*
-* Copyright 2020 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
-* Author: Eric Wild <ewild@sysmocom.de>
-*
-* SPDX-License-Identifier: 0BSD
-*
-    Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-*/
-#ifndef IPC_UHDWRAP_H
-#define IPC_UHDWRAP_H
-
-#ifdef __cplusplus
-#include "../uhd/UHDDevice.h"
-
-class uhd_wrap : public uhd_device {
-    public:
-	//	std::thread *t;
-	size_t samps_per_buff_rx;
-	size_t samps_per_buff_tx;
-	int channel_count;
-
-	std::vector<std::vector<short> > wrap_rx_buffs;
-	std::vector<std::vector<short> > wrap_tx_buffs;
-	std::vector<short *> wrap_rx_buf_ptrs;
-	std::vector<short *> wrap_tx_buf_ptrs;
-
-	template <typename... Args> uhd_wrap(Args... args) : uhd_device(args...)
-	{
-		//	t = new std::thread(magicthread);
-		// give the thread some time to start and set up
-		//	std::this_thread::sleep_for(std::chrono::seconds(1));
-	}
-	virtual ~uhd_wrap();
-
-	//    void ipc_sock_close() override {};
-	int wrap_read(TIMESTAMP *timestamp);
-	virtual int open(const std::string &args, int ref, bool swap_channels) override;
-
-	//	bool start() override;
-	//	bool stop() override;
-	//	virtual TIMESTAMP initialWriteTimestamp() override;
-	//	virtual TIMESTAMP initialReadTimestamp() override;
-
-	int getTimingOffset()
-	{
-		return ts_offset;
-	}
-	size_t bufsizerx();
-	size_t bufsizetx();
-	int chancount();
-};
-#else
-void *uhdwrap_open(struct ipc_sk_if_open_req *open_req);
-
-int32_t uhdwrap_get_bufsizerx(void *dev);
-
-int32_t uhdwrap_get_timingoffset(void *dev);
-
-int32_t uhdwrap_read(void *dev, uint32_t num_chans);
-
-int32_t uhdwrap_write(void *dev, uint32_t num_chans, bool *underrun);
-
-double uhdwrap_set_freq(void *dev, double f, size_t chan, bool for_tx);
-
-double uhdwrap_set_gain(void *dev, double f, size_t chan, bool for_tx);
-
-int32_t uhdwrap_start(void *dev, int chan);
-
-int32_t uhdwrap_stop(void *dev, int chan);
-
-void uhdwrap_fill_info_cnf(struct ipc_sk_if *ipc_prim);
-#endif
-
-#endif // IPC_B210_H
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -1202,7 +1202,6 @@ std::string uhd_device::str_code(uhd::async_metadata_t metadata)
 	return ost.str();
 }

-#ifndef IPCMAGIC
 RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
 			       InterfaceType iface, size_t chans, double lo_offset,
 			       const std::vector<std::string>& tx_paths,
@@ -1210,4 +1209,3 @@ RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
 {
 	return new uhd_device(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths);
 }
-#endif
--- a/Transceiver52M/device/uhd/UHDDevice.h
+++ b/Transceiver52M/device/uhd/UHDDevice.h
@@ -127,7 +127,7 @@ public:
 		ERROR_UNHANDLED = -4,
 	};

-protected:
+private:
 	uhd::usrp::multi_usrp::sptr usrp_dev;
 	uhd::tx_streamer::sptr tx_stream;
 	uhd::rx_streamer::sptr rx_stream;
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -236,7 +236,7 @@ static void setup_signal_handlers()
 		exit(EXIT_FAILURE);
 	}

-	osmo_fd_setup(&signal_ofd, sfd, BSC_FD_READ, signalfd_callback, NULL, 0);
+	osmo_fd_setup(&signal_ofd, sfd, OSMO_FD_READ, signalfd_callback, NULL, 0);
 	if (osmo_fd_register(&signal_ofd) < 0) {
 		fprintf(stderr, "osmo_fd_register() failed.\n");
 		exit(EXIT_FAILURE);
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,7 @@ CPPFLAGS=$save_CPPFLAGS
 PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0)
 PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0)
+PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.3.0)

 AC_ARG_ENABLE(sanitize,
 	[AS_HELP_STRING(
@@ -324,10 +325,10 @@ AC_CONFIG_FILES([\
    Transceiver52M/device/uhd/Makefile \
    Transceiver52M/device/usrp1/Makefile \
    Transceiver52M/device/lms/Makefile \
-    Transceiver52M/device/ipc/Makefile \
    tests/Makefile \
    tests/CommonLibs/Makefile \
    tests/Transceiver52M/Makefile \
+    utils/Makefile \
    doc/Makefile \
    doc/examples/Makefile \
    contrib/Makefile \
--- a/contrib/osmo-trx.spec
+++ b/contrib/osmo-trx.spec
@@ -0,0 +1,207 @@
+#
+# spec file for package osmo-trx
+#
+# Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+Name:           osmo-trx
+Version:        0.0.0
+Release:        0
+Summary:        SDR transceiver that implements Layer 1 of a GSM BTS
+License:        AGPL-3.0-or-later
+Group:          Productivity/Telephony/Servers
+URL:            https://osmocom.org/projects/osmotrx/wiki/OsmoTRX
+Source:         %{name}-%{version}.tar.xz
+BuildRequires:  autoconf
+BuildRequires:  automake
+%if 0%{?suse_version}
+BuildRequires:  fdupes
+%endif
+BuildRequires:  gcc-c++
+BuildRequires:  libtool
+BuildRequires:  pkgconfig >= 0.20
+%if ! 0%{?centos_ver}
+BuildRequires:  pkgconfig(LimeSuite)
+BuildRequires:  pkgconfig(usrp) >= 3.3
+%endif
+BuildRequires:  pkgconfig(fftw3f)
+BuildRequires:  pkgconfig(libosmocoding) >= 1.3.0
+BuildRequires:  pkgconfig(libosmocore) >= 0.12.0
+BuildRequires:  pkgconfig(libosmoctrl) >= 0.12.0
+BuildRequires:  pkgconfig(libosmovty) >= 0.12.0
+BuildRequires:  pkgconfig(libusb-1.0)
+BuildRequires:  pkgconfig(uhd)
+%{?systemd_requires}
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_program_options-devel
+BuildRequires:  libboost_system-devel
+BuildRequires:  libboost_test-devel
+BuildRequires:  libboost_thread-devel
+%else
+BuildRequires:  boost-devel
+%endif
+
+%description
+OsmoTRX is a software-defined radio transceiver that implements the Layer 1
+physical layer of a BTS comprising the following 3GPP specifications:
+
+TS 05.01 "Physical layer on the radio path"
+TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
+TS 05.04 "Modulation"
+TS 05.10 "Radio subsystem synchronization"
+
+In this context, BTS is "Base transceiver station". It's the stations that
+connect mobile phones to the mobile network.
+
+3GPP is the "3rd Generation Partnership Project" which is the collaboration
+between different telecommunication associations for developing new
+generations of mobile phone networks. (post-2G/GSM)
+
+%package uhd
+Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (UHD)
+Group:          Productivity/Telephony/Servers
+
+%description uhd
+OsmoTRX is a software-defined radio transceiver that implements the Layer 1
+physical layer of a BTS comprising the following 3GPP specifications:
+
+TS 05.01 "Physical layer on the radio path"
+TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
+TS 05.04 "Modulation"
+TS 05.10 "Radio subsystem synchronization"
+
+In this context, BTS is "Base transceiver station". It's the stations that
+connect mobile phones to the mobile network.
+
+3GPP is the "3rd Generation Partnership Project" which is the collaboration
+between different telecommunication associations for developing new
+generations of mobile phone networks. (post-2G/GSM)
+
+%if ! 0%{?centos_ver}
+%package usrp1
+Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
+Group:          Productivity/Telephony/Servers
+
+%description usrp1
+OsmoTRX is a software-defined radio transceiver that implements the Layer 1
+physical layer of a BTS comprising the following 3GPP specifications:
+
+TS 05.01 "Physical layer on the radio path"
+TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
+TS 05.04 "Modulation"
+TS 05.10 "Radio subsystem synchronization"
+
+In this context, BTS is "Base transceiver station". It's the stations that
+connect mobile phones to the mobile network.
+
+3GPP is the "3rd Generation Partnership Project" which is the collaboration
+between different telecommunication associations for developing new
+generations of mobile phone networks. (post-2G/GSM)
+
+%package lms
+Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
+Group:          Productivity/Telephony/Servers
+
+%description lms
+OsmoTRX is a software-defined radio transceiver that implements the Layer 1
+physical layer of a BTS comprising the following 3GPP specifications:
+
+TS 05.01 "Physical layer on the radio path"
+TS 05.02 "Multiplexing and Multiple Access on the Radio Path"
+TS 05.04 "Modulation"
+TS 05.10 "Radio subsystem synchronization"
+
+In this context, BTS is "Base transceiver station". It's the stations that
+connect mobile phones to the mobile network.
+
+3GPP is the "3rd Generation Partnership Project" which is the collaboration
+between different telecommunication associations for developing new
+generations of mobile phone networks. (post-2G/GSM)
+%endif
+
+%prep
+%setup -q
+
+%build
+echo "%{version}" >.tarball-version
+autoreconf -fi
+
+%if 0%{?centos_ver}
+%configure \
+  --docdir=%{_docdir}/%{name} \
+  --with-systemdsystemunitdir=%{_unitdir} \
+  --without-lms \
+  --with-uhd \
+  --without-usrp1
+%else
+%configure \
+  --docdir=%{_docdir}/%{name} \
+  --with-systemdsystemunitdir=%{_unitdir} \
+  --with-lms \
+  --with-uhd \
+  --with-usrp1
+%endif
+
+make %{?_smp_mflags} V=1
+
+%check
+make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
+
+%install
+%make_install
+%if 0%{?suse_version}
+%fdupes -s %{buildroot}/%{_datadir}
+
+%pre    lms %service_add_pre    osmo-trx-lms.service
+%post   lms %service_add_post   osmo-trx-lms.service
+%preun  lms %service_del_preun  osmo-trx-lms.service
+%postun lms %service_del_postun osmo-trx-lms.service
+%pre    uhd %service_add_pre    osmo-trx-uhd.service
+%post   uhd %service_add_post   osmo-trx-uhd.service
+%preun  uhd %service_del_preun  osmo-trx-uhd.service
+%postun uhd %service_del_postun osmo-trx-uhd.service
+%pre    usrp1 %service_add_pre    osmo-trx-usrp1.service
+%post   usrp1 %service_add_post   osmo-trx-usrp1.service
+%preun  usrp1 %service_del_preun  osmo-trx-usrp1.service
+%postun usrp1 %service_del_postun osmo-trx-usrp1.service
+%endif
+
+%files
+%license COPYING
+%doc README.md
+%doc %{_docdir}/%{name}/examples
+
+%if ! 0%{?centos_ver}
+%files lms
+%{_bindir}/osmo-trx-lms
+%dir %{_sysconfdir}/osmocom
+%config %{_sysconfdir}/osmocom/osmo-trx-lms.cfg
+%{_unitdir}/osmo-trx-lms.service
+%endif
+
+%files uhd
+%{_bindir}/osmo-trx-uhd
+%dir %{_sysconfdir}/osmocom
+%config %{_sysconfdir}/osmocom/osmo-trx-uhd.cfg
+%{_unitdir}/osmo-trx-uhd.service
+
+%if ! 0%{?centos_ver}
+%files usrp1
+%{_bindir}/osmo-trx-usrp1
+%dir %{_datadir}/usrp
+%dir %{_datadir}/usrp/rev2
+%dir %{_datadir}/usrp/rev4
+%{_datadir}/usrp/rev2/std_inband.rbf
+%{_datadir}/usrp/rev4/std_inband.rbf
+%{_unitdir}/osmo-trx-usrp1.service
+%endif
+
+%changelog
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -0,0 +1,9 @@
+AM_CPPFLAGS = $(LIBOSMOCODING_CFLAGS)
+AM_CFLAGS = -Wall
+
+EXTRA_DIST = clockdump.sh matlab
+
+noinst_PROGRAMS = osmo-prbs-tool
+
+osmo_prbs_tool_SOURCES = prbs-tool.c
+osmo_prbs_tool_LDADD = $(LIBOSMOCODING_LIBS)
--- a/utils/prbs-tool.c
+++ b/utils/prbs-tool.c
@@ -0,0 +1,386 @@
+/* Dummy TRX for sening PRBS test sequences into osmo-bts-trx to test
+ * the decoder/receiver processing in osmo-bts-trx as well as any
+ * additional PRBS testing code.
+ *
+ * The purpose of this program is to use it as a mock dummy MS-side
+ * transmitter of GSM bursts that contain encoded PRBS sequences,
+ * similar to what one would normally do with an arbitrary
+ * function/waveform generator or BERT tester in hardware.
+ *
+ * (C) 2017 by Harald Welte <laforge@gnumonks.org>
+ * All Rights Reserved
+ *
+ * Licensed under terms of the GNU Generral Public License, Version 2,
+ * or (at your option) any later version.
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <netinet/in.h>
+
+#include <osmocom/core/bits.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/prbs.h>
+#include <osmocom/core/socket.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/coding/gsm0503_coding.h>
+
+/***********************************************************************
+ * GSM Constants
+ ***********************************************************************/
+
+#define GSM_FR_BYTES	33
+#define GSM_BURST_BITS	116
+#define GSM_4BURST_BITS	(GSM_BURST_BITS*4)
+#define GSM_BURST_LEN	148
+
+
+/***********************************************************************
+ * TRX Interface / Protocol
+ ***********************************************************************/
+
+#define TRX_BASE_PORT	5700
+/* DATA port on the TRX side */
+#define	TRX_PORT_CTRL_TRX(C) 	(TRX_BASE_PORT+(2*(C))+1)
+#define	TRX_PORT_DATA_TRX(C) 	(TRX_BASE_PORT+(2*(C))+2)
+#define	TRX_PORT_CTRL_BTS(C) 	(TRX_PORT_CTRL_TRX(C)+100)
+#define	TRX_PORT_DATA_BTS(C) 	(TRX_PORT_DATA_TRX(C)+100)
+
+struct trx_ul_msg {
+	uint8_t		ts;
+	uint32_t	fn;
+	uint8_t		rssi;
+	uint16_t	t_offs;
+	uint8_t		bits[148];	/* 0..255, *NOT* sbit_t */
+} __attribute__((packed));
+
+struct trx_dl_msg {
+	uint8_t		ts;
+	uint32_t	fn;
+	uint8_t		att_db;
+	ubit_t		bits[148];
+} __attribute__((packed));
+
+
+/***********************************************************************
+ * Helper Functions
+ ***********************************************************************/
+
+static int ubits2trxbits(uint8_t *sbits, const ubit_t *ubits, unsigned int count)
+{
+	unsigned int i;
+
+	for (i = 0; i < count; i++) {
+		if ((*ubits++) & 1) {
+			*sbits++ = 255;
+		} else {
+			*sbits++ = 0;
+		}
+	}
+
+	return count;
+}
+
+static int __attribute__((__unused__)) dec(const ubit_t *bursts_u)
+{
+	sbit_t bursts_s[GSM_4BURST_BITS*2];
+	uint8_t dec_tch_data[GSM_FR_BYTES];
+	int n_errors, n_bits_total;
+	int rc;
+
+	/* convert from u_bit (tx) to s_bit (rx)  */
+	osmo_ubit2sbit(bursts_s, bursts_u, sizeof(bursts_s));
+
+	rc = gsm0503_tch_fr_decode(dec_tch_data, bursts_s, 1, 0, &n_errors, &n_bits_total);
+	printf("rc=%d, n_errors=%d, n_bits_total=%d: %s\n", rc, n_errors, n_bits_total,
+		osmo_hexdump(dec_tch_data, sizeof(dec_tch_data)));
+
+	return rc;
+}
+
+/*! \brief Training Sequences (TS 05.02 Chapter 5.2.3) */
+static const ubit_t _sched_tsc[8][26] = {
+	{ 0,0,1,0,0,1,0,1,1,1,0,0,0,0,1,0,0,0,1,0,0,1,0,1,1,1, },
+	{ 0,0,1,0,1,1,0,1,1,1,0,1,1,1,1,0,0,0,1,0,1,1,0,1,1,1, },
+	{ 0,1,0,0,0,0,1,1,1,0,1,1,1,0,1,0,0,1,0,0,0,0,1,1,1,0, },
+	{ 0,1,0,0,0,1,1,1,1,0,1,1,0,1,0,0,0,1,0,0,0,1,1,1,1,0, },
+	{ 0,0,0,1,1,0,1,0,1,1,1,0,0,1,0,0,0,0,0,1,1,0,1,0,1,1, },
+	{ 0,1,0,0,1,1,1,0,1,0,1,1,0,0,0,0,0,1,0,0,1,1,1,0,1,0, },
+	{ 1,0,1,0,0,1,1,1,1,1,0,1,1,0,0,0,1,0,1,0,0,1,1,1,1,1, },
+	{ 1,1,1,0,1,1,1,1,0,0,0,1,0,0,1,0,1,1,1,0,1,1,1,1,0,0, },
+};
+
+/***********************************************************************
+ * state + processing functions
+ ***********************************************************************/
+
+/* state we have to keep for one physical channel */
+struct pchan_data {
+	/* PRBS state */
+	struct osmo_prbs_state st;
+	/* unpacked PRBS bits, generated from PRBS */
+	ubit_t prbs_u[4+260];
+	/* packed frame (to be sent) */
+	uint8_t tch_data[GSM_FR_BYTES];
+	/* burst bits (ubit) to be transmitted */
+	ubit_t bursts[GSM_4BURST_BITS*2]; /* 116 * 8 */
+	/* burst bits (sbit) 'as if received' */
+	sbit_t bursts_s[GSM_4BURST_BITS*2];
+	/* next to-be transmitted burst number */
+	unsigned int burst_nr;
+	/* training sequence code */
+	unsigned int tsc;
+
+	/* loose 'count' bursts every 'nth_mframe' on TRX-BTS interface */
+	struct {
+		unsigned int count;
+		unsigned int nth_mframe;
+	} sim_lost_bursts;
+
+	/* zero 'count' bursts every 'nth_mframe' on TRX-BTS interface */
+	struct {
+		unsigned int count;
+		unsigned int nth_mframe;
+	} sim_zero_bursts;
+
+	/* flip every 'nth_bit' of the PRNG oudput before encoding */
+	struct {
+		unsigned int nth_bit;
+		unsigned int i;
+	} sim_flip_codec_bits;
+
+	unsigned int i;
+};
+
+struct ts_data {
+	struct pchan_data pchan[2];
+};
+
+struct trx_data {
+	struct ts_data ts[8];
+};
+
+static struct trx_data g_trx_data;
+
+/* initialize the state for one TRX */
+static void trx_data_init(struct trx_data *trx)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {
+		struct ts_data *ts = &trx->ts[i];
+		int j;
+		for (j = 0; j < ARRAY_SIZE(ts->pchan); j++) {
+			struct pchan_data *pchan = &ts->pchan[j];
+
+			memset(pchan, 0, sizeof(*pchan));
+			osmo_prbs_state_init(&pchan->st, &osmo_prbs9);
+			pchan->tsc = 7;
+		}
+	}
+}
+
+/* apply any intentional errors to the output of the PRBS sequence */
+static void apply_errors_prbs(struct pchan_data *pchan)
+{
+	int i;
+
+	for (i = 0; i < sizeof(pchan->prbs_u)-4; i++) {
+		pchan->sim_flip_codec_bits.i++;
+		if (pchan->sim_flip_codec_bits.i == pchan->sim_flip_codec_bits.nth_bit) {
+			pchan->sim_flip_codec_bits.i = 0;
+			pchan->prbs_u[4+i] ^= 0x01;
+		}
+	}
+}
+
+/*! obtain the next to-be-transmitted burst for the given pchan
+ *  \param pchan physical channel on which we operate
+ *  \param[in] fn frame number
+ *  \param[out] burst_out caller-provided buffer for 148 unpacked output bits
+ *  \retruns number of bits stored in \a burst_out */
+static int pchan_get_next_burst(struct pchan_data *pchan, uint32_t fn, ubit_t *burst_out)
+{
+	uint32_t fn26 = fn % 26;
+	int rc;
+
+	if (fn26 == 0 || fn26 == 4 || fn26 == 8 || fn26 == 13 || fn26 == 17 || fn26 == 21)
+		pchan->burst_nr = 0;
+
+	if (fn26 == 12 || fn26 == 25) {
+		memset(burst_out, 0, GSM_BURST_LEN);
+		return GSM_BURST_LEN;
+	}
+
+	if (pchan->burst_nr == 0) {
+		/* generate PRBS output in ubit format, skipping first nibble for 260-264 padding */
+		const uint8_t prefix[] = { 0xd0 };
+		osmo_pbit2ubit(pchan->prbs_u, prefix, 4);
+		rc = osmo_prbs_get_ubits(pchan->prbs_u+4, sizeof(pchan->prbs_u)-4, &pchan->st);
+		OSMO_ASSERT(rc == sizeof(pchan->prbs_u)-4);
+
+		apply_errors_prbs(pchan);
+
+		/* pack to PBIT format */
+		rc = osmo_ubit2pbit(pchan->tch_data, pchan->prbs_u, sizeof(pchan->prbs_u));
+		//memset(pchan->tch_data, 0xff, sizeof(pchan->tch_data));
+
+		printf("%s\n", osmo_hexdump(pchan->tch_data, GSM_FR_BYTES));
+
+		/* shift buffer by 4 bursts for interleaving */
+		memcpy(pchan->bursts, pchan->bursts + GSM_4BURST_BITS, GSM_4BURST_BITS);
+		memset(pchan->bursts + GSM_4BURST_BITS, 0, GSM_4BURST_BITS);
+
+		/* encode block (codec frame) into four bursts */
+		rc = gsm0503_tch_fr_encode(pchan->bursts, pchan->tch_data, GSM_FR_BYTES, 1);
+		OSMO_ASSERT(rc == 0);
+#if 0
+		int i;
+		for (i = 0; i < sizeof(pchan->bursts); i += GSM_BURST_BITS)
+			printf("\t%s\n", osmo_ubit_dump(pchan->bursts + i, GSM_BURST_BITS));
+
+		dec(pchan->bursts);
+#endif
+	}
+
+	/* for all bursts: format 148 symbols from 116 input bits */
+	ubit_t *burst = pchan->bursts  + pchan->burst_nr * GSM_BURST_BITS;
+//	printf("TX(%u): %s\n", pchan->burst_nr, osmo_ubit_dump(burst, GSM_BURST_BITS));
+	memset(burst_out, 0, 3);		/* guard bits */
+	memcpy(burst_out+3, burst, 58);		/* firrst half */
+	memcpy(burst_out+61, _sched_tsc[pchan->tsc], 26);	/* midamble */
+	memcpy(burst_out+87, burst+58, 58);	/* second half */
+	memset(burst_out+145, 0, 3);		/* guard bits */
+
+	/* increment burst number for next call */
+	pchan->burst_nr += 1;
+
+	return GSM_BURST_LEN;
+}
+
+static int pchan_process_ts_fn(struct pchan_data *pchan, uint32_t fn, uint8_t *burst_t)
+{
+	ubit_t burst_u[GSM_BURST_LEN];
+	int rc;
+
+	rc = pchan_get_next_burst(pchan, fn, burst_u);
+	OSMO_ASSERT(rc == sizeof(burst_u));
+
+	/* convert from u_bit (tx) to s_bit (rx)  */
+	ubits2trxbits(burst_t, burst_u, GSM_BURST_LEN);
+
+	return GSM_BURST_LEN;
+}
+
+/* read TRX DL data from BTS, write TRX UL data to BTS */
+static int read_and_process(int fd)
+{
+	/* receive (downlink) buffer */
+	uint8_t rx_dl_buf[1024];
+	struct trx_dl_msg *dl_msg = (struct trx_dl_msg *) rx_dl_buf;
+	/* transmit (uplink) buffer */
+	uint8_t tx_ul_buf[1024];
+	struct trx_ul_msg *ul_msg = (struct trx_ul_msg *) tx_ul_buf;
+	/* other variables */
+	struct pchan_data *pchan;
+	uint32_t fn;
+	uint8_t rc;
+
+	/* do a blocking read on the socket and receive DL from BTS */
+	rc = read(fd, rx_dl_buf, sizeof(rx_dl_buf));
+	if (rc < sizeof(*dl_msg))
+		return rc;
+
+	fn = ntohl(dl_msg->fn);
+
+	if (dl_msg->ts >= ARRAY_SIZE(g_trx_data.ts))
+		return -ENODEV;
+
+	if (dl_msg->ts != 2)
+		return 0;
+
+	printf("FN=%s TS=%u\n", gsm_fn_as_gsmtime_str(fn), dl_msg->ts);
+
+	/* FIXME: second pchan for TCH/H */
+	pchan = &g_trx_data.ts[dl_msg->ts].pchan[0];
+
+	rc = pchan_process_ts_fn(pchan, fn, (uint8_t *) ul_msg->bits);
+	OSMO_ASSERT(rc == sizeof(ul_msg->bits));
+
+	/* copy over timeslot and frame number */
+	ul_msg->fn = htonl(fn);
+	ul_msg->ts = dl_msg->ts;
+
+	/* simulate lost frames on TRX <-> BTS interface */
+	if (pchan->sim_lost_bursts.count) {
+		/* count number of 26-multiframes */
+		static int count = 0;
+		if (fn % 26 == 0)
+			count++;
+
+		/* every 10th multiframe, drop two entire block of 8 bursts */
+		if (count % pchan->sim_lost_bursts.nth_mframe == 0 &&
+		    (fn % 26) <= pchan->sim_lost_bursts.count) {
+			printf("===> SKIPPING BURST\n");
+			return 0;
+		}
+	}
+
+	/* simulate zero-ed frames on TRX <-> BTS interface */
+	if (pchan->sim_zero_bursts.count) {
+		/* count number of 26-multiframes */
+		static int count = 0;
+		if (fn % 26 == 0)
+			count++;
+
+		/* every 10th multiframe, drop two entire block of 8 bursts */
+		if (count % pchan->sim_zero_bursts.nth_mframe == 0 &&
+		    (fn % 26) <= pchan->sim_zero_bursts.count) {
+			memset(ul_msg->bits, 0, sizeof(ul_msg->bits));
+			printf("===> ZEROING BURST\n");
+		}
+	}
+
+	/* write uplink message towards BTS */
+	rc = write(fd, tx_ul_buf, sizeof(*ul_msg));
+	if (rc < sizeof(*ul_msg))
+		return -EIO;
+
+	return 0;
+}
+
+static int open_trx_data_sock(unsigned int trx_nr, const char *bts_host)
+{
+	int rc;
+
+	rc = osmo_sock_init2(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, TRX_PORT_DATA_TRX(trx_nr),
+				bts_host, TRX_PORT_DATA_BTS(trx_nr),
+				OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_BIND);
+	return rc;
+}
+
+
+int main(int argc, char **argv)
+{
+	int fd;
+
+	trx_data_init(&g_trx_data);
+
+	//g_trx_data.ts[2].pchan[0].sim_zero_bursts.count = 8;
+	//g_trx_data.ts[2].pchan[0].sim_zero_bursts.nth_mframe = 10;
+	g_trx_data.ts[2].pchan[0].sim_flip_codec_bits.nth_bit = 260*4;
+
+	fd = open_trx_data_sock(0, "127.0.0.1");
+	if (fd < 0)
+		exit(1);
+
+	while (1) {
+		read_and_process(fd);
+	}
+
+	return 0;
+}
Author	SHA1	Message	Date
Oliver Smith	c25356e080	contrib: integrate RPM spec Remove OpenSUSE bug report link, set version to 0.0.0, make it build with CentOS 8 etc. Disable lms, usrp1 for CentOS 8. Make fdupes dependency (duplicate files removal) suse specific, as the package is not available for CentOS 8. Related: OS#4550 Change-Id: Ie27fcc4f9033f0049507d9dcc295541ac0744c73	2020-05-15 11:51:26 +02:00
Oliver Smith	b74e08eaa9	contrib: import RPM spec Copy the RPM spec file from: https://build.opensuse.org/project/show/home:mnhauke:osmocom:nightly Related: OS#4550 Change-Id: I694fcd888778ab68d13165f4d0bf65e5d6870fb4	2020-05-14 11:54:22 +02:00
Pau Espin Pedrol	4a575b02b5	Use OSMO_FD_READ instead of deprecated BSC_FD_READ New define is available since libosmocore 1.1.0, and we already require 1.3.0, so no need to update dependenices. Let's change it to avoid people re-using old BSC_FD_READ symbol when copy-pasting somewhere else. Change-Id: I868baf575b77c448b3115701e70d439de89b0fb3	2020-05-09 18:54:20 +02:00
Harald Welte	cf35c37c94	prbs-tool: Don't require C99 from a Debian8 build: [ 256s] prbs-tool.c: In function 'apply_errors_prbs': [ 256s] prbs-tool.c:190:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 256s] for (int i = 0; i < sizeof(pchan->prbs_u)-4; i++) { [ 256s] ^ Change-Id: I8541fce50405525efffb12210a269e0ab8a687ab	2020-05-07 23:55:56 +02:00
Harald Welte	6e369348b0	utils: Ensure content of this directory is included in 'make dist' The python + matlab should be part of every source release Change-Id: I9814a9a352dbee03177ef9e8dfd19bc2baf0ca07	2020-05-02 22:34:27 +02:00
Harald Welte	546516d79c	prbs-tool: Add error simulation capabilities The tool can now simulate: * lost bursts on the TRX->BTS interface * zeroed/overwritten bursts on the TRX->BTS interface * errors in the TCH codec frames before passing them to the encoder Change-Id: I0b52c2af6d973669ac233bf9868400e497496460 TODO: Ability to introduce errors in certain classes of the bits only.	2020-05-02 22:32:51 +02:00
Harald Welte	6879bb0db9	PRBS tool sending PRBS sequence to TRX Change-Id: I2300f909bbfda10a7053320edfd1deaea763759a	2020-05-02 22:32:34 +02:00