mctp: add i2c_client and transport-i2c deps (Phase 6 Step 2)
Add three deps to the mctp_server Bazel binary target:
- //services/i2c/api:i2c_api
- //services/i2c/client:i2c_client
- //services/mctp/transport-i2c:mctp_transport_i2c
Fix two build errors uncovered by the new dependency graph:
- services/i2c/client/src/lib.rs: remove unused import
encode_disable_slave_notification_request
- services/mctp/transport-i2c/src/{sender,receiver}.rs: replace
openprot_i2c_api with i2c_api (the Bazel crate_name is i2c_api,
not openprot_i2c_api)
diff --git a/services/i2c/client/src/lib.rs b/services/i2c/client/src/lib.rs
index bb481a3..3752703 100644
--- a/services/i2c/client/src/lib.rs
+++ b/services/i2c/client/src/lib.rs
@@ -25,7 +25,7 @@
use i2c_api::{
wire::{
self, encode_configure_slave_request, encode_disable_slave_request,
- encode_disable_slave_notification_request, encode_enable_slave_request,
+ encode_enable_slave_request,
encode_enable_slave_notification_request, encode_probe_request, encode_read_request,
encode_slave_receive_request, encode_slave_set_response_request,
encode_slave_wait_event_request, encode_write_read_request, encode_write_request,
diff --git a/services/mctp/server/BUILD.bazel b/services/mctp/server/BUILD.bazel
index 2374fe8..7a6098d 100644
--- a/services/mctp/server/BUILD.bazel
+++ b/services/mctp/server/BUILD.bazel
@@ -35,7 +35,10 @@
deps = [
":app_mctp_server",
":mctp_server_lib",
+ "//services/i2c/api:i2c_api",
+ "//services/i2c/client:i2c_client",
"//services/mctp/api:mctp_api",
+ "//services/mctp/transport-i2c:mctp_transport_i2c",
"@rust_crates//:mctp",
"@rust_crates//:mctp-lib",
"@pigweed//pw_kernel/syscall:syscall_user",
diff --git a/services/mctp/transport-i2c/src/receiver.rs b/services/mctp/transport-i2c/src/receiver.rs
index 9c4b3b8..1230907 100644
--- a/services/mctp/transport-i2c/src/receiver.rs
+++ b/services/mctp/transport-i2c/src/receiver.rs
@@ -10,7 +10,7 @@
//! for decoding (same as Hubris).
use mctp_lib::i2c::MctpI2cEncap;
-use openprot_i2c_api::TargetMessage;
+use i2c_api::TargetMessage;
/// Decodes I2C target messages into raw MCTP packets.
///
diff --git a/services/mctp/transport-i2c/src/sender.rs b/services/mctp/transport-i2c/src/sender.rs
index 73ba2a8..47ef8e1 100644
--- a/services/mctp/transport-i2c/src/sender.rs
+++ b/services/mctp/transport-i2c/src/sender.rs
@@ -4,11 +4,11 @@
//!
//! Direct port of Hubris `mctp-server/src/i2c.rs` `I2cSender`.
//! Only the I2C driver API is replaced: `drv_i2c_api::I2cDevice` →
-//! `openprot_i2c_api::I2cClientBlocking`.
+//! `i2c_api::I2cClientBlocking`.
use mctp::Result;
use mctp_lib::i2c::{MctpI2cEncap, MCTP_I2C_MAXMTU};
-use openprot_i2c_api::{BusIndex, I2cAddress, I2cClientBlocking};
+use i2c_api::{BusIndex, I2cAddress, I2cClientBlocking};
/// I2C MCTP sender.
///