From 2652d1797b848c964a4b24424b8c3c2883ae6e2f Mon Sep 17 00:00:00 2001 From: "Cliff L. Biffle" Date: Thu, 25 Jan 2024 16:07:10 -0800 Subject: [PATCH] fixes --- Cargo.lock | 2 +- app/gimlet/base.toml | 2 +- task/gimlet-inspector/src/main.rs | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bbbbbeb76..ccf7858397 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2271,7 +2271,7 @@ dependencies = [ [[package]] name = "gimlet-inspector-protocol" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/gimlet-inspector-protocol?branch=initial-protocol#76d629bb130701df5c6ba644a7ccdd102506feb0" +source = "git+https://github.com/oxidecomputer/gimlet-inspector-protocol?branch=initial-protocol#f873ce5b6cc121ab0d4210bb52be38cb37d9e80f" dependencies = [ "hubpack", "serde", diff --git a/app/gimlet/base.toml b/app/gimlet/base.toml index e5dd3b3388..08e019150e 100644 --- a/app/gimlet/base.toml +++ b/app/gimlet/base.toml @@ -158,7 +158,7 @@ register_defs = "gimlet-regs-b.json" name = "task-gimlet-inspector" priority = 6 features = ["vlan"] -max-sizes = {flash = 65536, ram = 8192 } +max-sizes = {flash = 16384, ram = 2048 } stacksize = 1600 start = true task-slots = ["net", {seq = "gimlet_seq"}] diff --git a/task/gimlet-inspector/src/main.rs b/task/gimlet-inspector/src/main.rs index e7123818ad..3ec1729a96 100644 --- a/task/gimlet-inspector/src/main.rs +++ b/task/gimlet-inspector/src/main.rs @@ -10,7 +10,7 @@ #![no_main] use drv_gimlet_seq_api::{SeqError, Sequencer}; -use gimlet_inspector_protocol::{Query, Request, SequencerRegistersResponse}; +use gimlet_inspector_protocol::{QueryV0, Request, SequencerRegistersResponseV0}; use hubpack::SerializedSize; use task_net_api::*; use userlib::*; @@ -47,14 +47,15 @@ fn main() -> ! { }; match request { - Request::V0(Query::SequencerRegisters) => { - let (resp, trailer) = match seq.read_fpga_regs() { + Request::V0(QueryV0::SequencerRegisters) => { + let result = seq.read_fpga_regs(); + let (resp, trailer) = match result { Ok(regs) => ( - SequencerRegistersResponse::Success, + SequencerRegistersResponseV0::Success, Some(regs), ), Err(SeqError::ServerRestarted) => ( - SequencerRegistersResponse::SequencerTaskDead, + SequencerRegistersResponseV0::SequencerTaskDead, None, ), Err(_) => { @@ -62,7 +63,7 @@ fn main() -> ! { // together of all possible errors for all // possible sequencer IPC operations. The only // one we _expect_ here is ReadRegsFailed. - (SequencerRegistersResponse::SequencerReadRegsFailed, None) + (SequencerRegistersResponseV0::SequencerReadRegsFailed, None) } }; let mut len =