Automatically switch KSZ VLAN mode based on features (#749)

Author: mkeeter

task/net/src/bsp/gimlet_1.rs

@@ -92,7 +92,11 @@ impl Bsp {
                 // SP_TO_MGMT_MUX_RESET_L
                 ksz8463_nrst: Port::C.pin(2),
                 ksz8463_rst_type: mgmt::Ksz8463ResetSpeed::Normal,
+
+                #[cfg(feature = "vlan")]
                 ksz8463_vlan_mode: ksz8463::VLanMode::Mandatory,
+                #[cfg(not(feature = "vlan"))]
+                ksz8463_vlan_mode: ksz8463::VLanMode::Optional,
 
                 // SP_TO_MGMT_PHY_COMA_MODE
                 vsc85x2_coma_mode: Some(Port::D.pin(7)),

task/net/src/bsp/gimletlet_mgmt.rs

@@ -133,6 +133,10 @@ impl Bsp {
             ksz8463_spi: Spi::from(SPI.get_task_id()).device(0),
             ksz8463_nrst: Port::A.pin(9),
             ksz8463_rst_type: mgmt::Ksz8463ResetSpeed::Slow,
+
+            #[cfg(feature = "vlan")]
+            ksz8463_vlan_mode: ksz8463::VLanMode::Mandatory,
+            #[cfg(not(feature = "vlan"))]
             ksz8463_vlan_mode: ksz8463::VLanMode::Optional,
 
             vsc85x2_coma_mode: None,

task/net/src/bsp/gimletlet_nic.rs

@@ -65,9 +65,13 @@ impl Bsp {
             // Initialize the KSZ8463 (using SPI4_RESET, PB10)
             sys.gpio_init_reset_pulse(Port::B.pin(10), 10, 1).unwrap();
             let ksz8463 = Ksz8463::new(ksz8463_spi);
-            match ksz8463
-                .configure(ksz8463::Mode::Copper, ksz8463::VLanMode::Mandatory)
-            {
+
+            #[cfg(feature = "vlan")]
+            let vlan_mode = ksz8463::VLanMode::Mandatory;
+            #[cfg(not(feature = "vlan"))]
+            let vlan_mode = ksz8463::VLanMode::Optional;
+
+            match ksz8463.configure(ksz8463::Mode::Copper, vlan_mode) {
                 Err(err) => {
                     ringbuf_entry!(Trace::KszErr { err });
                     sleep_for(100);

task/net/src/bsp/psc_1.rs

@@ -62,7 +62,11 @@ impl Bsp {
             ksz8463_spi: Spi::from(SPI.get_task_id()).device(0),
             ksz8463_nrst: Port::C.pin(2),
             ksz8463_rst_type: mgmt::Ksz8463ResetSpeed::Normal,
+
+            #[cfg(feature = "vlan")]
             ksz8463_vlan_mode: ksz8463::VLanMode::Mandatory,
+            #[cfg(not(feature = "vlan"))]
+            ksz8463_vlan_mode: ksz8463::VLanMode::Optional,
 
             // SP_TO_MGMT_PHY_COMA_MODE
             vsc85x2_coma_mode: Some(Port::D.pin(7)),

task/net/src/bsp/sidecar_1.rs

@@ -68,7 +68,11 @@ impl Bsp {
             // SP_TO_EPE_RESET_L
             ksz8463_nrst: Port::A.pin(0),
             ksz8463_rst_type: mgmt::Ksz8463ResetSpeed::Normal,
+
+            #[cfg(feature = "vlan")]
             ksz8463_vlan_mode: ksz8463::VLanMode::Mandatory,
+            #[cfg(not(feature = "vlan"))]
+            ksz8463_vlan_mode: ksz8463::VLanMode::Optional,
 
             // SP_TO_PHY2_COMA_MODE_3V3
             vsc85x2_coma_mode: Some(Port::I.pin(15)),