[camera][sensor] Moved reg addrs to new header
This CL moves the MIPI CCS register addresses out into a separate
header. This is preliminary work for the addition of new functionality and
the later extraction of common sensor code for use across multiple
sensor drivers.
Change-Id: Ia2477629fdae694c447dcc57846ff51dd7a8b157
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/412342
Reviewed-by: Nic Zoghb <nzo@google.com>
Testability-Review: Nic Zoghb <nzo@google.com>
Commit-Queue: John Sasinowski <jsasinowski@google.com>
diff --git a/src/camera/drivers/sensors/imx227/constants.h b/src/camera/drivers/sensors/imx227/constants.h
index 96677f9..4cea3762 100644
--- a/src/camera/drivers/sensors/imx227/constants.h
+++ b/src/camera/drivers/sensors/imx227/constants.h
@@ -12,7 +12,6 @@
namespace camera {
inline const uint8_t kByteShift = 8;
-inline const uint16_t kSensorModelIdReg = 0x0016;
inline const uint16_t kSensorModelIdDefault = 0x0227;
// Max allowed for 30fps = 2782 (dec)=0x0ADE (hex)
inline const uint32_t kMaxCoarseIntegrationTimeFor30fpsInLines = 0x0ADE;
diff --git a/src/camera/drivers/sensors/imx227/imx227.cc b/src/camera/drivers/sensors/imx227/imx227.cc
index 557089b..ec77f32 100644
--- a/src/camera/drivers/sensors/imx227/imx227.cc
+++ b/src/camera/drivers/sensors/imx227/imx227.cc
@@ -23,14 +23,12 @@
#include "src/camera/drivers/sensors/imx227/constants.h"
#include "src/camera/drivers/sensors/imx227/imx227_modes.h"
#include "src/camera/drivers/sensors/imx227/imx227_seq.h"
+#include "src/camera/drivers/sensors/imx227/mipi_ccs_regs.h"
namespace camera {
namespace {
-constexpr uint16_t kModeSelectReg = 0x0100;
-constexpr uint16_t kFrameLengthLinesReg = 0x0340;
-constexpr uint16_t kLineLengthPckReg = 0x0342;
constexpr uint8_t kRaw10Bits = 10;
constexpr uint8_t kRaw12Bits = 12;
constexpr uint8_t kByteMask = 0xFF;
diff --git a/src/camera/drivers/sensors/imx227/imx227_protocol.cc b/src/camera/drivers/sensors/imx227/imx227_protocol.cc
index 2a77819..c769124 100644
--- a/src/camera/drivers/sensors/imx227/imx227_protocol.cc
+++ b/src/camera/drivers/sensors/imx227/imx227_protocol.cc
@@ -10,14 +10,12 @@
#include "src/camera/drivers/sensors/imx227/imx227_modes.h"
#include "src/camera/drivers/sensors/imx227/imx227_otp_config.h"
#include "src/camera/drivers/sensors/imx227/imx227_seq.h"
+#include "src/camera/drivers/sensors/imx227/mipi_ccs_regs.h"
namespace camera {
namespace {
-const int32_t kModeSelectReg = 0x0100;
// Extension Values
-const uint16_t kFrameLengthLinesReg = 0x0340;
-const uint16_t kLineLengthPckReg = 0x0342;
const int32_t kLog2GainShift = 18;
const int32_t kSensorExpNumber = 1;
const uint32_t kMasterClock = 288000000;
diff --git a/src/camera/drivers/sensors/imx227/mipi_ccs_regs.h b/src/camera/drivers/sensors/imx227/mipi_ccs_regs.h
new file mode 100644
index 0000000..e64e9d4
--- /dev/null
+++ b/src/camera/drivers/sensors/imx227/mipi_ccs_regs.h
@@ -0,0 +1,21 @@
+// Copyright 2020- The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SRC_CAMERA_DRIVERS_SENSORS_IMX227_MIPI_CCS_REGS_H_
+#define SRC_CAMERA_DRIVERS_SENSORS_IMX227_MIPI_CCS_REGS_H_
+
+// Definitions of sensor registers described by the MIPI CCS specification.
+
+#include <zircon/types.h>
+
+namespace camera {
+
+constexpr uint16_t kSensorModelIdReg = 0x0016;
+constexpr uint16_t kModeSelectReg = 0x0100;
+constexpr uint16_t kFrameLengthLinesReg = 0x0340;
+constexpr uint16_t kLineLengthPckReg = 0x0342;
+
+} // namespace camera
+
+#endif // SRC_CAMERA_DRIVERS_SENSORS_IMX227_MIPI_CCS_REGS_H_
diff --git a/src/camera/drivers/sensors/imx227/test/imx227_test.cc b/src/camera/drivers/sensors/imx227/test/imx227_test.cc
index b03febe..98af7df 100644
--- a/src/camera/drivers/sensors/imx227/test/imx227_test.cc
+++ b/src/camera/drivers/sensors/imx227/test/imx227_test.cc
@@ -15,6 +15,7 @@
#include "src/camera/drivers/sensors/imx227/constants.h"
#include "src/camera/drivers/sensors/imx227/imx227_id.h"
+#include "src/camera/drivers/sensors/imx227/mipi_ccs_regs.h"
// The following equality operators are necessary for mocks.
