Simplify

Author: mkeeter

drv/vsc7448/src/lib.rs

@@ -920,31 +920,54 @@ impl<'a, R: Vsc7448Rw> Vsc7448<'a, R> {
         &self,
         targets: VlanTargets,
     ) -> Result<(), VscError> {
-        self.configure_vlans(|p| match (targets, p) {
-            (_, sidecar::UPLINK) => None,
-            (_, sidecar::TECHNICIAN_1) => {
+        match targets {
+            VlanTargets::EverySp => self.sidecar_vlan_unlock_all(),
+            VlanTargets::ScrimletOnly => self.sidecar_vlan_unlock_scrimlet(),
+        }
+    }
+
+    fn sidecar_vlan_unlock_all(&self) -> Result<(), VscError> {
+        self.configure_vlans(|p| match p {
+            sidecar::UPLINK => None,
+            sidecar::TECHNICIAN_1 => {
                 // Technician ports are connected to every port, but not to each
                 // other (to prevent spanning tree fun)
                 Some(((1 << 53) - 1) & !(1 << sidecar::TECHNICIAN_2))
             }
-            (_, sidecar::TECHNICIAN_2) => {
+            sidecar::TECHNICIAN_2 => {
                 Some(((1 << 53) - 1) & !(1 << sidecar::TECHNICIAN_1))
             }
-            // SPs are connected to the Tofino and technician ports
-            (VlanTargets::EverySp, _)
-            | (
-                VlanTargets::ScrimletOnly,
-                sidecar::CUBBY_14 | sidecar::CUBBY_16,
-            ) => Some(
+            _ => {
+                // SPs are only connected to the Tofino and technician ports
+                Some(
+                    (1 << p)
+                        | (1 << sidecar::UPLINK)
+                        | (1 << sidecar::TECHNICIAN_1)
+                        | (1 << sidecar::TECHNICIAN_2),
+                )
+            }
+        })
+    }
+
+    fn sidecar_vlan_unlock_scrimlet(&self) -> Result<(), VscError> {
+        self.configure_vlans(|p| match p {
+            sidecar::UPLINK => None,
+            // Technician ports are connected to uplink and scrimlets
+            sidecar::TECHNICIAN_1 | sidecar::TECHNICIAN_2 => Some(
+                (1 << p)
+                    | (1 << sidecar::UPLINK)
+                    | (1 << sidecar::CUBBY_14)
+                    | (1 << sidecar::CUBBY_16),
+            ),
+            // Scrimlet SPs are connected to the Tofino and technician ports
+            sidecar::CUBBY_14 | sidecar::CUBBY_16 => Some(
                 (1 << p)
                     | (1 << sidecar::UPLINK)
                     | (1 << sidecar::TECHNICIAN_1)
                     | (1 << sidecar::TECHNICIAN_2),
             ),
-            // SPs connected to only the uplink port
-            (VlanTargets::ScrimletOnly, _) => {
-                Some((1 << p) | (1 << sidecar::UPLINK))
-            }
+            // Other SPs are only connected to the uplink port
+            _ => Some((1 << p) | (1 << sidecar::UPLINK)),
         })
     }