Skip to content

Commit 49e57ca

Browse files
AlexJones0marnovandermaas
authored andcommitted
Update pinmux 'all blocks' check to use 1-indexed PMOD pins
Updates the pinmux "all blocks" check to use PMOD pins that are 1-indexed instead of 0-indexed, so that they match the actual pin names used in the schematic, and now the udpated names used by the driver. This ensures that even after renaming the PMOD pins to be 1-indexed, the check still passes.
1 parent 83e247c commit 49e57ca

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

sw/cheri/checks/pinmux_all_blocks_check.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,32 +77,32 @@ using namespace CHERI;
7777
// initializers, as that requires `memcpy` to exist which we do not have.
7878
// Likewise, arrays with multiple pins/inputs must be individually set, or
7979
// we will get errors with `memcpy`.
80-
OutputPinAssignment pmod_test_gpio_on_pins[] = {{SonataPinmux::OutputPin::pmod0_1, 1}};
80+
OutputPinAssignment pmod_test_gpio_on_pins[] = {{SonataPinmux::OutputPin::pmod0_2, 1}};
8181
BlockInputAssignment pmod_test_gpio_on_inputs[] = {{SonataPinmux::BlockInput::gpio_2_ios_2, 1}};
82-
OutputPinAssignment pmod_test_gpio_off_pins[] = {{SonataPinmux::OutputPin::pmod0_1, 0}};
82+
OutputPinAssignment pmod_test_gpio_off_pins[] = {{SonataPinmux::OutputPin::pmod0_2, 0}};
8383
BlockInputAssignment pmod_test_gpio_off_inputs[] = {{SonataPinmux::BlockInput::gpio_2_ios_2, 0}};
8484

85-
OutputPinAssignment pmod_test_uart_on_pins[] = {{SonataPinmux::OutputPin::pmod0_1, 3}};
85+
OutputPinAssignment pmod_test_uart_on_pins[] = {{SonataPinmux::OutputPin::pmod0_2, 3}};
8686
BlockInputAssignment pmod_test_uart_on_inputs[] = {{SonataPinmux::BlockInput::uart_2_rx, 2}};
87-
OutputPinAssignment pmod_test_uart_off_pins[] = {{SonataPinmux::OutputPin::pmod0_1, 0}};
87+
OutputPinAssignment pmod_test_uart_off_pins[] = {{SonataPinmux::OutputPin::pmod0_2, 0}};
8888
BlockInputAssignment pmod_test_uart_off_inputs[] = {{SonataPinmux::BlockInput::uart_2_rx, 0}};
8989

9090
OutputPinAssignment pmod_test_i2c_on_pins[2];
91-
pmod_test_i2c_on_pins[0] = {SonataPinmux::OutputPin::pmod0_2, 2}; // Mux to I2C SDA
92-
pmod_test_i2c_on_pins[1] = {SonataPinmux::OutputPin::pmod0_3, 2}; // Mux to I2C SCL
91+
pmod_test_i2c_on_pins[0] = {SonataPinmux::OutputPin::pmod0_3, 2}; // Mux to I2C SDA
92+
pmod_test_i2c_on_pins[1] = {SonataPinmux::OutputPin::pmod0_4, 2}; // Mux to I2C SCL
9393
OutputPinAssignment pmod_test_i2c_off_pins[2];
94-
pmod_test_i2c_off_pins[0] = {SonataPinmux::OutputPin::pmod0_2, 0};
95-
pmod_test_i2c_off_pins[1] = {SonataPinmux::OutputPin::pmod0_3, 0};
94+
pmod_test_i2c_off_pins[0] = {SonataPinmux::OutputPin::pmod0_3, 0};
95+
pmod_test_i2c_off_pins[1] = {SonataPinmux::OutputPin::pmod0_4, 0};
9696

9797
OutputPinAssignment pmod_test_spi_on_pins[3];
98-
pmod_test_spi_on_pins[0] = {SonataPinmux::OutputPin::pmod0_0, 2}; // Mux to SPI CS
99-
pmod_test_spi_on_pins[1] = {SonataPinmux::OutputPin::pmod0_1, 2}; // Mux to SPI COPI
100-
pmod_test_spi_on_pins[2] = {SonataPinmux::OutputPin::pmod0_3, 3}; // Mux to SPI SCK
98+
pmod_test_spi_on_pins[0] = {SonataPinmux::OutputPin::pmod0_1, 2}; // Mux to SPI CS
99+
pmod_test_spi_on_pins[1] = {SonataPinmux::OutputPin::pmod0_2, 2}; // Mux to SPI COPI
100+
pmod_test_spi_on_pins[2] = {SonataPinmux::OutputPin::pmod0_4, 3}; // Mux to SPI SCK
101101
BlockInputAssignment pmod_test_spi_on_inputs[] = {{SonataPinmux::BlockInput::spi_2_rx, 2}};
102102
OutputPinAssignment pmod_test_spi_off_pins[3];
103-
pmod_test_spi_off_pins[0] = {SonataPinmux::OutputPin::pmod0_0, 0};
104-
pmod_test_spi_off_pins[1] = {SonataPinmux::OutputPin::pmod0_1, 0};
105-
pmod_test_spi_off_pins[2] = {SonataPinmux::OutputPin::pmod0_3, 0};
103+
pmod_test_spi_off_pins[0] = {SonataPinmux::OutputPin::pmod0_1, 0};
104+
pmod_test_spi_off_pins[1] = {SonataPinmux::OutputPin::pmod0_2, 0};
105+
pmod_test_spi_off_pins[2] = {SonataPinmux::OutputPin::pmod0_4, 0};
106106
BlockInputAssignment pmod_test_spi_off_inputs[] = {{SonataPinmux::BlockInput::spi_2_rx, 0}};
107107

108108
// The pinmux testplan to execute. This testplan runs through testing GPIO, UART, I2C and SPI

0 commit comments

Comments
 (0)