mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 07:13:03 +00:00 
			
		
		
		
	The acquisition device name is not configurable.
This commit is contained in:
		| @@ -82,11 +82,10 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( | ||||
|  | ||||
|     // UIO device file | ||||
|     std::string device_io_name; | ||||
|     std::string device_name = configuration->property(role + ".devicename", default_device_name); | ||||
|     // find the uio device file corresponding to the GNSS reset module | ||||
|     if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0) | ||||
|     // find the uio device file corresponding to the acquisition | ||||
|     if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0) | ||||
|         { | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl; | ||||
|             throw std::exception(); | ||||
|         } | ||||
|     acq_parameters.device_name = device_io_name; | ||||
|   | ||||
| @@ -183,7 +183,7 @@ public: | ||||
|     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; | ||||
|  | ||||
| private: | ||||
|     const std::string default_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|     const std::string acquisition_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|  | ||||
|     // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA | ||||
|     // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. | ||||
|   | ||||
| @@ -84,11 +84,10 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga( | ||||
|  | ||||
|     // UIO device file | ||||
|     std::string device_io_name; | ||||
|     std::string device_name = configuration->property(role + ".devicename", default_device_name); | ||||
|     // find the uio device file corresponding to the GNSS reset module | ||||
|     if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0) | ||||
|     // find the uio device file corresponding to the acquisition | ||||
|     if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0) | ||||
|         { | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl; | ||||
|             throw std::exception(); | ||||
|         } | ||||
|     acq_parameters.device_name = device_io_name; | ||||
|   | ||||
| @@ -191,7 +191,7 @@ public: | ||||
|     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; | ||||
|  | ||||
| private: | ||||
|     const std::string default_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|     const std::string acquisition_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|  | ||||
|     // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA | ||||
|     // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. | ||||
|   | ||||
| @@ -83,11 +83,10 @@ GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const Configuration | ||||
|  | ||||
|     // UIO device file | ||||
|     std::string device_io_name; | ||||
|     std::string device_name = configuration->property(role + ".devicename", default_device_name); | ||||
|     // find the uio device file corresponding to the GNSS reset module | ||||
|     if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0) | ||||
|     // find the uio device file corresponding to the acquisition | ||||
|     if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0) | ||||
|         { | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl; | ||||
|             throw std::exception(); | ||||
|         } | ||||
|     acq_parameters.device_name = device_io_name; | ||||
|   | ||||
| @@ -190,8 +190,7 @@ public: | ||||
|     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; | ||||
|  | ||||
| private: | ||||
|  | ||||
|     const std::string default_device_name = "acquisition_S00_AXI"; // UIO device name | ||||
|     const std::string acquisition_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|  | ||||
|     // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA | ||||
|     // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. | ||||
|   | ||||
| @@ -76,11 +76,10 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( | ||||
|  | ||||
|     // UIO device file | ||||
|     std::string device_io_name; | ||||
|     std::string device_name = configuration->property(role + ".devicename", default_device_name); | ||||
|     // find the uio device file corresponding to the GNSS reset module | ||||
|     if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0) | ||||
|     // find the uio device file corresponding to the acquisition | ||||
|     if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0) | ||||
|         { | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl; | ||||
|             throw std::exception(); | ||||
|         } | ||||
|     acq_parameters.device_name = device_io_name; | ||||
|   | ||||
| @@ -187,7 +187,7 @@ public: | ||||
| private: | ||||
|     static const uint32_t NUM_PRNs = 32; | ||||
|  | ||||
|     const std::string default_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|     const std::string acquisition_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|  | ||||
|     // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA | ||||
|     // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. | ||||
|   | ||||
| @@ -74,11 +74,10 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( | ||||
|  | ||||
|     // UIO device file | ||||
|     std::string device_io_name; | ||||
|     std::string device_name = configuration->property(role + ".devicename", default_device_name); | ||||
|     // find the uio device file corresponding to the GNSS reset module | ||||
|     if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0) | ||||
|     // find the uio device file corresponding to the acquisition | ||||
|     if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0) | ||||
|         { | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl; | ||||
|             throw std::exception(); | ||||
|         } | ||||
|     acq_parameters.device_name = device_io_name; | ||||
|   | ||||
| @@ -151,7 +151,7 @@ public: | ||||
|     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; | ||||
|  | ||||
| private: | ||||
|     const std::string default_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|     const std::string acquisition_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|  | ||||
|     static const uint32_t NUM_PRNs = 32; | ||||
|     static const uint32_t QUANT_BITS_LOCAL_CODE = 16; | ||||
|   | ||||
| @@ -80,11 +80,10 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( | ||||
|  | ||||
|     // UIO device file | ||||
|     std::string device_io_name; | ||||
|     std::string device_name = configuration->property(role + ".devicename", default_device_name); | ||||
|     // find the uio device file corresponding to the GNSS reset module | ||||
|     if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0) | ||||
|     // find the uio device file corresponding to the acquisition | ||||
|     if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0) | ||||
|         { | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; | ||||
|             std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl; | ||||
|             throw std::exception(); | ||||
|         } | ||||
|     acq_parameters.device_name = device_io_name; | ||||
|   | ||||
| @@ -187,7 +187,7 @@ public: | ||||
| private: | ||||
|     static const uint32_t NUM_PRNs = 32; | ||||
|  | ||||
|     const std::string default_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|     const std::string acquisition_device_name = "acquisition_S00_AXI";  // UIO device name | ||||
|  | ||||
|     // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA | ||||
|     // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Marc Majoral
					Marc Majoral