[camera] Run fx format-code on all camera
Just moved more code, so formatting it.
Testing: no functional changes
Change-Id: I6fd877d2588fc59cf3e8dff4397ff0d0491eb3b4
diff --git a/src/camera/camera_manager/camera_manager_impl.h b/src/camera/camera_manager/camera_manager_impl.h
index 51ec206..3dff50c 100644
--- a/src/camera/camera_manager/camera_manager_impl.h
+++ b/src/camera/camera_manager/camera_manager_impl.h
@@ -8,9 +8,9 @@
#include <ddk/debug.h>
#include <ddk/driver.h>
#include <fuchsia/camera/cpp/fidl.h>
-#include <src/camera/camera_manager/video_device_client.h>
#include <lib/fidl/cpp/binding.h>
#include <lib/fsl/io/device_watcher.h>
+#include <src/camera/camera_manager/video_device_client.h>
#include <list>
diff --git a/src/camera/drivers/common/aml-mipicsi/aml-mipi-regs.h b/src/camera/drivers/common/aml-mipicsi/aml-mipi-regs.h
index 19bceff6..6df8c44 100644
--- a/src/camera/drivers/common/aml-mipicsi/aml-mipi-regs.h
+++ b/src/camera/drivers/common/aml-mipicsi/aml-mipi-regs.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_COMMON_AML_MIPICSI_AML_MIPI_REGS_H_
+#define SRC_CAMERA_DRIVERS_COMMON_AML_MIPICSI_AML_MIPI_REGS_H_
// clang-format off
#define HI_CSI_PHY_CNTL0 0x4C
@@ -122,3 +123,5 @@
// CLK offsets.
#define HHI_MIPI_CSI_PHY_CLK_CNTL (0xD0 << 2)
+
+#endif // SRC_CAMERA_DRIVERS_COMMON_AML_MIPICSI_AML_MIPI_REGS_H_
diff --git a/src/camera/drivers/hw_accel/gdc/gdc-regs.h b/src/camera/drivers/hw_accel/gdc/gdc-regs.h
index 6e87bbd..a9ae33b 100644
--- a/src/camera/drivers/hw_accel/gdc/gdc-regs.h
+++ b/src/camera/drivers/hw_accel/gdc/gdc-regs.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_HW_ACCEL_GDC_GDC_REGS_H_
+#define SRC_CAMERA_DRIVERS_HW_ACCEL_GDC_GDC_REGS_H_
#include <hwreg/bitfields.h>
#include <zircon/types.h>
@@ -49,3 +50,5 @@
};
} // namespace gdc
+
+#endif // SRC_CAMERA_DRIVERS_HW_ACCEL_GDC_GDC_REGS_H_
diff --git a/src/camera/drivers/hw_accel/gdc/test/gdc-test.h b/src/camera/drivers/hw_accel/gdc/test/gdc-test.h
index 2fccdab..13c6d09 100644
--- a/src/camera/drivers/hw_accel/gdc/test/gdc-test.h
+++ b/src/camera/drivers/hw_accel/gdc/test/gdc-test.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_HW_ACCEL_GDC_TEST_GDC_TEST_H_
+#define SRC_CAMERA_DRIVERS_HW_ACCEL_GDC_TEST_GDC_TEST_H_
#include <zxtest/zxtest.h>
@@ -23,3 +24,5 @@
};
} // namespace gdc
+
+#endif // SRC_CAMERA_DRIVERS_HW_ACCEL_GDC_TEST_GDC_TEST_H_
diff --git a/src/camera/drivers/isp/mali-009/arm-isp-regs.h b/src/camera/drivers/isp/mali-009/arm-isp-regs.h
index 382d913..1782466 100644
--- a/src/camera/drivers/isp/mali-009/arm-isp-regs.h
+++ b/src/camera/drivers/isp/mali-009/arm-isp-regs.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_ISP_MALI_009_ARM_ISP_REGS_H_
+#define SRC_CAMERA_DRIVERS_ISP_MALI_009_ARM_ISP_REGS_H_
#include <hwreg/bitfields.h>
#include <zircon/types.h>
@@ -26,3 +27,5 @@
// Product ID
#define PRODUCT_ID_DEFAULT (2658)
+
+#endif // SRC_CAMERA_DRIVERS_ISP_MALI_009_ARM_ISP_REGS_H_
diff --git a/src/camera/drivers/isp/mali-009/arm-isp-test.h b/src/camera/drivers/isp/mali-009/arm-isp-test.h
index 1d93e58..37d6d20 100644
--- a/src/camera/drivers/isp/mali-009/arm-isp-test.h
+++ b/src/camera/drivers/isp/mali-009/arm-isp-test.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_ISP_MALI_009_ARM_ISP_TEST_H_
+#define SRC_CAMERA_DRIVERS_ISP_MALI_009_ARM_ISP_TEST_H_
#include <ddktl/device.h>
#include <ddktl/protocol/empty-protocol.h>
@@ -82,3 +83,5 @@
};
} // namespace camera
+
+#endif // SRC_CAMERA_DRIVERS_ISP_MALI_009_ARM_ISP_TEST_H_
diff --git a/src/camera/drivers/isp/mali-009/global_regs.h b/src/camera/drivers/isp/mali-009/global_regs.h
index e3ae729..4173dce 100644
--- a/src/camera/drivers/isp/mali-009/global_regs.h
+++ b/src/camera/drivers/isp/mali-009/global_regs.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_ISP_MALI_009_GLOBAL_REGS_H_
+#define SRC_CAMERA_DRIVERS_ISP_MALI_009_GLOBAL_REGS_H_
#include <hwreg/bitfields.h>
#include <zircon/types.h>
@@ -1116,3 +1117,5 @@
};
} // namespace camera
+
+#endif // SRC_CAMERA_DRIVERS_ISP_MALI_009_GLOBAL_REGS_H_
diff --git a/src/camera/drivers/isp/mali-009/pingpong_regs.h b/src/camera/drivers/isp/mali-009/pingpong_regs.h
index edbd275..fcd23e2 100644
--- a/src/camera/drivers/isp/mali-009/pingpong_regs.h
+++ b/src/camera/drivers/isp/mali-009/pingpong_regs.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_ISP_MALI_009_PINGPONG_REGS_H_
+#define SRC_CAMERA_DRIVERS_ISP_MALI_009_PINGPONG_REGS_H_
#include <hwreg/bitfields.h>
#include <lib/mmio/mmio.h>
@@ -6250,3 +6251,5 @@
DEF_NAMESPACE_REG(MultiCtx_ConfigDone, pong, 0x342d0)
} // namespace camera
+
+#endif // SRC_CAMERA_DRIVERS_ISP_MALI_009_PINGPONG_REGS_H_
diff --git a/src/camera/drivers/isp/modules/dma-format.h b/src/camera/drivers/isp/modules/dma-format.h
index 03be9f7..bc11127 100644
--- a/src/camera/drivers/isp/modules/dma-format.h
+++ b/src/camera/drivers/isp/modules/dma-format.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_ISP_MODULES_DMA_FORMAT_H_
+#define SRC_CAMERA_DRIVERS_ISP_MODULES_DMA_FORMAT_H_
#include <fuchsia/sysmem/c/fidl.h>
#include <stdint.h>
@@ -85,3 +86,5 @@
};
} // namespace camera
+
+#endif // SRC_CAMERA_DRIVERS_ISP_MODULES_DMA_FORMAT_H_
diff --git a/src/camera/drivers/isp/modules/dma-mgr.h b/src/camera/drivers/isp/modules/dma-mgr.h
index a450635..eec2c32 100644
--- a/src/camera/drivers/isp/modules/dma-mgr.h
+++ b/src/camera/drivers/isp/modules/dma-mgr.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_ISP_MODULES_DMA_MGR_H_
+#define SRC_CAMERA_DRIVERS_ISP_MODULES_DMA_MGR_H_
#include <fuchsia/camera/common/c/fidl.h>
#include <fuchsia/sysmem/c/fidl.h>
@@ -94,3 +95,5 @@
};
} // namespace camera
+
+#endif // SRC_CAMERA_DRIVERS_ISP_MODULES_DMA_MGR_H_
diff --git a/src/camera/drivers/sensors/imx227/imx227-test.h b/src/camera/drivers/sensors/imx227/imx227-test.h
index bb64a9a..1b4e8e6 100644
--- a/src/camera/drivers/sensors/imx227/imx227-test.h
+++ b/src/camera/drivers/sensors/imx227/imx227-test.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_DRIVERS_SENSORS_IMX227_IMX227_TEST_H_
+#define SRC_CAMERA_DRIVERS_SENSORS_IMX227_IMX227_TEST_H_
#include <ddktl/device.h>
#include <zxtest/zxtest.h>
@@ -24,3 +25,5 @@
};
} // namespace camera
+
+#endif // SRC_CAMERA_DRIVERS_SENSORS_IMX227_IMX227_TEST_H_
diff --git a/src/camera/drivers/usb_video/usb-video.cpp b/src/camera/drivers/usb_video/usb-video.cpp
index 2b686b8..81984fa 100644
--- a/src/camera/drivers/usb_video/usb-video.cpp
+++ b/src/camera/drivers/usb_video/usb-video.cpp
@@ -333,10 +333,10 @@
}
static zx_driver_ops_t driver_ops = []() {
- zx_driver_ops_t ops;
- ops.version = DRIVER_OPS_VERSION;
- ops.bind = usb_video_parse_descriptors;
- return ops;
+ zx_driver_ops_t ops;
+ ops.version = DRIVER_OPS_VERSION;
+ ops.bind = usb_video_parse_descriptors;
+ return ops;
}();
} // namespace
@@ -348,4 +348,4 @@
BI_ABORT_IF(NE, BIND_USB_SUBCLASS, USB_SUBCLASS_VIDEO_INTERFACE_COLLECTION),
BI_MATCH_IF(EQ, BIND_USB_PROTOCOL, 0),
ZIRCON_DRIVER_END(usb_video)
-// clang-format on
+ // clang-format on
diff --git a/src/camera/drivers/virtual_camera/virtual_camera.cpp b/src/camera/drivers/virtual_camera/virtual_camera.cpp
index d9866ae..08a9da7 100644
--- a/src/camera/drivers/virtual_camera/virtual_camera.cpp
+++ b/src/camera/drivers/virtual_camera/virtual_camera.cpp
@@ -3,12 +3,11 @@
// found in the LICENSE file.
#include <ddk/binding.h>
+#include <ddk/debug.h>
#include <ddk/device.h>
#include <ddk/driver.h>
#include <ddk/protocol/test.h>
-#include <ddk/debug.h>
-
#include <memory>
#include "src/camera/drivers/virtual_camera/virtual_camera_device.h"
@@ -31,15 +30,16 @@
}
static constexpr zx_driver_ops_t driver_ops = []() {
- zx_driver_ops_t ops = {};
- ops.version = DRIVER_OPS_VERSION;
- ops.bind = bind;
- return ops;
+ zx_driver_ops_t ops = {};
+ ops.version = DRIVER_OPS_VERSION;
+ ops.bind = bind;
+ return ops;
}();
} // namespace virtual_camera
// clang-format: off
-ZIRCON_DRIVER_BEGIN(virtual_camera, virtual_camera::driver_ops, "fuchsia", "0.1", 1)
- BI_MATCH_IF(EQ, BIND_PROTOCOL, ZX_PROTOCOL_TEST_PARENT),
-ZIRCON_DRIVER_END(virtual_camera)
+ZIRCON_DRIVER_BEGIN(virtual_camera, virtual_camera::driver_ops, "fuchsia",
+ "0.1", 1)
+BI_MATCH_IF(EQ, BIND_PROTOCOL, ZX_PROTOCOL_TEST_PARENT),
+ ZIRCON_DRIVER_END(virtual_camera)
diff --git a/src/camera/examples/video_display/main.cpp b/src/camera/examples/video_display/main.cpp
index 337ee6f..08de634 100644
--- a/src/camera/examples/video_display/main.cpp
+++ b/src/camera/examples/video_display/main.cpp
@@ -3,16 +3,17 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/ui/base_view/cpp/view_provider_component.h>
#include <src/lib/fxl/command_line.h>
#include <src/lib/fxl/log_settings_command_line.h>
-#include <lib/ui/base_view/cpp/view_provider_component.h>
#include <trace-provider/provider.h>
#include "src/camera/examples/video_display/simple_camera_view.h"
/*
To run this code, log in and then run the following command:
- > fx shell sessionctl add_mod fuchsia-pkg://fuchsia.com/video_display#meta/video_display.cmx
+ > fx shell sessionctl add_mod
+ fuchsia-pkg://fuchsia.com/video_display#meta/video_display.cmx
*/
int main(int argc, const char** argv) {
diff --git a/src/camera/examples/video_display/simple_camera_view.h b/src/camera/examples/video_display/simple_camera_view.h
index 6542cd4..87c8a7c 100644
--- a/src/camera/examples/video_display/simple_camera_view.h
+++ b/src/camera/examples/video_display/simple_camera_view.h
@@ -5,15 +5,15 @@
#ifndef SRC_CAMERA_EXAMPLES_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
#define SRC_CAMERA_EXAMPLES_VIDEO_DISPLAY_SIMPLE_CAMERA_VIEW_H_
-#include <deque>
-#include <list>
-
#include <fbl/vector.h>
#include <fuchsia/simplecamera/cpp/fidl.h>
-#include <src/lib/fxl/logging.h>
-#include <src/lib/fxl/macros.h>
#include <lib/ui/base_view/cpp/base_view.h>
#include <lib/ui/scenic/cpp/resources.h>
+#include <src/lib/fxl/logging.h>
+#include <src/lib/fxl/macros.h>
+
+#include <deque>
+#include <list>
namespace video_display {
diff --git a/src/camera/simple_camera/simple_camera_lib/buffer_fence.h b/src/camera/simple_camera/simple_camera_lib/buffer_fence.h
index d4d4ab8..42c3543 100644
--- a/src/camera/simple_camera/simple_camera_lib/buffer_fence.h
+++ b/src/camera/simple_camera/simple_camera_lib/buffer_fence.h
@@ -83,4 +83,4 @@
} // namespace simple_camera
-#endif // SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_FENCED_BUFFER_H_
+#endif // SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_LIB_BUFFER_FENCE_H_
diff --git a/src/camera/simple_camera/simple_camera_lib/meta/simple_camera_unittests.cmx b/src/camera/simple_camera/simple_camera_lib/meta/simple_camera_unittests.cmx
index b247f19..ff8c8eb 100644
--- a/src/camera/simple_camera/simple_camera_lib/meta/simple_camera_unittests.cmx
+++ b/src/camera/simple_camera/simple_camera_lib/meta/simple_camera_unittests.cmx
@@ -3,6 +3,6 @@
"binary": "test/simple_camera_unittests"
},
"sandbox": {
- "services": [ ]
+ "services": []
}
}
diff --git a/src/camera/simple_camera/simple_camera_lib/tests/buffer_fence_unittest.cpp b/src/camera/simple_camera/simple_camera_lib/tests/buffer_fence_unittest.cpp
index 0b942e2..a176b4c 100644
--- a/src/camera/simple_camera/simple_camera_lib/tests/buffer_fence_unittest.cpp
+++ b/src/camera/simple_camera/simple_camera_lib/tests/buffer_fence_unittest.cpp
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "src/camera/simple_camera/simple_camera_lib/buffer_fence.h"
+
#include "gtest/gtest.h"
#include "lib/gtest/test_loop_fixture.h"
-#include "src/camera/simple_camera/simple_camera_lib/buffer_fence.h"
namespace simple_camera {
namespace test {
@@ -20,8 +21,8 @@
zx::event release_fence;
bf->DuplicateReleaseFence(&release_fence);
- bf->SetReleaseFenceHandler([&signalled_index] (BufferFence* b) {
- signalled_index = b->index(); });
+ bf->SetReleaseFenceHandler(
+ [&signalled_index](BufferFence* b) { signalled_index = b->index(); });
// signal the fence so we will get a callback
release_fence.signal(0, ZX_EVENT_SIGNALED);
diff --git a/src/camera/simple_camera/simple_camera_lib/video_display.h b/src/camera/simple_camera/simple_camera_lib/video_display.h
index 03a2b62..4f33deb 100644
--- a/src/camera/simple_camera/simple_camera_lib/video_display.h
+++ b/src/camera/simple_camera/simple_camera_lib/video_display.h
@@ -7,10 +7,10 @@
#include <fuchsia/camera/cpp/fidl.h>
#include <fuchsia/images/cpp/fidl.h>
-#include <src/camera/simple_camera/simple_camera_lib/buffer_fence.h>
-#include <src/camera/simple_camera/simple_camera_lib/frame_scheduler.h>
#include <lib/component/cpp/startup_context.h>
#include <lib/zx/eventpair.h>
+#include <src/camera/simple_camera/simple_camera_lib/buffer_fence.h>
+#include <src/camera/simple_camera/simple_camera_lib/frame_scheduler.h>
#include <deque>
#include <list>
diff --git a/src/camera/simple_camera/simple_camera_server/simple_camera_server_app.h b/src/camera/simple_camera/simple_camera_server/simple_camera_server_app.h
index a2327f2..b333006b 100644
--- a/src/camera/simple_camera/simple_camera_server/simple_camera_server_app.h
+++ b/src/camera/simple_camera/simple_camera_server/simple_camera_server_app.h
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#pragma once
+#ifndef SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_SERVER_SIMPLE_CAMERA_SERVER_APP_H_
+#define SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_SERVER_SIMPLE_CAMERA_SERVER_APP_H_
#include <fuchsia/images/cpp/fidl.h>
#include <fuchsia/simplecamera/cpp/fidl.h>
@@ -30,3 +31,5 @@
};
} // namespace simple_camera
+
+#endif // SRC_CAMERA_SIMPLE_CAMERA_SIMPLE_CAMERA_SERVER_SIMPLE_CAMERA_SERVER_APP_H_
