From 876d4150aa3da531ddd687b48afada6e43f79146 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 2 Mar 2020 15:25:13 -0800 Subject: uhd: Apply clang-format against all .cpp and .hpp files in host/ Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of files that clang-format gets applied against. --- .../transport/nirio/nirio_driver_iface_linux.cpp | 64 ++++++++++++---------- 1 file changed, 36 insertions(+), 28 deletions(-) (limited to 'host/lib/transport/nirio/nirio_driver_iface_linux.cpp') diff --git a/host/lib/transport/nirio/nirio_driver_iface_linux.cpp b/host/lib/transport/nirio/nirio_driver_iface_linux.cpp index b66f6413e..40dc8b199 100644 --- a/host/lib/transport/nirio/nirio_driver_iface_linux.cpp +++ b/host/lib/transport/nirio/nirio_driver_iface_linux.cpp @@ -6,18 +6,16 @@ // #include -#include #include #include -#include +#include #include #include +#include namespace nirio_driver_iface { -nirio_status rio_open( - const std::string& device_path, - rio_dev_handle_t& device_handle) +nirio_status rio_open(const std::string& device_path, rio_dev_handle_t& device_handle) { device_handle = ::open(device_path.c_str(), O_RDWR | O_CLOEXEC); return (device_handle < 0) ? NiRio_Status_InvalidParameter : NiRio_Status_Success; @@ -34,59 +32,69 @@ bool rio_isopen(rio_dev_handle_t device_handle) return (device_handle >= 0); } -nirio_status rio_ioctl( - rio_dev_handle_t device_handle, +nirio_status rio_ioctl(rio_dev_handle_t device_handle, uint32_t ioctl_code, - const void *write_buf, + const void* write_buf, size_t write_buf_len, - void *read_buf, + void* read_buf, size_t read_buf_len) { - nirio_ioctl_block_t ioctl_block = {0,0,0,0,0,0}; + nirio_ioctl_block_t ioctl_block = {0, 0, 0, 0, 0, 0}; // two-casts necessary to prevent pointer sign-extension - ioctl_block.in_buf = static_cast(reinterpret_cast(write_buf)); - ioctl_block.in_buf_len = write_buf_len; - ioctl_block.out_buf = static_cast(reinterpret_cast(read_buf)); + ioctl_block.in_buf = static_cast(reinterpret_cast(write_buf)); + ioctl_block.in_buf_len = write_buf_len; + ioctl_block.out_buf = static_cast(reinterpret_cast(read_buf)); ioctl_block.out_buf_len = read_buf_len; int status = ::ioctl(device_handle, ioctl_code, &ioctl_block); if (status == -1) { switch (errno) { - case EINVAL: return NiRio_Status_InvalidParameter; - case EFAULT: return NiRio_Status_MemoryFull; - default: return NiRio_Status_SoftwareFault; + case EINVAL: + return NiRio_Status_InvalidParameter; + case EFAULT: + return NiRio_Status_MemoryFull; + default: + return NiRio_Status_SoftwareFault; } } else { return NiRio_Status_Success; } } -nirio_status rio_mmap( - rio_dev_handle_t device_handle, +nirio_status rio_mmap(rio_dev_handle_t device_handle, uint16_t memory_type, size_t size, bool writable, - rio_mmap_t &map) + rio_mmap_t& map) { - int access_mode = PROT_READ; //Write-only mode not supported - if (writable) access_mode |= PROT_WRITE; - map.addr = ::mmap(NULL, size, access_mode, MAP_SHARED, device_handle, (off_t) memory_type * sysconf(_SC_PAGESIZE)); + int access_mode = PROT_READ; // Write-only mode not supported + if (writable) + access_mode |= PROT_WRITE; + map.addr = ::mmap(NULL, + size, + access_mode, + MAP_SHARED, + device_handle, + (off_t)memory_type * sysconf(_SC_PAGESIZE)); map.size = size; - if (map.addr == MAP_FAILED) { + if (map.addr == MAP_FAILED) { map.addr = NULL; map.size = 0; switch (errno) { - case EINVAL: return NiRio_Status_InvalidParameter; - case EFAULT: return NiRio_Status_MemoryFull; - default: return NiRio_Status_SoftwareFault; + case EINVAL: + return NiRio_Status_InvalidParameter; + case EFAULT: + return NiRio_Status_MemoryFull; + default: + return NiRio_Status_SoftwareFault; } } return NiRio_Status_Success; } -nirio_status rio_munmap(rio_mmap_t &map) +nirio_status rio_munmap(rio_mmap_t& map) { nirio_status status = 0; if (map.addr != NULL) { @@ -98,4 +106,4 @@ nirio_status rio_munmap(rio_mmap_t &map) return status; } -} +} // namespace nirio_driver_iface -- cgit v1.2.3